Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 318dd2303 -> cab56f39d refs/heads/4.x-HBase-1.1 e9498bf47 -> 0a84cb8c9 refs/heads/4.x-HBase-1.2 54c28d196 -> bf334b12e refs/heads/master a78811131 -> 9c458fa3d
PHOENIX-3960 PhoenixStorageHandler for Hive doesn't work from Spark jobs Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9c458fa3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9c458fa3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9c458fa3 Branch: refs/heads/master Commit: 9c458fa3d3ecdeb17de5b717c26cfdea1608c358 Parents: a788111 Author: Sergey Soldatov <s...@apache.org> Authored: Mon Jun 19 12:49:29 2017 -0700 Committer: Sergey Soldatov <s...@apache.org> Committed: Tue Jul 25 14:17:16 2017 -0700 ---------------------------------------------------------------------- .../apache/phoenix/hive/PhoenixStorageHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9c458fa3/phoenix-hive/src/main/java/org/apache/phoenix/hive/PhoenixStorageHandler.java ---------------------------------------------------------------------- diff --git a/phoenix-hive/src/main/java/org/apache/phoenix/hive/PhoenixStorageHandler.java b/phoenix-hive/src/main/java/org/apache/phoenix/hive/PhoenixStorageHandler.java index ae8f242..4e9f465 100644 --- a/phoenix-hive/src/main/java/org/apache/phoenix/hive/PhoenixStorageHandler.java +++ b/phoenix-hive/src/main/java/org/apache/phoenix/hive/PhoenixStorageHandler.java @@ -51,6 +51,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.UUID; /** * This class manages all the Phoenix/Hive table initial configurations and SerDe Election @@ -110,6 +111,12 @@ public class PhoenixStorageHandler extends DefaultStorageHandler implements return PhoenixOutputFormat.class; } + @SuppressWarnings("rawtypes") + @Override + public Class<? extends InputFormat> getInputFormatClass() { + return PhoenixInputFormat.class; + } + @Override public void configureInputJobProperties(TableDesc tableDesc, Map<String, String> jobProperties) { @@ -182,7 +189,12 @@ public class PhoenixStorageHandler extends DefaultStorageHandler implements } SessionState sessionState = SessionState.get(); - String sessionId = sessionState.getSessionId(); + String sessionId; + if(sessionState!= null) { + sessionId = sessionState.getSessionId(); + } else { + sessionId = UUID.randomUUID().toString(); + } jobProperties.put(PhoenixConfigurationUtil.SESSION_ID, sessionId); jobProperties.put(PhoenixConfigurationUtil.INPUT_TABLE_NAME, tableName); jobProperties.put(PhoenixStorageHandlerConstants.ZOOKEEPER_QUORUM, tableProperties
