You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/02/16 13:19:47 UTC
[1/8] git commit: refs/heads/master - db: Fix Upgrade40to41 and add
cleaning path schema-40to410-cleanup.sql
db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/46ab9731
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/46ab9731
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/46ab9731
Branch: refs/heads/master
Commit: 46ab973143eeb2461038cf62e89d5e43d71bf45b
Parents: 87b668b
Author: Rohit Yadav <bh...@apache.org>
Authored: Sat Feb 16 12:28:00 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sat Feb 16 12:28:00 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 37 ++------------
setup/db/db/schema-40to410-cleanup.sql | 21 ++++++++
2 files changed, 27 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46ab9731/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
index d3a8cd5..2ebe980 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -32,47 +32,24 @@ import java.util.UUID;
import org.apache.log4j.Logger;
-/**
- * @author htrippaers
- *
- */
public class Upgrade40to41 implements DbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade40to41.class);
- /**
- *
- */
- public Upgrade40to41() {
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange()
- */
@Override
public String[] getUpgradableVersionRange() {
return new String[] { "4.0.0", "4.1.0" };
}
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion()
- */
@Override
public String getUpgradedVersion() {
return "4.1.0";
}
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade()
- */
@Override
public boolean supportsRollingUpgrade() {
return false;
}
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts()
- */
@Override
public File[] getPrepareScripts() {
String script = Script.findScript("", "db/schema-40to410.sql");
@@ -83,21 +60,20 @@ public class Upgrade40to41 implements DbUpgrade {
return new File[] { new File(script) };
}
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection)
- */
@Override
public void performDataMigration(Connection conn) {
upgradeEIPNetworkOfferings(conn);
upgradeEgressFirewallRules(conn);
}
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts()
- */
@Override
public File[] getCleanupScripts() {
- return new File[0];
+ String script = Script.findScript("", "db/schema-40to410-cleanup.sql");
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find db/schema-302to40-cleanup.sql");
+ }
+
+ return new File[] { new File(script) };
}
private void upgradeEIPNetworkOfferings(Connection conn) {
@@ -133,7 +109,6 @@ public class Upgrade40to41 implements DbUpgrade {
}
}
-
private void upgradeEgressFirewallRules(Connection conn) {
PreparedStatement pstmt = null;
ResultSet rs = null;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46ab9731/setup/db/db/schema-40to410-cleanup.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410-cleanup.sql b/setup/db/db/schema-40to410-cleanup.sql
new file mode 100644
index 0000000..411b568
--- /dev/null
+++ b/setup/db/db/schema-40to410-cleanup.sql
@@ -0,0 +1,21 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- 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. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
+-- Schema cleanup from 4.0.0 to 4.1.0;
+--;
+