Repository: oozie Updated Branches: refs/heads/master eaf025a4e -> 3cc71c018
OOZIE-2053 Change old HCatalog API (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3cc71c01 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3cc71c01 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3cc71c01 Branch: refs/heads/master Commit: 3cc71c0185736d6eeaeff579a9eaa40eeba02e23 Parents: eaf025a Author: egashira <[email protected]> Authored: Wed Nov 19 01:25:43 2014 -0800 Committer: egashira <[email protected]> Committed: Wed Nov 19 01:25:43 2014 -0800 ---------------------------------------------------------------------- .../apache/oozie/jms/TestHCatMessageHandler.java | 6 +++--- .../org/apache/oozie/test/MiniHCatServer.java | 18 +++++++++--------- .../java/org/apache/oozie/test/XHCatTestCase.java | 2 +- .../site/twiki/CoordinatorFunctionalSpec.twiki | 16 ++++++++-------- examples/src/main/apps/hcatalog/id.pig | 4 ++-- release-log.txt | 1 + 6 files changed, 24 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java b/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java index 8558084..1a1a44e 100644 --- a/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java +++ b/core/src/test/java/org/apache/oozie/jms/TestHCatMessageHandler.java @@ -32,9 +32,9 @@ import javax.jms.Session; import javax.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.hcatalog.common.HCatConstants; -import org.apache.hcatalog.messaging.HCatEventMessage; -import org.apache.hcatalog.messaging.json.JSONAddPartitionMessage; +import org.apache.hive.hcatalog.common.HCatConstants; +import org.apache.hive.hcatalog.messaging.HCatEventMessage; +import org.apache.hive.hcatalog.messaging.json.JSONAddPartitionMessage; import org.apache.log4j.Appender; import org.apache.log4j.Layout; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java index d0b8c18..8699ff8 100644 --- a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java +++ b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java @@ -40,15 +40,15 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStore; import org.apache.hadoop.hive.metastore.HiveMetaStore.HMSHandler; import org.apache.hadoop.hive.shims.ShimLoader; -import org.apache.hcatalog.api.HCatAddPartitionDesc; -import org.apache.hcatalog.api.HCatClient; -import org.apache.hcatalog.api.HCatClient.DropDBMode; -import org.apache.hcatalog.api.HCatCreateDBDesc; -import org.apache.hcatalog.api.HCatCreateTableDesc; -import org.apache.hcatalog.api.HCatPartition; -import org.apache.hcatalog.common.HCatConstants; -import org.apache.hcatalog.data.schema.HCatFieldSchema; -import org.apache.hcatalog.data.schema.HCatFieldSchema.Type; +import org.apache.hive.hcatalog.api.HCatAddPartitionDesc; +import org.apache.hive.hcatalog.api.HCatClient; +import org.apache.hive.hcatalog.api.HCatClient.DropDBMode; +import org.apache.hive.hcatalog.api.HCatCreateDBDesc; +import org.apache.hive.hcatalog.api.HCatCreateTableDesc; +import org.apache.hive.hcatalog.api.HCatPartition; +import org.apache.hive.hcatalog.common.HCatConstants; +import org.apache.hive.hcatalog.data.schema.HCatFieldSchema; +import org.apache.hive.hcatalog.data.schema.HCatFieldSchema.Type; import org.apache.oozie.util.HCatURI; import org.apache.oozie.util.XLog; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/core/src/test/java/org/apache/oozie/test/XHCatTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XHCatTestCase.java b/core/src/test/java/org/apache/oozie/test/XHCatTestCase.java index 2186576..85ee1f2 100644 --- a/core/src/test/java/org/apache/oozie/test/XHCatTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XHCatTestCase.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.Shell; -import org.apache.hcatalog.api.HCatPartition; +import org.apache.hive.hcatalog.api.HCatPartition; import org.apache.oozie.util.HCatURI; /** http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki b/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki index adf4ae1..7f8c0c6 100644 --- a/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki +++ b/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki @@ -2701,24 +2701,24 @@ any workflow action. *Example usage in Pig:* <blockquote> -A = load '$HCAT_IN_DB.$HCAT_IN_TABLE' using org.apache.hcatalog.pig.HCatLoader(); +A = load '$HCAT_IN_DB.$HCAT_IN_TABLE' using org.apache.hive.hcatalog.pig.HCatLoader(); B = FILTER A BY $PARTITION_FILTER; C = foreach B generate foo, bar; -store C into '$HCAT_OUT_DB.$HCAT_OUT_TABLE' using org.apache.hcatalog.pig.HCatStorer('$OUTPUT_PARTITIONS'); +store C into '$HCAT_OUT_DB.$HCAT_OUT_TABLE' using org.apache.hive.hcatalog.pig.HCatStorer('$OUTPUT_PARTITIONS'); </blockquote> For the =2009-01-02T00:00Z= run with the given dataset instances, the above Pig script with resolved values would look like: <blockquote> -A = load 'myInputDatabase.myInputTable' using org.apache.hcatalog.pig.HCatLoader(); +A = load 'myInputDatabase.myInputTable' using org.apache.hive.hcatalog.pig.HCatLoader(); B = FILTER A BY ((datestamp==2009010101 AND region==USA) OR (datestamp==2009010102 AND region==USA) OR ... (datestamp==2009010123 AND region==USA) OR (datestamp==2009010200 AND region==USA)); C = foreach B generate foo, bar; -store C into 'myOutputDatabase.myOutputTable' using org.apache.hcatalog.pig.HCatStorer('datestamp=20090102,region=EUR'); +store C into 'myOutputDatabase.myOutputTable' using org.apache.hive.hcatalog.pig.HCatStorer('datestamp=20090102,region=EUR'); </blockquote> ---++++ 6.8.5 coord:dataInPartitionMin(String name, String partition) EL function @@ -2860,20 +2860,20 @@ This illustrates another pig script which filters partitions based on range, wit EL funtions <blockquote> -A = load '$HCAT_IN_DB.$HCAT_IN_TABLE' using org.apache.hcatalog.pig.HCatLoader(); +A = load '$HCAT_IN_DB.$HCAT_IN_TABLE' using org.apache.hive.hcatalog.pig.HCatLoader(); B = FILTER A BY datestamp >= '$PARTITION_DATE_MIN' AND datestamp < '$PARTITION_DATE_MAX' AND region=='$REGION'; C = foreach B generate foo, bar; -store C into '$HCAT_OUT_DB.$HCAT_OUT_TABLE' using org.apache.hcatalog.pig.HCatStorer('region=$OUT_PARTITION_VAL_REGION,datestamp=$OUT_PARTITION_VAL_DATE'); +store C into '$HCAT_OUT_DB.$HCAT_OUT_TABLE' using org.apache.hive.hcatalog.pig.HCatStorer('region=$OUT_PARTITION_VAL_REGION,datestamp=$OUT_PARTITION_VAL_DATE'); </blockquote> For example, for the =2009-01-02T00:00Z= run with the given dataset instances, the above Pig script with resolved values would look like: <blockquote> -A = load 'myInputDatabase.myInputTable' using org.apache.hcatalog.pig.HCatLoader(); +A = load 'myInputDatabase.myInputTable' using org.apache.hive.hcatalog.pig.HCatLoader(); B = FILTER A BY datestamp >= '2009010101' AND datestamp < '2009010200' AND region='APAC'; C = foreach B generate foo, bar; -store C into 'myOutputDatabase.myOutputTable' using org.apache.hcatalog.pig.HCatStorer('region=APAC,datestamp=20090102'); +store C into 'myOutputDatabase.myOutputTable' using org.apache.hive.hcatalog.pig.HCatStorer('region=APAC,datestamp=20090102'); </blockquote> ---++++ 6.8.8 coord:dataInPartitions(String name, String type) EL function http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/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 c53115a..403bcf0 100644 --- a/examples/src/main/apps/hcatalog/id.pig +++ b/examples/src/main/apps/hcatalog/id.pig @@ -15,7 +15,7 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- -A = load '$DB.$TABLE' using org.apache.hcatalog.pig.HCatLoader(); +A = load '$DB.$TABLE' using org.apache.hive.hcatalog.pig.HCatLoader(); B = FILTER A BY $FILTER; C = foreach B generate foo, bar, car; -store C into '$OUTPUT_DB.$OUTPUT_TABLE' USING org.apache.hcatalog.pig.HCatStorer('$OUTPUT_PARTITION'); +store C into '$OUTPUT_DB.$OUTPUT_TABLE' USING org.apache.hive.hcatalog.pig.HCatStorer('$OUTPUT_PARTITION'); http://git-wip-us.apache.org/repos/asf/oozie/blob/3cc71c01/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 05fb53b..695e1dd 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2053 Change old HCatalog API (ryota) OOZIE-2064 coord job with frequency coord:endOfMonths doesn't materialize (puru) OOZIE-2063 Cron syntax creates duplicate actions (bzhang) OOZIE-1803 Improvement in Purge service (jaydeepvishwakarma via shwethags)
