You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by vi...@apache.org on 2020/10/30 05:33:38 UTC
[hudi] 08/14: [RFC-15] Fixing checkstyle errors.
This is an automated email from the ASF dual-hosted git repository.
vinoth pushed a commit to branch rfc-15
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 48d2f807c7382d57005e4a50c6ac10db2dae84bf
Author: Prashant Wason <pw...@uber.com>
AuthorDate: Tue Oct 27 15:56:01 2020 -0700
[RFC-15] Fixing checkstyle errors.
---
.../java/org/apache/hudi/cli/commands/MetadataCommand.java | 12 ++++++++----
.../java/org/apache/hudi/metadata/HoodieMetadataWriter.java | 2 --
.../java/org/apache/hudi/metadata/TestHoodieMetadata.java | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/MetadataCommand.java b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/MetadataCommand.java
index 4c31efd..4ecc6a9 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/commands/MetadataCommand.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/commands/MetadataCommand.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hudi.cli.HoodieCLI;
import org.apache.hudi.cli.utils.SparkUtil;
import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.config.HoodieMetadataConfig;
import org.apache.hudi.config.HoodieWriteConfig;
import org.apache.hudi.metadata.HoodieMetadataReader;
import org.apache.hudi.metadata.HoodieMetadataWriter;
@@ -71,8 +72,7 @@ public class MetadataCommand implements CommandMarker {
}
long t1 = System.currentTimeMillis();
- HoodieWriteConfig writeConfig = HoodieWriteConfig.newBuilder().withPath(HoodieCLI.basePath)
- .withUseFileListingMetadata(true).build();
+ HoodieWriteConfig writeConfig = getWriteConfig();
initJavaSparkContext();
HoodieMetadataWriter.instance(HoodieCLI.conf, writeConfig).initialize(jsc);
long t2 = System.currentTimeMillis();
@@ -113,8 +113,7 @@ public class MetadataCommand implements CommandMarker {
if (readOnly) {
//HoodieMetadata.init(HoodieCLI.conf, HoodieCLI.basePath);
} else {
- HoodieWriteConfig writeConfig = HoodieWriteConfig.newBuilder().withPath(HoodieCLI.basePath)
- .withUseFileListingMetadata(true).build();
+ HoodieWriteConfig writeConfig = getWriteConfig();
initJavaSparkContext();
HoodieMetadataWriter.instance(HoodieCLI.conf, writeConfig).initialize(jsc);
}
@@ -195,6 +194,11 @@ public class MetadataCommand implements CommandMarker {
return out.toString();
}
+ private HoodieWriteConfig getWriteConfig() {
+ return HoodieWriteConfig.newBuilder().withPath(HoodieCLI.basePath)
+ .withMetadataConfig(HoodieMetadataConfig.newBuilder().enable(true).build()).build();
+ }
+
private void initJavaSparkContext() {
if (jsc == null) {
jsc = SparkUtil.initJavaSparkConf("HoodieClI");
diff --git a/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieMetadataWriter.java b/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieMetadataWriter.java
index c7eb33f..655890b 100644
--- a/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieMetadataWriter.java
+++ b/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieMetadataWriter.java
@@ -42,7 +42,6 @@ import org.apache.hudi.avro.model.HoodieRollbackMetadata;
import org.apache.hudi.client.HoodieWriteClient;
import org.apache.hudi.client.WriteStatus;
import org.apache.hudi.client.utils.ClientUtils;
-import org.apache.hudi.common.config.SerializableConfiguration;
import org.apache.hudi.common.fs.ConsistencyGuardConfig;
import org.apache.hudi.common.fs.FSUtils;
import org.apache.hudi.common.metrics.Registry;
@@ -58,7 +57,6 @@ import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.model.HoodieWriteStat;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
-import org.apache.hudi.common.table.timeline.HoodieDefaultTimeline;
import org.apache.hudi.common.table.timeline.HoodieInstant;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.table.timeline.TimelineMetadataUtils;
diff --git a/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieMetadata.java b/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieMetadata.java
index 36a8c13..e830054 100644
--- a/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieMetadata.java
+++ b/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieMetadata.java
@@ -54,7 +54,6 @@ import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
import org.apache.hudi.common.table.view.TableFileSystemView;
import org.apache.hudi.common.testutils.HoodieTestDataGenerator;
import org.apache.hudi.common.testutils.HoodieTestTable;
-import org.apache.hudi.common.testutils.HoodieTestUtils;
import org.apache.hudi.common.util.Option;
import org.apache.hudi.config.HoodieCompactionConfig;
import org.apache.hudi.config.HoodieIndexConfig;