This is an automated email from the ASF dual-hosted git repository.
leesf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new f3777f4 [MINOR] Remove unused imports and some other checkstyle
issues (#2800)
f3777f4 is described below
commit f3777f44fe3229e9582a03d5734a4580eaa8503a
Author: wangxianghu <[email protected]>
AuthorDate: Sun Apr 11 21:42:34 2021 +0800
[MINOR] Remove unused imports and some other checkstyle issues (#2800)
---
.../hudi/integ/testsuite/HoodieTestSuiteWriter.java | 2 +-
.../integ/testsuite/converter/DeleteConverter.java | 2 --
.../org/apache/hudi/integ/testsuite/dag/DagUtils.java | 5 -----
.../integ/testsuite/dag/scheduler/DagScheduler.java | 1 -
.../dag/scheduler/SaferSchemaDagScheduler.java | 1 -
.../testsuite/generator/DeleteGeneratorIterator.java | 2 --
.../integ/testsuite/generator/DeltaGenerator.java | 19 -------------------
.../FlexibleSchemaRecordGenerationIterator.java | 2 +-
.../generator/GenericRecordFullPayloadGenerator.java | 1 -
.../integ/testsuite/writer/DFSDeltaWriterAdapter.java | 2 --
.../org/apache/hudi/integ/HoodieTestHiveBase.java | 2 +-
.../test/java/org/apache/hudi/integ/ITTestBase.java | 2 +-
.../testsuite/converter/TestDeleteConverter.java | 1 -
.../testsuite/converter/TestUpdateConverter.java | 1 -
.../internal/HoodieDataSourceInternalTable.java | 3 ++-
15 files changed, 6 insertions(+), 40 deletions(-)
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
index a30312f..7c16432 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
@@ -126,7 +126,7 @@ public class HoodieTestSuiteWriter implements Serializable {
public RDD<GenericRecord> getNextBatch() throws Exception {
Pair<SchemaProvider, Pair<String, JavaRDD<HoodieRecord>>> nextBatch =
fetchSource();
lastCheckpoint = Option.of(nextBatch.getValue().getLeft());
- JavaRDD <HoodieRecord> inputRDD = nextBatch.getRight().getRight();
+ JavaRDD<HoodieRecord> inputRDD = nextBatch.getRight().getRight();
return inputRDD.map(r -> (GenericRecord) r.getData()
.getInsertValue(new Schema.Parser().parse(schema)).get()).rdd();
}
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/converter/DeleteConverter.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/converter/DeleteConverter.java
index f6dc08b..d5c4860 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/converter/DeleteConverter.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/converter/DeleteConverter.java
@@ -24,8 +24,6 @@ import
org.apache.hudi.integ.testsuite.generator.LazyRecordGeneratorIterator;
import org.apache.avro.generic.GenericRecord;
import org.apache.spark.api.java.JavaRDD;
-import java.util.List;
-
public class DeleteConverter implements Converter<GenericRecord,
GenericRecord> {
private final String schemaStr;
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
index 700a5b8..82c5a2f 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
@@ -50,11 +50,6 @@ import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hudi.common.util.ReflectionUtils;
-import org.apache.hudi.common.util.StringUtils;
-import org.apache.hudi.common.util.collection.Pair;
-import org.apache.hudi.integ.testsuite.configuration.DeltaConfig;
-import org.apache.hudi.integ.testsuite.dag.nodes.DagNode;
/**
* Utility class to SerDe workflow dag.
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/DagScheduler.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/DagScheduler.java
index f658628..0183f52 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/DagScheduler.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/DagScheduler.java
@@ -27,7 +27,6 @@ import org.apache.hudi.integ.testsuite.dag.nodes.DelayNode;
import org.apache.hudi.metrics.Metrics;
import org.apache.spark.api.java.JavaSparkContext;
-import org.junit.runners.Suite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/SaferSchemaDagScheduler.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/SaferSchemaDagScheduler.java
index ba89675..70ebe6c 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/SaferSchemaDagScheduler.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/SaferSchemaDagScheduler.java
@@ -19,7 +19,6 @@
package org.apache.hudi.integ.testsuite.dag.scheduler;
import org.apache.hudi.exception.HoodieException;
-import org.apache.hudi.integ.testsuite.dag.scheduler.DagScheduler;
import org.apache.hudi.integ.testsuite.dag.WorkflowDag;
import org.apache.hudi.integ.testsuite.dag.WriterContext;
import org.apache.hudi.integ.testsuite.dag.nodes.DagNode;
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeleteGeneratorIterator.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeleteGeneratorIterator.java
index b95bd0e..22729fe 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeleteGeneratorIterator.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeleteGeneratorIterator.java
@@ -21,9 +21,7 @@ package org.apache.hudi.integ.testsuite.generator;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericRecord;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
/**
* Lazy delete record generator.
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeltaGenerator.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeltaGenerator.java
index 258b6b7..e004b3b 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeltaGenerator.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/DeltaGenerator.java
@@ -28,7 +28,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.StreamSupport;
@@ -41,10 +40,6 @@ import
org.apache.hudi.integ.testsuite.configuration.DFSDeltaConfig;
import org.apache.hudi.integ.testsuite.configuration.DeltaConfig.Config;
import org.apache.hudi.integ.testsuite.converter.Converter;
import org.apache.hudi.integ.testsuite.converter.DeleteConverter;
-import org.apache.hudi.common.util.Option;
-import org.apache.hudi.integ.testsuite.configuration.DFSDeltaConfig;
-import org.apache.hudi.integ.testsuite.configuration.DeltaConfig;
-import org.apache.hudi.integ.testsuite.configuration.DeltaConfig.Config;
import org.apache.hudi.integ.testsuite.converter.UpdateConverter;
import org.apache.hudi.integ.testsuite.reader.DFSAvroDeltaInputReader;
import org.apache.hudi.integ.testsuite.reader.DFSHoodieDatasetInputReader;
@@ -55,7 +50,6 @@ import
org.apache.hudi.integ.testsuite.writer.DeltaWriterAdapter;
import org.apache.hudi.integ.testsuite.writer.DeltaWriterFactory;
import org.apache.hudi.keygen.BuiltinKeyGenerator;
-import org.apache.avro.generic.GenericRecord;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SparkSession;
@@ -63,18 +57,6 @@ import org.apache.spark.storage.StorageLevel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.UncheckedIOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-
import scala.Tuple2;
/**
@@ -235,7 +217,6 @@ public class DeltaGenerator implements Serializable {
}
}
-
public Map<Integer, Long> getPartitionToCountMap(JavaRDD<GenericRecord>
records) {
// Requires us to keep the partitioner the same
return records.mapPartitionsWithIndex((index, itr) -> {
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/FlexibleSchemaRecordGenerationIterator.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/FlexibleSchemaRecordGenerationIterator.java
index cd46b10..4af9262 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/FlexibleSchemaRecordGenerationIterator.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/FlexibleSchemaRecordGenerationIterator.java
@@ -53,7 +53,7 @@ public class FlexibleSchemaRecordGenerationIterator
implements Iterator<GenericR
List<String> partitionPathFieldNames, int numPartitions, int
startPartition) {
this.counter = maxEntriesToProduce;
this.partitionPathFieldNames = new HashSet<>(partitionPathFieldNames);
- if(partitionPathFieldNames != null && partitionPathFieldNames.size() > 0) {
+ if (partitionPathFieldNames != null && partitionPathFieldNames.size() > 0)
{
this.firstPartitionPathField = partitionPathFieldNames.get(0);
}
Schema schema = new Schema.Parser().parse(schemaStr);
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/GenericRecordFullPayloadGenerator.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/GenericRecordFullPayloadGenerator.java
index d7d2e87..59f02de 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/GenericRecordFullPayloadGenerator.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/generator/GenericRecordFullPayloadGenerator.java
@@ -27,7 +27,6 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericData.Fixed;
import org.apache.avro.generic.GenericFixed;
import org.apache.avro.generic.GenericRecord;
-import org.junit.runners.Suite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/writer/DFSDeltaWriterAdapter.java
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/writer/DFSDeltaWriterAdapter.java
index 054870f..19016a1 100644
---
a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/writer/DFSDeltaWriterAdapter.java
+++
b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/writer/DFSDeltaWriterAdapter.java
@@ -18,8 +18,6 @@
package org.apache.hudi.integ.testsuite.writer;
-import org.apache.hudi.integ.testsuite.schema.SchemaUtils;
-
import org.apache.avro.generic.GenericRecord;
import java.io.IOException;
diff --git
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
index 95e4c01..808ce5f 100644
---
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
+++
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
@@ -77,7 +77,7 @@ public class HoodieTestHiveBase extends ITTestBase {
tableType, hiveTableName, commitType, hoodieTableName);
if (partitionType == PartitionType.MULTI_KEYS_PARTITIONED) {
cmd = cmd + " --use-multi-partition-keys";
- } else if (partitionType == PartitionType.NON_PARTITIONED){
+ } else if (partitionType == PartitionType.NON_PARTITIONED) {
cmd = cmd + " --non-partitioned";
}
executeCommandStringInDocker(ADHOC_1_CONTAINER, cmd, true);
diff --git
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
index 80ed1d4..97ec316 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
@@ -166,7 +166,7 @@ public abstract class ITTestBase {
// try to capture stdout and stderr of the stuck process.
boolean completed =
-
dockerClient.execStartCmd(createCmdResponse.getId()).withDetach(false).withTty(false).exec(callback)
+
dockerClient.execStartCmd(createCmdResponse.getId()).withDetach(false).withTty(false).exec(callback)
.awaitCompletion(540, SECONDS);
if (!completed) {
callback.getStderr().flush();
diff --git
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestDeleteConverter.java
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestDeleteConverter.java
index 8ed98b4..adaa7e9 100644
---
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestDeleteConverter.java
+++
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestDeleteConverter.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
diff --git
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestUpdateConverter.java
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestUpdateConverter.java
index e162448..8d1189c 100644
---
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestUpdateConverter.java
+++
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/converter/TestUpdateConverter.java
@@ -20,7 +20,6 @@ package org.apache.hudi.integ.testsuite.converter;
import static junit.framework.TestCase.assertTrue;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
diff --git
a/hudi-spark-datasource/hudi-spark3/src/main/java/org/apache/hudi/spark3/internal/HoodieDataSourceInternalTable.java
b/hudi-spark-datasource/hudi-spark3/src/main/java/org/apache/hudi/spark3/internal/HoodieDataSourceInternalTable.java
index f1fded0..ce746e7 100644
---
a/hudi-spark-datasource/hudi-spark3/src/main/java/org/apache/hudi/spark3/internal/HoodieDataSourceInternalTable.java
+++
b/hudi-spark-datasource/hudi-spark3/src/main/java/org/apache/hudi/spark3/internal/HoodieDataSourceInternalTable.java
@@ -66,7 +66,8 @@ class HoodieDataSourceInternalTable implements SupportsWrite {
return new HashSet<TableCapability>() {{
add(TableCapability.BATCH_WRITE);
add(TableCapability.TRUNCATE);
- }};
+ }
+ };
}
@Override
