db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r719008 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access: btree/BTreeController.java btree/BTreeScan.java conglomerate/TemplateRow.java
Date Wed, 19 Nov 2008 16:42:29 GMT
Author: kristwaa
Date: Wed Nov 19 08:42:29 2008
New Revision: 719008

URL: http://svn.apache.org/viewvc?rev=719008&view=rev
Log:
DERBY-3956: Remove method TemplateRow.checkPartialColumnTypes
Deleted the method, which always returned true and was only called from withing debug blocks
(sane builds).
Patch file: derby-3956-1a.diff

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java?rev=719008&r1=719007&r2=719008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
Wed Nov 19 08:42:29 2008
@@ -1256,10 +1256,6 @@
         if (SanityManager.DEBUG)
         {
             SanityManager.ASSERT(this.container != null);
-
-            TemplateRow.checkPartialColumnTypes(
-                this.getConglomerate().format_ids, 
-                (FormatableBitSet) null, (int []) null, row);
         }
 
 		return doIns(row);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java?rev=719008&r1=719007&r2=719008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
Wed Nov 19 08:42:29 2008
@@ -1541,10 +1541,6 @@
         {
             SanityManager.ASSERT(this.container != null,
                 "BTreeScan.fetch() called on a closed scan.");
-            
-            TemplateRow.checkPartialColumnTypes(
-                this.getConglomerate().format_ids, 
-                init_scanColumnList, (int []) null, row);
         }
 
         try
@@ -1797,13 +1793,6 @@
 	{
         boolean ret_val;
 
-        if (SanityManager.DEBUG)
-        {
-            TemplateRow.checkPartialColumnTypes(
-                this.getConglomerate().format_ids, 
-                init_scanColumnList, (int[]) null, row);
-        }
-
         // Turn this call into a group fetch of a 1 element group.
         fetchNext_one_slot_array[0] = row;
         ret_val = 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java?rev=719008&r1=719007&r2=719008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
Wed Nov 19 08:42:29 2008
@@ -21,8 +21,6 @@
 
 package org.apache.derby.impl.store.access.conglomerate;
 
-import org.apache.derby.iapi.reference.SQLState;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.services.io.ArrayUtil;
 import org.apache.derby.iapi.services.io.Storable;
@@ -321,27 +319,4 @@
 
         return(ret_val);
 	}
-
-    /**
-     * Check that columns in the row conform to a set of format id's, 
-     * both in number and type.
-     *
-	 * @return boolean indicating if template matches format id's
-     *
-     * @param format_ids array of format ids which are the types of cols in row
-     * @param row        the array of columns that make up the row.
-     *
-	 * @exception  StandardException  Standard exception policy.
-     **/
-	static public boolean checkPartialColumnTypes(
-    int[]                   format_ids, 
-    FormatableBitSet        validColumns,
-    int[]                   fieldStates,
-    DataValueDescriptor[]   row)
-		throws StandardException
-	{
-        boolean ret_val = true;
-
-        return(ret_val);
-	}
 }



Mime
View raw message