wuchong commented on code in PR #2277: URL: https://github.com/apache/fluss/pull/2277#discussion_r2659718413
########## fluss-spark/fluss-spark-ut/src/test/scala/org/apache/fluss/spark/SparkWriteTest.scala: ########## @@ -0,0 +1,271 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.fluss.spark + +import org.apache.fluss.metadata.{Schema, TableDescriptor} +import org.apache.fluss.row.{BinaryString, GenericRow, InternalRow} +import org.apache.fluss.spark.util.TestUtils.FLUSS_ROWTYPE +import org.apache.fluss.types.DataTypes + +import org.assertj.core.api.Assertions.assertThat + +import java.sql.Timestamp +import java.time.Duration + +import scala.collection.JavaConverters._ + +class SparkWriteTest extends FlussSparkTestBase { + + import SparkWriteTest._ + + test("Fluss Write: all data types") { + val tablePath = createTablePath("test_all_data_types") + val tableDescriptor: TableDescriptor = TableDescriptor.builder + .schema(Schema.newBuilder().fromRowType(FLUSS_ROWTYPE).build) + .build() + createFlussTable(tablePath, tableDescriptor) + + spark.sql(s""" + |INSERT INTO $DEFAULT_DATABASE.test_all_data_types + |VALUES ( + | true, 1, 10, 100, 1000L, 12.3F, 45.6D, + | 1234567.89, 12345678900987654321.12, + | "test", + | TO_TIMESTAMP('2025-12-31 10:00:00', 'yyyy-MM-dd kk:mm:ss'), + | array(11.11F, 22.22F), struct(123L, "apache fluss") + |) + |""".stripMargin) + + val table = loadFlussTable(tablePath) + val rows = getRowsWithChangeType(table).map(_._2) + assertThat(rows.length).isEqualTo(1) + + val row = rows.head + assertThat(row.getFieldCount).isEqualTo(13) + assertThat(row.getBoolean(0)).isEqualTo(true) + assertThat(row.getByte(1)).isEqualTo(1.toByte) + assertThat(row.getShort(2)).isEqualTo(10.toShort) + assertThat(row.getInt(3)).isEqualTo(100) + assertThat(row.getLong(4)).isEqualTo(1000L) + assertThat(row.getFloat(5)).isEqualTo(12.3f) + assertThat(row.getDouble(6)).isEqualTo(45.6) + assertThat(row.getDecimal(7, 10, 2).toBigDecimal).isEqualTo(BigDecimal("1234567.89").bigDecimal) + assertThat(row.getDecimal(8, 38, 2).toBigDecimal) + .isEqualTo(BigDecimal("12345678900987654321.12").bigDecimal) + assertThat(row.getString(9).toString).isEqualTo("test") + assertThat(row.getTimestampLtz(10, 6).toInstant) + .isEqualTo(Timestamp.valueOf("2025-12-31 10:00:00.0").toInstant) + assertThat(row.getArray(11).toFloatArray).containsExactly(Array(11.11f, 22.22f): _*) + val nestedRow = row.getRow(12, 2) + assertThat(nestedRow.getFieldCount).isEqualTo(2) + assertThat(nestedRow.getLong(0)).isEqualTo(123L) + assertThat(nestedRow.getString(1).toString).isEqualTo("apache fluss") + } + + test("Fluss Write: log table") { + val tablePath = createTablePath(logTableName) + createFlussTable(tablePath, logTableDescriptor) + + sql(s""" + |INSERT INTO $DEFAULT_DATABASE.$logTableName VALUES + |(600L, 21L, 601, "addr1"), (700L, 22L, 602, "addr2"), + |(800L, 23L, 603, "addr3"), (900L, 24L, 604, "addr4"), + |(1000L, 25L, 605, "addr5") + |""".stripMargin) + + val table = loadFlussTable(tablePath) + val flussRows = getRowsWithChangeType(table).map(_._2) + + val expectRows = Array( + GenericRowBuilder(4) + .setField(0, 600L) + .setField(1, 21L) + .setField(2, 601) + .setField(3, BinaryString.fromString("addr1")) + .builder(), + GenericRowBuilder(4) + .setField(0, 700L) + .setField(1, 22L) + .setField(2, 602) + .setField(3, BinaryString.fromString("addr2")) + .builder(), + GenericRowBuilder(4) + .setField(0, 800L) + .setField(1, 23L) + .setField(2, 603) + .setField(3, BinaryString.fromString("addr3")) + .builder(), + GenericRowBuilder(4) + .setField(0, 900L) + .setField(1, 24L) + .setField(2, 604) + .setField(3, BinaryString.fromString("addr4")) + .builder(), + GenericRowBuilder(4) + .setField(0, 1000L) + .setField(1, 25L) + .setField(2, 605) + .setField(3, BinaryString.fromString("addr5")) + .builder() + ) + assertThat(flussRows.length).isEqualTo(5) + assertThat(flussRows).containsAll(expectRows.toIterable.asJava) + } + + test("Fluss Write: upsert table") { + val tablePath = createTablePath(pkTableName) + createFlussTable(tablePath, pkTableDescriptor) + val table = loadFlussTable(tablePath) + val logScanner = table.newScan.createLogScanner + (0 until table.getTableInfo.getNumBuckets).foreach(i => logScanner.subscribeFromBeginning(i)) + + // insert data + sql(s""" + |INSERT INTO $DEFAULT_DATABASE.$pkTableName VALUES + |(600L, 21L, 601, "addr1"), (700L, 22L, 602, "addr2"), + |(800L, 23L, 603, "addr3"), (900L, 24L, 604, "addr4"), + |(1000L, 25L, 605, "addr5") + |""".stripMargin) + + val flussRows1 = getRowsWithChangeType(table, Some(logScanner)) + val expectRows1 = Array( + ( + "+I", + GenericRowBuilder(4) + .setField(0, 600L) + .setField(1, 21L) + .setField(2, 601) + .setField(3, BinaryString.fromString("addr1")) + .builder()), + ( + "+I", + GenericRowBuilder(4) + .setField(0, 700L) + .setField(1, 22L) + .setField(2, 602) + .setField(3, BinaryString.fromString("addr2")) + .builder()), + ( + "+I", + GenericRowBuilder(4) + .setField(0, 800L) + .setField(1, 23L) + .setField(2, 603) + .setField(3, BinaryString.fromString("addr3")) + .builder()), + ( + "+I", + GenericRowBuilder(4) + .setField(0, 900L) + .setField(1, 24L) + .setField(2, 604) + .setField(3, BinaryString.fromString("addr4")) + .builder()), + ( + "+I", + GenericRowBuilder(4) + .setField(0, 1000L) + .setField(1, 25L) + .setField(2, 605) + .setField(3, BinaryString.fromString("addr5")) + .builder()) + ) + assertThat(flussRows1.length).isEqualTo(5) + assertThat(flussRows1).containsAll(expectRows1.toIterable.asJava) + + // update data + sql(s""" + |INSERT INTO $DEFAULT_DATABASE.$pkTableName VALUES + |(800L, 230L, 603, "addr3"), (900L, 240L, 604, "addr4") + |""".stripMargin) + + val flussRows2 = getRowsWithChangeType(table, Some(logScanner)) + val expectRows2 = Array( + ( + "-U", + GenericRowBuilder(4) + .setField(0, 800L) + .setField(1, 23L) + .setField(2, 603) + .setField(3, BinaryString.fromString("addr3")) + .builder()), + ( + "-U", + GenericRowBuilder(4) + .setField(0, 900L) + .setField(1, 24L) + .setField(2, 604) + .setField(3, BinaryString.fromString("addr4")) + .builder()), + ( + "+U", + GenericRowBuilder(4) + .setField(0, 800L) + .setField(1, 230L) + .setField(2, 603) + .setField(3, BinaryString.fromString("addr3")) + .builder()), + ( + "+U", + GenericRowBuilder(4) + .setField(0, 900L) + .setField(1, 240L) + .setField(2, 604) + .setField(3, BinaryString.fromString("addr4")) + .builder()) + ) + assertThat(flussRows2.length).isEqualTo(4) + assertThat(flussRows2).containsAll(expectRows2.toIterable.asJava) Review Comment: OK, then the original code makes sense to me. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
