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 15:50:54 UTC
svn commit: r433632 - in /db/derby/code/trunk/java/engine/org/apache/derby:
iapi/sql/dictionary/ impl/sql/catalog/
Author: djd
Date: Tue Aug 22 06:50:53 2006
New Revision: 433632
URL: http://svn.apache.org/viewvc?rev=433632&view=rev
Log:
DERBY-1674 Remove some unused methods related to TabInfo classes.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.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/TabInfoImpl.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=433632&r1=433631&r2=433632&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Tue Aug 22 06:50:53 2006
@@ -273,21 +273,6 @@
public boolean usesSqlAuthorization();
/**
- * Get the tabinfo of a system catalog. Paw through the tabinfo arrays looking for the tabinfo
- * corresponding to this table name.
- *
- * RESOLVE: This does not bother to fault in the TabInfo. It assumes it already
- * has been faulted in. This seems odd.
- *
- * @param tableName name of table to get the TabInfo for.
- *
- * @return tabinfo corresponding to tablename
- *
- * @exception StandardException Thrown on error
- */
- public TabInfo getTabInfo( String tableName ) throws StandardException;
-
- /**
* Get the descriptor for the named schema.
Schema descriptors include authorization ids and schema ids.
* SQL92 allows a schema to specify a default character set - we will
@@ -1361,16 +1346,6 @@
public void dropAliasDescriptor(AliasDescriptor ad,
TransactionController tc)
throws StandardException;
-
- /**
- * Get core catalog info.
- *
- * @param coreNum The index into coreInfo[].
- *
- * @exception StandardException Thrown on error
- */
- public TabInfo getCoreCatalog(int coreNum)
- throws StandardException;
public int getEngineType();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java?rev=433632&r1=433631&r2=433632&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java Tue Aug 22 06:50:53 2006
@@ -102,14 +102,6 @@
*/
public String getIndexName(int indexID);
- /**
- * Set the index name for the specified indexID
- *
- * @param indexID Index number for index for table
- * @param indexName The name for that index ID
- */
- public void setIndexName(int indexID, String indexName);
-
/**
* Get the CatalogRowFactory for this TabInfo.
*
@@ -169,19 +161,6 @@
* @return int The base column position for the column.
*/
public int getBaseColumnPosition(int indexNumber, int colNumber);
-
- /**
- * Set the base column position for a column within a catalog
- * given the (0-based) index number for this catalog and the
- * (0-based) column number for the column within the index.
- *
- * @param indexNumber The index number
- * @param colNumber The column number within the index
- * @param baseColumnPosition The base column position for the column.
- *
- */
- public void setBaseColumnPosition(int indexNumber, int colNumber,
- int baseColumnPosition);
/**
* Return whether or not this index is declared unique
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=433632&r1=433631&r2=433632&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Tue Aug 22 06:50:53 2006
@@ -7333,42 +7333,6 @@
noncoreInfo = new TabInfo[NUM_NONCORE];
}
- /**
- * Get the tabinfo of a system catalog. Paw through the tabinfo arrays looking for the tabinfo
- * corresponding to this table name.
- *
- * RESOLVE: This does not bother to fault in the TabInfo. It assumes it already
- * has been faulted in. This seems odd.
- *
- * @param tableName name of table to get the TabInfo for.
- *
- * @return tabinfo corresponding to tablename
- *
- * @exception StandardException Thrown on error
- */
- public TabInfo getTabInfo( String tableName ) throws StandardException
- {
- TabInfo tabinfo;
-
- for ( int ictr = 0; ictr < coreInfo.length; ictr++ )
- {
- tabinfo = coreInfo[ ictr ];
- if ( tabinfo.getTableName().equals( tableName ) ) { return tabinfo; }
- }
-
- // Non-core tables are not pre-loaded. Translate the name
- // to a number and look it up that way.
- for (int ictr = 0; ictr < nonCoreNames.length; ictr++)
- {
- if (nonCoreNames[ictr].equals(tableName))
- {
- return getNonCoreTI(ictr);
- }
- }
-
- return null;
- }
-
/**
* Get the TransactionController to use, when not
* passed in as a parameter. (This hides logic about
@@ -7868,19 +7832,6 @@
private void clearNoncoreTable(int nonCoreNum)
{
noncoreInfo[nonCoreNum] = null;
- }
-
- /**
- * Get core catalog info.
- *
- * @param coreNum The index into coreInfo[].
- *
- * @exception StandardException Thrown on error
- */
- public TabInfo getCoreCatalog(int coreNum)
- throws StandardException
- {
- return coreInfo[coreNum];
}
/**
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=433632&r1=433631&r2=433632&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 Tue Aug 22 06:50:53 2006
@@ -96,16 +96,6 @@
}
/**
- * Set the name for the index.
- *
- * @param indexName The name for the index.
- */
- void setIndexName(String indexName)
- {
- name = indexName;
- }
-
- /**
* Get the column count for the index.
*
* @return int The column count for the index.
@@ -146,19 +136,6 @@
int getBaseColumnPosition(int colNumber)
{
return columnPositions[colNumber];
- }
-
- /**
- * Set the base column position for a column within a catalog
- * given the (0-based) column number for the column within the index.
- *
- * @param colNumber The column number within the index
- * @param baseColumnPosition The base column position for the column.
- */
- void setBaseColumnPosition(int colNumber,
- int baseColumnPosition)
- {
- columnPositions[colNumber] = baseColumnPosition;
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java?rev=433632&r1=433631&r2=433632&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java Tue Aug 22 06:50:53 2006
@@ -226,24 +226,6 @@
}
/**
- * @see TabInfo#setIndexName
- */
- public void setIndexName(int indexID, String indexName)
- {
- if (SanityManager.DEBUG)
- {
- SanityManager.ASSERT(indexes != null,
- "indexes is expected to be non-null");
-
- if (indexID >= indexes.length)
- SanityManager.THROWASSERT(
- "indexID (" + indexID + ") is out of range(0-" +
- indexes.length + ")");
- }
- indexes[indexID].setIndexName(indexName);
- }
-
- /**
* @see TabInfo#getCatalogRowFactory
*/
public CatalogRowFactory getCatalogRowFactory()
@@ -357,26 +339,6 @@
}
return indexes[indexNumber].getBaseColumnPosition(colNumber);
- }
-
- /**
- * @see TabInfo#setBaseColumnPosition
- */
- public void setBaseColumnPosition(int indexNumber, int colNumber,
- int baseColumnPosition)
- {
- if (SanityManager.DEBUG)
- {
- SanityManager.ASSERT(indexes != null,
- "indexes is expected to be non-null");
- if (indexNumber >= indexes.length)
- {
- SanityManager.THROWASSERT("indexNumber (" + indexNumber + ") is out of range(0-" +
- indexes.length + ")");
- }
- }
-
- indexes[indexNumber].setBaseColumnPosition(colNumber, baseColumnPosition);
}
/**