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 ma...@apache.org on 2008/05/16 20:28:17 UTC
svn commit: r657154 - in
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile:
AlterTableNode.java sqlgrammar.jj
Author: mamta
Date: Fri May 16 11:28:17 2008
New Revision: 657154
URL: http://svn.apache.org/viewvc?rev=657154&view=rev
Log:
Cleaning for sqlgrammar.jj a little bit by removing the code to pass the parameters which never will be
set during ALTER TABLE when we are doing a non-compress operation on the table. This is for DERBY-1062
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java?rev=657154&r1=657153&r2=657154&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java Fri May 16 11:28:17 2008
@@ -160,10 +160,6 @@
* @param lockGranularity The new lock granularity, if any
* @param changeType ADD_TYPE or DROP_TYPE
* @param behavior If drop column is CASCADE or RESTRICTED
- * @param sequential Whether or not the COMPRESS is SEQUENTIAL
- * @param purge PURGE during INPLACE COMPRESS?
- * @param defragment DEFRAGMENT during INPLACE COMPRESS?
- * @param truncateEndOfTable TRUNCATE END during INPLACE COMPRESS?
*
* @exception StandardException Thrown on error
*/
@@ -173,11 +169,7 @@
Object tableElementList,
Object lockGranularity,
Object changeType,
- Object behavior,
- Object sequential,
- Object purge,
- Object defragment,
- Object truncateEndOfTable )
+ Object behavior )
throws StandardException
{
initAndCheck(objectName);
@@ -187,14 +179,6 @@
int[] ct = (int[]) changeType, bh = (int[]) behavior;
this.changeType = ct[0];
this.behavior = bh[0];
- boolean[] seq = (boolean[]) sequential;
- this.sequential = seq[0];
- boolean[] booleanPurge = (boolean[]) purge;
- this.purge = booleanPurge[0];
- boolean[] booleanDefragment = (boolean[]) defragment;
- this.defragment = booleanDefragment[0];
- boolean[] booleanTruncateEndOfTable = (boolean[]) truncateEndOfTable;
- this.truncateEndOfTable = booleanTruncateEndOfTable[0];
switch ( this.changeType )
{
case ADD_TYPE:
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=657154&r1=657153&r2=657154&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Fri May 16 11:28:17 2008
@@ -12250,10 +12250,6 @@
getContextManager());
int[] changeType = new int[1];
int[] behavior = new int[1];
- boolean[] sequential = new boolean[1];
- boolean[] purge = new boolean[1];
- boolean[] defragment = new boolean[1];
- boolean[] truncateEndOfTable = new boolean[1];
}
{
//insert special key before compress so that only internal SP can know
@@ -12267,7 +12263,7 @@
return sn;
}
|
- lockGranularity = alterTableAction( tableElementList, changeType, behavior, sequential )
+ lockGranularity = alterTableAction( tableElementList, changeType, behavior )
{
return (StatementNode) nodeFactory.getNode(
C_NodeTypes.ALTER_TABLE_NODE,
@@ -12276,10 +12272,6 @@
new Character(lockGranularity),
changeType,
behavior,
- sequential,
- purge,
- defragment,
- truncateEndOfTable,
getContextManager());
}
}
@@ -12379,7 +12371,7 @@
}
*/
char
-alterTableAction(TableElementList tableElementList, int[] changeType, int[] behavior, boolean[] sequential) throws StandardException :
+alterTableAction(TableElementList tableElementList, int[] changeType, int[] behavior) throws StandardException :
{
char lockGranularity = '\0';
TableElementNode tableElement;