Modified: oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java?rev=1426301&r1=1426300&r2=1426301&view=diff ============================================================================== --- oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java (original) +++ oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java Thu Dec 27 19:46:06 2012 @@ -29,7 +29,7 @@ public class TestHCatURI { @Test public void testHCatURIParseValidURI() { - String input = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us"; + String input = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us"; HCatURI uri = null; try { uri = new HCatURI(input); @@ -47,7 +47,7 @@ public class TestHCatURI { @Test(expected = URISyntaxException.class) public void testHCatURIParseInvalidURI() throws Exception { - String input = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us/invalid"; + String input = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us/invalid"; new HCatURI(input); } @@ -86,7 +86,7 @@ public class TestHCatURI { HCatURI uri2 = null; try { uri1 = new HCatURI(hcatUri); - uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us"); + uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us"); } catch (URISyntaxException e) { fail(e.getMessage()); @@ -100,9 +100,9 @@ public class TestHCatURI { HCatURI uri2 = null; HCatURI uri3 = null; try { - uri1 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us×tamp=1201"); - uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us×tamp=1201"); - uri3 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=us×tamp=1201&datastamp=12"); + uri1 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us;timestamp=1201"); + uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us;timestamp=1201"); + uri3 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=us;timestamp=1201;datastamp=12"); } catch (URISyntaxException e) { fail(e.getMessage()); @@ -121,11 +121,11 @@ public class TestHCatURI { HCatURI uri4 = null; HCatURI uri5 = null; try { - uri1 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12®ion=us×tamp=1201"); - uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb2/clicks/region=us×tamp=1201&datastamp=12"); - uri3 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks2/region=us×tamp=1201&datastamp=12"); - uri4 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=uk×tamp=1201&datastamp=12"); - uri5 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=us×tamp=1201"); + uri1 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/datastamp=12;region=us;timestamp=1201"); + uri2 = new HCatURI("hcat://hcat.server.com:5080/mydb2/clicks/region=us;timestamp=1201;datastamp=12"); + uri3 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks2/region=us;timestamp=1201;datastamp=12"); + uri4 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=uk;timestamp=1201;datastamp=12"); + uri5 = new HCatURI("hcat://hcat.server.com:5080/mydb/clicks/region=us;timestamp=1201"); } catch (URISyntaxException e) { fail(e.getMessage()); @@ -142,7 +142,7 @@ public class TestHCatURI { @Test public void testToFilter() { - String hcatURI = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=20120230®ion=us"; + String hcatURI = "hcat://hcat.server.com:5080/mydb/clicks/datastamp=20120230;region=us"; String filter = ""; try { filter = new HCatURI(hcatURI).toFilter(); @@ -150,7 +150,7 @@ public class TestHCatURI { catch (URISyntaxException e) { fail(e.getMessage()); } - assertTrue(filter.equals("datastamp=='20120230' AND region=='us'") - || filter.equals("region=='us' AND datastamp=='20120230'")); + assertTrue(filter.equals("datastamp='20120230' AND region='us'") + || filter.equals("region='us' AND datastamp='20120230'")); } }
Modified: oozie/branches/hcat-intre/release-log.txt URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1426301&r1=1426300&r2=1426301&view=diff ============================================================================== --- oozie/branches/hcat-intre/release-log.txt (original) +++ oozie/branches/hcat-intre/release-log.txt Thu Dec 27 19:46:06 2012 @@ -1,5 +1,6 @@ -- Oozie 3.4.0 release (trunk - unreleased) +OOZIE-1125 Prepare actions for hcat (rohini via virag) OOZIE-1123 EL Functions for hcatalog (mona) OOZIE-1138 Provide rule based mechanism to allow multiple hcatalog servers to connect to JMS server (virag) OOZIE-1124 Split pig unit tests to a separate module (rohini via virag) Modified: oozie/branches/hcat-intre/resourcelib/README URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/resourcelib/README?rev=1426301&r1=1426300&r2=1426301&view=diff ============================================================================== --- oozie/branches/hcat-intre/resourcelib/README (original) +++ oozie/branches/hcat-intre/resourcelib/README Thu Dec 27 19:46:06 2012 @@ -3,11 +3,13 @@ Build instructions Oozie's ability to process JMS messages produced by HCatalog about partitions, depends on hcatalog-0.4.1 jar. This jar is packaged as a resource with this Oozie tarball, since it is not yet available via the central maven repo. Place this JAR at a suitable location and use that path in the command below -Step 1: Upload the HCatalog jar to local maven cache +Step 1: Upload the HCatalog and webhcat jar to local maven cache -mvn install:install-file -Dfile=<path-to-hcat-jar-file> -DgroupId=org.apache.hcatalog -DartifactId=hcatalog-core -Dversion=0.4.1 -Dpackaging=jar +mvn install:install-file -Dfile=./resourcelib/hcatalog-0.4.1.jar -DgroupId=org.apache.hcatalog -DartifactId=hcatalog-core -Dversion=0.4.1 -Dpackaging=jar -Step 2: Build Oozie distro with this hcatalog.version=0.4.1 (since default in POM is 0.5.0-SNAPSHOT) -$OOZIE_HOME/bin/mkdistro.sh -Dhcatalog.version=0.4.1 -DskipTests +mvn install:install-file -Dfile=./resourcelib/webhcat-java-client-0.4.1.jar -DgroupId=org.apache.hcatalog -DartifactId=webhcat-java-client -Dversion=0.4.1 -Dpackaging=jar + +Step 2: Build Oozie distro with this hcatalog.version=0.4.1 and webhcat.version=0.4.1 (since default in POM is 0.5.0-SNAPSHOT) +$OOZIE_HOME/bin/mkdistro.sh -Dhcatalog.version=0.4.1 -Dwebhcat.version=0.4.1 -DskipTests Step 3: Follow usual instructions on Apache Oozie docs of setting up and running the Oozie server Added: oozie/branches/hcat-intre/resourcelib/webhcat-java-client-0.4.1.jar URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/resourcelib/webhcat-java-client-0.4.1.jar?rev=1426301&view=auto ============================================================================== Binary file - no diff available. Propchange: oozie/branches/hcat-intre/resourcelib/webhcat-java-client-0.4.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1426301&r1=1426300&r2=1426301&view=diff ============================================================================== --- oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java (original) +++ oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java Thu Dec 27 19:46:06 2012 @@ -27,6 +27,7 @@ import org.apache.hadoop.mapred.JobID; import org.apache.oozie.WorkflowActionBean; import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.client.WorkflowAction; +import org.apache.oozie.service.URIHandlerService; import org.apache.oozie.service.WorkflowAppService; import org.apache.oozie.service.Services; import org.apache.oozie.service.HadoopAccessorService; @@ -67,6 +68,12 @@ public class TestPigActionExecutor exten "store B into '$OUT' USING PigStorage();\n"; @Override + protected void setUp() throws Exception { + System.setProperty("oozie.test.metastore.server", "false"); + super.setUp(); + } + + @Override protected void setSystemProps() throws Exception { super.setSystemProps(); setSystemProperty("oozie.service.ActionService.executor.classes", PigActionExecutor.class.getName()); @@ -90,8 +97,8 @@ public class TestPigActionExecutor exten classes.add(LauncherSecurityManager.class); classes.add(LauncherException.class); classes.add(LauncherMainException.class); - classes.add(FileSystemActions.class); classes.add(PrepareActionsDriver.class); + classes.addAll(Services.get().get(URIHandlerService.class).getURIHandlerClassesToShip()); classes.add(ActionStats.class); classes.add(ActionType.class); classes.add(LauncherMain.class); Modified: oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java?rev=1426301&r1=1426300&r2=1426301&view=diff ============================================================================== --- oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java (original) +++ oozie/branches/hcat-intre/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java Thu Dec 27 19:46:06 2012 @@ -39,6 +39,7 @@ public class TestPigMain extends PigTest @Override protected void setUp() throws Exception { + System.setProperty("oozie.test.metastore.server", "false"); super.setUp(); SECURITY_MANAGER = System.getSecurityManager(); }
