Updated Branches: refs/heads/master 040e5f4d4 -> c873b8e63
OOZIE-1645 Oozie upgrade DB command fails due to missing dependencies for mssql (omaliuvanchuk via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c873b8e6 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c873b8e6 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c873b8e6 Branch: refs/heads/master Commit: c873b8e63c33d6304e9151b537b8cffa904e2766 Parents: 040e5f4 Author: Robert Kanter <[email protected]> Authored: Mon Jan 27 13:24:59 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Mon Jan 27 13:24:59 2014 -0800 ---------------------------------------------------------------------- release-log.txt | 1 + .../main/java/org/apache/oozie/tools/OozieDBCLI.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c873b8e6/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index d4643c7..518eee4 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1645 Oozie upgrade DB command fails due to missing dependencies for mssql (omaliuvanchuk via rkanter) OOZIE-1668 Coord log streaming start and end time should be of action list start and end time (puru via rohini) OOZIE-1674 DB upgrade from 3.3.0 to trunk fails on postgres (rkanter) OOZIE-1581 Workflow performance optimizations (mona) http://git-wip-us.apache.org/repos/asf/oozie/blob/c873b8e6/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java index 116be52..7312faa 100644 --- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java +++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java @@ -326,6 +326,9 @@ public class OozieDBCLI { private final static String UPDATE_DELIMITER_VER_TWO = "UPDATE COORD_ACTIONS SET MISSING_DEPENDENCIES = REPLACE(MISSING_DEPENDENCIES,';','!!')"; + private final static String UPDATE_DELIMITER_VER_TWO_MSSQL= + "UPDATE COORD_ACTIONS SET MISSING_DEPENDENCIES = REPLACE(CAST(MISSING_DEPENDENCIES AS varchar(MAX)),';','!!')"; + private void postUpgradeTasks(String sqlFile, boolean run, boolean force) throws Exception { PrintWriter writer = new PrintWriter(new FileWriter(sqlFile, true)); writer.println(); @@ -373,11 +376,18 @@ public class OozieDBCLI { System.out.println(" although those jobs may show different status names in their actions"); } if (!getDBVendor().equals("derby")) { - writer.println(UPDATE_DELIMITER_VER_TWO + ";"); + String updateMissingDependenciesQuery; + if (getDBVendor().equals("sqlserver")){ + updateMissingDependenciesQuery = UPDATE_DELIMITER_VER_TWO_MSSQL; + } else { + updateMissingDependenciesQuery = UPDATE_DELIMITER_VER_TWO; + } + + writer.println(updateMissingDependenciesQuery + ";"); System.out.println("Post-upgrade MISSING_DEPENDENCIES column"); if (run) { Statement st = conn.createStatement(); - st.executeUpdate(UPDATE_DELIMITER_VER_TWO); + st.executeUpdate(updateMissingDependenciesQuery); st.close(); } }
