yihua commented on code in PR #11649:
URL: https://github.com/apache/hudi/pull/11649#discussion_r1690484129
##########
hudi-common/src/main/java/org/apache/hudi/avro/HoodieAvroUtils.java:
##########
@@ -1241,7 +1241,7 @@ public static int fromJavaDate(Date date) {
return julianDays;
}
- private static Schema getActualSchemaFromUnion(Schema schema, Object data) {
+ public static Schema getActualSchemaFromUnion(Schema schema, Object data) {
Review Comment:
Avoid using public if this is only for testing. Use the annotation that
makes this visible to testing.
##########
hudi-client/hudi-java-client/src/test/java/org/apache/hudi/hadoop/TestHoodieFileGroupReaderOnHive.java:
##########
@@ -0,0 +1,329 @@
+/*
+ * 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.hadoop;
+
+import org.apache.hudi.avro.HoodieAvroUtils;
+import org.apache.hudi.client.HoodieJavaWriteClient;
+import org.apache.hudi.client.common.HoodieJavaEngineContext;
+import org.apache.hudi.common.config.HoodieMemoryConfig;
+import org.apache.hudi.common.config.HoodieReaderConfig;
+import org.apache.hudi.common.config.RecordMergeMode;
+import org.apache.hudi.common.engine.EngineType;
+import org.apache.hudi.common.engine.HoodieReaderContext;
+import org.apache.hudi.common.model.DefaultHoodieRecordPayload;
+import org.apache.hudi.common.model.HoodieRecord;
+import org.apache.hudi.common.model.HoodieRecordMerger;
+import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.common.table.read.CustomPayloadForTesting;
+import org.apache.hudi.common.table.read.TestHoodieFileGroupReaderBase;
+import org.apache.hudi.common.testutils.HoodieTestDataGenerator;
+import org.apache.hudi.common.testutils.HoodieTestUtils;
+import org.apache.hudi.common.testutils.minicluster.HdfsTestService;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.hadoop.hive.HoodieCombineHiveInputFormat;
+import org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat;
+import org.apache.hudi.hadoop.utils.HoodieArrayWritableAvroUtils;
+import org.apache.hudi.storage.HoodieStorage;
+import org.apache.hudi.storage.StorageConfiguration;
+import org.apache.hudi.storage.hadoop.HoodieHadoopStorage;
+import org.apache.hudi.testutils.HoodieJavaClientTestHarness;
+
+import org.apache.avro.Schema;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RawLocalFileSystem;
+import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
+import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.exec.mr.ExecMapper;
+import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
+import org.apache.hadoop.hive.ql.plan.MapredWork;
+import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.TableDesc;
+import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
+import org.apache.hadoop.io.ArrayWritable;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapred.FileInputFormat;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+import static org.apache.hadoop.hive.ql.exec.Utilities.HAS_MAP_WORK;
+import static org.apache.hadoop.hive.ql.exec.Utilities.MAPRED_MAPPER_CLASS;
+import static
org.apache.hudi.hadoop.HoodieFileGroupReaderBasedRecordReader.getRecordKeyField;
+import static
org.apache.hudi.hadoop.HoodieFileGroupReaderBasedRecordReader.getStoredPartitionFieldNames;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class TestHoodieFileGroupReaderOnHive extends
TestHoodieFileGroupReaderBase<ArrayWritable> {
+
+ @Override
+ @Disabled
+ public void testReadLogFilesOnlyInMergeOnReadTable(RecordMergeMode
recordMergeMode, String logDataBlockFormat) throws Exception {}
+
+ private static final String PARTITION_COLUMN = "datestr";
+ private static JobConf baseJobConf;
+ private static HdfsTestService hdfsTestService;
+ private static HoodieStorage storage;
+ private static FileSystem fs;
+ private static StorageConfiguration<Configuration> storageConf;
+
+ @BeforeAll
+ public static void setUpClass() throws IOException, InterruptedException {
+ // Append is not supported in LocalFileSystem. HDFS needs to be setup.
+ hdfsTestService = new HdfsTestService();
+ fs = hdfsTestService.start(true).getFileSystem();
+ storageConf = HoodieTestUtils.getDefaultStorageConf();
+ baseJobConf = new JobConf(storageConf.unwrap());
+ baseJobConf.set(HoodieMemoryConfig.MAX_DFS_STREAM_BUFFER_SIZE.key(),
String.valueOf(1024 * 1024));
+ fs.setConf(baseJobConf);
+ storage = new HoodieHadoopStorage(fs);
+ }
+
+ @AfterAll
+ public static void tearDownClass() throws IOException {
+ hdfsTestService.stop();
+ if (fs != null) {
+ fs.close();
+ storage.close();
+ }
+ }
+
+ @Override
+ public StorageConfiguration<?> getStorageConf() {
+ return storageConf;
+ }
+
+ @Override
+ public String getBasePath() {
+ return tempDir.toAbsolutePath() + "/myTable";
+ }
+
+ @Override
+ public HoodieReaderContext<ArrayWritable> getHoodieReaderContext(String
tablePath, Schema avroSchema, StorageConfiguration<?> storageConf) {
+ HoodieFileGroupReaderBasedRecordReader.HiveReaderCreator readerCreator =
(s, j) -> new MapredParquetInputFormat().getRecordReader(s, j, null);
+ HoodieTableMetaClient metaClient =
HoodieTableMetaClient.builder().setConf(storageConf).setBasePath(tablePath).build();
+ String tableName = metaClient.getTableConfig().getTableName();
+ JobConf jobConf = new JobConf(storageConf.unwrapAs(Configuration.class));
+ setupJobconf(jobConf);
+ HoodieArrayWritableAvroUtils.initCacheForTable(tableName, avroSchema,
jobConf);
+ return new HiveHoodieReaderContext(readerCreator, tableName,
getRecordKeyField(metaClient),
+ getStoredPartitionFieldNames(new
JobConf(storageConf.unwrapAs(Configuration.class)), avroSchema));
+
+ }
+
+ @Override
+ public String getRecordPayloadForMergeMode(RecordMergeMode mergeMode) {
+ switch (mergeMode) {
+ case EVENT_TIME_ORDERING:
+ return DefaultHoodieRecordPayload.class.getName();
+ case OVERWRITE_WITH_LATEST:
+ return OverwriteWithLatestAvroPayload.class.getName();
+ case CUSTOM:
+ default:
+ return CustomPayloadForTesting.class.getName();
+ }
+ }
+
+ @Override
+ public void commitToTable(List<HoodieRecord> recordList, String operation,
Map<String, String> writeConfigs) {
+ HoodieWriteConfig writeConfig = HoodieWriteConfig.newBuilder()
+ .withEngineType(EngineType.JAVA)
+ .withEmbeddedTimelineServerEnabled(false)
+ .withProps(writeConfigs)
+ .withPath(getBasePath())
+ .withSchema(HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA)
+ .build();
+
+ HoodieJavaClientTestHarness.TestJavaTaskContextSupplier
taskContextSupplier = new
HoodieJavaClientTestHarness.TestJavaTaskContextSupplier();
+ HoodieJavaEngineContext context = new
HoodieJavaEngineContext(getStorageConf(), taskContextSupplier);
+ //init table if not exists
+ try {
+ try (RawLocalFileSystem lfs = new RawLocalFileSystem()) {
+ lfs.setConf(baseJobConf);
+ boolean basepathExists = lfs.exists(new Path(getBasePath()));
+ boolean operationIsInsert = operation.equalsIgnoreCase("insert");
+ if (!basepathExists || operationIsInsert) {
+ if (basepathExists) {
+ lfs.delete(new Path(getBasePath()), true);
+ }
+ String recordMergerStrategy = "";
+ if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.OVERWRITE_WITH_LATEST))
{
+ recordMergerStrategy =
HoodieRecordMerger.OVERWRITE_MERGER_STRATEGY_UUID;
+ } else if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.EVENT_TIME_ORDERING))
{
+ recordMergerStrategy =
HoodieRecordMerger.DEFAULT_MERGER_STRATEGY_UUID;
+ } else if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.CUSTOM))
{
+ //match the behavior of spark for now, but this should be a config
+ recordMergerStrategy =
HoodieRecordMerger.DEFAULT_MERGER_STRATEGY_UUID;
+ }
+ Map<String, Object> initConfigs = new HashMap<>(writeConfigs);
+ HoodieTableMetaClient.withPropertyBuilder()
+
.setTableType(writeConfigs.getOrDefault("hoodie.datasource.write.table.type",
"MERGE_ON_READ"))
+ .setTableName(writeConfigs.get("hoodie.table.name"))
+
.setPartitionFields(writeConfigs.getOrDefault("hoodie.datasource.write.partitionpath.field",
""))
+
.setRecordMergeMode(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")))
+ .setRecordMergerStrategy(recordMergerStrategy)
+ .set(initConfigs).initTable(storageConf, getBasePath());
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+
+ HoodieJavaWriteClient writeClient = new HoodieJavaWriteClient(context,
writeConfig);
+ String instantTime = writeClient.createNewInstantTime();
+ writeClient.startCommitWithTime(instantTime);
+ if (operation.toLowerCase().equals("insert")) {
+ writeClient.insert(recordList, instantTime);
+ } else {
+ writeClient.upsert(recordList, instantTime);
+ }
+ }
+
+ @Override
+ public void validateRecordsInFileGroup(String tablePath, List<ArrayWritable>
actualRecordList, Schema schema, String fileGroupId) {
+
assertEquals(HoodieAvroUtils.addMetadataFields(HoodieTestDataGenerator.AVRO_SCHEMA),
schema);
+ try {
+ //prepare fg reader records to be compared to the baseline reader
+ HoodieReaderContext<ArrayWritable> readerContext =
getHoodieReaderContext(tablePath, schema, storageConf);
+ Map<String, ArrayWritable> recordMap = new HashMap<>();
+ for (ArrayWritable record : actualRecordList) {
+ recordMap.put(readerContext.getRecordKey(record, schema), record);
+ }
+
+
+ JobConf jobConf = new JobConf(baseJobConf);
+ jobConf.set(HoodieReaderConfig.FILE_GROUP_READER_ENABLED.key(), "false");
+
+ TableDesc tblDesc = Utilities.defaultTd;
+ // Set the input format
+ tblDesc.setInputFileFormatClass(HoodieParquetRealtimeInputFormat.class);
+ LinkedHashMap<Path, PartitionDesc> pt = new LinkedHashMap<>();
+ LinkedHashMap<Path, ArrayList<String>> talias = new LinkedHashMap<>();
+
+ PartitionDesc partDesc = new PartitionDesc(tblDesc, null);
+
+ pt.put(new Path(tablePath), partDesc);
+
+ ArrayList<String> arrayList = new ArrayList<>();
+ arrayList.add(tablePath);
+ talias.put(new Path(tablePath), arrayList);
+
+ MapredWork mrwork = new MapredWork();
+ mrwork.getMapWork().setPathToPartitionInfo(pt);
+ mrwork.getMapWork().setPathToAliases(talias);
+
+ Path mapWorkPath = new Path(tablePath);
+ Utilities.setMapRedWork(jobConf, mrwork, mapWorkPath);
+
+ // Add three partition path to InputPaths
+ Path[] partitionDirArray = new
Path[HoodieTestDataGenerator.DEFAULT_PARTITION_PATHS.length];
+ Arrays.stream(HoodieTestDataGenerator.DEFAULT_PARTITION_PATHS).map(s ->
new Path(tablePath, s)).collect(Collectors.toList()).toArray(partitionDirArray);
+ FileInputFormat.setInputPaths(jobConf, partitionDirArray);
+ jobConf.set(HAS_MAP_WORK, "true");
+ // The following config tells Hive to choose ExecMapper to read the
MAP_WORK
+ jobConf.set(MAPRED_MAPPER_CLASS, ExecMapper.class.getName());
+ // setting the split size to be 3 to create one split for 3 file groups
+
jobConf.set(org.apache.hadoop.mapreduce.lib.input.FileInputFormat.SPLIT_MAXSIZE,
"128000000");
+ setupJobconf(jobConf);
+
+ HoodieCombineHiveInputFormat combineHiveInputFormat = new
HoodieCombineHiveInputFormat();
+ InputSplit[] splits = combineHiveInputFormat.getSplits(jobConf, 1);
+
+ assertEquals(1, splits.length);
+ RecordReader<NullWritable, ArrayWritable> reader =
combineHiveInputFormat.getRecordReader(splits[0], jobConf, Reporter.NULL);
+ // use reader to read log file.
+ NullWritable key = reader.createKey();
+ ArrayWritable value = reader.createValue();
+ while (reader.next(key, value)) {
+ if (readerContext.getValue(value, schema,
HoodieRecord.FILENAME_METADATA_FIELD).toString().contains(fileGroupId)) {
+ //only evaluate records from the specified filegroup. Maybe there is
a way to get
+ //hive to do this?
+ ArrayWritable compVal =
recordMap.remove(readerContext.getRecordKey(value, schema));
+ assertNotNull(compVal);
+ for (Schema.Field field : schema.getFields()) {
+ switch (HoodieAvroUtils.getActualSchemaFromUnion(field.schema(),
null).getType()) {
+ case UNION:
+ throw new IllegalStateException("we resolve unions so we
should never be here");
+ case RECORD:
+ case MAP:
+ case ENUM:
+ case ARRAY:
+ //TODO: validate complex types
+ continue;
Review Comment:
Is direct comparison not working?
##########
hudi-client/hudi-java-client/src/test/java/org/apache/hudi/hadoop/TestHoodieFileGroupReaderOnHive.java:
##########
@@ -0,0 +1,329 @@
+/*
+ * 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.hadoop;
+
+import org.apache.hudi.avro.HoodieAvroUtils;
+import org.apache.hudi.client.HoodieJavaWriteClient;
+import org.apache.hudi.client.common.HoodieJavaEngineContext;
+import org.apache.hudi.common.config.HoodieMemoryConfig;
+import org.apache.hudi.common.config.HoodieReaderConfig;
+import org.apache.hudi.common.config.RecordMergeMode;
+import org.apache.hudi.common.engine.EngineType;
+import org.apache.hudi.common.engine.HoodieReaderContext;
+import org.apache.hudi.common.model.DefaultHoodieRecordPayload;
+import org.apache.hudi.common.model.HoodieRecord;
+import org.apache.hudi.common.model.HoodieRecordMerger;
+import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.common.table.read.CustomPayloadForTesting;
+import org.apache.hudi.common.table.read.TestHoodieFileGroupReaderBase;
+import org.apache.hudi.common.testutils.HoodieTestDataGenerator;
+import org.apache.hudi.common.testutils.HoodieTestUtils;
+import org.apache.hudi.common.testutils.minicluster.HdfsTestService;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.hadoop.hive.HoodieCombineHiveInputFormat;
+import org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat;
+import org.apache.hudi.hadoop.utils.HoodieArrayWritableAvroUtils;
+import org.apache.hudi.storage.HoodieStorage;
+import org.apache.hudi.storage.StorageConfiguration;
+import org.apache.hudi.storage.hadoop.HoodieHadoopStorage;
+import org.apache.hudi.testutils.HoodieJavaClientTestHarness;
+
+import org.apache.avro.Schema;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RawLocalFileSystem;
+import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
+import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.exec.mr.ExecMapper;
+import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
+import org.apache.hadoop.hive.ql.plan.MapredWork;
+import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.TableDesc;
+import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
+import org.apache.hadoop.io.ArrayWritable;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapred.FileInputFormat;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+import static org.apache.hadoop.hive.ql.exec.Utilities.HAS_MAP_WORK;
+import static org.apache.hadoop.hive.ql.exec.Utilities.MAPRED_MAPPER_CLASS;
+import static
org.apache.hudi.hadoop.HoodieFileGroupReaderBasedRecordReader.getRecordKeyField;
+import static
org.apache.hudi.hadoop.HoodieFileGroupReaderBasedRecordReader.getStoredPartitionFieldNames;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class TestHoodieFileGroupReaderOnHive extends
TestHoodieFileGroupReaderBase<ArrayWritable> {
+
+ @Override
+ @Disabled
+ public void testReadLogFilesOnlyInMergeOnReadTable(RecordMergeMode
recordMergeMode, String logDataBlockFormat) throws Exception {}
+
+ private static final String PARTITION_COLUMN = "datestr";
+ private static JobConf baseJobConf;
+ private static HdfsTestService hdfsTestService;
+ private static HoodieStorage storage;
+ private static FileSystem fs;
+ private static StorageConfiguration<Configuration> storageConf;
+
+ @BeforeAll
+ public static void setUpClass() throws IOException, InterruptedException {
+ // Append is not supported in LocalFileSystem. HDFS needs to be setup.
+ hdfsTestService = new HdfsTestService();
+ fs = hdfsTestService.start(true).getFileSystem();
+ storageConf = HoodieTestUtils.getDefaultStorageConf();
+ baseJobConf = new JobConf(storageConf.unwrap());
+ baseJobConf.set(HoodieMemoryConfig.MAX_DFS_STREAM_BUFFER_SIZE.key(),
String.valueOf(1024 * 1024));
+ fs.setConf(baseJobConf);
+ storage = new HoodieHadoopStorage(fs);
+ }
+
+ @AfterAll
+ public static void tearDownClass() throws IOException {
+ hdfsTestService.stop();
+ if (fs != null) {
+ fs.close();
+ storage.close();
+ }
+ }
+
+ @Override
+ public StorageConfiguration<?> getStorageConf() {
+ return storageConf;
+ }
+
+ @Override
+ public String getBasePath() {
+ return tempDir.toAbsolutePath() + "/myTable";
+ }
+
+ @Override
+ public HoodieReaderContext<ArrayWritable> getHoodieReaderContext(String
tablePath, Schema avroSchema, StorageConfiguration<?> storageConf) {
+ HoodieFileGroupReaderBasedRecordReader.HiveReaderCreator readerCreator =
(s, j) -> new MapredParquetInputFormat().getRecordReader(s, j, null);
+ HoodieTableMetaClient metaClient =
HoodieTableMetaClient.builder().setConf(storageConf).setBasePath(tablePath).build();
+ String tableName = metaClient.getTableConfig().getTableName();
+ JobConf jobConf = new JobConf(storageConf.unwrapAs(Configuration.class));
+ setupJobconf(jobConf);
+ HoodieArrayWritableAvroUtils.initCacheForTable(tableName, avroSchema,
jobConf);
+ return new HiveHoodieReaderContext(readerCreator, tableName,
getRecordKeyField(metaClient),
+ getStoredPartitionFieldNames(new
JobConf(storageConf.unwrapAs(Configuration.class)), avroSchema));
+
+ }
+
+ @Override
+ public String getRecordPayloadForMergeMode(RecordMergeMode mergeMode) {
+ switch (mergeMode) {
+ case EVENT_TIME_ORDERING:
+ return DefaultHoodieRecordPayload.class.getName();
+ case OVERWRITE_WITH_LATEST:
+ return OverwriteWithLatestAvroPayload.class.getName();
+ case CUSTOM:
+ default:
+ return CustomPayloadForTesting.class.getName();
+ }
+ }
+
+ @Override
+ public void commitToTable(List<HoodieRecord> recordList, String operation,
Map<String, String> writeConfigs) {
+ HoodieWriteConfig writeConfig = HoodieWriteConfig.newBuilder()
+ .withEngineType(EngineType.JAVA)
+ .withEmbeddedTimelineServerEnabled(false)
+ .withProps(writeConfigs)
+ .withPath(getBasePath())
+ .withSchema(HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA)
+ .build();
+
+ HoodieJavaClientTestHarness.TestJavaTaskContextSupplier
taskContextSupplier = new
HoodieJavaClientTestHarness.TestJavaTaskContextSupplier();
+ HoodieJavaEngineContext context = new
HoodieJavaEngineContext(getStorageConf(), taskContextSupplier);
+ //init table if not exists
+ try {
+ try (RawLocalFileSystem lfs = new RawLocalFileSystem()) {
+ lfs.setConf(baseJobConf);
+ boolean basepathExists = lfs.exists(new Path(getBasePath()));
+ boolean operationIsInsert = operation.equalsIgnoreCase("insert");
+ if (!basepathExists || operationIsInsert) {
+ if (basepathExists) {
+ lfs.delete(new Path(getBasePath()), true);
+ }
+ String recordMergerStrategy = "";
+ if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.OVERWRITE_WITH_LATEST))
{
+ recordMergerStrategy =
HoodieRecordMerger.OVERWRITE_MERGER_STRATEGY_UUID;
+ } else if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.EVENT_TIME_ORDERING))
{
+ recordMergerStrategy =
HoodieRecordMerger.DEFAULT_MERGER_STRATEGY_UUID;
+ } else if
(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")).equals(RecordMergeMode.CUSTOM))
{
+ //match the behavior of spark for now, but this should be a config
+ recordMergerStrategy =
HoodieRecordMerger.DEFAULT_MERGER_STRATEGY_UUID;
+ }
+ Map<String, Object> initConfigs = new HashMap<>(writeConfigs);
+ HoodieTableMetaClient.withPropertyBuilder()
+
.setTableType(writeConfigs.getOrDefault("hoodie.datasource.write.table.type",
"MERGE_ON_READ"))
+ .setTableName(writeConfigs.get("hoodie.table.name"))
+
.setPartitionFields(writeConfigs.getOrDefault("hoodie.datasource.write.partitionpath.field",
""))
+
.setRecordMergeMode(RecordMergeMode.valueOf(writeConfigs.get("hoodie.record.merge.mode")))
+ .setRecordMergerStrategy(recordMergerStrategy)
+ .set(initConfigs).initTable(storageConf, getBasePath());
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+
+ HoodieJavaWriteClient writeClient = new HoodieJavaWriteClient(context,
writeConfig);
+ String instantTime = writeClient.createNewInstantTime();
+ writeClient.startCommitWithTime(instantTime);
+ if (operation.toLowerCase().equals("insert")) {
+ writeClient.insert(recordList, instantTime);
+ } else {
+ writeClient.upsert(recordList, instantTime);
+ }
+ }
+
+ @Override
+ public void validateRecordsInFileGroup(String tablePath, List<ArrayWritable>
actualRecordList, Schema schema, String fileGroupId) {
+
assertEquals(HoodieAvroUtils.addMetadataFields(HoodieTestDataGenerator.AVRO_SCHEMA),
schema);
+ try {
+ //prepare fg reader records to be compared to the baseline reader
+ HoodieReaderContext<ArrayWritable> readerContext =
getHoodieReaderContext(tablePath, schema, storageConf);
+ Map<String, ArrayWritable> recordMap = new HashMap<>();
+ for (ArrayWritable record : actualRecordList) {
+ recordMap.put(readerContext.getRecordKey(record, schema), record);
+ }
+
+
+ JobConf jobConf = new JobConf(baseJobConf);
+ jobConf.set(HoodieReaderConfig.FILE_GROUP_READER_ENABLED.key(), "false");
+
+ TableDesc tblDesc = Utilities.defaultTd;
+ // Set the input format
+ tblDesc.setInputFileFormatClass(HoodieParquetRealtimeInputFormat.class);
+ LinkedHashMap<Path, PartitionDesc> pt = new LinkedHashMap<>();
+ LinkedHashMap<Path, ArrayList<String>> talias = new LinkedHashMap<>();
+
+ PartitionDesc partDesc = new PartitionDesc(tblDesc, null);
+
+ pt.put(new Path(tablePath), partDesc);
+
+ ArrayList<String> arrayList = new ArrayList<>();
+ arrayList.add(tablePath);
+ talias.put(new Path(tablePath), arrayList);
+
+ MapredWork mrwork = new MapredWork();
+ mrwork.getMapWork().setPathToPartitionInfo(pt);
+ mrwork.getMapWork().setPathToAliases(talias);
+
+ Path mapWorkPath = new Path(tablePath);
+ Utilities.setMapRedWork(jobConf, mrwork, mapWorkPath);
+
+ // Add three partition path to InputPaths
+ Path[] partitionDirArray = new
Path[HoodieTestDataGenerator.DEFAULT_PARTITION_PATHS.length];
+ Arrays.stream(HoodieTestDataGenerator.DEFAULT_PARTITION_PATHS).map(s ->
new Path(tablePath, s)).collect(Collectors.toList()).toArray(partitionDirArray);
+ FileInputFormat.setInputPaths(jobConf, partitionDirArray);
+ jobConf.set(HAS_MAP_WORK, "true");
+ // The following config tells Hive to choose ExecMapper to read the
MAP_WORK
+ jobConf.set(MAPRED_MAPPER_CLASS, ExecMapper.class.getName());
+ // setting the split size to be 3 to create one split for 3 file groups
+
jobConf.set(org.apache.hadoop.mapreduce.lib.input.FileInputFormat.SPLIT_MAXSIZE,
"128000000");
+ setupJobconf(jobConf);
+
+ HoodieCombineHiveInputFormat combineHiveInputFormat = new
HoodieCombineHiveInputFormat();
+ InputSplit[] splits = combineHiveInputFormat.getSplits(jobConf, 1);
+
+ assertEquals(1, splits.length);
+ RecordReader<NullWritable, ArrayWritable> reader =
combineHiveInputFormat.getRecordReader(splits[0], jobConf, Reporter.NULL);
+ // use reader to read log file.
+ NullWritable key = reader.createKey();
+ ArrayWritable value = reader.createValue();
+ while (reader.next(key, value)) {
+ if (readerContext.getValue(value, schema,
HoodieRecord.FILENAME_METADATA_FIELD).toString().contains(fileGroupId)) {
+ //only evaluate records from the specified filegroup. Maybe there is
a way to get
+ //hive to do this?
Review Comment:
Could you filter the records based on `FILENAME_METADATA_FIELD` to get the
records for a particular file group?
--
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]
