You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by od...@apache.org on 2016/12/08 19:33:29 UTC

incubator-hawq git commit: HAWQ-1191. Decomissioned DELIMITER from HiveOrc profile.

Repository: incubator-hawq
Updated Branches:
  refs/heads/master 52333bb00 -> ca5d8de05


HAWQ-1191. Decomissioned DELIMITER from HiveOrc profile.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/ca5d8de0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/ca5d8de0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/ca5d8de0

Branch: refs/heads/master
Commit: ca5d8de050f62ec5929471f1ab5d0a1420a363b7
Parents: 52333bb
Author: Oleksandr Diachenko <od...@pivotal.io>
Authored: Thu Dec 8 11:33:18 2016 -0800
Committer: Oleksandr Diachenko <od...@pivotal.io>
Committed: Thu Dec 8 11:33:18 2016 -0800

----------------------------------------------------------------------
 .../org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java | 2 --
 .../java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java    | 6 ++----
 pxf/pxf-service/src/main/resources/pxf-profiles-default.xml    | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ca5d8de0/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java b/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java
index c789402..7673713 100644
--- a/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java
+++ b/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveORCSerdeResolver.java
@@ -61,7 +61,6 @@ public class HiveORCSerdeResolver extends HiveResolver {
             throw new UnsupportedTypeException("Unsupported Hive Serde: " + serdeEnumStr);
         }
         partitionKeys = toks[HiveInputFormatFragmenter.TOK_KEYS];
-        parseDelimiterChar(input);
         collectionDelim = input.getUserProperty("COLLECTION_DELIM") == null ? COLLECTION_DELIM
                 : input.getUserProperty("COLLECTION_DELIM");
         mapkeyDelim = input.getUserProperty("MAPKEY_DELIM") == null ? MAPKEY_DELIM
@@ -126,5 +125,4 @@ public class HiveORCSerdeResolver extends HiveResolver {
 
         deserializer.initialize(new JobConf(new Configuration(), HiveORCSerdeResolver.class), serdeProperties);
     }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ca5d8de0/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java b/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java
index d5e6e96..3837f78 100644
--- a/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java
+++ b/pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java
@@ -79,7 +79,7 @@ public class HiveResolver extends Plugin implements ReadResolver {
     private String serdeName;
     private String propsString;
     String partitionKeys;
-    char delimiter;
+    protected char delimiter;
     String nullChar = "\\N";
     private Configuration conf;
     private String hiveDefaultPartName;
@@ -263,8 +263,8 @@ public class HiveResolver extends Plugin implements ReadResolver {
                             "Unsupported partition type: " + type);
             }
             addOneFieldToRecord(partitionFields, convertedType, convertedValue);
-            numberOfPartitions = partitionFields.size();
         }
+        numberOfPartitions = partitionFields.size();
     }
 
     /*
@@ -281,7 +281,6 @@ public class HiveResolver extends Plugin implements ReadResolver {
             String type = levelKey[1];
             String val = levelKey[2];
             parts.append(delimiter);
-
             if (isDefaultPartition(type, val)) {
                 parts.append(nullChar);
             } else {
@@ -619,7 +618,6 @@ public class HiveResolver extends Plugin implements ReadResolver {
                                      DataType gpdbWritableType, Object val) {
         record.add(new OneField(gpdbWritableType.getOID(), val));
     }
-
     /*
      * Gets the delimiter character from the URL, verify and store it. Must be a
      * single ascii character (same restriction as Hawq's). If a hex

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ca5d8de0/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml b/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
index 71e6845..1edb6d5 100644
--- a/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
+++ b/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
@@ -83,7 +83,6 @@ under the License.
         <description>This profile is suitable only for Hive tables stored in ORC files
             and serialized with either the ColumnarSerDe or the LazyBinaryColumnarSerDe.
             It is much faster than the general purpose Hive profile.
-            DELIMITER parameter is mandatory.
         </description>
         <plugins>
             <fragmenter>org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter</fragmenter>