Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 21507 invoked from network); 1 Dec 2006 22:07:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Dec 2006 22:07:12 -0000 Received: (qmail 99833 invoked by uid 500); 1 Dec 2006 22:07:20 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 99805 invoked by uid 500); 1 Dec 2006 22:07:20 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 99794 invoked by uid 99); 1 Dec 2006 22:07:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 14:07:20 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 14:07:10 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 16FB11A9846; Fri, 1 Dec 2006 14:06:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r481423 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ Date: Fri, 01 Dec 2006 22:06:30 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061201220631.16FB11A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Fri Dec 1 14:06:29 2006 New Revision: 481423 URL: http://svn.apache.org/viewvc?view=rev&rev=481423 Log: organize imports (using eclipse) in a number of query nodes, cleans up several unrequired imports of DataDictionayContext. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java Fri Dec 1 14:06:29 2006 @@ -21,41 +21,22 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; +import java.lang.reflect.Modifier; +import org.apache.derby.catalog.types.RoutineAliasInfo; import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; - -import org.apache.derby.iapi.sql.ResultSet; -import org.apache.derby.iapi.sql.Activation; +import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.classfile.VMOpcode; +import org.apache.derby.iapi.services.compiler.MethodBuilder; +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.ResultDescription; - +import org.apache.derby.iapi.sql.compile.C_NodeTypes; import org.apache.derby.iapi.sql.compile.CompilerContext; import org.apache.derby.iapi.sql.compile.Visitable; import org.apache.derby.iapi.sql.compile.Visitor; -import org.apache.derby.iapi.sql.compile.C_NodeTypes; - -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; import org.apache.derby.iapi.sql.conn.Authorizer; - -import org.apache.derby.iapi.services.loader.GeneratedMethod; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.compiler.MethodBuilder; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.iapi.reference.ClassName; -import org.apache.derby.iapi.services.classfile.VMOpcode; - -import org.apache.derby.catalog.types.RoutineAliasInfo; -import org.apache.derby.iapi.reference.SQLState; - -import java.lang.reflect.Modifier; - -import java.util.Vector; +import org.apache.derby.iapi.sql.dictionary.DataDictionary; /** * An CallStatementNode represents a CALL statement. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java Fri Dec 1 14:06:29 2006 @@ -21,41 +21,24 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - -import org.apache.derby.iapi.sql.ResultSet; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.Limits; +import org.apache.derby.iapi.reference.Property; +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.property.PropertyUtil; +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.compile.CompilerContext; - import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.DataDictionary; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; -import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; - -import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.Limits; -import org.apache.derby.iapi.reference.Property; - import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.monitor.Monitor; -import org.apache.derby.iapi.services.property.PropertyUtil; -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.execute.BaseActivation; -import org.apache.derby.impl.sql.execute.ColumnInfo; import org.apache.derby.iapi.types.DataTypeDescriptor; -import org.apache.derby.catalog.UUID; - -import java.util.Hashtable; -import java.util.Properties; -import java.util.Vector; /** * A CreateIndexNode is the root of a QueryTree that represents a CREATE INDEX Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java Fri Dec 1 14:06:29 2006 @@ -21,29 +21,11 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - - -import org.apache.derby.iapi.sql.ResultSet; -import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; -import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; - -import org.apache.derby.iapi.sql.compile.CompilerContext; -import org.apache.derby.iapi.sql.conn.Authorizer; - import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.execute.BaseActivation; - -import java.util.Properties; +import org.apache.derby.iapi.sql.compile.CompilerContext; +import org.apache.derby.iapi.sql.conn.Authorizer; +import org.apache.derby.iapi.sql.execute.ConstantAction; /** * A CreateSchemaNode is the root of a QueryTree that Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java Fri Dec 1 14:06:29 2006 @@ -21,44 +21,26 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; -import org.apache.derby.iapi.services.monitor.Monitor; -import org.apache.derby.iapi.services.sanity.SanityManager; +import java.sql.Timestamp; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import org.apache.derby.catalog.UUID; import org.apache.derby.iapi.error.StandardException; - +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.compile.CompilerContext; -import org.apache.derby.iapi.sql.compile.Parser; - +import org.apache.derby.iapi.sql.conn.Authorizer; +import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.DataDictionary; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; -import org.apache.derby.iapi.sql.dictionary.SPSDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; import org.apache.derby.iapi.sql.dictionary.TriggerDescriptor; - -import org.apache.derby.iapi.sql.conn.Authorizer; -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; - -import org.apache.derby.iapi.sql.depend.Dependent; - -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.sql.ResultSet; - import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.types.TypeId; - -import org.apache.derby.catalog.UUID; -import java.sql.Timestamp; -import java.sql.Types; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; /** * A CreateTriggerNode is the root of a QueryTree Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java Fri Dec 1 14:06:29 2006 @@ -21,34 +21,19 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - -import org.apache.derby.iapi.sql.compile.C_NodeTypes; - -import org.apache.derby.iapi.sql.conn.Authorizer; -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; +import java.util.ArrayList; +import java.util.Vector; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.reference.SQLState; - +import org.apache.derby.iapi.services.compiler.MethodBuilder; +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.ResultColumnDescriptor; - +import org.apache.derby.iapi.sql.compile.C_NodeTypes; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; -import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.compiler.MethodBuilder; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; - import org.apache.derby.impl.sql.CursorInfo; import org.apache.derby.impl.sql.CursorTableReference; - -import java.util.ArrayList; -import java.util.Vector; /** * A CursorNode represents a result set that can be returned to a client. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java Fri Dec 1 14:06:29 2006 @@ -21,69 +21,42 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.loader.GeneratedMethod; - -import org.apache.derby.iapi.services.context.ContextManager; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; -import org.apache.derby.iapi.services.compiler.JavaFactory; +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.classfile.VMOpcode; import org.apache.derby.iapi.services.compiler.MethodBuilder; - +import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.sql.depend.Dependent; - -import org.apache.derby.iapi.sql.compile.CompilerContext; -import org.apache.derby.iapi.sql.compile.Parser; -import org.apache.derby.iapi.sql.compile.CostEstimate; -import org.apache.derby.iapi.sql.compile.OptimizerFactory; +import org.apache.derby.iapi.sql.StatementType; import org.apache.derby.iapi.sql.compile.C_NodeTypes; +import org.apache.derby.iapi.sql.compile.CompilerContext; import org.apache.derby.iapi.sql.compile.NodeFactory; - +import org.apache.derby.iapi.sql.compile.Parser; import org.apache.derby.iapi.sql.conn.Authorizer; - -import org.apache.derby.iapi.reference.ClassName; -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; - -import org.apache.derby.iapi.sql.dictionary.CheckConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.IndexRowGenerator; -import org.apache.derby.iapi.sql.dictionary.ForeignKeyConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.GenericDescriptorList; -import org.apache.derby.iapi.sql.dictionary.ReferencedKeyConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.KeyConstraintDescriptor; +import org.apache.derby.iapi.sql.depend.Dependent; +import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; +import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList; +import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptorList; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; +import org.apache.derby.iapi.sql.dictionary.ForeignKeyConstraintDescriptor; +import org.apache.derby.iapi.sql.dictionary.GenericDescriptorList; +import org.apache.derby.iapi.sql.dictionary.IndexRowGenerator; +import org.apache.derby.iapi.sql.dictionary.ReferencedKeyConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; import org.apache.derby.iapi.sql.dictionary.TriggerDescriptor; -import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; -import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList; - -import org.apache.derby.iapi.sql.StatementType; - import org.apache.derby.iapi.store.access.TransactionController; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.compile.ExpressionClassBuilder; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.impl.sql.execute.FKInfo; +import org.apache.derby.impl.sql.execute.FKInfo; import org.apache.derby.impl.sql.execute.TriggerInfo; - -import org.apache.derby.iapi.types.RowLocation; - -import org.apache.derby.catalog.UUID; -import java.util.Properties; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Hashtable; -import org.apache.derby.iapi.services.io.FormatableBitSet; -import org.apache.derby.iapi.services.classfile.VMOpcode; /** * A DMLStatement for a table modification: to wit, INSERT Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java Fri Dec 1 14:06:29 2006 @@ -21,40 +21,19 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; +import java.util.Vector; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.sql.compile.CompilerContext; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.sql.ResultColumnDescriptor; +import org.apache.derby.iapi.sql.ResultDescription; +import org.apache.derby.iapi.sql.compile.C_NodeTypes; import org.apache.derby.iapi.sql.compile.Visitable; import org.apache.derby.iapi.sql.compile.Visitor; -import org.apache.derby.iapi.sql.compile.C_NodeTypes; - -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; import org.apache.derby.iapi.sql.conn.Authorizer; -import org.apache.derby.iapi.sql.execute.ExecutionContext; -import org.apache.derby.iapi.sql.ResultColumnDescriptor; -import org.apache.derby.iapi.sql.ParameterValueSet; -import org.apache.derby.iapi.sql.ResultDescription; - -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.TableDescriptor; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; -import org.apache.derby.iapi.sql.dictionary.IndexRowGenerator; - -import org.apache.derby.iapi.services.monitor.Monitor; - -import org.apache.derby.iapi.services.compiler.MethodBuilder; - -import org.apache.derby.iapi.services.sanity.SanityManager; - +import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.util.JBitSet; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; - -import java.util.Enumeration; -import java.util.Properties; -import java.util.Vector; /** * A DMLStatementNode represents any type of DML statement: a cursor declaration, Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java Fri Dec 1 14:06:29 2006 @@ -21,24 +21,15 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.sql.compile.CompilerContext; - import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; - -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; - -import org.apache.derby.iapi.error.StandardException; /** * A DropIndexNode is the root of a QueryTree that represents a DROP INDEX Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java Fri Dec 1 14:06:29 2006 @@ -21,28 +21,12 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.execute.BaseActivation; -import org.apache.derby.iapi.sql.ResultSet; - import org.apache.derby.iapi.error.StandardException; - +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.compile.CompilerContext; -import org.apache.derby.iapi.sql.StatementType; - import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; -import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; - -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.services.sanity.SanityManager; /** * A DropTableNode is the root of a QueryTree that represents a DROP TABLE Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Fri Dec 1 14:06:29 2006 @@ -21,56 +21,32 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - -import org.apache.derby.iapi.store.access.ColumnOrdering; +import java.util.Vector; +import org.apache.derby.catalog.IndexDescriptor; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.services.classfile.VMOpcode; +import org.apache.derby.iapi.services.compiler.MethodBuilder; +import org.apache.derby.iapi.services.io.FormatableArrayHolder; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.sql.LanguageFactory; +import org.apache.derby.iapi.sql.ResultColumnDescriptor; import org.apache.derby.iapi.sql.compile.AccessPath; +import org.apache.derby.iapi.sql.compile.C_NodeTypes; +import org.apache.derby.iapi.sql.compile.CostEstimate; import org.apache.derby.iapi.sql.compile.Optimizable; -import org.apache.derby.iapi.sql.compile.OptimizableList; import org.apache.derby.iapi.sql.compile.OptimizablePredicate; import org.apache.derby.iapi.sql.compile.OptimizablePredicateList; import org.apache.derby.iapi.sql.compile.Optimizer; -import org.apache.derby.iapi.sql.compile.CostEstimate; -import org.apache.derby.iapi.sql.compile.Visitable; -import org.apache.derby.iapi.sql.compile.Visitor; import org.apache.derby.iapi.sql.compile.RequiredRowOrdering; import org.apache.derby.iapi.sql.compile.RowOrdering; -import org.apache.derby.iapi.sql.compile.C_NodeTypes; - -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; -import org.apache.derby.iapi.reference.ClassName; - -import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; -import org.apache.derby.catalog.IndexDescriptor; - +import org.apache.derby.iapi.sql.dictionary.DataDictionary; import org.apache.derby.iapi.sql.execute.ExecutionContext; - -import org.apache.derby.iapi.sql.Activation; -import org.apache.derby.iapi.sql.LanguageFactory; -import org.apache.derby.iapi.sql.ResultColumnDescriptor; -import org.apache.derby.iapi.sql.ResultSet; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; +import org.apache.derby.iapi.store.access.ColumnOrdering; import org.apache.derby.impl.sql.execute.AggregatorInfo; import org.apache.derby.impl.sql.execute.AggregatorInfoList; - -import org.apache.derby.iapi.services.compiler.MethodBuilder; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.io.FormatableArrayHolder; -import org.apache.derby.iapi.util.JBitSet; - -import org.apache.derby.impl.sql.compile.MaxMinAggregateDefinition; -import org.apache.derby.iapi.services.classfile.VMOpcode; - -import java.util.Vector; -import java.util.Properties; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java Fri Dec 1 14:06:29 2006 @@ -21,34 +21,16 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; - -import org.apache.derby.iapi.services.compiler.MethodBuilder; - -import org.apache.derby.iapi.services.sanity.SanityManager; - import org.apache.derby.iapi.error.StandardException; - +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.compile.CompilerContext; - import org.apache.derby.iapi.sql.conn.Authorizer; - import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; - -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.sql.execute.ConstantAction; - -import org.apache.derby.iapi.sql.Activation; -import org.apache.derby.iapi.sql.ResultSet; -import org.apache.derby.iapi.reference.ClassName; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.iapi.services.classfile.VMOpcode; /** * A LockTableNode is the root of a QueryTree that represents a LOCK TABLE command: Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java Fri Dec 1 14:06:29 2006 @@ -21,53 +21,41 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.sql.execute.ExecutionFactory; -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.compile.ExpressionClassBuilder; -import org.apache.derby.impl.sql.execute.GenericConstantActionFactory; -import org.apache.derby.impl.sql.execute.GenericExecutionFactory; -import org.apache.derby.iapi.util.ByteArray; +import java.sql.Types; + +import org.apache.derby.catalog.AliasInfo; +import org.apache.derby.catalog.types.SynonymAliasInfo; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.classfile.VMOpcode; +import org.apache.derby.iapi.services.compiler.MethodBuilder; +import org.apache.derby.iapi.services.context.ContextManager; +import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.loader.ClassFactory; import org.apache.derby.iapi.services.loader.ClassInspector; -import org.apache.derby.iapi.services.loader.GeneratedClass; -import org.apache.derby.iapi.services.context.ContextManager; -import org.apache.derby.iapi.services.compiler.MethodBuilder; -import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.StoredFormatIds; -import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.sql.StatementType; +import org.apache.derby.iapi.sql.compile.C_NodeTypes; import org.apache.derby.iapi.sql.compile.CompilerContext; import org.apache.derby.iapi.sql.compile.NodeFactory; import org.apache.derby.iapi.sql.compile.Parser; +import org.apache.derby.iapi.sql.compile.TypeCompiler; import org.apache.derby.iapi.sql.compile.Visitable; import org.apache.derby.iapi.sql.compile.Visitor; -import org.apache.derby.iapi.sql.compile.C_NodeTypes; -import org.apache.derby.iapi.sql.compile.NodeFactory; import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; -import org.apache.derby.iapi.sql.conn.LanguageConnectionFactory; +import org.apache.derby.iapi.sql.depend.DependencyManager; +import org.apache.derby.iapi.sql.dictionary.AliasDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; -import org.apache.derby.iapi.sql.dictionary.AliasDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; -import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.sql.execute.ConstantAction; +import org.apache.derby.iapi.sql.execute.ExecutionFactory; import org.apache.derby.iapi.types.DataTypeDescriptor; -import org.apache.derby.iapi.types.TypeId; import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.sql.compile.TypeCompiler; -import org.apache.derby.iapi.sql.ResultDescription; -import org.apache.derby.iapi.sql.StatementType; -import org.apache.derby.iapi.sql.Activation; -import org.apache.derby.iapi.services.classfile.VMOpcode; -import org.apache.derby.iapi.sql.depend.DependencyManager; -import org.apache.derby.iapi.sql.dictionary.AliasDescriptor; -import org.apache.derby.catalog.AliasInfo; -import org.apache.derby.catalog.types.SynonymAliasInfo; -import java.util.Properties; -import java.util.Vector; -import java.sql.Types; -import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.types.TypeId; +import org.apache.derby.impl.sql.execute.GenericConstantActionFactory; +import org.apache.derby.impl.sql.execute.GenericExecutionFactory; /** * QueryTreeNode is the root class for all query tree nodes. All Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?view=diff&rev=481423&r1=481422&r2=481423 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java Fri Dec 1 14:06:29 2006 @@ -21,80 +21,43 @@ package org.apache.derby.impl.sql.compile; -import org.apache.derby.iapi.services.context.ContextManager; -import org.apache.derby.iapi.services.compiler.MethodBuilder; -import org.apache.derby.iapi.services.compiler.LocalField; - -import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.monitor.Monitor; -import org.apache.derby.iapi.services.loader.ClassFactory; -import org.apache.derby.iapi.services.io.Storable; -import org.apache.derby.iapi.services.context.ContextManager; +import java.lang.reflect.Modifier; +import java.sql.ResultSetMetaData; +import java.sql.Types; +import java.util.Hashtable; +import java.util.Vector; +import org.apache.derby.catalog.types.DefaultInfoImpl; import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.sql.compile.NodeFactory; -import org.apache.derby.iapi.sql.compile.CompilerContext; +import org.apache.derby.iapi.reference.ClassName; +import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.services.classfile.VMOpcode; +import org.apache.derby.iapi.services.compiler.LocalField; +import org.apache.derby.iapi.services.compiler.MethodBuilder; +import org.apache.derby.iapi.services.context.ContextManager; +import org.apache.derby.iapi.services.io.FormatableBitSet; +import org.apache.derby.iapi.services.loader.ClassFactory; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.sql.ResultColumnDescriptor; import org.apache.derby.iapi.sql.compile.C_NodeTypes; - -import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; - +import org.apache.derby.iapi.sql.compile.NodeFactory; import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor; import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList; +import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.DefaultDescriptor; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; - -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.services.classfile.VMOpcode; -import org.apache.derby.iapi.util.JBitSet; - -import org.apache.derby.iapi.reference.SQLState; - -import org.apache.derby.iapi.reference.SQLState; - -import org.apache.derby.iapi.sql.Activation; - -import org.apache.derby.iapi.sql.ResultColumnDescriptor; -import org.apache.derby.iapi.sql.Row; -import org.apache.derby.iapi.types.TypeId; - import org.apache.derby.iapi.sql.execute.ExecRow; -import org.apache.derby.iapi.sql.execute.ExecIndexRow; -import org.apache.derby.iapi.sql.execute.ExecutionFactory; import org.apache.derby.iapi.sql.execute.ExecutionContext; - -import org.apache.derby.iapi.types.DataTypeDescriptor; -import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.types.RowLocation; - import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.StoreCostController; import org.apache.derby.iapi.store.access.TransactionController; - -import org.apache.derby.iapi.services.loader.GeneratedMethod; - -import org.apache.derby.impl.sql.compile.ActivationClassBuilder; -import org.apache.derby.impl.sql.compile.ExpressionClassBuilder; - -import org.apache.derby.iapi.services.io.FormatableBitSet; -import org.apache.derby.iapi.reference.ClassName; - -import org.apache.derby.catalog.types.DefaultInfoImpl; - -import java.lang.reflect.Modifier; - +import org.apache.derby.iapi.types.DataTypeDescriptor; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.RowLocation; +import org.apache.derby.iapi.types.TypeId; +import org.apache.derby.iapi.util.JBitSet; import org.apache.derby.iapi.util.ReuseFactory; -import org.apache.derby.iapi.services.classfile.VMOpcode; - -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Types; - -import java.util.Hashtable; -import java.util.Vector; /** * A ResultColumnList is the target list of a SELECT, INSERT, or UPDATE.