Repository: oozie Updated Branches: refs/heads/branch-4.1 9280bbb63 -> 8ef50cbc2
OOZIE-2047 Oozie does not support Hive tables that use datatypes introduced since Hive 0.8 (venkatnrangan via bzhang) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/8ef50cbc Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/8ef50cbc Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/8ef50cbc Branch: refs/heads/branch-4.1 Commit: 8ef50cbc263b9cdfbf108bc5af5471745832660c Parents: 9280bbb Author: Bowen Zhang <[email protected]> Authored: Wed Oct 29 19:49:04 2014 -0700 Committer: Bowen Zhang <[email protected]> Committed: Wed Oct 29 19:49:04 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/dependency/HCatURIHandler.java | 8 ++++---- .../org/apache/oozie/dependency/hcat/HCatMessageHandler.java | 6 +++--- examples/src/main/apps/hcatalog/README | 2 +- examples/src/main/apps/hcatalog/id.pig | 2 +- release-log.txt | 1 + .../apache/oozie/action/hadoop/HCatLauncherURIHandler.java | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java index da78105..a6c5bc4 100644 --- a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java +++ b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java @@ -30,10 +30,10 @@ import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hcatalog.api.ConnectionFailureException; -import org.apache.hcatalog.api.HCatClient; -import org.apache.hcatalog.api.HCatPartition; -import org.apache.hcatalog.common.HCatException; +import org.apache.hive.hcatalog.api.ConnectionFailureException; +import org.apache.hive.hcatalog.api.HCatClient; +import org.apache.hive.hcatalog.api.HCatPartition; +import org.apache.hive.hcatalog.common.HCatException; import org.apache.oozie.ErrorCode; import org.apache.oozie.action.hadoop.HCatLauncherURIHandler; import org.apache.oozie.action.hadoop.LauncherURIHandler; http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java b/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java index 7a40ce2..e2d8813 100644 --- a/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java +++ b/core/src/main/java/org/apache/oozie/dependency/hcat/HCatMessageHandler.java @@ -22,9 +22,9 @@ import java.util.Map; import javax.jms.Message; -import org.apache.hcatalog.messaging.AddPartitionMessage; -import org.apache.hcatalog.messaging.HCatEventMessage; -import org.apache.hcatalog.messaging.jms.MessagingUtils; +import org.apache.hive.hcatalog.messaging.AddPartitionMessage; +import org.apache.hive.hcatalog.messaging.HCatEventMessage; +import org.apache.hive.hcatalog.messaging.jms.MessagingUtils; import org.apache.oozie.jms.MessageHandler; import org.apache.oozie.service.PartitionDependencyManagerService; import org.apache.oozie.service.Services; http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/examples/src/main/apps/hcatalog/README ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/hcatalog/README b/examples/src/main/apps/hcatalog/README index e9c5462..5f65840 100644 --- a/examples/src/main/apps/hcatalog/README +++ b/examples/src/main/apps/hcatalog/README @@ -2,7 +2,7 @@ Running the coordinator example with HCatalog (End-to-end test) 1. Setup services - Hive with JMS (e.g. ActiveMQ Server), HCatalog, database e.g. MySQL, and of course Hadoop 2. This example points to hive.metastore.uris=thrift://localhost:11002. Change it in job.properties if required -3. Create 2 tables 'invites' (input) and 'oozie' (output) with this structure: "create table invites (foo INT, bar INT) partitioned by (ds STRING, region STRING)" +3. Create 2 tables 'invites' (input) and 'oozie' (output) with this structure: "create table invites (foo INT, bar INT, car VARCHAR(10)) partitioned by (ds STRING, region STRING)" 4. Oozie distro should be built this way $> bin/mkdistro.sh -Dhcatalog.version=0.4.1 -DskipTests 5. The 'libext' dir used by oozie-setup should contain the following list JARS hcatalog-core.jar http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/examples/src/main/apps/hcatalog/id.pig ---------------------------------------------------------------------- diff --git a/examples/src/main/apps/hcatalog/id.pig b/examples/src/main/apps/hcatalog/id.pig index aed05fe..c53115a 100644 --- a/examples/src/main/apps/hcatalog/id.pig +++ b/examples/src/main/apps/hcatalog/id.pig @@ -17,5 +17,5 @@ -- A = load '$DB.$TABLE' using org.apache.hcatalog.pig.HCatLoader(); B = FILTER A BY $FILTER; -C = foreach B generate foo, bar; +C = foreach B generate foo, bar, car; store C into '$OUTPUT_DB.$OUTPUT_TABLE' USING org.apache.hcatalog.pig.HCatStorer('$OUTPUT_PARTITION'); http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index bd9167c..6c2ada3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-2047 Oozie does not support Hive tables that use datatypes introduced since Hive 0.8 (venkatnrangan via bzhang) OOZIE-2034 Disable SSLv3 (POODLEbleed vulnerability) (rkanter) OOZIE-1914 CLI should retry on timeout (puru) OOZIE-1973 ConcurrentModificationException in Sharelib service (puru) http://git-wip-us.apache.org/repos/asf/oozie/blob/8ef50cbc/sharelib/hcatalog/src/main/java/org/apache/oozie/action/hadoop/HCatLauncherURIHandler.java ---------------------------------------------------------------------- diff --git a/sharelib/hcatalog/src/main/java/org/apache/oozie/action/hadoop/HCatLauncherURIHandler.java b/sharelib/hcatalog/src/main/java/org/apache/oozie/action/hadoop/HCatLauncherURIHandler.java index 4991eac..07c9641 100644 --- a/sharelib/hcatalog/src/main/java/org/apache/oozie/action/hadoop/HCatLauncherURIHandler.java +++ b/sharelib/hcatalog/src/main/java/org/apache/oozie/action/hadoop/HCatLauncherURIHandler.java @@ -27,9 +27,9 @@ import java.util.Map.Entry; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hcatalog.api.ConnectionFailureException; -import org.apache.hcatalog.api.HCatClient; -import org.apache.hcatalog.common.HCatException; +import org.apache.hive.hcatalog.api.ConnectionFailureException; +import org.apache.hive.hcatalog.api.HCatClient; +import org.apache.hive.hcatalog.common.HCatException; import org.apache.oozie.util.HCatURI; public class HCatLauncherURIHandler implements LauncherURIHandler {
