db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1034384 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/impl/sql/catalog/
Date Fri, 12 Nov 2010 13:04:24 GMT
Author: kristwaa
Date: Fri Nov 12 13:04:23 2010
New Revision: 1034384

URL: http://svn.apache.org/viewvc?rev=1034384&view=rev
Log:
DERBY-4772: Data truncation error with XPLAIN-functionality enabled

Merged fix from trunk (r1033864).

Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 12 13:04:23 2010
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,958163,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1030043
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,958163,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1030043,1033864
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java?rev=1034384&r1=1034383&r2=1034384&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
Fri Nov 12 13:04:23 2010
@@ -5,7 +5,7 @@ import java.sql.SQLException;
 
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.impl.sql.catalog.SystemColumnImpl;
+import org.apache.derby.iapi.types.TypeId;
 import java.sql.Types;
 
 public class XPLAINResultSetDescriptor extends XPLAINTableDescriptor 
@@ -167,8 +167,10 @@ public class XPLAINResultSetDescriptor e
         
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("RS_ID", false),
-            SystemColumnImpl.getColumn("OP_IDENTIFIER",Types.VARCHAR,false,30),
-            SystemColumnImpl.getColumn("OP_DETAILS", Types.VARCHAR, true, 256),
+            SystemColumnImpl.getColumn("OP_IDENTIFIER", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("OP_DETAILS", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("NO_OPENS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_INDEX_UPDATES", Types.INTEGER, true),
             SystemColumnImpl.getColumn("LOCK_MODE", Types.CHAR, true, 2),

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java?rev=1034384&r1=1034383&r2=1034384&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
Fri Nov 12 13:04:23 2010
@@ -5,7 +5,7 @@ import java.sql.SQLException;
 
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.impl.sql.catalog.SystemColumnImpl;
+import org.apache.derby.iapi.types.TypeId;
 import java.sql.Types;
 
 public class XPLAINScanPropsDescriptor extends XPLAINTableDescriptor 
@@ -184,14 +184,20 @@ public class XPLAINScanPropsDescriptor e
             SystemColumnImpl.getColumn("NO_QUALIFIED_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_VISITED_DELETED_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_FETCHED_COLUMNS", Types.INTEGER, true),
-            SystemColumnImpl.getColumn("BITSET_OF_FETCHED_COLUMNS", Types.VARCHAR, true,
256),
+            SystemColumnImpl.getColumn("BITSET_OF_FETCHED_COLUMNS",
+                    Types.VARCHAR, true, TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("BTREE_HEIGHT", Types.INTEGER, true),
             SystemColumnImpl.getColumn("FETCH_SIZE", Types.INTEGER, true),
-            SystemColumnImpl.getColumn("START_POSITION", Types.VARCHAR, true, 512),
-            SystemColumnImpl.getColumn("STOP_POSITION", Types.VARCHAR, true, 512),
-            SystemColumnImpl.getColumn("SCAN_QUALIFIERS", Types.VARCHAR, true, 512),
-            SystemColumnImpl.getColumn("NEXT_QUALIFIERS", Types.VARCHAR, true, 512),
-            SystemColumnImpl.getColumn("HASH_KEY_COLUMN_NUMBERS", Types.VARCHAR, true, 512),
+            SystemColumnImpl.getColumn("START_POSITION", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("STOP_POSITION", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("SCAN_QUALIFIERS", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("NEXT_QUALIFIERS", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("HASH_KEY_COLUMN_NUMBERS",
+                    Types.VARCHAR, true, TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("HASH_TABLE_SIZE", Types.INTEGER, true),
         };
     }

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java?rev=1034384&r1=1034383&r2=1034384&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
Fri Nov 12 13:04:23 2010
@@ -5,11 +5,11 @@ import java.sql.SQLException;
 
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.impl.sql.catalog.SystemColumnImpl;
+import org.apache.derby.iapi.types.TypeId;
 import java.sql.Types;
+
 /**
  * This class describes a Tuple for the XPLAIN_SORT_PROPS System Table.
- *
  */
 public class XPLAINSortPropsDescriptor extends XPLAINTableDescriptor 
 {
@@ -114,11 +114,11 @@ public class XPLAINSortPropsDescriptor e
             SystemColumnImpl.getColumn("NO_INPUT_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_OUTPUT_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_MERGE_RUNS", Types.INTEGER, true),
-            SystemColumnImpl.getColumn("MERGE_RUN_DETAILS", Types.VARCHAR, true, 256),
+            SystemColumnImpl.getColumn("MERGE_RUN_DETAILS", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("ELIMINATE_DUPLICATES", Types.CHAR, true, 1),
             SystemColumnImpl.getColumn("IN_SORT_ORDER", Types.CHAR, true, 1),
             SystemColumnImpl.getColumn("DISTINCT_AGGREGATE", Types.CHAR, true, 1),
-
         };
     }
 

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java?rev=1034384&r1=1034383&r2=1034384&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
Fri Nov 12 13:04:23 2010
@@ -6,7 +6,6 @@ import java.sql.Timestamp;
 
 import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
-import org.apache.derby.impl.sql.catalog.SystemColumnImpl;
 import org.apache.derby.iapi.types.TypeId;
 import java.sql.Types;
 
@@ -101,15 +100,21 @@ public class XPLAINStatementDescriptor e
             SystemColumnImpl.getIdentifierColumn("STMT_NAME", true),
             SystemColumnImpl.getColumn("STMT_TYPE", Types.CHAR, false, 3),
             SystemColumnImpl.getColumn("STMT_TEXT", Types.VARCHAR, false, TypeId.VARCHAR_MAXWIDTH),
-            SystemColumnImpl.getColumn("JVM_ID", Types.CHAR, false, 30),
-            SystemColumnImpl.getColumn("OS_IDENTIFIER", Types.CHAR, false, 30),
+            SystemColumnImpl.getColumn("JVM_ID", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("OS_IDENTIFIER", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("XPLAIN_MODE", Types.CHAR, true, 1),
             SystemColumnImpl.getColumn("XPLAIN_TIME", Types.TIMESTAMP, true),
-            SystemColumnImpl.getColumn("XPLAIN_THREAD_ID", Types.CHAR, false, 32),
-            SystemColumnImpl.getColumn("TRANSACTION_ID", Types.CHAR, false, 32),
-            SystemColumnImpl.getColumn("SESSION_ID", Types.CHAR, false, 32),
+            SystemColumnImpl.getColumn("XPLAIN_THREAD_ID", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("TRANSACTION_ID", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
+            SystemColumnImpl.getColumn("SESSION_ID", Types.VARCHAR, false,
+                    TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getIdentifierColumn("DATABASE_NAME", false),
-            SystemColumnImpl.getColumn("DRDA_ID", Types.CHAR, true, 32),
+            SystemColumnImpl.getColumn("DRDA_ID", Types.VARCHAR, true,
+                    TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getUUIDColumn("TIMING_ID", true),
         };
     }



Mime
View raw message