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 dj...@apache.org on 2006/08/22 05:33:16 UTC
svn commit: r433487 - in /db/derby/code/trunk/java/engine/org/apache/derby:
iapi/sql/dictionary/ impl/sql/catalog/
Author: djd
Date: Mon Aug 21 20:33:15 2006
New Revision: 433487
URL: http://svn.apache.org/viewvc?rev=433487&view=rev
Log:
DERBY-1739 Do not have a set of column name for indexesin implementations of CatalogRowFactory
as they were never used and are of no need. If the column name was needed it would be better
to derive it from the column postions of the index, rather than duplicating information.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java Mon Aug 21 20:33:15 2006
@@ -33,6 +33,7 @@
import org.apache.derby.iapi.sql.execute.ExecIndexRow;
import org.apache.derby.iapi.sql.execute.ExecRow;
import org.apache.derby.iapi.sql.execute.ExecutionContext;
+import org.apache.derby.iapi.types.DataTypeDescriptor;
import org.apache.derby.iapi.types.DataValueFactory;
import org.apache.derby.iapi.types.RowLocation;
import org.apache.derby.iapi.store.raw.RawStoreFactory;
@@ -60,7 +61,6 @@
protected String[] indexNames;
protected int[][] indexColumnPositions;
- protected String[][] indexColumnNames;
protected boolean[] indexUniqueness;
protected UUID tableUUID;
@@ -140,9 +140,6 @@
*/
public UUID getCanonicalIndexUUID( int indexNumber )
{
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNumber);
-
return indexUUID[indexNumber];
}
@@ -155,9 +152,6 @@
*/
public int getIndexColumnCount(int indexNum)
{
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNum);
-
return indexColumnPositions[indexNum].length;
}
@@ -178,9 +172,6 @@
*/
public String getIndexName(int indexNum)
{
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNum);
-
return indexNames[indexNum];
}
@@ -193,9 +184,6 @@
*/
public boolean isIndexUnique(int indexNumber)
{
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNumber);
-
return (indexUniqueness != null ? indexUniqueness[indexNumber] : true);
}
@@ -233,8 +221,6 @@
* @param catalogName name of the catalog (the case might have to be converted).
* @param indexColumnPositions 2 dim array of ints specifying the base
* column positions for each index.
- * @param indexColumnNames 2 dim array of Strings specifying the name
- * of the base column for each index.
* @param indexUniqueness Uniqueness of the indices
* @param uuidStrings Array of stringified UUIDs for table and its conglomerates
*
@@ -242,7 +228,6 @@
public void initInfo(int columnCount,
String catalogName,
int[][] indexColumnPositions,
- String[][] indexColumnNames,
boolean[] indexUniqueness,
String[] uuidStrings)
@@ -267,10 +252,8 @@
indexUUID[ictr] = uf.recreateUUID(uuidStrings[ictr + 2 ]);
}
this.indexColumnPositions = indexColumnPositions;
- this.indexColumnNames = indexColumnNames;
this.indexUniqueness = indexUniqueness;
-
-
+
}
}
@@ -366,6 +349,7 @@
/** builds a column list for the catalog */
public abstract SystemColumn[] buildColumnList();
+
/**
* builds an empty row given for a given index number.
@@ -377,36 +361,6 @@
/** Return the column positions for a given index number */
public int[] getIndexColumnPositions(int indexNumber)
{
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNumber);
-
return indexColumnPositions[indexNumber];
- }
-
- /** Return the names of columns for a given index number */
- public String[] getIndexColumnNames(int indexNumber)
- {
- if (SanityManager.DEBUG)
- checkIndexNumber(indexNumber);
-
- if (!convertIdToLower)
- return indexColumnNames[indexNumber];
-
- String[] s = new String[indexColumnNames[indexNumber].length];
- for (int i = 0; i < s.length; i++)
- s[i] = StringUtil.SQLToLowerCase(indexColumnNames[indexNumber][i]);
- return s;
}
-
- protected void checkIndexNumber(int indexNumber)
- {
- if (SanityManager.DEBUG)
- {
- if (!(indexNumber < indexCount))
- {
- SanityManager.THROWASSERT("indexNumber (" +
- indexNumber + ") expected to be < " + indexCount);
- }
- }
- }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java Mon Aug 21 20:33:15 2006
@@ -38,7 +38,6 @@
class IndexInfoImpl
{
private boolean isUnique;
- private String[] columnNames;
private int[] columnPositions;
private IndexRowGenerator irg;
private int columnCount;
@@ -63,7 +62,6 @@
name = indexName;
this.columnCount = columnCount;
this.isUnique = isUnique;
- columnNames = crf.getIndexColumnNames(indexNumber);
columnPositions = crf.getIndexColumnPositions(indexNumber);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java Mon Aug 21 20:33:15 2006
@@ -109,13 +109,6 @@
{SYSALIASES_SCHEMAID, SYSALIASES_SPECIFIC_NAME},
};
- private static String[][] indexColumnNames =
- {
- {"SCHEMAID", "ALIAS", "NAMESPACE"},
- {"ALIASID"},
- {"SCHEMAID", "SPECIFICNAME"},
- };
-
private static final String[] uuids =
{
"c013800d-00d7-ddbd-08ce-000a0a411400" // catalog UUID
@@ -135,7 +128,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(SYSALIASES_COLUMN_COUNT, "SYSALIASES", indexColumnPositions, indexColumnNames, uniqueness, uuids);
+ initInfo(SYSALIASES_COLUMN_COUNT, "SYSALIASES", indexColumnPositions, uniqueness, uuids);
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -84,11 +84,6 @@
{SYSCHECKS_CONSTRAINTID}
};
- private static final String[][] indexColumnNames =
- {
- {"CONSTRAINTID"}
- };
-
private static final String[] uuids =
{
"80000056-00d0-fd77-3ed8-000a0a0b1900" // catalog UUID
@@ -109,7 +104,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(SYSCHECKS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ initInfo(SYSCHECKS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -76,12 +76,7 @@
{ COLPERMSID_COL_NUM },
{ TABLEID_COL_NUM }
};
- private static final String[][] indexColumnNames =
- {
- {"GRANTEE", "TABLEID", "TYPE", "GRANTOR"},
- {"COLPERMSID"},
- {"TABLEID"}
- };
+
private static final boolean[] indexUniqueness = { true, true, false};
private static final String[] uuids =
@@ -99,7 +94,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, indexUniqueness, uuids);
+ initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
}
public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -137,12 +137,6 @@
{SYSCOLUMNS_COLUMNDEFAULTID}
};
- private static final String[][] indexColumnNames =
- {
- {REFERENCEDID_STRING, COLUMNNAME_STRING},
- {COLUMNDEFAULTID_STRING}
- };
-
/////////////////////////////////////////////////////////////////////////////
//
// STATE
@@ -167,7 +161,7 @@
boolean convertIdToLower, String myName )
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(SYSCOLUMNS_COLUMN_COUNT, myName, indexColumnPositions, indexColumnNames, uniqueness, uuids);
+ initInfo(SYSCOLUMNS_COLUMN_COUNT, myName, indexColumnPositions, uniqueness, uuids);
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java Mon Aug 21 20:33:15 2006
@@ -92,13 +92,6 @@
{SYSCONGLOMERATES_TABLEID}
};
- private static final String[][] indexColumnNames =
- {
- {"CONGLOMERATE_ID"},
- {"CONGLOMERATE_NAME", "SCHEMAID"},
- {"TABLEID"}
- };
-
private static final String[] uuids =
{
"80000010-00d0-fd77-3ed8-000a0a0b1900" // catalog UUID
@@ -114,7 +107,7 @@
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSCONGLOMERATES_COLUMN_COUNT,
TABLENAME_STRING, indexColumnPositions,
- indexColumnNames, uniqueness, uuids );
+ uniqueness, uuids );
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -94,13 +94,6 @@
{SYSCONSTRAINTS_TABLEID}
};
- private static final String[][] indexColumnNames =
- {
- {"CONSTRAINTID"},
- {"CONSTRAINTNAME", "SCHEMAID"},
- {"TABLEID"}
- };
-
private static final String[] uuids =
{
"8000002f-00d0-fd77-3ed8-000a0a0b1900" // catalog UUID
@@ -121,7 +114,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSCONSTRAINTS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -87,12 +87,6 @@
{SYSDEPENDS_PROVIDERID}
};
- private static final String[][] indexColumnNames =
- {
- {"DEPENDENTID"},
- {"PROVIDERID"}
- };
-
private static final String[] uuids =
{
"8000003e-00d0-fd77-3ed8-000a0a0b1900" // catalog UUID
@@ -112,7 +106,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSDEPENDS_COLUMN_COUNT,TABLENAME_STRING, indexColumnPositions,
- indexColumnNames, uniqueness, uuids );
+ uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java Mon Aug 21 20:33:15 2006
@@ -79,7 +79,7 @@
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSDUMMY1_COLUMN_COUNT, TABLENAME_STRING,
- null, null, null, uuids);
+ null, null, uuids);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java Mon Aug 21 20:33:15 2006
@@ -84,12 +84,6 @@
{ID_COL_NUM}
};
- private static final String[][] indexColumnNames =
- {
- {NAME_COL_NAME, SCHEMA_ID_COL_NAME},
- {ID_COL_NAME}
- };
-
private static final boolean[] uniqueness = null;
private static final String[] uuids =
@@ -111,7 +105,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSFILES_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -87,12 +87,6 @@
{SYSFOREIGNKEYS_KEYCONSTRAINTID}
};
- private static final String[][] indexColumnNames =
- {
- {"CONSTRAINTID"},
- {"KEYCONSTRAINTID"}
- };
-
private static final boolean[] uniqueness = {
true,
false
@@ -117,7 +111,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSFOREIGNKEYS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -78,11 +78,6 @@
{SYSKEYS_CONSTRAINTID}
};
- private static String[][] indexColumnNames =
- {
- {"CONSTRAINTID"}
- };
-
private static final String[] uuids =
{
"80000039-00d0-fd77-3ed8-000a0a0b1900" // catalog UUID
@@ -100,7 +95,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(SYSKEYS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ initInfo(SYSKEYS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -67,12 +67,7 @@
{ ROUTINEPERMSID_COL_NUM },
{ ALIASID_COL_NUM }
};
- private static final String[][] indexColumnNames =
- {
- {"GRANTEE", "ALIASID", "GRANTOR"},
- {"ROUTINEPERMSID"},
- {"ALIASID"}
- };
+
private static final boolean[] indexUniqueness = { true, true, false };
private static final String[] uuids =
@@ -90,7 +85,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo( COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, indexUniqueness, uuids);
+ initInfo( COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
}
public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java Mon Aug 21 20:33:15 2006
@@ -78,12 +78,6 @@
{SYSSCHEMAS_SCHEMAID}
};
- private static final String[][] indexColumnNames =
- {
- {"SCHEMANAME"},
- {"SCHEMAID"}
- };
-
private static final boolean[] uniqueness = null;
private static final String[] uuids =
@@ -105,7 +99,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSSCHEMAS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -99,12 +99,6 @@
{SYSSTATEMENTS_STMTNAME, SYSSTATEMENTS_SCHEMAID}
};
- private static final String[][] indexColumnNames =
- {
- {"STATEMENTID"},
- {"STMTNAME", "SCHEMAID"}
- };
-
private static final boolean[] uniqueness = null;
private static final String[] uuids =
@@ -126,7 +120,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSSTATEMENTS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids);
+ indexColumnPositions, uniqueness, uuids);
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -102,11 +102,6 @@
{SYSSTATISTICS_TABLEID, SYSSTATISTICS_REFERENCEID}
};
- private static final String[][] indexColumnNames =
- {
- {"TABLEID", "REFERENCEID"}
- };
-
private static final String[] uuids =
{
"f81e0010-00e3-6612-5a96-009e3a3b5e00", // catalog UUID
@@ -129,7 +124,7 @@
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSSTATISTICS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids);
+ indexColumnPositions, uniqueness, uuids);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -71,12 +71,7 @@
{ TABLEPERMSID_COL_NUM },
{ TABLEID_COL_NUM }
};
- private static final String[][] indexColumnNames =
- {
- {"GRANTEE", "TABLEID", "GRANTOR"},
- {"TABLEPERMSID"},
- {"TABLEID"}
- };
+
private static final boolean[] indexUniqueness = { true, true, false};
private static final String[] uuids =
@@ -94,7 +89,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, indexUniqueness, uuids);
+ initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
}
public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java Mon Aug 21 20:33:15 2006
@@ -90,12 +90,6 @@
{ SYSTABLES_TABLEID }
};
- private static final String[][] indexColumnNames =
- {
- {"TABLENAME", "SCHEMAID"},
- {"TABLEID"}
- };
-
/////////////////////////////////////////////////////////////////////////////
//
// CONSTRUCTORS
@@ -106,7 +100,7 @@
boolean convertIdToLower)
{
super(uuidf,ef,dvf,convertIdToLower);
- initInfo(SYSTABLES_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexColumnNames, (boolean[]) null, uuids);
+ initInfo(SYSTABLES_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, (boolean[]) null, uuids);
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -97,13 +97,6 @@
{SYSTRIGGERS_TABLEID, SYSTRIGGERS_CREATIONTIMESTAMP}
};
- private static final String[][] indexColumnNames =
- {
- {"TRIGGERID"},
- {"TRIGGERNAME", "SCHEMAID"},
- {"CREATIONTIMESTAMP"}
- };
-
private static final boolean[] uniqueness = {
true,
true,
@@ -129,7 +122,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSTRIGGERS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids);
+ indexColumnPositions, uniqueness, uuids);
}
/////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?rev=433487&r1=433486&r2=433487&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Mon Aug 21 20:33:15 2006
@@ -79,10 +79,6 @@
{SYSVIEWS_TABLEID}
};
- private static final String[][] indexColumnNames =
- {
- {"TABLEID"}
- };
// if you add a non-unique index allocate this array.
private static final boolean[] uniqueness = null;
@@ -105,7 +101,7 @@
{
super(uuidf,ef,dvf,convertIdToLower);
initInfo(SYSVIEWS_COLUMN_COUNT, TABLENAME_STRING,
- indexColumnPositions, indexColumnNames, uniqueness, uuids );
+ indexColumnPositions, uniqueness, uuids );
}
/////////////////////////////////////////////////////////////////////////////