Skip to content
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

Jump to bottom

Use "replace" in all write modes #43

Merged
merged 2 commits into from
Dec 29, 2022
Merged

Use "replace" in all write modes #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3240b35
Update driver to v0.10.0
akudiyar Dec 29, 2022
3a59414
Use replace for write operations instead of insert
akudiyar Dec 9, 2022
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
29 changes: 17 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,23 @@ ThisBuild / developers := List(
ThisBuild / scalaVersion := scala211

val commonDependencies = Seq(
"io.tarantool" % "cartridge-driver" % "0.9.0",
"junit" % "junit" % "4.12" % Test,
"com.github.sbt" % "junit-interface" % "0.12" % Test,
"org.testcontainers" % "testcontainers" % "1.17.3" % Test,
"io.tarantool" % "testcontainers-java-tarantool" % "0.5.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.14" % Test,
"org.scalamock" %% "scalamock" % "5.1.0" % Test,
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.39.5" % Test,
"org.slf4j" % "slf4j-api" % "1.7.36" % Test,
"ch.qos.logback" % "logback-core" % "1.2.5" % Test,
"ch.qos.logback" % "logback-classic" % "1.2.5" % Test,
"org.apache.derby" % "derby" % "10.11.1.1" % Test
"io.tarantool" % "cartridge-driver" % "0.10.0",
"junit" % "junit" % "4.12" % Test,
"com.github.sbt" % "junit-interface" % "0.12" % Test,
"org.scalatest" %% "scalatest" % "3.2.14" % Test,
"org.scalamock" %% "scalamock" % "5.2.0" % Test,
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.12" % Test,
"org.slf4j" % "slf4j-api" % "1.7.36" % Test,
"ch.qos.logback" % "logback-core" % "1.2.5" % Test,
"ch.qos.logback" % "logback-classic" % "1.2.5" % Test,
"org.apache.derby" % "derby" % "10.11.1.1" % Test,
"io.tarantool" % "testcontainers-java-tarantool" % "0.5.3" % Test
).map(
_.exclude("io.netty", "netty-all")
.exclude("io.netty", "netty-transport")
.exclude("io.netty", "netty-handler")
.exclude("io.netty", "netty-codec")
.exclude("io.netty", "netty-codec-http")
)

lazy val root = (project in file("."))
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/io/tarantool/spark/connector/rdd/TarantoolReadRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package io.tarantool.spark.connector.rdd
import io.tarantool.driver.api.conditions.Conditions
import io.tarantool.driver.api.tuple.TarantoolTuple
import io.tarantool.driver.api.{TarantoolClient, TarantoolResult}
import io.tarantool.driver.mappers.{DefaultMessagePackMapperFactory, MessagePackMapper}
import io.tarantool.driver.mappers.MessagePackMapper
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import io.tarantool.spark.connector.config.{ReadConfig, TarantoolConfig}
import io.tarantool.spark.connector.connection.TarantoolConnection
import io.tarantool.spark.connector.partition.TarantoolPartition
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/io/tarantool/spark/connector/rdd/TarantoolWriteRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import io.tarantool.driver.api.tuple.{DefaultTarantoolTupleFactory, TarantoolTup
import io.tarantool.driver.api.TarantoolResult
import io.tarantool.driver.api.space.options.proxy.ProxyInsertManyOptions
import io.tarantool.driver.api.space.options.proxy.ProxyReplaceManyOptions
import io.tarantool.driver.mappers.{DefaultMessagePackMapperFactory, MessagePackMapper}
import io.tarantool.driver.mappers.MessagePackMapper
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import io.tarantool.spark.connector.{Logging, TarantoolSparkException}
import io.tarantool.spark.connector.config.{TarantoolConfig, WriteConfig}
import io.tarantool.spark.connector.connection.TarantoolConnection
Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/org/apache/spark/sql/tarantool/DefaultSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class DefaultSource
case SaveMode.Append => relation.rdd.write(connection, data, overwrite = true)
case SaveMode.Overwrite => {
relation.rdd.truncate(connection)
relation.rdd.write(connection, data, overwrite = false)
relation.rdd.write(connection, data, overwrite = true)
}
case SaveMode.ErrorIfExists => {
if (relation.rdd.nonEmpty(connection)) {
Expand All @@ -60,11 +60,11 @@ class DefaultSource
"already exists in Tarantool and contains data."
)
}
relation.rdd.write(connection, data, overwrite = false)
relation.rdd.write(connection, data, overwrite = true)
}
case SaveMode.Ignore =>
if (relation.rdd.isEmpty(connection)) {
relation.rdd.write(connection, data, overwrite = false)
relation.rdd.write(connection, data, overwrite = true)
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/org/apache/spark/sql/tarantool/TarantoolReadRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.apache.spark.sql.tarantool

import io.tarantool.driver.api.tuple.TarantoolTuple
import io.tarantool.driver.mappers.{DefaultMessagePackMapperFactory, MessagePackMapper}
import io.tarantool.driver.mappers.MessagePackMapper
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import io.tarantool.spark.connector.rdd.TarantoolReadRDD
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.sources.TableScan
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/io/tarantool/spark/connector/integration/TarantoolSparkReadClusterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.tarantool.spark.connector.integration

import io.tarantool.driver.api.conditions.Conditions
import io.tarantool.driver.api.tuple.{DefaultTarantoolTupleFactory, TarantoolTuple}
import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import io.tarantool.spark.connector.config.TarantoolConfig
import io.tarantool.spark.connector.connection.TarantoolConnection
import io.tarantool.spark.connector.rdd.converter.FunctionBasedTupleConverterFactory
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/io/tarantool/spark/connector/integration/TarantoolSparkWriteClusterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.tarantool.spark.connector.integration

import io.tarantool.driver.api.conditions.Conditions
import io.tarantool.driver.api.tuple.{DefaultTarantoolTupleFactory, TarantoolTuple}
import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import io.tarantool.spark.connector.toSparkContextFunctions
import org.apache.spark.SparkException
import org.apache.spark.sql.{Encoders, Row, SaveMode}
Expand Down Expand Up @@ -311,7 +311,7 @@ class TarantoolSparkWriteClusterTest extends AnyFunSuite with Matchers with Tara
)
).toDS

intercept[SparkException] {
val ex = intercept[SparkException] {
ds.write
.format("org.apache.spark.sql.tarantool")
.mode(SaveMode.Overwrite)
Expand All @@ -321,6 +321,7 @@ class TarantoolSparkWriteClusterTest extends AnyFunSuite with Matchers with Tara
.option("tarantool.batchSize", 2)
.save()
}
ex.getMessage should not(contain("Not all tuples of the batch"))

val actual = spark.sparkContext.tarantoolSpace(space, Conditions.any()).collect()
actual.length should equal(1) // only one tuple from the first batch should be successful
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/apache/spark/sql/tarantool/MapFunctionsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.apache.spark.sql.tarantool
import io.tarantool.driver.api.metadata.{TestSpaceMetadata, TestSpaceWithArrayMetadata, TestSpaceWithMapMetadata}
import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory
import io.tarantool.driver.core.tuple.TarantoolTupleImpl
import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory
import org.apache.spark.sql.Row
import org.apache.spark.sql.types._
import org.scalatest.Inspectors.forAll
Expand Down