db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1131272 - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Date Fri, 03 Jun 2011 22:33:14 GMT
Author: kmarsden
Date: Fri Jun  3 22:33:14 2011
New Revision: 1131272

URL: http://svn.apache.org/viewvc?rev=1131272&view=rev
Log:
DERBY-5249 A table created with 10.0.2.1 with constraints cannot be dropped with 10.5 due
to NullPointerException with insane build or ASSERT FAILED Failed to find sharable conglomerate
descriptor for index conglomerate with sane build


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java?rev=1131272&r1=1131271&r2=1131272&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
Fri Jun  3 22:33:14 2011
@@ -598,8 +598,15 @@ public final class ConglomerateDescripto
 			}
 
 			// Skip if ignoreThis is true and it describes "this".
+			// DERBY-5249. We need to check both the UUID and the
+			// conglomerateName to see if this is a match, because
+			// databases prior to the DERBY-655 fix may have a 
+			// duplicate conglomerateID
 			if (ignoreThis &&
-				getUUID().equals(descriptors[i].getUUID()))
+				getUUID().equals(descriptors[i].getUUID()) &&
+				getConglomerateName().equals(descriptors[i].
+							getConglomerateName())
+				)
 			{
 				continue;
 			}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1131272&r1=1131271&r2=1131272&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Fri Jun  3 22:33:14 2011
@@ -268,7 +268,7 @@ public class BasicSetup extends UpgradeC
      * test once the bug is fixed.
      * 
      */
-    public void xtestDropTableAfterUpgradeWithConstraint() throws SQLException {
+    public void testDropTableAfterUpgradeWithConstraint() throws SQLException {
         final int phase = getPhase();
 
         Statement s = createStatement();
@@ -291,18 +291,20 @@ public class BasicSetup extends UpgradeC
             /*
              * With 10.0 and early 10.1 releases a duplicate conglomerate entry
              * shows in sys.sysconglomerates for the primary key PK_RS. It can
-             * be seen with this query.Utilities.showResultSet(s.executeQuery(
-             * "select c.constraintname, c.constraintid,  cong.conglomerateid, cong.conglomeratename
 from sys.sysconglomerates cong, sys.syskeys k, sys.sysconstraints c where c.constraintname
= 'PK_RS' and c.constraintid =k.constraintid and k.conglomerateid = cong.conglomerateid "
-             * ));
-             */
+             * be seen with this query.
+             
+                Utilities.showResultSet(s.executeQuery(
+                        "select c.constraintname, c.constraintid,  cong.conglomerateid, cong.conglomeratename
 from sys.sysconglomerates cong, sys.syskeys k, sys.sysconstraints c where c.constraintname
= 'PK_RS' and c.constraintid =k.constraintid and k.conglomerateid = cong.conglomerateid "
+              ));
+            */
             break;
         case PH_SOFT_UPGRADE:
             s.executeUpdate("ALTER TABLE S.RS DROP CONSTRAINT FK_RS_TYPEID");
-            s.executeUpdate("ALTER TABLE S.R_TYPE_ID ADD CONSTRAINT "
-                    + "PK_R_TYPE_ID PRIMARY KEY (R_TYPE_ID)");
+            s.executeUpdate("ALTER TABLE S.R_TYPE_ID DROP CONSTRAINT "
+                    + "PK_R_TYPE_ID");
             s.executeUpdate("ALTER TABLE S.RS DROP CONSTRAINT PK_RS");
             s.executeUpdate("DROP TABLE S.RS");
-            s.executeUpdate("DROP TABLE S.R_TYPE");
+            s.executeUpdate("DROP TABLE S.R_TYPE_ID");
             s.executeUpdate("DROP SCHEMA S RESTRICT");
             break;
         case PH_POST_SOFT_UPGRADE:



Mime
View raw message