Skip to content

subtask: Added Spark OceanBase catalog implementation for OceanBase MySQL mode #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 12, 2025
Merged

subtask: Added Spark OceanBase catalog implementation for OceanBase MySQL mode #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ecd560
subtask: Added Spark OceanBase catalog implementation for OceanBase M…
yuanoOo Feb 10, 2025
a2f7106
Merge branch 'main' into catalog
yuanoOo Feb 10, 2025
e224179
BugFix: Fix error caused after git merge main branch.
yuanoOo Feb 10, 2025
14f053c
BugFix: Remove schema comment related code.
yuanoOo Feb 11, 2025
479e59d
BugFix: 1. drop table throw exception 2.Remove useless and deprecated…
yuanoOo Feb 11, 2025
fe556e7
BugFix: Change method name to writeDataViaDirectLoad
yuanoOo Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...onnector-oceanbase-base/src/main/scala/com/oceanbase/spark/catalog/OceanBaseCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ class OceanBaseCatalog
dialect.dropTable(conn, getTableName(ident), options)
true
} catch {
case _: SQLException => false
case ex: SQLException =>
throw OceanBaseCatalogException(s"Failed to drop table ${getTableName(ident)}", ex)
}
}
}
Expand Down
76 changes: 0 additions & 76 deletions ...k-connector-oceanbase-base/src/main/scala/com/oceanbase/spark/sql/OceanBaseRelation.scala
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions ...onnector-oceanbase-base/src/main/scala/com/oceanbase/spark/sql/OceanBaseSparkSource.scala
View file
Open in desktop

This file was deleted.

22 changes: 19 additions & 3 deletions ...nnector-oceanbase-base/src/main/scala/org/apache/spark/sql/OceanBaseSparkDataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
package org.apache.spark.sql

import com.oceanbase.spark.config.OceanBaseConfig
import com.oceanbase.spark.sql.OceanBaseSparkSource
import com.oceanbase.spark.utils.OBJdbcUtils
import com.oceanbase.spark.utils.OBJdbcUtils.{getCompatibleMode, getDbTable}
import com.oceanbase.spark.writer.DirectLoadWriter

import OceanBaseSparkDataSource.{JDBC_TXN_ISOLATION_LEVEL, JDBC_URL, JDBC_USER, OCEANBASE_DEFAULT_ISOLATION_LEVEL, SHORT_NAME}
import OceanBaseSparkDataSource.{saveTableBasedDirectLoad, JDBC_TXN_ISOLATION_LEVEL, JDBC_URL, JDBC_USER, OCEANBASE_DEFAULT_ISOLATION_LEVEL, SHORT_NAME}
import org.apache.spark.sql
import org.apache.spark.sql.execution.datasources.jdbc.{JDBCOptions, JDBCRelation, JdbcRelationProvider}
import org.apache.spark.sql.jdbc.{JdbcDialects, OceanBaseMySQLDialect, OceanBaseOracleDialect}
import org.apache.spark.sql.sources._
Expand Down Expand Up @@ -53,7 +55,7 @@ class OceanBaseSparkDataSource extends JdbcRelationProvider {
val param = buildJDBCOptions(parameters, oceanBaseConfig)._2
super.createRelation(sqlContext, mode, param, dataFrame)
} else {
OceanBaseSparkSource.createDirectLoadRelation(sqlContext, mode, dataFrame, oceanBaseConfig)
saveTableBasedDirectLoad(mode, dataFrame, oceanBaseConfig)
createRelation(sqlContext, parameters)
}
}
Expand Down Expand Up @@ -92,4 +94,18 @@ object OceanBaseSparkDataSource {
val JDBC_USER = "user"
val JDBC_TXN_ISOLATION_LEVEL = "isolationLevel"
val OCEANBASE_DEFAULT_ISOLATION_LEVEL = "READ_COMMITTED"

def saveTableBasedDirectLoad(
mode: SaveMode,
dataFrame: DataFrame,
oceanBaseConfig: OceanBaseConfig): Unit = {
mode match {
case sql.SaveMode.Append => // do nothing
case sql.SaveMode.Overwrite =>
OBJdbcUtils.truncateTable(oceanBaseConfig)
case _ =>
throw new NotImplementedError(s"${mode.name()} mode is not currently supported.")
}
DirectLoadWriter.savaTable(dataFrame, oceanBaseConfig)
}
}