You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by sh...@apache.org on 2015/12/08 00:01:59 UTC

incubator-hawq git commit: Adding null pointer check for Resolver per Stanley Sung, also fixing some Javadoc-related markup issues.

Repository: incubator-hawq
Updated Branches:
  refs/heads/master 871996000 -> 7d47116c5


Adding null pointer check for Resolver per Stanley Sung, also fixing some Javadoc-related markup issues.


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

Branch: refs/heads/master
Commit: 7d47116c59e6de79ec407e1ba426a4eec8d2e2d4
Parents: 8719960
Author: Kyle Dunn <kd...@gmail.com>
Authored: Tue Nov 3 19:36:41 2015 -0700
Committer: Shivram Mani <sh...@gmail.com>
Committed: Mon Dec 7 14:18:07 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/hawq/pxf/plugins/hive/HiveResolver.java     | 5 +++++
 .../java/org/apache/hawq/pxf/service/FragmentsResponse.java     | 2 +-
 .../java/org/apache/hawq/pxf/service/rest/WritableResource.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d47116c/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 bfc1923..103ae4d 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
@@ -588,6 +588,11 @@ public class HiveResolver extends Plugin implements ReadResolver {
 
         String userDelim = input.getUserProperty("DELIMITER");
 
+	if (userDelim == null) {
+            throw new IllegalArgumentException(
+                    "DELIMITER is a required option" ) ;
+	}
+
         final int VALID_LENGTH = 1;
         final int VALID_LENGTH_HEX = 4;
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d47116c/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/FragmentsResponse.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/FragmentsResponse.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/FragmentsResponse.java
index 634d913..515ee61 100644
--- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/FragmentsResponse.java
+++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/FragmentsResponse.java
@@ -59,7 +59,7 @@ public class FragmentsResponse implements StreamingOutput {
      * Serializes a fragments list in JSON,
      * To be used as the result string for HAWQ.
      * An example result is as follows:
-     * <code>{"PXFFragments":[{"replicas":["sdw1.corp.emc.com","sdw3.corp.emc.com","sdw8.corp.emc.com"],"sourceName":"text2.csv", "index":"0", "metadata":<base64 metadata for fragment>, "userData":"<data_specific_to_third_party_fragmenter>"},{"replicas":["sdw2.corp.emc.com","sdw4.corp.emc.com","sdw5.corp.emc.com"],"sourceName":"text_data.csv","index":"0","metadata":<base64 metadata for fragment>,"userData":"<data_specific_to_third_party_fragmenter>"}]}</code>
+     * &lt;code&gt;{"PXFFragments":[{"replicas":["sdw1.corp.emc.com","sdw3.corp.emc.com","sdw8.corp.emc.com"],"sourceName":"text2.csv", "index":"0", "metadata":"&lt;base64 metadata for fragment&gt;", "userData":"&lt;data_specific_to_third_party_fragmenter&gt;"},{"replicas":["sdw2.corp.emc.com","sdw4.corp.emc.com","sdw5.corp.emc.com"],"sourceName":"text_data.csv","index":"0","metadata":"&lt;base64 metadata for fragment&gt;","userData":"&lt;data_specific_to_third_party_fragmenter&gt;"}]}&lt;/code&gt;
      */
     @Override
     public void write(OutputStream output) throws IOException,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7d47116c/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/WritableResource.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/WritableResource.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/WritableResource.java
index 02c5631..70bec2a 100644
--- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/WritableResource.java
+++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/WritableResource.java
@@ -82,7 +82,7 @@ import org.apache.hawq.pxf.service.utilities.Utilities;
 
 
 /**
- * This class handles the subpath /<version>/Writable/ of this
+ * This class handles the subpath /&lt;version&gt;/Writable/ of this
  * REST component
  */
 @Path("/" + Version.PXF_PROTOCOL_VERSION + "/Writable/")