This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 9bdb607 Hive: Move Hive-related classes to mr.hive package (#1247)
9bdb607 is described below
commit 9bdb607b038e9da9c71cefb7f6a0eafda0dfeddb
Author: Adrien Guillo <[email protected]>
AuthorDate: Sat Jul 25 18:42:20 2020 -0700
Hive: Move Hive-related classes to mr.hive package (#1247)
---
.../org/apache/iceberg/mr/hive/HiveIcebergInputFormat.java | 1 -
.../{mapred/IcebergSerDe.java => hive/HiveIcebergSerDe.java} | 7 ++++---
.../org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java | 3 +--
.../org/apache/iceberg/mr/{mapred => hive}/TableResolver.java | 2 +-
.../serde/objectinspector/IcebergBinaryObjectInspector.java | 2 +-
.../serde/objectinspector/IcebergDateObjectInspector.java | 2 +-
.../serde/objectinspector/IcebergDecimalObjectInspector.java | 2 +-
.../serde/objectinspector/IcebergObjectInspector.java | 2 +-
.../serde/objectinspector/IcebergRecordObjectInspector.java | 2 +-
.../objectinspector/IcebergTimestampObjectInspector.java | 2 +-
.../TestIcebergSerDe.java => hive/TestHiveIcebergSerDe.java} | 11 ++++++-----
.../apache/iceberg/mr/{mapred => hive}/TestTableResolver.java | 2 +-
.../objectinspector/TestIcebergBinaryObjectInspector.java | 2 +-
.../serde/objectinspector/TestIcebergDateObjectInspector.java | 2 +-
.../objectinspector/TestIcebergDecimalObjectInspector.java | 2 +-
.../serde/objectinspector/TestIcebergObjectInspector.java | 2 +-
.../objectinspector/TestIcebergRecordObjectInspector.java | 2 +-
.../objectinspector/TestIcebergTimestampObjectInspector.java | 2 +-
18 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergInputFormat.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergInputFormat.java
index 0b9fd70..55341ee 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergInputFormat.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergInputFormat.java
@@ -35,7 +35,6 @@ import org.apache.iceberg.data.Record;
import org.apache.iceberg.mr.InputFormatConfig;
import org.apache.iceberg.mr.mapred.Container;
import org.apache.iceberg.mr.mapred.MapredIcebergInputFormat;
-import org.apache.iceberg.mr.mapred.TableResolver;
import org.apache.iceberg.mr.mapreduce.IcebergSplit;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
diff --git a/mr/src/main/java/org/apache/iceberg/mr/mapred/IcebergSerDe.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergSerDe.java
similarity index 91%
rename from mr/src/main/java/org/apache/iceberg/mr/mapred/IcebergSerDe.java
rename to mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergSerDe.java
index f0ee139..9ba7e9e 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/mapred/IcebergSerDe.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergSerDe.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred;
+package org.apache.iceberg.mr.hive;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -30,9 +30,10 @@ import org.apache.hadoop.hive.serde2.SerDeStats;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.io.Writable;
import org.apache.iceberg.Table;
-import
org.apache.iceberg.mr.mapred.serde.objectinspector.IcebergObjectInspector;
+import org.apache.iceberg.mr.hive.serde.objectinspector.IcebergObjectInspector;
+import org.apache.iceberg.mr.mapred.Container;
-public class IcebergSerDe extends AbstractSerDe {
+public class HiveIcebergSerDe extends AbstractSerDe {
private ObjectInspector inspector;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
index 086945c..4b063a3 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.hive.serde2.Deserializer;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputFormat;
-import org.apache.iceberg.mr.mapred.IcebergSerDe;
public class HiveIcebergStorageHandler implements HiveStoragePredicateHandler,
HiveStorageHandler {
@@ -52,7 +51,7 @@ public class HiveIcebergStorageHandler implements
HiveStoragePredicateHandler, H
@Override
public Class<? extends AbstractSerDe> getSerDeClass() {
- return IcebergSerDe.class;
+ return HiveIcebergSerDe.class;
}
@Override
diff --git a/mr/src/main/java/org/apache/iceberg/mr/mapred/TableResolver.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/TableResolver.java
similarity index 98%
rename from mr/src/main/java/org/apache/iceberg/mr/mapred/TableResolver.java
rename to mr/src/main/java/org/apache/iceberg/mr/hive/TableResolver.java
index c8c7414..12febbb 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/mapred/TableResolver.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/hive/TableResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred;
+package org.apache.iceberg.mr.hive;
import java.io.IOException;
import java.util.Map;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergBinaryObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergBinaryObjectInspector.java
similarity index 97%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergBinaryObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergBinaryObjectInspector.java
index 6ec48eb..44502b4 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergBinaryObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergBinaryObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDateObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDateObjectInspector.java
similarity index 97%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDateObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDateObjectInspector.java
index 2af9a17..122ffc6 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDateObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDateObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.sql.Date;
import java.time.LocalDate;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDecimalObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDecimalObjectInspector.java
similarity index 97%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDecimalObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDecimalObjectInspector.java
index fa8f91c..fc06e64 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergDecimalObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergDecimalObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergObjectInspector.java
similarity index 98%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergObjectInspector.java
index 5e251f7..a5fed0b 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.util.List;
import javax.annotation.Nullable;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergRecordObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergRecordObjectInspector.java
similarity index 98%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergRecordObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergRecordObjectInspector.java
index c49396b..bc208c1 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergRecordObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergRecordObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.util.Collections;
import java.util.List;
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergTimestampObjectInspector.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergTimestampObjectInspector.java
similarity index 97%
rename from
mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergTimestampObjectInspector.java
rename to
mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergTimestampObjectInspector.java
index 974e59f..f05eaa5 100644
---
a/mr/src/main/java/org/apache/iceberg/mr/mapred/serde/objectinspector/IcebergTimestampObjectInspector.java
+++
b/mr/src/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergTimestampObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.sql.Timestamp;
import java.time.LocalDateTime;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/TestIcebergSerDe.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergSerDe.java
similarity index 89%
rename from mr/src/test/java/org/apache/iceberg/mr/mapred/TestIcebergSerDe.java
rename to mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergSerDe.java
index a2fb90d..5947ca0 100644
--- a/mr/src/test/java/org/apache/iceberg/mr/mapred/TestIcebergSerDe.java
+++ b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergSerDe.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred;
+package org.apache.iceberg.mr.hive;
import java.io.File;
import java.io.IOException;
@@ -31,7 +31,8 @@ import org.apache.iceberg.data.RandomGenericData;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.hadoop.HadoopTables;
import org.apache.iceberg.mr.InputFormatConfig;
-import
org.apache.iceberg.mr.mapred.serde.objectinspector.IcebergObjectInspector;
+import org.apache.iceberg.mr.hive.serde.objectinspector.IcebergObjectInspector;
+import org.apache.iceberg.mr.mapred.Container;
import org.apache.iceberg.types.Types;
import org.junit.Assert;
import org.junit.Rule;
@@ -40,7 +41,7 @@ import org.junit.rules.TemporaryFolder;
import static org.apache.iceberg.types.Types.NestedField.required;
-public class TestIcebergSerDe {
+public class TestHiveIcebergSerDe {
private static final Schema schema = new Schema(required(1, "string_field",
Types.StringType.get()));
@@ -61,7 +62,7 @@ public class TestIcebergSerDe {
HadoopTables tables = new HadoopTables(conf);
tables.create(schema, PartitionSpec.unpartitioned(),
Collections.emptyMap(), location.toString());
- IcebergSerDe serDe = new IcebergSerDe();
+ HiveIcebergSerDe serDe = new HiveIcebergSerDe();
serDe.initialize(conf, properties);
Assert.assertEquals(IcebergObjectInspector.create(schema),
serDe.getObjectInspector());
@@ -69,7 +70,7 @@ public class TestIcebergSerDe {
@Test
public void testDeserialize() {
- IcebergSerDe serDe = new IcebergSerDe();
+ HiveIcebergSerDe serDe = new HiveIcebergSerDe();
Record record = RandomGenericData.generate(schema, 1, 0).get(0);
Container<Record> container = new Container<>();
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/TestTableResolver.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/TestTableResolver.java
similarity index 99%
rename from mr/src/test/java/org/apache/iceberg/mr/mapred/TestTableResolver.java
rename to mr/src/test/java/org/apache/iceberg/mr/hive/TestTableResolver.java
index ff5b645..a760794 100644
--- a/mr/src/test/java/org/apache/iceberg/mr/mapred/TestTableResolver.java
+++ b/mr/src/test/java/org/apache/iceberg/mr/hive/TestTableResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred;
+package org.apache.iceberg.mr.hive;
import java.io.File;
import java.io.IOException;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergBinaryObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
similarity index 98%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergBinaryObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
index f28e78b..3209600 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergBinaryObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.nio.ByteBuffer;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDateObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspector.java
similarity index 97%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDateObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspector.java
index 28962aa..a263a2b 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDateObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.sql.Date;
import java.time.LocalDate;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDecimalObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
similarity index 98%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDecimalObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
index 77489a4..4d04eee 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergDecimalObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.math.BigDecimal;
import org.apache.hadoop.hive.common.type.HiveDecimal;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
similarity index 99%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
index 1cc345b..dc2a95d 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergRecordObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
similarity index 97%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergRecordObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
index edfaa17..b67042b 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergRecordObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
diff --git
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergTimestampObjectInspector.java
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspector.java
similarity index 97%
rename from
mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergTimestampObjectInspector.java
rename to
mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspector.java
index a1f6c18..7c91e80 100644
---
a/mr/src/test/java/org/apache/iceberg/mr/mapred/serde/objectinspector/TestIcebergTimestampObjectInspector.java
+++
b/mr/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg.mr.mapred.serde.objectinspector;
+package org.apache.iceberg.mr.hive.serde.objectinspector;
import java.sql.Timestamp;
import java.time.LocalDateTime;
