This is an automated email from the ASF dual-hosted git repository.
vinoyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/master by this push:
new c06d89b [HUDI-378] Refactor the rest codes based on new ImportOrder
code style rule (#1078)
c06d89b is described below
commit c06d89b648bbdaaad9c68fb9d3c6d53b4d68541c
Author: lamber-ken <lamber...@163.com>
AuthorDate: Thu Dec 5 17:25:03 2019 +0800
[HUDI-378] Refactor the rest codes based on new ImportOrder code style rule
(#1078)
---
.../apache/hudi/config/HoodieStorageConfig.java | 3 +-
.../apache/hudi/metrics/JmxMetricsReporter.java | 16 +++---
.../src/test/java/org/apache/hudi/TestCleaner.java | 1 +
.../apache/hudi/metrics/TestHoodieJmxMetrics.java | 10 ++--
.../org/apache/hudi/common/util/CleanerUtils.java | 6 ++-
.../versioning/clean/CleanMetadataMigrator.java | 3 +-
.../versioning/clean/CleanV1MigrationHandler.java | 3 +-
.../versioning/clean/CleanV2MigrationHandler.java | 3 +-
.../org/apache/hudi/hive/HoodieHiveClient.java | 58 +++++++++++-----------
style/checkstyle.xml | 1 -
10 files changed, 57 insertions(+), 47 deletions(-)
diff --git
a/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java
b/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java
index 90fdb6c..f9c98c7 100644
--- a/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java
+++ b/hudi-client/src/main/java/org/apache/hudi/config/HoodieStorageConfig.java
@@ -18,11 +18,12 @@
package org.apache.hudi.config;
+import javax.annotation.concurrent.Immutable;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import javax.annotation.concurrent.Immutable;
/**
* Storage related config
diff --git
a/hudi-client/src/main/java/org/apache/hudi/metrics/JmxMetricsReporter.java
b/hudi-client/src/main/java/org/apache/hudi/metrics/JmxMetricsReporter.java
index 7bc73d2..d00ec67 100644
--- a/hudi-client/src/main/java/org/apache/hudi/metrics/JmxMetricsReporter.java
+++ b/hudi-client/src/main/java/org/apache/hudi/metrics/JmxMetricsReporter.java
@@ -18,18 +18,20 @@
package org.apache.hudi.metrics;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.exception.HoodieException;
+
import com.google.common.base.Preconditions;
-import java.io.Closeable;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
-import java.lang.management.ManagementFactory;
-import java.rmi.registry.LocateRegistry;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.hudi.config.HoodieWriteConfig;
-import org.apache.hudi.exception.HoodieException;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+
+import java.io.Closeable;
+import java.lang.management.ManagementFactory;
+import java.rmi.registry.LocateRegistry;
/**
* Implementation of Jmx reporter, which used to report jmx metric.
diff --git a/hudi-client/src/test/java/org/apache/hudi/TestCleaner.java
b/hudi-client/src/test/java/org/apache/hudi/TestCleaner.java
index 370021a..200575a 100644
--- a/hudi-client/src/test/java/org/apache/hudi/TestCleaner.java
+++ b/hudi-client/src/test/java/org/apache/hudi/TestCleaner.java
@@ -78,6 +78,7 @@ import java.util.TreeSet;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import scala.Tuple3;
import static
org.apache.hudi.common.model.HoodieTestUtils.DEFAULT_PARTITION_PATHS;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/metrics/TestHoodieJmxMetrics.java
b/hudi-client/src/test/java/org/apache/hudi/metrics/TestHoodieJmxMetrics.java
index 7260774..b014329 100644
---
a/hudi-client/src/test/java/org/apache/hudi/metrics/TestHoodieJmxMetrics.java
+++
b/hudi-client/src/test/java/org/apache/hudi/metrics/TestHoodieJmxMetrics.java
@@ -18,16 +18,16 @@
package org.apache.hudi.metrics;
-import static org.apache.hudi.metrics.Metrics.registerGauge;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.hudi.config.HoodieMetricsConfig;
import org.apache.hudi.config.HoodieWriteConfig;
import org.junit.Test;
+import static org.apache.hudi.metrics.Metrics.registerGauge;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* Test for the Jmx metrics report.
*/
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java
b/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java
index 4d4ccb9..0e8c460 100644
--- a/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java
+++ b/hudi-common/src/main/java/org/apache/hudi/common/util/CleanerUtils.java
@@ -18,8 +18,6 @@
package org.apache.hudi.common.util;
-import com.google.common.collect.ImmutableMap;
-import java.util.List;
import org.apache.hudi.avro.model.HoodieCleanMetadata;
import org.apache.hudi.avro.model.HoodieCleanPartitionMetadata;
import org.apache.hudi.common.HoodieCleanStat;
@@ -28,6 +26,10 @@ import
org.apache.hudi.common.versioning.clean.CleanMetadataMigrator;
import org.apache.hudi.common.versioning.clean.CleanV1MigrationHandler;
import org.apache.hudi.common.versioning.clean.CleanV2MigrationHandler;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.List;
+
public class CleanerUtils {
public static final Integer CLEAN_METADATA_VERSION_1 =
CleanV1MigrationHandler.VERSION;
public static final Integer CLEAN_METADATA_VERSION_2 =
CleanV2MigrationHandler.VERSION;
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java
index 219572d..536f148 100644
---
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java
+++
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanMetadataMigrator.java
@@ -18,11 +18,12 @@
package org.apache.hudi.common.versioning.clean;
-import java.util.Arrays;
import org.apache.hudi.avro.model.HoodieCleanMetadata;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.versioning.MetadataMigrator;
+import java.util.Arrays;
+
public class CleanMetadataMigrator extends
MetadataMigrator<HoodieCleanMetadata> {
public CleanMetadataMigrator(HoodieTableMetaClient metaClient) {
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java
index d9dbead..998d4f0 100644
---
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java
+++
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV1MigrationHandler.java
@@ -26,9 +26,10 @@ import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.common.versioning.AbstractMigratorBase;
import com.google.common.base.Preconditions;
+import org.apache.hadoop.fs.Path;
+
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.hadoop.fs.Path;
public class CleanV1MigrationHandler extends
AbstractMigratorBase<HoodieCleanMetadata> {
diff --git
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java
index 2609672..84896a0 100644
---
a/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java
+++
b/hudi-common/src/main/java/org/apache/hudi/common/versioning/clean/CleanV2MigrationHandler.java
@@ -25,10 +25,11 @@ import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.common.versioning.AbstractMigratorBase;
import com.google.common.base.Preconditions;
+import org.apache.hadoop.fs.Path;
+
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.hadoop.fs.Path;
public class CleanV2MigrationHandler extends
AbstractMigratorBase<HoodieCleanMetadata> {
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
b/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
index cf222db..dd0a460 100644
--- a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
+++ b/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
@@ -18,23 +18,24 @@
package org.apache.hudi.hive;
+import org.apache.hudi.common.model.HoodieCommitMetadata;
+import org.apache.hudi.common.model.HoodieFileFormat;
+import org.apache.hudi.common.model.HoodieLogFile;
+import org.apache.hudi.common.model.HoodieTableType;
+import org.apache.hudi.common.storage.StorageSchemes;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.common.table.HoodieTimeline;
+import org.apache.hudi.common.table.timeline.HoodieInstant;
+import org.apache.hudi.common.util.FSUtils;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.common.util.collection.Pair;
+import org.apache.hudi.exception.HoodieIOException;
+import org.apache.hudi.exception.InvalidDatasetException;
+import org.apache.hudi.hive.util.SchemaUtil;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -47,20 +48,6 @@ import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hive.jdbc.HiveDriver;
-import org.apache.hudi.common.model.HoodieCommitMetadata;
-import org.apache.hudi.common.model.HoodieFileFormat;
-import org.apache.hudi.common.model.HoodieLogFile;
-import org.apache.hudi.common.model.HoodieTableType;
-import org.apache.hudi.common.storage.StorageSchemes;
-import org.apache.hudi.common.table.HoodieTableMetaClient;
-import org.apache.hudi.common.table.HoodieTimeline;
-import org.apache.hudi.common.table.timeline.HoodieInstant;
-import org.apache.hudi.common.util.FSUtils;
-import org.apache.hudi.common.util.Option;
-import org.apache.hudi.common.util.collection.Pair;
-import org.apache.hudi.exception.HoodieIOException;
-import org.apache.hudi.exception.InvalidDatasetException;
-import org.apache.hudi.hive.util.SchemaUtil;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.parquet.format.converter.ParquetMetadataConverter;
@@ -69,6 +56,21 @@ import org.apache.parquet.hadoop.metadata.ParquetMetadata;
import org.apache.parquet.schema.MessageType;
import org.apache.thrift.TException;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
@SuppressWarnings("ConstantConditions")
public class HoodieHiveClient {
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index a5bdb35..c201cfa 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -282,7 +282,6 @@
<!-- Checks for out of order import statements. -->
<module name="ImportOrder">
- <property name="severity" value="info"/>
<property name="groups"
value="org.apache.hudi,*,javax,java,scala"/>
<property name="separated" value="true"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
