You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/06/04 11:23:18 UTC

svn commit: r1489354 - in /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io: RegisteredFormatIds.java StoredFormatIds.java

Author: kahatlen
Date: Tue Jun  4 09:23:18 2013
New Revision: 1489354

URL: http://svn.apache.org/r1489354
Log:
DERBY-6168: Clean up registered format ids

Remove entries that reference non-existing classes or classes that do
not implement the TypedFormat interface or the InstanceGetter interface.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java?rev=1489354&r1=1489353&r2=1489354&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java Tue Jun  4 09:23:18 2013
@@ -163,7 +163,7 @@ private static final    String[] TwoByte
         /* 111 */       "org.apache.derby.impl.store.raw.data.AllocPageOperation",
         /* 112 */       null,
         /* 113 */       "org.apache.derby.impl.store.raw.data.InvalidatePageOperation",
-        /* 114 */       "org.apache.derby.impl.store.raw.log.SaveLWMOperation",
+        /* 114 */       null,
         /* 115 */       null, 
         /* 116 */       null,
         /* 117 */       "org.apache.derby.impl.store.raw.data.StoredPage",
@@ -262,13 +262,13 @@ private static final    String[] TwoByte
         /* 210 */       "org.apache.derby.impl.store.raw.data.CopyRowsOperation",
         /* 211 */       null,
         /* 212 */       null,
-        /* 213 */       "org.apache.derby.impl.sql.execute.ReplaceJarConstantAction",
+        /* 213 */       null,
         /* 214 */       null,
         /* 215 */       null,
         /* 216 */       null,
         /* 217 */       null,
         /* 218 */       "org.apache.derby.impl.sql.execute.IndexColumnOrder",
-        /* 219 */       "org.apache.derby.iapi.util.ByteArray",
+        /* 219 */       null,
         /* 220 */       null,
         /* 221 */       null,
         /* 222 */       null,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java?rev=1489354&r1=1489353&r2=1489354&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java Tue Jun  4 09:23:18 2013
@@ -1085,24 +1085,6 @@ public interface StoredFormatIds {
     //static public final int INDEX_ROW_V01_ID =
     //       (MIN_ID_2 + 238);
 
-    /**
-      class org.apache.derby.impl.sql.execute.AddJarConstantAction;
-     */
-    static public final int ADD_JAR_CONSTANT_ACTION_V01_ID =
-            (MIN_ID_2 + 211);
-
-    /**
-      class org.apache.derby.impl.sql.execute.DropJarConstantAction;
-     */
-    static public final int DROP_JAR_CONSTANT_ACTION_V01_ID =
-            (MIN_ID_2 + 212);
-
-    /**
-      class org.apache.derby.impl.sql.execute.ReplaceJarConstantAction;
-     */
-    static public final int REPLACE_JAR_CONSTANT_ACTION_V01_ID =
-            (MIN_ID_2 + 213);
-
      /**
     class org.apache.derby.Database.Language.Execution.ConstraintInfo
      */
@@ -1686,25 +1668,6 @@ public interface StoredFormatIds {
     public static final int RAW_STORE_TRANSACTION_TABLE =
             (MIN_ID_2 + 262);
 
-            
-    /******************************************************************
-    **
-    **  LocalDriver Formatables.
-    **
-    ******************************************************************/
-
-    /* NOT USED = org.apache.derby.impl.jdbc.ExternalizableConnection */
-    public static final int EXTERNALIZABLE_CONNECTION_ID = (MIN_ID_2 + 192);
-
-
-    /******************************************************************
-    **
-    **      InternalUtils MODULE CLASSES
-    **
-    ******************************************************************/
-    /* org.apache.derby.iapi.util.ByteArray */
-    public static final int FORMATABLE_BYTE_ARRAY_V01_ID = (MIN_ID_2 + 219);
-
 
    /******************************************************************
     **