yanghua commented on a change in pull request #2192:
URL: https://github.com/apache/hudi/pull/2192#discussion_r535807469
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/TestSchemaPostProcessor.java
##########
@@ -39,20 +44,51 @@
private TypedProperties properties = new TypedProperties();
+ private static String ORIGINAL_SCHEMA =
"{\"name\":\"t3_biz_operation_t_driver\",\"type\":\"record\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"null\",\"string\"],\"default\":null},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"null\",\"string\"],\"default\":null}]}";
+
+ private static String RESULT_SCHEMA =
"{\"type\":\"record\",\"name\":\"hoodie_source\",\"namespace\":\"hoodie.source\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"string\",\"null\"]},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"string\",\"null\"]}]}";
+
@Test
public void testPostProcessor() throws IOException {
properties.put(Config.SCHEMA_POST_PROCESSOR_PROP,
DummySchemaPostProcessor.class.getName());
SchemaProvider provider =
UtilHelpers.wrapSchemaProviderWithPostProcessor(
UtilHelpers.createSchemaProvider(DummySchemaProvider.class.getName(),
properties, jsc),
- properties, jsc);
+ properties, jsc,null);
Review comment:
Please add a backspace before `,null`.
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/SparkAvroSchemaProvider.java
##########
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import org.apache.avro.Schema;
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.utilities.schema.SchemaProvider;
+import org.apache.spark.api.java.JavaSparkContext;
+
+public class SparkAvroSchemaProvider extends SchemaProvider {
Review comment:
Does `SparkAvroTestSchemaProvider` look better?
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/TestSchemaPostProcessor.java
##########
@@ -39,20 +44,51 @@
private TypedProperties properties = new TypedProperties();
+ private static String ORIGINAL_SCHEMA =
"{\"name\":\"t3_biz_operation_t_driver\",\"type\":\"record\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"null\",\"string\"],\"default\":null},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"null\",\"string\"],\"default\":null}]}";
+
+ private static String RESULT_SCHEMA =
"{\"type\":\"record\",\"name\":\"hoodie_source\",\"namespace\":\"hoodie.source\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"string\",\"null\"]},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"string\",\"null\"]}]}";
+
@Test
public void testPostProcessor() throws IOException {
properties.put(Config.SCHEMA_POST_PROCESSOR_PROP,
DummySchemaPostProcessor.class.getName());
SchemaProvider provider =
UtilHelpers.wrapSchemaProviderWithPostProcessor(
UtilHelpers.createSchemaProvider(DummySchemaProvider.class.getName(),
properties, jsc),
- properties, jsc);
+ properties, jsc,null);
Schema schema = provider.getSourceSchema();
assertEquals(schema.getType(), Type.RECORD);
assertEquals(schema.getName(), "test");
assertNotNull(schema.getField("testString"));
}
+ @Test
+ public void testSparkAvro() throws IOException {
Review comment:
IMO, this naming is not good.
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/SparkAvroSchemaProvider.java
##########
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import org.apache.avro.Schema;
+import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.utilities.schema.SchemaProvider;
+import org.apache.spark.api.java.JavaSparkContext;
+
+public class SparkAvroSchemaProvider extends SchemaProvider {
Review comment:
Or define a static inner class in `TestSchemaPostProcessor`?
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/TestSchemaPostProcessor.java
##########
@@ -39,20 +44,51 @@
private TypedProperties properties = new TypedProperties();
+ private static String ORIGINAL_SCHEMA =
"{\"name\":\"t3_biz_operation_t_driver\",\"type\":\"record\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"null\",\"string\"],\"default\":null},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"null\",\"string\"],\"default\":null}]}";
+
+ private static String RESULT_SCHEMA =
"{\"type\":\"record\",\"name\":\"hoodie_source\",\"namespace\":\"hoodie.source\",\"fields\":[{\"name\":\"ums_id_\",\"type\":[\"string\",\"null\"]},"
+ +
"{\"name\":\"ums_ts_\",\"type\":[\"string\",\"null\"]}]}";
+
@Test
public void testPostProcessor() throws IOException {
properties.put(Config.SCHEMA_POST_PROCESSOR_PROP,
DummySchemaPostProcessor.class.getName());
SchemaProvider provider =
UtilHelpers.wrapSchemaProviderWithPostProcessor(
UtilHelpers.createSchemaProvider(DummySchemaProvider.class.getName(),
properties, jsc),
- properties, jsc);
+ properties, jsc,null);
Schema schema = provider.getSourceSchema();
assertEquals(schema.getType(), Type.RECORD);
assertEquals(schema.getName(), "test");
assertNotNull(schema.getField("testString"));
}
+ @Test
+ public void testSparkAvro() throws IOException {
+ properties.put(Config.SCHEMA_POST_PROCESSOR_PROP,
SparkAvroPostProcessor.class.getName());
+ List<String> transformerClassNames = new ArrayList<>();
+ transformerClassNames.add(FlatteningTransformer.class.getName());
+
+ SchemaProvider provider =
+ UtilHelpers.wrapSchemaProviderWithPostProcessor(
+
UtilHelpers.createSchemaProvider(SparkAvroSchemaProvider.class.getName(),
properties, jsc),
+ properties, jsc, transformerClassNames);
+
+ Schema schema = provider.getSourceSchema();
+ assertEquals(schema.getType(), Type.RECORD);
+ assertEquals(schema.getName(), "hoodie_source");
+ assertEquals(schema.getNamespace(), "hoodie.source");
+ assertNotNull(schema.getField("day"));
+ }
+
+ @Test
+ public void testSparkAvroSchema() throws IOException {
Review comment:
WDYT about naming it to be `testSparkAvroSchemaPostProcessor`?
##########
File path:
hudi-utilities/src/test/java/org/apache/hudi/utilities/TestSchemaPostProcessor.java
##########
@@ -22,15 +22,20 @@
import org.apache.hudi.utilities.schema.SchemaPostProcessor;
import org.apache.hudi.utilities.schema.SchemaPostProcessor.Config;
import org.apache.hudi.utilities.schema.SchemaProvider;
+import org.apache.hudi.utilities.schema.SparkAvroPostProcessor;
import org.apache.hudi.utilities.testutils.UtilitiesTestBase;
import org.apache.avro.Schema;
import org.apache.avro.Schema.Type;
import org.apache.avro.SchemaBuilder;
+
+import org.apache.hudi.utilities.transform.FlatteningTransformer;
Review comment:
wrong place
----------------------------------------------------------------
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]
