Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java Wed Jun 12 23:17:31 2013 @@ -91,7 +91,7 @@ public class TestLiteWorkflowAppService WorkflowAppService wps = services.get(WorkflowAppService.class); String wfDef = wps.readDefinition("file://" + getTestCaseDir() + File.separator + "workflow.xml", - getTestUser(), "authToken", conf); + getTestUser(), conf); assertNotNull(reader.toString(), wfDef); } finally { @@ -118,7 +118,7 @@ public class TestLiteWorkflowAppService WorkflowAppService wps = services.get(WorkflowAppService.class); wps.readDefinition("file://" + getTestCaseDir() + File.separator + "workflow.xml", getTestUser(), - "authToken", conf); + conf); fail("an exception should be thrown as the definition exceeds the given maximum"); } catch (WorkflowException wfe) { @@ -134,7 +134,7 @@ public class TestLiteWorkflowAppService services.init(); WorkflowAppService wps = services.get(WorkflowAppService.class); try { - assertNotNull(wps.parseDef(new XConfiguration(), "authToken")); + assertNotNull(wps.parseDef(new XConfiguration())); fail(); } catch (Exception ex) { @@ -161,7 +161,7 @@ public class TestLiteWorkflowAppService jobConf.set(OozieClient.USER_NAME, getTestUser()); - WorkflowApp app = wps.parseDef(jobConf, "authToken"); + WorkflowApp app = wps.parseDef(jobConf); assertNotNull(app); assertEquals("test-wf", app.getName()); @@ -170,7 +170,7 @@ public class TestLiteWorkflowAppService IOUtils.copyCharStream(reader, writer); try { - wps.parseDef(jobConf, "authToken"); + wps.parseDef(jobConf); fail(); } catch (WorkflowException ex) { @@ -201,7 +201,7 @@ public class TestLiteWorkflowAppService jobConf.set(OozieClient.USER_NAME, getTestUser()); - LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken"); + LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf); assertNotNull(app); assertEquals("test-wf", app.getName()); @@ -210,7 +210,7 @@ public class TestLiteWorkflowAppService IOUtils.copyCharStream(reader, writer); try { - wps.parseDef(jobConf, "authToken"); + wps.parseDef(jobConf); fail(); } catch (WorkflowException ex) { @@ -240,7 +240,7 @@ public class TestLiteWorkflowAppService try { - LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken"); + LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf); fail(); } catch (WorkflowException ex) { @@ -268,7 +268,7 @@ public class TestLiteWorkflowAppService jobConf.set(OozieClient.USER_NAME, getTestUser()); - LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken"); + LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf); assertNotNull(app); assertEquals("test-wf", app.getName()); assertNotNull(app.getNode(StartNodeDef.START)); @@ -326,7 +326,7 @@ public class TestLiteWorkflowAppService jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml"); jobConf.set(OozieClient.USER_NAME, getTestUser()); - Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true); + Configuration protoConf = wps.createProtoActionConf(jobConf, true); assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME)); assertEquals(2, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length); @@ -368,7 +368,7 @@ public class TestLiteWorkflowAppService jobConf.set(OozieClient.LIBPATH, "file://" + getTestCaseDir() + "/libx"); jobConf.set(OozieClient.USER_NAME, getTestUser()); - Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true); + Configuration protoConf = wps.createProtoActionConf(jobConf, true); assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME)); assertEquals(3, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length); @@ -427,7 +427,7 @@ public class TestLiteWorkflowAppService "file://" + getTestCaseDir() + "/liby", "file://" + getTestCaseDir() + "/libz"); jobConf.set(OozieClient.USER_NAME, getTestUser()); - Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true); + Configuration protoConf = wps.createProtoActionConf(jobConf, true); assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME)); assertEquals(6, protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST).length); @@ -622,7 +622,7 @@ public class TestLiteWorkflowAppService // Set the parent libs jobConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST, parentLibsFullPaths); - Configuration protoConf = wps.createProtoActionConf(jobConf, "authToken", true); + Configuration protoConf = wps.createProtoActionConf(jobConf, true); assertEquals(getTestUser(), protoConf.get(OozieClient.USER_NAME)); String[] foundLibs = protoConf.getStrings(WorkflowAppService.APP_LIB_PATH_LIST);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java Wed Jun 12 23:17:31 2013 @@ -96,7 +96,7 @@ public class TestPurgeService extends XD Writer writer = new FileWriter(getTestCaseDir() + "/workflow.xml"); IOUtils.copyCharStream(reader, writer); - final DagEngine engine = new DagEngine("u", "a"); + final DagEngine engine = new DagEngine("u"); Configuration conf = new XConfiguration(); conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml"); conf.setStrings(OozieClient.USER_NAME, getTestUser()); @@ -184,7 +184,7 @@ public class TestPurgeService extends XD Runnable purgeRunnable = new PurgeRunnable(1, 1, 1, 100); purgeRunnable.run(); - final CoordinatorEngine engine = new CoordinatorEngine("u", "a"); + final CoordinatorEngine engine = new CoordinatorEngine("u"); waitFor(10000, new Predicate() { public boolean evaluate() throws Exception { try { @@ -247,7 +247,7 @@ public class TestPurgeService extends XD Runnable purgeRunnable = new PurgeRunnable(1, 1, 1, 100); purgeRunnable.run(); - final BundleEngine engine = new BundleEngine("u", "a"); + final BundleEngine engine = new BundleEngine("u"); waitFor(10000, new Predicate() { public boolean evaluate() throws Exception { try { Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java Wed Jun 12 23:17:31 2013 @@ -113,7 +113,7 @@ public class TestRecoveryService extends createTestCaseSubDir("lib"); IOUtils.copyCharStream(reader, writer); - final DagEngine engine = new DagEngine(getTestUser(), "a"); + final DagEngine engine = new DagEngine(getTestUser()); Configuration conf = new XConfiguration(); conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml"); conf.set(OozieClient.USER_NAME, getTestUser()); @@ -253,7 +253,7 @@ public class TestRecoveryService extends final String jobId = "0000000-" + new Date().getTime() + "-testCoordRecoveryService-C"; final int actionNum = 1; final String actionId = jobId + "@" + actionNum; - final CoordinatorEngine ce = new CoordinatorEngine(getTestUser(), "UNIT_TESTING"); + final CoordinatorEngine ce = new CoordinatorEngine(getTestUser()); CoordinatorStore store = Services.get().get(StoreService.class).getStore(CoordinatorStore.class); store.beginTrx(); try { @@ -670,7 +670,6 @@ public class TestRecoveryService extends coordJob.setLastModifiedTime(new Date()); coordJob.setUser(getTestUser()); coordJob.setGroup(getTestGroup()); - coordJob.setAuthToken("notoken"); coordJob.setTimeZone("UTC"); String baseURI = baseDir + "/workflows"; Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java Wed Jun 12 23:17:31 2013 @@ -1357,7 +1357,7 @@ public class TestStatusTransitService ex conf.set(OozieClient.LOG_TOKEN, "testToken"); conf.set(OozieClient.USER_NAME, getTestUser()); - WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus); + WorkflowJobBean wfBean = createWorkflow(app, conf, jobStatus, instanceStatus); wfBean.setId(wfId); try { JPAService jpaService = Services.get().get(JPAService.class); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java Wed Jun 12 23:17:31 2013 @@ -70,8 +70,8 @@ public class MockCoordinatorEngineServic } @Override - public CoordinatorEngine getCoordinatorEngine(String user, String authToken) { - return new MockCoordinatorEngine(user, authToken); + public CoordinatorEngine getCoordinatorEngine(String user) { + return new MockCoordinatorEngine(user); } @Override @@ -84,8 +84,8 @@ public class MockCoordinatorEngineServic public MockCoordinatorEngine() { } - public MockCoordinatorEngine(String user, String authToken) { - super(user, authToken); + public MockCoordinatorEngine(String user) { + super(user); } @Override @@ -217,7 +217,6 @@ public class MockCoordinatorEngineServic coordJob.setLastModifiedTime(new Date()); coordJob.setUser(USER); coordJob.setGroup(GROUP); - coordJob.setAuthToken("notoken"); coordJob.setConf(CONFIGURATION); coordJob.setLastActionNumber(0); coordJob.setFrequency(1); @@ -250,7 +249,6 @@ public class MockCoordinatorEngineServic coordJob.setLastModifiedTime(new Date()); coordJob.setUser(USER); coordJob.setGroup(GROUP); - coordJob.setAuthToken("notoken"); coordJob.setConf(conf.toString()); coordJob.setLastActionNumber(0); coordJob.setFrequency(1); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java Wed Jun 12 23:17:31 2013 @@ -80,8 +80,8 @@ public class MockDagEngineService extend } @Override - public DagEngine getDagEngine(String user, String authToken) { - return new MockDagEngine(user, authToken); + public DagEngine getDagEngine(String user) { + return new MockDagEngine(user); } private static class MockDagEngine extends DagEngine { @@ -89,8 +89,8 @@ public class MockDagEngineService extend public MockDagEngine() { } - public MockDagEngine(String user, String authToken) { - super(user, authToken); + public MockDagEngine(String user) { + super(user); } @Override Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java Wed Jun 12 23:17:31 2013 @@ -106,7 +106,7 @@ public class TestJobsServlet extends Dag obj.get(JsonTags.JOB_ID)); assertTrue(MockDagEngineService.started.get(wfCount)); Services services = Services.get(); - DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser(), "undef"); + DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser()); StringReader sr = new StringReader(de.getJob(MockDagEngineService.JOB_ID + wfCount).getConf()); Configuration conf1 = new XConfiguration(sr); return null; Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java Wed Jun 12 23:17:31 2013 @@ -103,7 +103,7 @@ public class TestV1JobsServlet extends D obj.get(JsonTags.JOB_ID)); assertTrue(MockDagEngineService.started.get(wfCount)); Services services = Services.get(); - DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser(), "undef"); + DagEngine de = services.get(DagEngineService.class).getDagEngine(getTestUser()); StringReader sr = new StringReader(de.getJob(MockDagEngineService.JOB_ID + wfCount).getConf()); Configuration conf1 = new XConfiguration(sr); wfCount++; Modified: oozie/trunk/core/src/test/java/org/apache/oozie/sla/TestSLAEventGeneration.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/sla/TestSLAEventGeneration.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/sla/TestSLAEventGeneration.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/sla/TestSLAEventGeneration.java Wed Jun 12 23:17:31 2013 @@ -156,7 +156,7 @@ public class TestSLAEventGeneration exte String expectedEnd = DateUtils.formatDateOozieTZ(cal.getTime()); // Call SubmitX - SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING"); + SubmitXCommand sc = new SubmitXCommand(conf); String jobId = sc.call(); SLACalcStatus slaEvent = slas.getSLACalculator().get(jobId); assertEquals(jobId, slaEvent.getId()); @@ -191,7 +191,7 @@ public class TestSLAEventGeneration exte cal.add(Calendar.MINUTE, 30); // as per the sla xml expectedEnd = DateUtils.formatDateOozieTZ(cal.getTime()); - ReRunXCommand rerun = new ReRunXCommand(jobId, conf, "UNIT_TESTING"); + ReRunXCommand rerun = new ReRunXCommand(jobId, conf); rerun.call(); slaEvent = slas.getSLACalculator().get(jobId); // assert for new conf @@ -245,7 +245,7 @@ public class TestSLAEventGeneration exte conf.set("nominal_time", nominalTime); // Call SubmitX - SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING"); + SubmitXCommand sc = new SubmitXCommand(conf); String jobId = sc.call(); String actionId = jobId+"@grouper"; @@ -267,7 +267,7 @@ public class TestSLAEventGeneration exte cal.add(Calendar.MINUTE, 30); // as per the sla xml String expectedEnd = DateUtils.formatDateOozieTZ(cal.getTime()); - ReRunXCommand rerun = new ReRunXCommand(jobId, conf, "UNIT_TESTING"); + ReRunXCommand rerun = new ReRunXCommand(jobId, conf); rerun.call(); SLACalcStatus slaEvent = slas.getSLACalculator().get(actionId); assertNotNull(slaEvent); @@ -317,7 +317,7 @@ public class TestSLAEventGeneration exte String expectedEnd = DateUtils.formatDateOozieTZ(cal.getTime()); // testing creation of new sla registration via Submit command - SubmitXCommand sc = new SubmitXCommand(conf, "UNIT_TESTING"); + SubmitXCommand sc = new SubmitXCommand(conf); String jobId = sc.call(); SLACalcStatus slaEvent = slas.getSLACalculator().get(jobId); assertEquals(jobId, slaEvent.getId()); @@ -402,7 +402,7 @@ public class TestSLAEventGeneration exte // testing creation of new sla registration via Submit + Materialize // command - CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING"); + CoordSubmitXCommand sc = new CoordSubmitXCommand(conf); String jobId = sc.call(); Thread.sleep(500); // waiting for materialize command to run final CoordActionGetJPAExecutor getCmd = new CoordActionGetJPAExecutor(jobId + "@1"); @@ -427,7 +427,7 @@ public class TestSLAEventGeneration exte action.setStatus(CoordinatorAction.Status.SUBMITTED); final CoordActionUpdateJPAExecutor writeCmd = new CoordActionUpdateJPAExecutor(action); jpa.execute(writeCmd); - new CoordActionStartXCommand(actionId, getTestUser(), appName, "authtoken", jobId).call(); + new CoordActionStartXCommand(actionId, getTestUser(), appName, jobId).call(); slaEvent = slas.getSLACalculator().get(actionId); slaEvent.setEventProcessed(0); //resetting for testing sla event ehs.new EventWorker().run(); Modified: oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java Wed Jun 12 23:17:31 2013 @@ -97,7 +97,7 @@ public class TestDBWorkflowStore extends private WorkflowJobBean createWorkflow(WorkflowApp app, Configuration conf, String authToken) throws Exception { WorkflowAppService wps = Services.get().get(WorkflowAppService.class); - Configuration protoActionConf = wps.createProtoActionConf(conf, authToken, true); + Configuration protoActionConf = wps.createProtoActionConf(conf, true); WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB(); WorkflowInstance wfInstance; wfInstance = workflowLib.createInstance(app, conf); @@ -113,7 +113,6 @@ public class TestDBWorkflowStore extends workflow.setRun(0); workflow.setUser(conf.get(OozieClient.USER_NAME)); workflow.setGroup(conf.get(OozieClient.GROUP_NAME)); - workflow.setAuthToken(authToken); workflow.setWorkflowInstance(wfInstance); return workflow; } Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java (original) +++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java Wed Jun 12 23:17:31 2013 @@ -330,7 +330,6 @@ public abstract class XDataTestCase exte coordJob.setLastModifiedTime(new Date()); coordJob.setUser(getTestUser()); coordJob.setGroup(getTestGroup()); - coordJob.setAuthToken("notoken"); if (pending) { coordJob.setPending(); } @@ -383,7 +382,6 @@ public abstract class XDataTestCase exte coordJob.setLastModifiedTime(new Date()); coordJob.setUser(getTestUser()); coordJob.setGroup(getTestGroup()); - coordJob.setAuthToken("notoken"); if (pending) { coordJob.setPending(); } @@ -439,7 +437,6 @@ public abstract class XDataTestCase exte coordJob.setLastModifiedTime(new Date()); coordJob.setUser(getTestUser()); coordJob.setGroup(getTestGroup()); - coordJob.setAuthToken("notoken"); if (pending) { coordJob.setPending(); } @@ -686,7 +683,7 @@ public abstract class XDataTestCase exte conf.set(OozieClient.LOG_TOKEN, "testToken"); conf.set(OozieClient.USER_NAME, getTestUser()); - WorkflowJobBean wfBean = createWorkflow(app, conf, "auth", jobStatus, instanceStatus); + WorkflowJobBean wfBean = createWorkflow(app, conf, jobStatus, instanceStatus); try { JPAService jpaService = Services.get().get(JPAService.class); @@ -1099,10 +1096,10 @@ public abstract class XDataTestCase exte * @return workflow job bean * @throws Exception thrown if unable to create workflow job bean */ - protected WorkflowJobBean createWorkflow(WorkflowApp app, Configuration conf, String authToken, + protected WorkflowJobBean createWorkflow(WorkflowApp app, Configuration conf, WorkflowJob.Status jobStatus, WorkflowInstance.Status instanceStatus) throws Exception { WorkflowAppService wps = Services.get().get(WorkflowAppService.class); - Configuration protoActionConf = wps.createProtoActionConf(conf, authToken, true); + Configuration protoActionConf = wps.createProtoActionConf(conf, true); WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB(); WorkflowInstance wfInstance = workflowLib.createInstance(app, conf); ((LiteWorkflowInstance) wfInstance).setStatus(instanceStatus); @@ -1119,7 +1116,6 @@ public abstract class XDataTestCase exte workflow.setRun(0); workflow.setUser(conf.get(OozieClient.USER_NAME)); workflow.setGroup(conf.get(OozieClient.GROUP_NAME)); - workflow.setAuthToken(authToken); workflow.setWorkflowInstance(wfInstance); return workflow; } @@ -1217,7 +1213,6 @@ public abstract class XDataTestCase exte bundle.setId(Services.get().get(UUIDService.class).generateId(ApplicationType.BUNDLE)); bundle.setAppName("BUNDLE-TEST"); bundle.setAppPath(bundleAppPath.toString()); - bundle.setAuthToken("authToken"); bundle.setConf(XmlUtils.prettyPrint(conf).toString()); bundle.setConsoleUrl("consoleUrl"); bundle.setCreatedTime(new Date()); @@ -1272,7 +1267,6 @@ public abstract class XDataTestCase exte bundle.setId(Services.get().get(UUIDService.class).generateId(ApplicationType.BUNDLE)); bundle.setAppName("BUNDLE-TEST"); bundle.setAppPath(bundleAppPath.toString()); - bundle.setAuthToken("authToken"); bundle.setConf(XmlUtils.prettyPrint(conf).toString()); bundle.setConsoleUrl("consoleUrl"); bundle.setCreatedTime(new Date()); Modified: oozie/trunk/release-log.txt URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/release-log.txt (original) +++ oozie/trunk/release-log.txt Wed Jun 12 23:17:31 2013 @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1398 Reduce the number of CLOB columns used (ryota) OOZIE-1374 Make all unit tests run with Hadoop 2 (rohini) OOZIE-1394 Fix Bugs in Job and SLA Events (mona) OOZIE-1315 Refactor classes from launcher jar into Oozie sharelib (rkanter) Modified: oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java (original) +++ oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java Wed Jun 12 23:17:31 2013 @@ -32,6 +32,7 @@ import java.io.FileWriter; import java.io.PrintWriter; import java.sql.Clob; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -408,31 +409,120 @@ public class OozieDBCLI { PrintWriter writer = new PrintWriter(new FileWriter(sqlFile, true)); writer.println(); String dbVendor = getDBVendor(); - String ddlQuery = null; + ArrayList<String> ddlQueries = new ArrayList<String>(); if (dbVendor.equals("derby")) { - ddlQuery = "ALTER TABLE WF_ACTIONS ALTER COLUMN execution_path SET DATA TYPE VARCHAR(1024)"; + ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN execution_path SET DATA TYPE VARCHAR(1024)"); + // change coord_jobs.sla_xml from clob to varchar(4000) + ddlQueries.add("ALTER TABLE COORD_JOBS ADD COLUMN sla_xml_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE COORD_JOBS SET sla_xml_temp=sla_xml"); + ddlQueries.add("ALTER TABLE COORD_JOBS DROP COLUMN sla_xml"); + ddlQueries.add("RENAME COLUMN COORD_JOBS.sla_xml_temp TO sla_xml"); + // change coord_actions.sla_xml from clob to varchar(4000) + ddlQueries.add("ALTER TABLE COORD_ACTIONS ADD COLUMN sla_xml_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE COORD_ACTIONS SET sla_xml_temp=sla_xml"); + ddlQueries.add("ALTER TABLE COORD_ACTIONS DROP COLUMN sla_xml"); + ddlQueries.add("RENAME COLUMN COORD_ACTIONS.sla_xml_temp TO sla_xml"); + // change wf_jobs.sla_xml from clob to varchar(4000) + ddlQueries.add("ALTER TABLE WF_JOBS ADD COLUMN sla_xml_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE WF_JOBS SET sla_xml_temp=sla_xml"); + ddlQueries.add("ALTER TABLE WF_JOBS DROP COLUMN sla_xml"); + ddlQueries.add("RENAME COLUMN WF_JOBS.sla_xml_temp TO sla_xml"); + // change wf_actions.sla_xml from clob to varchar(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD COLUMN sla_xml_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE WF_ACTIONS SET sla_xml_temp=sla_xml"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN sla_xml"); + ddlQueries.add("RENAME COLUMN WF_ACTIONS.sla_xml_temp TO sla_xml"); + // change wf_jobs.error_message from clob to varchar(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD COLUMN error_message_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE WF_ACTIONS SET error_message_temp=error_message"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN error_message"); + ddlQueries.add("RENAME COLUMN WF_ACTIONS.error_message_temp TO error_message"); + // change wf_jobs.data from clob to varchar(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD COLUMN data_temp VARCHAR(4000)"); + ddlQueries.add("UPDATE WF_ACTIONS SET data_temp=data"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN data"); + ddlQueries.add("RENAME COLUMN WF_ACTIONS.data_temp TO data"); } else if (dbVendor.equals("oracle")) { - ddlQuery = "ALTER TABLE WF_ACTIONS MODIFY (execution_path VARCHAR2(1024))"; + ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY (execution_path VARCHAR2(1024))"); + // change coord_jobs.sla_xml from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE COORD_JOBS ADD (sla_xml_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE COORD_JOBS SET sla_xml_temp = sla_xml"); + ddlQueries.add("ALTER TABLE COORD_JOBS DROP COLUMN sla_xml"); + ddlQueries.add("ALTER TABLE COORD_JOBS RENAME COLUMN sla_xml_temp TO sla_xml"); + // change coord_actions.sla_xml from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE COORD_ACTIONS ADD (sla_xml_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE COORD_ACTIONS SET sla_xml_temp = sla_xml"); + ddlQueries.add("ALTER TABLE COORD_ACTIONS DROP COLUMN sla_xml"); + ddlQueries.add("ALTER TABLE COORD_ACTIONS RENAME COLUMN sla_xml_temp TO sla_xml"); + // change wf_jobs.sla_xml from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE WF_JOBS ADD (sla_xml_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE WF_JOBS SET sla_xml_temp = sla_xml"); + ddlQueries.add("ALTER TABLE WF_JOBS DROP COLUMN sla_xml"); + ddlQueries.add("ALTER TABLE WF_JOBS RENAME COLUMN sla_xml_temp TO sla_xml"); + // change wf_actions.sla_xml from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD (sla_xml_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE WF_ACTIONS SET sla_xml_temp = sla_xml"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN sla_xml"); + ddlQueries.add("ALTER TABLE WF_ACTIONS RENAME COLUMN sla_xml_temp TO sla_xml"); + // change wf_jobs.error_message from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD (error_message_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE WF_ACTIONS SET error_message_temp = error_message"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN error_message"); + ddlQueries.add("ALTER TABLE WF_ACTIONS RENAME COLUMN error_message_temp TO error_message"); + // change wf_jobs.data from clob to varchar2(4000) + ddlQueries.add("ALTER TABLE WF_ACTIONS ADD (data_temp VARCHAR2(4000))"); + ddlQueries.add("UPDATE WF_ACTIONS SET data_temp = data"); + ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN data"); + ddlQueries.add("ALTER TABLE WF_ACTIONS RENAME COLUMN data_temp TO data"); } else if (dbVendor.equals("mysql")) { - ddlQuery = "ALTER TABLE WF_ACTIONS MODIFY execution_path VARCHAR(1024)"; + ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY execution_path VARCHAR(1024)"); + ddlQueries.add("ALTER TABLE COORD_JOBS MODIFY sla_xml VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE COORD_ACTIONS MODIFY sla_xml VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_JOBS MODIFY sla_xml VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY sla_xml VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY error_message VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY data VARCHAR(4000)"); } else if (dbVendor.equals("postgresql")) { - ddlQuery = "ALTER TABLE WF_ACTIONS ALTER COLUMN execution_path TYPE VARCHAR(1024)"; + ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN execution_path TYPE VARCHAR(1024)"); + ddlQueries.add("ALTER TABLE COORD_JOBS ALTER COLUMN sla_xml TYPE VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE COORD_ACTIONS ALTER COLUMN sla_xml TYPE VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_JOBS ALTER COLUMN sla_xml TYPE VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN sla_xml TYPE VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN error_message TYPE VARCHAR(4000)"); + ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN data TYPE VARCHAR(4000)"); } Connection conn = (run) ? createConnection() : null; + try { System.out.println("Table 'WF_ACTIONS' column 'execution_path', length changed to 1024"); - writer.println(ddlQuery + ";"); - if (run) { - conn.setAutoCommit(true); - Statement st = conn.createStatement(); - st.executeUpdate(ddlQuery); - st.close(); + System.out.println("Table 'COORD_JOB/ACTIONS, WF_JOBS/ACTIONS' column 'sla_xml', changed to varchar/varchar2"); + System.out.println("Table 'WF_ACTIONS, column 'error_message/data', changed to varchar/varchar2"); + for(String query : ddlQueries){ + writer.println(query + ";"); + if (run) { + conn.setAutoCommit(true); + Statement st = conn.createStatement(); + st.executeUpdate(query); + st.close(); + } + } + System.out.println("DONE"); + + // Drop AUTH_TOKEN from BUNDLE_JOBS, COORD_JOBS, WF_JOBS (OOIZE-1398) + System.out.println("Post-upgrade BUNDLE_JOBS, COORD_JOBS, WF_JOBS to drop AUTH_TOKEN column"); + for (String sql : DROP_AUTH_TOKEN_QUERIES){ + writer.println(sql + ";"); + if (run) { + Statement st = conn.createStatement(); + st.executeUpdate(sql); + st.close(); + } } System.out.println("DONE"); writer.close(); @@ -444,6 +534,10 @@ public class OozieDBCLI { } } + private final static String[] DROP_AUTH_TOKEN_QUERIES = {"ALTER TABLE BUNDLE_JOBS DROP COLUMN AUTH_TOKEN", + "ALTER TABLE COORD_JOBS DROP COLUMN AUTH_TOKEN", + "ALTER TABLE WF_JOBS DROP COLUMN AUTH_TOKEN"}; + private final static String SET_SQL_MEDIUMTEXT_TRUE = "insert into OOZIE_SYS (name, data) values ('mysql.mediumtext', 'true')"; private void setSQLMediumTextFlag(String sqlFile, boolean run) throws Exception { @@ -473,7 +567,6 @@ public class OozieDBCLI { } private final static String[] SQL_MEDIUMTEXT_DDL_QUERIES = {"ALTER TABLE BUNDLE_JOBS MODIFY conf MEDIUMTEXT", - "ALTER TABLE BUNDLE_JOBS MODIFY auth_token MEDIUMTEXT", "ALTER TABLE BUNDLE_JOBS MODIFY job_xml MEDIUMTEXT", "ALTER TABLE BUNDLE_JOBS MODIFY orig_job_xml MEDIUMTEXT", @@ -481,29 +574,21 @@ public class OozieDBCLI { "ALTER TABLE COORD_ACTIONS MODIFY created_conf MEDIUMTEXT", "ALTER TABLE COORD_ACTIONS MODIFY missing_dependencies MEDIUMTEXT", "ALTER TABLE COORD_ACTIONS MODIFY run_conf MEDIUMTEXT", - "ALTER TABLE COORD_ACTIONS MODIFY sla_xml MEDIUMTEXT", "ALTER TABLE COORD_JOBS MODIFY conf MEDIUMTEXT", - "ALTER TABLE COORD_JOBS MODIFY auth_token MEDIUMTEXT", "ALTER TABLE COORD_JOBS MODIFY job_xml MEDIUMTEXT", "ALTER TABLE COORD_JOBS MODIFY orig_job_xml MEDIUMTEXT", - "ALTER TABLE COORD_JOBS MODIFY sla_xml MEDIUMTEXT", "ALTER TABLE SLA_EVENTS MODIFY job_data MEDIUMTEXT", "ALTER TABLE SLA_EVENTS MODIFY notification_msg MEDIUMTEXT", "ALTER TABLE SLA_EVENTS MODIFY upstream_apps MEDIUMTEXT", "ALTER TABLE WF_ACTIONS MODIFY conf MEDIUMTEXT", - "ALTER TABLE WF_ACTIONS MODIFY data MEDIUMTEXT", - "ALTER TABLE WF_ACTIONS MODIFY error_message MEDIUMTEXT", "ALTER TABLE WF_ACTIONS MODIFY external_child_ids MEDIUMTEXT", "ALTER TABLE WF_ACTIONS MODIFY stats MEDIUMTEXT", - "ALTER TABLE WF_ACTIONS MODIFY sla_xml MEDIUMTEXT", "ALTER TABLE WF_JOBS MODIFY conf MEDIUMTEXT", - "ALTER TABLE WF_JOBS MODIFY auth_token MEDIUMTEXT", - "ALTER TABLE WF_JOBS MODIFY proto_action_conf MEDIUMTEXT", - "ALTER TABLE WF_JOBS MODIFY sla_xml MEDIUMTEXT"}; + "ALTER TABLE WF_JOBS MODIFY proto_action_conf MEDIUMTEXT"}; private void doSQLMediumTextTweaks(String sqlFile, boolean run) throws Exception { if (getDBVendor().equals("mysql")) { Modified: oozie/trunk/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java?rev=1492478&r1=1492477&r2=1492478&view=diff ============================================================================== --- oozie/trunk/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java (original) +++ oozie/trunk/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java Wed Jun 12 23:17:31 2013 @@ -115,6 +115,9 @@ public class TestOozieDBCLI extends XTes // generate an upgrade script File upgrade = new File(getTestCaseConfDir() + File.separator + "update.sql"); execSQL("DROP table OOZIE_SYS"); + execSQL("ALTER TABLE BUNDLE_JOBS ADD COLUMN AUTH_TOKEN CLOB"); + execSQL("ALTER TABLE COORD_JOBS ADD COLUMN AUTH_TOKEN CLOB"); + execSQL("ALTER TABLE WF_JOBS ADD COLUMN AUTH_TOKEN CLOB"); String[] argsUpgrade = { "upgrade", "-sqlfile", upgrade.getAbsolutePath(), "-run" }; assertEquals(0, execOozieDBCLICommands(argsUpgrade));
