db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1467200 - in /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io: RegisteredFormatIds.java StoredFormatIds.java
Date Fri, 12 Apr 2013 08:15:29 GMT
Author: kahatlen
Date: Fri Apr 12 08:15:29 2013
New Revision: 1467200

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

Removed the format ids for the run-time statistics classes.

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=1467200&r1=1467199&r2=1467200&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
Fri Apr 12 08:15:29 2013
@@ -21,9 +21,6 @@
 
 package org.apache.derby.iapi.services.io;
 
-import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.services.info.JVMInfo;
-
 /**
         Registration of TypedFormat classes.
 
@@ -225,25 +222,25 @@ String[] TwoByte = {
         /* 170 */       null, 
         /* 171 */       null, 
         /* 172 */       null,
-        /* 173 */       "org.apache.derby.impl.sql.execute.rts.RunTimeStatisticsImpl",
+        /* 173 */       null,
         /* 174 */       null,
         /* 175 */       null,
         /* 176 */       null,
-        /* 177 */       "org.apache.derby.impl.sql.execute.rts.RealProjectRestrictStatistics",
-        /* 178 */       "org.apache.derby.impl.sql.execute.rts.RealSortStatistics",
-        /* 179 */       "org.apache.derby.impl.sql.execute.rts.RealTableScanStatistics",
-        /* 180 */       "org.apache.derby.impl.sql.execute.rts.RealNestedLoopJoinStatistics",
-        /* 181 */       "org.apache.derby.impl.sql.execute.rts.RealIndexRowToBaseRowStatistics",
-        /* 182 */       "org.apache.derby.impl.sql.execute.rts.RealAnyResultSetStatistics",
-        /* 183 */       "org.apache.derby.impl.sql.execute.rts.RealOnceResultSetStatistics",
-        /* 184 */       "org.apache.derby.impl.sql.execute.rts.RealCurrentOfStatistics",
-        /* 185 */       "org.apache.derby.impl.sql.execute.rts.RealRowResultSetStatistics",
-        /* 186 */       "org.apache.derby.impl.sql.execute.rts.RealUnionResultSetStatistics",
-        /* 187 */       "org.apache.derby.impl.sql.execute.rts.RealNestedLoopLeftOuterJoinStatistics",
-        /* 188 */       "org.apache.derby.impl.sql.execute.rts.RealNormalizeResultSetStatistics",
-        /* 189 */       "org.apache.derby.impl.sql.execute.rts.RealInsertResultSetStatistics",
-        /* 190 */       "org.apache.derby.impl.sql.execute.rts.RealUpdateResultSetStatistics",
-        /* 191 */       "org.apache.derby.impl.sql.execute.rts.RealDeleteResultSetStatistics",
+        /* 177 */       null,
+        /* 178 */       null,
+        /* 179 */       null,
+        /* 180 */       null,
+        /* 181 */       null,
+        /* 182 */       null,
+        /* 183 */       null,
+        /* 184 */       null,
+        /* 185 */       null,
+        /* 186 */       null,
+        /* 187 */       null,
+        /* 188 */       null,
+        /* 189 */       null,
+        /* 190 */       null,
+        /* 191 */       null,
         /* 192 */       null,
         /* 193 */       null,
         /* 194 */       null,
