This is an automated email from the ASF dual-hosted git repository.
vbalaji pushed a commit to branch hackathon-0619
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/hackathon-0619 by this push:
new ea0b70a Hoodie Hive to use log4j Logger instead of slf4j
ea0b70a is described below
commit ea0b70a7cf4ee744dadffb5f9aa5daac8f94be71
Author: Balaji Varadarajan <[email protected]>
AuthorDate: Tue Jun 18 18:12:42 2019 -0700
Hoodie Hive to use log4j Logger instead of slf4j
---
hoodie-hive/pom.xml | 8 ++------
hoodie-hive/src/main/java/com/uber/hoodie/hive/HiveSyncTool.java | 8 +++++---
.../src/main/java/com/uber/hoodie/hive/HoodieHiveClient.java | 7 ++++---
.../src/main/java/com/uber/hoodie/hive/util/SchemaUtil.java | 6 +++---
.../src/test/java/com/uber/hoodie/hive/util/HiveTestService.java | 7 +++----
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/hoodie-hive/pom.xml b/hoodie-hive/pom.xml
index d5c3694..f6622b3 100644
--- a/hoodie-hive/pom.xml
+++ b/hoodie-hive/pom.xml
@@ -85,12 +85,8 @@
<!-- Logging -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
diff --git a/hoodie-hive/src/main/java/com/uber/hoodie/hive/HiveSyncTool.java
b/hoodie-hive/src/main/java/com/uber/hoodie/hive/HiveSyncTool.java
index 29e9000..9ab8824 100644
--- a/hoodie-hive/src/main/java/com/uber/hoodie/hive/HiveSyncTool.java
+++ b/hoodie-hive/src/main/java/com/uber/hoodie/hive/HiveSyncTool.java
@@ -36,9 +36,10 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.api.Partition;
import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat;
import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.parquet.schema.MessageType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
/**
@@ -52,7 +53,8 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("WeakerAccess")
public class HiveSyncTool {
- private static final Logger LOG =
LoggerFactory.getLogger(HiveSyncTool.class);
+ private static Logger LOG = LogManager.getLogger(HiveSyncTool.class);
+
private final HoodieHiveClient hoodieHiveClient;
public static final String SUFFIX_REALTIME_TABLE = "_rt";
private final HiveSyncConfig cfg;
diff --git
a/hoodie-hive/src/main/java/com/uber/hoodie/hive/HoodieHiveClient.java
b/hoodie-hive/src/main/java/com/uber/hoodie/hive/HoodieHiveClient.java
index 3f34de8..94887be 100644
--- a/hoodie-hive/src/main/java/com/uber/hoodie/hive/HoodieHiveClient.java
+++ b/hoodie-hive/src/main/java/com/uber/hoodie/hive/HoodieHiveClient.java
@@ -57,13 +57,14 @@ import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.metastore.api.Partition;
import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.hive.jdbc.HiveDriver;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.parquet.format.converter.ParquetMetadataConverter;
import org.apache.parquet.hadoop.ParquetFileReader;
import org.apache.parquet.hadoop.metadata.ParquetMetadata;
import org.apache.parquet.schema.MessageType;
import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
@SuppressWarnings("ConstantConditions")
public class HoodieHiveClient {
@@ -80,7 +81,7 @@ public class HoodieHiveClient {
}
}
- private static Logger LOG = LoggerFactory.getLogger(HoodieHiveClient.class);
+ private static Logger LOG = LogManager.getLogger(HoodieHiveClient.class);
private final HoodieTableMetaClient metaClient;
private final HoodieTableType tableType;
private final PartitionValueExtractor partitionValueExtractor;
diff --git
a/hoodie-hive/src/main/java/com/uber/hoodie/hive/util/SchemaUtil.java
b/hoodie-hive/src/main/java/com/uber/hoodie/hive/util/SchemaUtil.java
index f6d461d..d826781 100644
--- a/hoodie-hive/src/main/java/com/uber/hoodie/hive/util/SchemaUtil.java
+++ b/hoodie-hive/src/main/java/com/uber/hoodie/hive/util/SchemaUtil.java
@@ -36,6 +36,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.parquet.avro.AvroSchemaConverter;
import org.apache.parquet.schema.DecimalMetadata;
import org.apache.parquet.schema.GroupType;
@@ -43,15 +45,13 @@ import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.OriginalType;
import org.apache.parquet.schema.PrimitiveType;
import org.apache.parquet.schema.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Schema Utilities
*/
public class SchemaUtil {
- private static final Logger LOG = LoggerFactory.getLogger(SchemaUtil.class);
+ private static Logger LOG = LogManager.getLogger(SchemaUtil.class);
/**
* Get the schema difference between the storage schema and hive table schema
diff --git
a/hoodie-hive/src/test/java/com/uber/hoodie/hive/util/HiveTestService.java
b/hoodie-hive/src/test/java/com/uber/hoodie/hive/util/HiveTestService.java
index 2a7451f..9ccffa2 100644
--- a/hoodie-hive/src/test/java/com/uber/hoodie/hive/util/HiveTestService.java
+++ b/hoodie-hive/src/test/java/com/uber/hoodie/hive/util/HiveTestService.java
@@ -41,6 +41,8 @@ import org.apache.hadoop.hive.metastore.TUGIBasedProcessor;
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.thrift.TUGIContainingTransport;
import org.apache.hive.service.server.HiveServer2;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.server.TServer;
@@ -52,13 +54,10 @@ import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TTransportFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class HiveTestService {
- private static final Logger LOG =
LoggerFactory.getLogger(HiveTestService.class);
-
+ private static Logger LOG = LogManager.getLogger(HiveTestService.class);
private static final int CONNECTION_TIMEOUT = 30000;
/**