You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/06/29 00:19:28 UTC
svn commit: r1497947 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/client/rest/
tools/src/main/java/org/apache/oozie/tools/
Author: virag
Date: Fri Jun 28 22:19:27 2013
New Revision: 1497947
URL: http://svn.apache.org/r1497947
Log:
OOZIE-1436 Revert SLA_XML and few other varchar columns back to clob (virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java
oozie/trunk/release-log.txt
oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java Fri Jun 28 22:19:27 2013
@@ -185,8 +185,8 @@ public class CoordinatorActionBean exten
@Column(name = "external_id")
private String externalId;
- @Basic
- @Column(name = "sla_xml", length = 4000)
+ @Column(name = "sla_xml")
+ @Lob
private String slaXml = null;
@Basic
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java Fri Jun 28 22:19:27 2013
@@ -139,8 +139,9 @@ public class CoordinatorJobBean extends
@Lob
private String origJobXml = null;
- @Basic
- @Column(name = "sla_xml", length = 4000)
+
+ @Column(name = "sla_xml")
+ @Lob
private String slaXml = null;
@Basic
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java Fri Jun 28 22:19:27 2013
@@ -121,8 +121,8 @@ public class WorkflowActionBean extends
@Transient
private Date pendingAge;
- @Basic
- @Column(name = "sla_xml", length = 4000)
+ @Column(name = "sla_xml")
+ @Lob
private String slaXml = null;
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java Fri Jun 28 22:19:27 2013
@@ -121,8 +121,8 @@ public class WorkflowJobBean extends Jso
@Lob
private byte[] wfInstance = null;
- @Basic
- @Column(name = "sla_xml", length = 4000)
+ @Column(name = "sla_xml")
+ @Lob
private String slaXml = null;
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java Fri Jun 28 22:19:27 2013
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -61,15 +61,15 @@ public class JsonWorkflowAction implemen
@Basic
@Column(name = "retries")
private int retries;
-
+
@Basic
@Column(name = "user_retry_count")
private int userRetryCount;
-
+
@Basic
@Column(name = "user_retry_max")
private int userRetryMax;
-
+
@Basic
@Column(name = "user_retry_interval")
private int userRetryInterval;
@@ -84,7 +84,8 @@ public class JsonWorkflowAction implemen
@Column(name = "transition")
private String transition = null;
- @Column(name = "data", length = 4000)
+ @Column(name = "data")
+ @Lob
private String data = null;
@Column(name = "stats")
@@ -125,7 +126,7 @@ public class JsonWorkflowAction implemen
public JSONObject toJSONObject() {
return toJSONObject("GMT");
}
-
+
@SuppressWarnings("unchecked")
public JSONObject toJSONObject(String timeZoneId) {
JSONObject json = new JSONObject();
@@ -207,7 +208,7 @@ public class JsonWorkflowAction implemen
public void setRetries(int retries) {
this.retries = retries;
}
-
+
public int getUserRetryCount() {
return userRetryCount;
}
@@ -215,11 +216,11 @@ public class JsonWorkflowAction implemen
public void setUserRetryCount(int retryCount) {
this.userRetryCount = retryCount;
}
-
+
public void incrmentUserRetryCount() {
this.userRetryCount++;
}
-
+
public int getUserRetryMax() {
return userRetryMax;
}
@@ -227,7 +228,7 @@ public class JsonWorkflowAction implemen
public void setUserRetryMax(int retryMax) {
this.userRetryMax = retryMax;
}
-
+
public int getUserRetryInterval() {
return userRetryInterval;
}
@@ -265,9 +266,6 @@ public class JsonWorkflowAction implemen
}
public void setData(String data) {
- if( data != null && data.length() > 2000){
- data = data.substring(0, 2000);
- }
this.data = data;
}
@@ -329,8 +327,8 @@ public class JsonWorkflowAction implemen
public void setErrorInfo(String errorCode, String errorMessage) {
this.errorCode = errorCode;
- if(errorMessage != null && errorMessage.length() > 2000){
- errorMessage = errorMessage.substring(0, 2000);
+ if(errorMessage != null && errorMessage.length() > 500){
+ errorMessage = errorMessage.substring(0, 500);
}
this.errorMessage = errorMessage;
}
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1497947&r1=1497946&r2=1497947&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 28 22:19:27 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1436 Revert SLA_XML and few other varchar columns back to clob (virag)
OOZIE-1427 Update CredentialsModule docs to mention Hive (rkanter)
OOZIE-1429 Fix bugs in SLA UI (rohini)
OOZIE-1423 Coordinator job change command not removing SLA Registration bean (mona)
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=1497947&r1=1497946&r2=1497947&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 Fri Jun 28 22:19:27 2013
@@ -412,36 +412,11 @@ public class OozieDBCLI {
ArrayList<String> ddlQueries = new ArrayList<String>();
if (dbVendor.equals("derby")) {
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)
+ // change wf_action.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");
// change coord_jobs.frequency from int to varchar(255)
// Derby doesn't support INTEGER to VARCHAR, so: INTEGER --> CHAR --> VARCHAR
// http://java.dzone.com/articles/derby-casting-madness-â-sequel
@@ -458,36 +433,11 @@ public class OozieDBCLI {
else
if (dbVendor.equals("oracle")) {
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)
+ // change wf_action.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");
// change coord_jobs.frequency from int to varchar(255)
ddlQueries.add("ALTER TABLE COORD_JOBS ADD (frequency_temp VARCHAR2(255))");
ddlQueries.add("UPDATE COORD_JOBS SET frequency_temp = CAST(frequency AS VARCHAR(255))");
@@ -497,31 +447,20 @@ public class OozieDBCLI {
else
if (dbVendor.equals("mysql")) {
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)");
ddlQueries.add("ALTER TABLE COORD_JOBS MODIFY frequency VARCHAR(255)");
}
else
if (dbVendor.equals("postgresql")) {
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)");
ddlQueries.add("ALTER TABLE COORD_JOBS ALTER COLUMN frequency TYPE VARCHAR(255)");
}
Connection conn = (run) ? createConnection() : null;
try {
System.out.println("Table 'WF_ACTIONS' column 'execution_path', length changed to 1024");
- 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");
+ System.out.println("Table 'WF_ACTIONS, column 'error_message', changed to varchar/varchar2");
System.out.println("Table 'COORD_JOB' column 'frequency' changed to varchar/varchar2");
for(String query : ddlQueries){
writer.println(query + ";");
@@ -594,10 +533,12 @@ 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 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",
@@ -606,9 +547,13 @@ public class OozieDBCLI {
"ALTER TABLE WF_ACTIONS MODIFY conf MEDIUMTEXT",
"ALTER TABLE WF_ACTIONS MODIFY external_child_ids MEDIUMTEXT",
"ALTER TABLE WF_ACTIONS MODIFY stats MEDIUMTEXT",
+ "ALTER TABLE WF_ACTIONS MODIFY data MEDIUMTEXT",
+ "ALTER TABLE WF_ACTIONS MODIFY sla_xml MEDIUMTEXT",
"ALTER TABLE WF_JOBS MODIFY conf MEDIUMTEXT",
- "ALTER TABLE WF_JOBS MODIFY proto_action_conf MEDIUMTEXT"};
+ "ALTER TABLE WF_JOBS MODIFY proto_action_conf MEDIUMTEXT",
+ "ALTER TABLE WF_JOBS MODIFY sla_xml MEDIUMTEXT"};
+
private void doSQLMediumTextTweaks(String sqlFile, boolean run) throws Exception {
if (getDBVendor().equals("mysql")) {