nsivabalan commented on a change in pull request #1819:
URL: https://github.com/apache/hudi/pull/1819#discussion_r460415342
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/model/OverwriteWithLatestAvroPayload.java
##########
@@ -36,6 +36,8 @@
public class OverwriteWithLatestAvroPayload extends BaseAvroPayload
implements HoodieRecordPayload<OverwriteWithLatestAvroPayload> {
+ private String deletedField = "_hoodie_is_deleted";
Review comment:
can we name something like "deleteMarkerField" or something. Feel
"deletedField" conveys the field is deleted.
##########
File path:
hudi-spark/src/test/scala/org/apache/hudi/functional/HoodieSparkSqlWriterSuite.scala
##########
@@ -100,6 +100,53 @@ class HoodieSparkSqlWriterSuite extends FunSuite with
Matchers {
}
}
+ test("test OverwriteWithLatestAvroPayload with user defined delete field") {
+ val session = SparkSession.builder()
+ .appName("test_append_mode")
+ .master("local[2]")
+ .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
+ .getOrCreate()
+ val path = java.nio.file.Files.createTempDirectory("hoodie_test_path1")
+
+ try {
+ val sqlContext = session.sqlContext
+ val hoodieFooTableName = "hoodie_foo_tbl"
+
+ val keyField = "id"
+ val deleteField = "delete_field"
+
+ //create a new table
+ val fooTableModifier = Map("path" -> path.toAbsolutePath.toString,
+ HoodieWriteConfig.TABLE_NAME -> hoodieFooTableName,
+ "hoodie.insert.shuffle.parallelism" -> "2",
+ "hoodie.upsert.shuffle.parallelism" -> "2",
+ DELETE_FIELD_OPT_KEY -> deleteField,
+ RECORDKEY_FIELD_OPT_KEY -> keyField)
+ val fooTableParams =
HoodieSparkSqlWriter.parametersWithWriteDefaults(fooTableModifier)
+
+ val dataFrame = session.createDataFrame(Seq(
+ (12, "ming", 20.23, "2018-01-01T13:51:39.340396Z", false),
+ (34, "zhi", 21.323, "2018-01-01T13:52:39.340396Z", false)
+ )) toDF(keyField, "name", "weight", "ts", deleteField)
+
+ HoodieSparkSqlWriter.write(sqlContext, SaveMode.Append, fooTableParams,
dataFrame)
+ val recordCount1 =
sqlContext.read.format("org.apache.hudi").load(path.toString +
"/*/*.parquet").count
+ assert(recordCount1 == 2, "result should be 2, but get " + recordCount1)
+
+ val dataFrame2 = session.createDataFrame(Seq(
+ (12, "ming", 20.23, "2018-01-01T13:53:39.340396Z", true),
+ (34, "zhi", 30.3, "2018-01-01T13:54:39.340396Z", false)
+ )) toDF(keyField, "name", "weight", "ts", deleteField)
+ HoodieSparkSqlWriter.write(sqlContext, SaveMode.Append, fooTableParams,
dataFrame2)
+
+ val recordCount =
sqlContext.read.format("org.apache.hudi").load(path.toString +
"/*/*.parquet").count
+ assert(recordCount == 1, "result should be 1, but get " + recordCount)
Review comment:
can we also compare the record actually matches the active one and not
the deleted one.
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestDeltaStreamerWithOverwriteLatestAvroPayload.java
##########
@@ -0,0 +1,97 @@
+/*
+ * 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.hudi.utilities.functional;
+
+import org.apache.avro.generic.GenericRecord;
+import org.apache.hadoop.fs.Path;
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.model.HoodieKey;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.testutils.HoodieTestDataGenerator;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.sources.ParquetDFSSource;
+import org.apache.hudi.utilities.testutils.UtilitiesTestBase;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class TestDeltaStreamerWithOverwriteLatestAvroPayload extends
UtilitiesTestBase {
+ private static String PARQUET_SOURCE_ROOT;
+ private static final String PROPS_FILENAME_TEST_PARQUET =
"test-parquet-dfs-source.properties";
+
+ @BeforeAll
+ public static void initClass() throws Exception {
+ UtilitiesTestBase.initClass(true);
+ PARQUET_SOURCE_ROOT = dfsBasePath + "/parquetFiles";
+
+ // prepare the configs.
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/base.properties",
dfs, dfsBasePath + "/base.properties");
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/sql-transformer.properties",
dfs,
+ dfsBasePath + "/sql-transformer.properties");
+ UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/source.avsc",
dfs, dfsBasePath + "/source.avsc");
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/source-flattened.avsc",
dfs, dfsBasePath + "/source-flattened.avsc");
+ UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/target.avsc",
dfs, dfsBasePath + "/target.avsc");
+ }
+
+ private static List<GenericRecord> genericRecords(int n, boolean
isDeleteRecord, int instantTime) {
Review comment:
why not move this method to HoodieTestDataGenerator?
##########
File path:
hudi-common/src/test/java/org/apache/hudi/common/model/TestOverwriteWithLatestAvroPayload.java
##########
@@ -54,16 +55,16 @@ public void testActiveRecords() throws IOException {
record1.put("id", "1");
record1.put("partition", "partition0");
record1.put("ts", 0L);
- record1.put("_hoodie_is_deleted", false);
+ record1.put(deleteField, false);
Review comment:
can we test for both cases, i.e. user defined field and non user defined
field for detele marker field
##########
File path:
hudi-spark/src/test/scala/org/apache/hudi/functional/HoodieSparkSqlWriterSuite.scala
##########
@@ -100,6 +100,53 @@ class HoodieSparkSqlWriterSuite extends FunSuite with
Matchers {
}
}
+ test("test OverwriteWithLatestAvroPayload with user defined delete field") {
+ val session = SparkSession.builder()
+ .appName("test_append_mode")
+ .master("local[2]")
+ .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
+ .getOrCreate()
+ val path = java.nio.file.Files.createTempDirectory("hoodie_test_path1")
+
+ try {
+ val sqlContext = session.sqlContext
+ val hoodieFooTableName = "hoodie_foo_tbl"
+
+ val keyField = "id"
+ val deleteField = "delete_field"
+
+ //create a new table
+ val fooTableModifier = Map("path" -> path.toAbsolutePath.toString,
+ HoodieWriteConfig.TABLE_NAME -> hoodieFooTableName,
+ "hoodie.insert.shuffle.parallelism" -> "2",
+ "hoodie.upsert.shuffle.parallelism" -> "2",
+ DELETE_FIELD_OPT_KEY -> deleteField,
+ RECORDKEY_FIELD_OPT_KEY -> keyField)
+ val fooTableParams =
HoodieSparkSqlWriter.parametersWithWriteDefaults(fooTableModifier)
+
+ val dataFrame = session.createDataFrame(Seq(
+ (12, "ming", 20.23, "2018-01-01T13:51:39.340396Z", false),
Review comment:
try to avoid hardcoding test records. If you generate in a for loop, it
wud be easy to scale tests.
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestDeltaStreamerWithOverwriteLatestAvroPayload.java
##########
@@ -0,0 +1,97 @@
+/*
+ * 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.hudi.utilities.functional;
+
+import org.apache.avro.generic.GenericRecord;
+import org.apache.hadoop.fs.Path;
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.model.HoodieKey;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.testutils.HoodieTestDataGenerator;
+import org.apache.hudi.utilities.deltastreamer.HoodieDeltaStreamer;
+import org.apache.hudi.utilities.sources.ParquetDFSSource;
+import org.apache.hudi.utilities.testutils.UtilitiesTestBase;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class TestDeltaStreamerWithOverwriteLatestAvroPayload extends
UtilitiesTestBase {
+ private static String PARQUET_SOURCE_ROOT;
+ private static final String PROPS_FILENAME_TEST_PARQUET =
"test-parquet-dfs-source.properties";
+
+ @BeforeAll
+ public static void initClass() throws Exception {
+ UtilitiesTestBase.initClass(true);
+ PARQUET_SOURCE_ROOT = dfsBasePath + "/parquetFiles";
+
+ // prepare the configs.
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/base.properties",
dfs, dfsBasePath + "/base.properties");
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/sql-transformer.properties",
dfs,
+ dfsBasePath + "/sql-transformer.properties");
+ UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/source.avsc",
dfs, dfsBasePath + "/source.avsc");
+
UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/source-flattened.avsc",
dfs, dfsBasePath + "/source-flattened.avsc");
+ UtilitiesTestBase.Helpers.copyToDFS("delta-streamer-config/target.avsc",
dfs, dfsBasePath + "/target.avsc");
+ }
+
+ private static List<GenericRecord> genericRecords(int n, boolean
isDeleteRecord, int instantTime) {
+ return IntStream.range(0, n).boxed().map(i -> {
+ String partitionPath = "partitionPath1";
+ HoodieKey key = new HoodieKey("id_" + i, partitionPath);
+ HoodieTestDataGenerator.KeyPartition kp = new
HoodieTestDataGenerator.KeyPartition();
+ kp.key = key;
+ kp.partitionPath = partitionPath;
+ return HoodieTestDataGenerator.generateGenericRecord(
+ key.getRecordKey(), "rider-" + instantTime, "driver-" + instantTime,
instantTime, isDeleteRecord, false);
+ }).collect(Collectors.toList());
+ }
+
+ @Test
+ public void testOverwriteLatestAvroPayload() throws Exception {
Review comment:
can we test for both default and user defined fields here.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