@@ -255,7 +252,7 @@ String[] TwoByte = {
         /* 200 */       null, // DECIMAL - register dynamically by DataValueFactory implementation
         /* 201 */       null,
         /* 202 */       "org.apache.derby.iapi.types.UserType",
-        /* 203 */       "org.apache.derby.impl.sql.execute.rts.RealHashScanStatistics",
+        /* 203 */       null,
         /* 204 */       null,
         /* 205 */       "org.apache.derby.catalog.types.ReferencedColumnsDescriptorImpl",
         /* 206 */       null,
@@ -266,7 +263,7 @@ String[] TwoByte = {
         /* 211 */       null,
         /* 212 */       null,
         /* 213 */       "org.apache.derby.impl.sql.execute.ReplaceJarConstantAction",
-        /* 214 */       "org.apache.derby.impl.sql.execute.rts.RealVTIStatistics",
+        /* 214 */       null,
         /* 215 */       null,
         /* 216 */       null,
         /* 217 */       null,
@@ -335,9 +332,9 @@ String[] TwoByte = {
         /* 280 */       null,
         /* 281 */       null,
         /* 282 */       "org.apache.derby.impl.sql.execute.FKInfo",
-        /* 283 */       "org.apache.derby.impl.sql.execute.rts.RealScalarAggregateStatistics",
-        /* 284 */       "org.apache.derby.impl.sql.execute.rts.RealDistinctScalarAggregateStatistics",
-        /* 285 */       "org.apache.derby.impl.sql.execute.rts.RealGroupedAggregateStatistics",
+        /* 283 */       null,
+        /* 284 */       null,
+        /* 285 */       null,
         /* 286 */       null,
         /* 287 */       "org.apache.derby.impl.store.raw.data.SetReservedSpaceOperation",
         /* 288 */    null,
@@ -356,11 +353,11 @@ String[] TwoByte = {
         /* 301 */       null,
         /* 302 */       null,
         /* 303 */       "org.apache.derby.iapi.services.io.FormatableIntHolder",
-        /* 304 */       "org.apache.derby.impl.sql.execute.rts.RealHashJoinStatistics",
-        /* 305 */       "org.apache.derby.impl.sql.execute.rts.RealHashLeftOuterJoinStatistics",
-        /* 306 */       "org.apache.derby.impl.sql.execute.rts.RealHashTableStatistics",
+        /* 304 */       null,
+        /* 305 */       null,
+        /* 306 */       null,
         /* 307 */       "org.apache.derby.iapi.types.JSQLType",
-        /* 308 */       "org.apache.derby.impl.sql.execute.rts.RealMaterializedResultSetStatistics",
+        /* 308 */       null,
         /* 309 */       null,
         /* 310 */       null,
         /* 311 */       null,
@@ -379,14 +376,14 @@ String[] TwoByte = {
         /* 324 */       null,
         /* 325 */       "org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo",      
      // InstanceGetter
         /* 326 */       "org.apache.derby.catalog.types.DefaultInfoImpl",
-        /* 327 */       "org.apache.derby.impl.sql.execute.rts.RealLastIndexKeyScanStatistics",
+        /* 327 */       null,
         /* 328 */       "org.apache.derby.impl.store.raw.xact.GlobalXactId",
         /* 329 */       "org.apache.derby.iapi.services.io.FormatableLongHolder",
-        /* 330 */       "org.apache.derby.impl.sql.execute.rts.RealScrollInsensitiveResultSetStatistics",
+        /* 330 */       null,
         /* 331 */       null,
         /* 332 */       null,
         /* 333 */       null,
-        /* 334 */       "org.apache.derby.impl.sql.execute.rts.RealDistinctScanStatistics",
+        /* 334 */       null,
         /* 335 */       null,
         /* 336 */       null,
         /* 337 */       null,
@@ -431,8 +428,8 @@ String[] TwoByte = {
         /* 376 */       null,
         /* 377 */       null,
         /* 378 */       null,
-        /* 379 */       "org.apache.derby.impl.sql.execute.rts.RealInsertVTIResultSetStatistics",
-        /* 380 */       "org.apache.derby.impl.sql.execute.rts.RealDeleteVTIResultSetStatistics",
+        /* 379 */       null,
+        /* 380 */       null,
         /* 381 */       null, // Unused,
         /* 382 */       null, // Unused
         /* 383 */   "org.apache.derby.impl.sql.GenericColumnDescriptor",
@@ -490,8 +487,8 @@ String[] TwoByte = {
         /* 32 */        null,
         /* 33 */        null,
         /* 403 + 34 */  null,
-    /* 438 */   null,
-        /* 439 */   "org.apache.derby.impl.sql.execute.rts.RealDeleteCascadeResultSetStatistics",
   
+        /* 438 */       null,
+        /* 439 */       null,
 
     /// --- BLOB is copying LONGVARBIT in implementation
         /* 440 */   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=1467200&r1=1467199&r2=1467200&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
Fri Apr 12 08:15:29 2013
@@ -37,17 +37,17 @@ package org.apache.derby.iapi.services.i
   <UL>
   <LI>The interface(s) the stored object must support. Any implementation
   which reads the object must support these interfaces.
-  <LI>The format of the stored object. All implementaions which support
+  <LI>The format of the stored object. All implementations which support
   the format must be able to read and write it.
   </UL>
 
-  <P>An object should implement the Formatable inteface to support a
+  <P>An object should implement the Formatable interface to support a
   stored format. In addition, the module which contains the object
   should register the object's class with the Monitor (See
   FormatIdUtil.register.)
 
   <P>When you add a format id to this file, please include the list
-  of interfaces an implementaion must support when it supports
+  of interfaces an implementation must support when it supports
   the format id. When Derby code reads a stored form it returns an 
   object of a Class which supports the stored form. A reader may
   cast this object to any interface listed in this file. It is an error for
@@ -1025,194 +1025,12 @@ public interface StoredFormatIds {
             (MIN_ID_2 + 155);
 
     /**
-        class org.apache.derby.impl.sql.execute.RunTimeStatisticsImpl
-     */
-    static public final int RUN_TIME_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 173);
-
-    /**
         class org.apache.derby.Database.Language.Execution.LockTableConstantAction
     */
     static public final int UNUSED_2_275 =
             (MIN_ID_2 + 275);
 
     /**
-        class org.apache.derby.impl.sql.execute.RealProjectRestrictStatistics
-     */
-    static public final int REAL_PROJECT_RESTRICT_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 177);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealDistinctScalarAggregateStatistics
-     */
-    static public final int REAL_DISTINCT_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 284);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealScalarAggregateStatistics
-    */
-    static public final int REAL_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 283);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealGroupedAggregateStatistics
-     */
-    static public final int REAL_GROUPED_AGGREGATE_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 285);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealSortStatistics
-     */
-    static public final int REAL_SORT_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 178);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealTableScanStatistics
-     */
-    static public final int REAL_TABLE_SCAN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 179);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealHashJoinStatistics
-     */
-    static public final int REAL_HASH_JOIN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 304);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealNestedLoopJoinStatistics
-     */
-    static public final int REAL_NESTED_LOOP_JOIN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 180);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealIndexRowToBaseRowStatistics
-     */
-    static public final int REAL_INDEX_ROW_TO_BASE_ROW_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 181);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealAnyResultSetStatistics
-     */
-    static public final int REAL_ANY_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 182);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealOnceResultSetStatistics
-     */
-    static public final int REAL_ONCE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 183);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealCurrentOfStatistics
-     */
-    static public final int REAL_CURRENT_OF_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 184);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealRowResultSetStatistics
-     */
-    static public final int REAL_ROW_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 185);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealUnionResultSetStatistics
-     */
-    static public final int REAL_UNION_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 186);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealHashLeftOuterJoinStatistics
-     */
-    static public final int REAL_HASH_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 305);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealNestedLoopLeftOuterJoinStatistics
-     */
-    static public final int REAL_NESTED_LOOP_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 187);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealNormalizeResultSetStatistics
-     */
-    static public final int REAL_NORMALIZE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 188);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealInsertResultSetStatistics
-     */
-    static public final int REAL_INSERT_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 189);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealInsertVTIResultSetStatistics
-     */
-    static public final int REAL_INSERT_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 379);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealUpdateResultSetStatistics
-     */
-    static public final int REAL_UPDATE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 190);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
-     */
-    static public final int REAL_DELETE_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 380);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
-     */
-    static public final int REAL_DELETE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 191);
-
-    /**
-       org.apache.derby.impl.sql.execute.rts.RealDeleteCascadeResultSetStatistics"
-     */
-    static public final int REAL_DELETE_CASCADE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 439);
-
-
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealHashScanStatistics
-     */
-    static public final int REAL_HASH_SCAN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 203);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealDistinctScanStatistics
-     */
-    static public final int REAL_DISTINCT_SCAN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 334);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealHashTableStatistics
-     */
-    static public final int REAL_HASH_TABLE_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 306);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealVTIStatistics
-     */
-    static public final int REAL_VTI_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 214);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealMaterializedResultSetStatistics
-     */
-    static public final int REAL_MATERIALIZED_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 308);
-
-    /**
-        class org.apache.derby.impl.sql.execute.RealScrollInsensitiveResultSetStatistics
-     */
-    static public final int REAL_SCROLL_INSENSITIVE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 330);
-
-    /**
     class org.apache.derby.Database.Language.Execution.CreateSPSConstantAction
     */
     static public final int UNUSED_2_221    =
@@ -1343,12 +1161,6 @@ public interface StoredFormatIds {
     static public final int REP_SET_TRIGGERS_CONSTANT_ACTION_V01_ID =
             (MIN_ID_2 + 322);
 
-    /**
-        class org.apache.derby.impl.sql.execute.RealLastIndexKeyScanStatistics
-     */
-    static public final int REAL_LAST_INDEX_KEY_SCAN_STATISTICS_IMPL_V01_ID =
-            (MIN_ID_2 + 327);
-
     ////////////////////////////////////////////////////////////////////////////
     //
     // New versions of 2.0 Language ConstantActions, versioned in 3.0



Mime
View raw message