nsivabalan commented on a change in pull request #2012:
URL: https://github.com/apache/hudi/pull/2012#discussion_r618643401
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieDeltaStreamer.java
##########
@@ -696,6 +697,44 @@ public void testBulkInsertsAndUpsertsWithBootstrap()
throws Exception {
assertTrue(fieldNames.containsAll(expectedFieldNames));
}
+ @Test
+ public void testSchemaEvolution() throws Exception {
+ String tableBasePath = dfsBasePath + "/test_table_schema_evolution";
+
+ // Insert data produced with Schema A, pass Schema A
+ HoodieDeltaStreamer.Config cfg = TestHelpers.makeConfig(tableBasePath,
Operation.INSERT,
Collections.singletonList(IdentityTransformer.class.getName()));
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.source.schema.file="
+ dfsBasePath + "/source.avsc");
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.target.schema.file="
+ dfsBasePath + "/source.avsc");
+ new HoodieDeltaStreamer(cfg, jsc).sync();
+ TestHelpers.assertRecordCount(1000, tableBasePath + "/*/*.parquet",
sqlContext);
+ TestHelpers.assertCommitMetadata("00000", tableBasePath, dfs, 1);
+
+ // Upsert data produced with Schema B, pass Schema B
+ cfg = TestHelpers.makeConfig(tableBasePath, Operation.UPSERT,
Collections.singletonList(TripsWithEvolvedOptionalFieldTransformer.class.getName()));
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.source.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.target.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ new HoodieDeltaStreamer(cfg, jsc).sync();
+ TestHelpers.assertRecordCount(1450, tableBasePath + "/*/*.parquet",
sqlContext);
+ TestHelpers.assertCommitMetadata("00001", tableBasePath, dfs, 2);
+ List<Row> counts = TestHelpers.countsPerCommit(tableBasePath +
"/*/*.parquet", sqlContext);
+ assertEquals(1450, counts.stream().mapToLong(entry ->
entry.getLong(1)).sum());
Review comment:
can you add a comment here as to how 1450 is expected.
// batch 1: 1000 inserts
// batch2: total records to be generated 1000. 50% inserts. 50% updates. 50
count deletes. and so, 500 new inserts. 450 updates from previous batch. 50
deletes. in all, 1450.
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHoodieDeltaStreamer.java
##########
@@ -696,6 +697,44 @@ public void testBulkInsertsAndUpsertsWithBootstrap()
throws Exception {
assertTrue(fieldNames.containsAll(expectedFieldNames));
}
+ @Test
+ public void testSchemaEvolution() throws Exception {
+ String tableBasePath = dfsBasePath + "/test_table_schema_evolution";
+
+ // Insert data produced with Schema A, pass Schema A
+ HoodieDeltaStreamer.Config cfg = TestHelpers.makeConfig(tableBasePath,
Operation.INSERT,
Collections.singletonList(IdentityTransformer.class.getName()));
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.source.schema.file="
+ dfsBasePath + "/source.avsc");
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.target.schema.file="
+ dfsBasePath + "/source.avsc");
+ new HoodieDeltaStreamer(cfg, jsc).sync();
+ TestHelpers.assertRecordCount(1000, tableBasePath + "/*/*.parquet",
sqlContext);
+ TestHelpers.assertCommitMetadata("00000", tableBasePath, dfs, 1);
+
+ // Upsert data produced with Schema B, pass Schema B
+ cfg = TestHelpers.makeConfig(tableBasePath, Operation.UPSERT,
Collections.singletonList(TripsWithEvolvedOptionalFieldTransformer.class.getName()));
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.source.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.target.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ new HoodieDeltaStreamer(cfg, jsc).sync();
+ TestHelpers.assertRecordCount(1450, tableBasePath + "/*/*.parquet",
sqlContext);
+ TestHelpers.assertCommitMetadata("00001", tableBasePath, dfs, 2);
+ List<Row> counts = TestHelpers.countsPerCommit(tableBasePath +
"/*/*.parquet", sqlContext);
+ assertEquals(1450, counts.stream().mapToLong(entry ->
entry.getLong(1)).sum());
+
+ sqlContext.read().format("org.apache.hudi").load(tableBasePath +
"/*/*.parquet").createOrReplaceTempView("tmp_trips");
+ long recordCount =
+ sqlContext.sparkSession().sql("select * from tmp_trips where
evoluted_optional_union_field is not NULL").count();
+ assertEquals(950, recordCount);
+
+ // Upsert data produced with Schema A, pass Schema B
+ cfg = TestHelpers.makeConfig(tableBasePath, Operation.UPSERT,
Collections.singletonList(IdentityTransformer.class.getName()));
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.source.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ cfg.configs.add("hoodie.deltastreamer.schemaprovider.target.schema.file="
+ dfsBasePath + "/source_evolved.avsc");
+ new HoodieDeltaStreamer(cfg, jsc).sync();
+ TestHelpers.assertRecordCount(1900, tableBasePath + "/*/*.parquet",
sqlContext);
+ TestHelpers.assertCommitMetadata("00002", tableBasePath, dfs, 3);
+ counts = TestHelpers.countsPerCommit(tableBasePath + "/*/*.parquet",
sqlContext);
+ assertEquals(1900, counts.stream().mapToLong(entry ->
entry.getLong(1)).sum());
Review comment:
similarly, would be good to add a comment here as to how 1900 is
expected.
##########
File path:
hudi-utilities/src/test/resources/delta-streamer-config/source_evolved.avsc
##########
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+{
+ "type" : "record",
+ "name" : "triprec",
+ "fields" : [
+ {
+ "name" : "timestamp",
+ "type" : "long"
+ }, {
+ "name" : "_row_key",
+ "type" : "string"
+ }, {
+ "name" : "rider",
+ "type" : "string"
+ }, {
+ "name" : "driver",
+ "type" : "string"
+ }, {
+ "name" : "begin_lat",
+ "type" : "double"
+ }, {
+ "name" : "begin_lon",
+ "type" : "double"
+ }, {
+ "name" : "end_lat",
+ "type" : "double"
+ }, {
+ "name" : "end_lon",
+ "type" : "double"
+ }, {
+ "name" : "distance_in_meters",
+ "type" : "int"
+ }, {
+ "name" : "seconds_since_epoch",
+ "type" : "long"
+ }, {
+ "name" : "weight",
+ "type" : "float"
+ },{
+ "name" : "nation",
+ "type" : "bytes"
+ },{
+ "name" : "current_date",
+ "type" : {
+ "type" : "int",
+ "logicalType" : "date"
+ }
+ },{
+ "name" : "current_ts",
+ "type" : {
+ "type" : "long"
+ }
+ },{
+ "name" : "height",
+ "type" : {
+ "type" : "fixed",
+ "name" : "fixed",
+ "size" : 5,
+ "logicalType" : "decimal",
+ "precision" : 10,
+ "scale": 6
+ }
+ }, {
+ "name" :"city_to_state",
+ "type" : {
+ "type" : "map",
+ "values": "string"
+ }
+ },
+ {
+ "name" : "fare",
+ "type" : {
+ "type" : "record",
+ "name" : "fare",
+ "fields" : [
+ {
+ "name" : "amount",
+ "type" : "double"
+ },
+ {
+ "name" : "currency",
+ "type" : "string"
+ }
+ ]
+ }
+ },
+ {
Review comment:
may I know why this new column is not added at the end of the schema.
##########
File path: hudi-utilities/src/test/resources/delta-streamer-config/target.avsc
##########
@@ -70,7 +70,7 @@
"name" : "height",
"type" : {
"type" : "fixed",
- "name" : "abc",
Review comment:
also, can you help me understand why we change the name here to fixed.
name could be anything in general right.
--
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:
[email protected]
