You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/08/19 16:52:18 UTC
[orc] branch branch-1.7 updated: ORC-726: Support MapType in
orc-tools convert (#875)
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new 5cc23f0 ORC-726: Support MapType in orc-tools convert (#875)
5cc23f0 is described below
commit 5cc23f086d6ce2d8cdbe3b82b97c5794050a1bbc
Author: guiyanakaung <gu...@gmail.com>
AuthorDate: Thu Aug 19 09:51:51 2021 -0700
ORC-726: Support MapType in orc-tools convert (#875)
Implement MapType to support multiple ORC files for convert.
Feature Improvement.
Added testMapMerges unit test.
(cherry picked from commit 9790ba8a241cf8b4440a9de4402ccc195d3e4275)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.../java/org/apache/orc/tools/json/HiveType.java | 3 +-
.../apache/orc/tools/json/JsonSchemaFinder.java | 3 +
.../java/org/apache/orc/tools/json/MapType.java | 83 ++++++++++++++++++++++
.../orc/tools/json/TestJsonSchemaFinder.java | 38 ++++++++++
4 files changed, 126 insertions(+), 1 deletion(-)
diff --git a/java/tools/src/java/org/apache/orc/tools/json/HiveType.java b/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
index aa31457..b467898 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/HiveType.java
@@ -34,7 +34,8 @@ abstract class HiveType {
BINARY(1), DATE(1), TIMESTAMP(1), TIMESTAMP_INSTANT(1), STRING(2),
STRUCT(1, false),
LIST(1, false),
- UNION(8, false);
+ UNION(8, false),
+ MAP(9, false);
// for types that subsume each other, establish a ranking.
final int rank;
diff --git a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
index 68d39a5..9a8cfe9 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
@@ -338,6 +338,9 @@ public class JsonSchemaFinder {
return result;
}
case MAP:
+ return new MapType(
+ makeHiveType(schema.getChildren().get(0)),
+ makeHiveType(schema.getChildren().get(1)));
default:
throw new IllegalArgumentException("Unhandled type " + schema);
}
diff --git a/java/tools/src/java/org/apache/orc/tools/json/MapType.java b/java/tools/src/java/org/apache/orc/tools/json/MapType.java
new file mode 100644
index 0000000..b06f136
--- /dev/null
+++ b/java/tools/src/java/org/apache/orc/tools/json/MapType.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.orc.tools.json;
+
+import org.apache.orc.TypeDescription;
+
+import java.io.PrintStream;
+import java.util.Objects;
+
+public class MapType extends HiveType {
+
+ private final HiveType keyType;
+
+ private final HiveType valueType;
+
+ MapType(HiveType keyType, HiveType valueType) {
+ super(Kind.MAP);
+ this.keyType = keyType;
+ this.valueType = valueType;
+ }
+
+ @Override
+ public String toString() {
+ return "map<" + keyType + "," + valueType + ">";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return super.equals(o) && keyType.equals(((MapType)o).keyType)
+ && valueType.equals(((MapType)o).valueType);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), keyType, valueType);
+ }
+
+ @Override
+ public boolean subsumes(HiveType other) {
+ return (other.kind == Kind.MAP
+ && keyType.subsumes(((MapType)other).keyType)
+ && valueType.subsumes(((MapType)other).valueType))
+ || other.kind == Kind.NULL;
+ }
+
+ @Override
+ public void merge(HiveType other) {
+ if (other.getClass() == MapType.class) {
+ MapType otherMap = (MapType) other;
+ keyType.merge(otherMap.keyType);
+ valueType.merge(otherMap.valueType);
+ }
+ }
+
+ @Override
+ public void printFlat(PrintStream out, String prefix) {
+ prefix = prefix + ".";
+ keyType.printFlat(out, prefix + "key");
+ keyType.printFlat(out, prefix + "value");
+ }
+
+ @Override
+ public TypeDescription getSchema() {
+ return TypeDescription.createMap(keyType.getSchema(), valueType.getSchema());
+ }
+
+}
diff --git a/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java b/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
index 674d163..fbeffac 100644
--- a/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
+++ b/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
@@ -353,4 +353,42 @@ public class TestJsonSchemaFinder {
new StringType(HiveType.Kind.TIMESTAMP)
).toString());
}
+
+ @Test
+ public void testMapMerges() throws Exception {
+ assertEquals("map<decimal(15,10),string>", JsonSchemaFinder.mergeType(
+ new MapType(new NumericType(HiveType.Kind.DECIMAL, 2, 10),
+ new StringType(HiveType.Kind.TIMESTAMP)),
+ new MapType(new NumericType(HiveType.Kind.INT, 5, 0),
+ new StringType(HiveType.Kind.BINARY))
+ ).toString());
+ assertEquals("map<binary,timestamp>", JsonSchemaFinder.mergeType(
+ new MapType(new StringType(HiveType.Kind.BINARY), new StringType(HiveType.Kind.TIMESTAMP)),
+ new MapType(new StringType(HiveType.Kind.BINARY), new StringType(HiveType.Kind.TIMESTAMP))
+ ).toString());
+ assertEquals("map<string,string>", JsonSchemaFinder.mergeType(
+ new MapType(new StringType(HiveType.Kind.BINARY), new StringType(HiveType.Kind.TIMESTAMP)),
+ new MapType(new StringType(HiveType.Kind.TIMESTAMP), new StringType(HiveType.Kind.BINARY))
+ ).toString());
+ assertEquals("struct<bar:map<struct<i:decimal(15,10),j:string>,struct<k:boolean>>,foo:int>",
+ JsonSchemaFinder.mergeType(
+ new StructType()
+ .addField("bar", new MapType(
+ new StructType()
+ .addField("i", new NumericType(HiveType.Kind.INT, 5, 0))
+ .addField("j", new StringType(HiveType.Kind.BINARY)),
+ new StructType()
+ .addField("k", new BooleanType())))
+ .addField("foo", new NumericType(HiveType.Kind.INT, 5, 0)),
+ new StructType()
+ .addField("bar", new MapType(
+ new StructType()
+ .addField("i", new NumericType(HiveType.Kind.DECIMAL, 2, 10))
+ .addField("j", new StringType(HiveType.Kind.TIMESTAMP)),
+ new StructType()
+ .addField("k", new BooleanType())))
+ .addField("foo", new NumericType(HiveType.Kind.INT, 5, 0))
+ ).toString());
+ }
+
}