Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 28547 invoked from network); 7 Sep 2006 21:32:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Sep 2006 21:32:21 -0000 Received: (qmail 32457 invoked by uid 500); 7 Sep 2006 21:32:21 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 32393 invoked by uid 500); 7 Sep 2006 21:32: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 32382 invoked by uid 99); 7 Sep 2006 21:32:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 14:32:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 14:32:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AF35A1A981A; Thu, 7 Sep 2006 14:31:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r441232 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ Date: Thu, 07 Sep 2006 21:31:56 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060907213157.AF35A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djd Date: Thu Sep 7 14:31:54 2006 New Revision: 441232 URL: http://svn.apache.org/viewvc?view=rev&rev=441232 Log: DERBY-1700 Patch the removes closeCleanup from ResultSet implementations: - remove any field storing the reference to a close cleanup method - remove any calling of the method - remove passing the reference to the method in the constructor. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java Thu Sep 7 14:31:54 2006 @@ -210,7 +210,6 @@ // block, to ensure that it is executed? clearCurrentRow(); - currentRow = null; source.close(); super.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java Thu Sep 7 14:31:54 2006 @@ -1473,8 +1473,7 @@ true, rsNum, 0, - 0, - null); + 0); } RowResultSet[] rrs = new RowResultSet[numRows]; UnionResultSet[] urs = new UnionResultSet[numRows - 1]; @@ -1487,8 +1486,7 @@ true, rsNum, 1, - 0, - null); + 0); if (i > 0) { urs[i - 1] = new UnionResultSet ( @@ -1497,8 +1495,7 @@ this, rsNum, i + 1, - 0, - null); + 0); } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java Thu Sep 7 14:31:54 2006 @@ -67,7 +67,7 @@ * * @author jamie */ -public class BulkTableScanResultSet extends TableScanResultSet +class BulkTableScanResultSet extends TableScanResultSet implements CursorResultSet { private DataValueDescriptor[][] rowArray; @@ -84,7 +84,7 @@ * * @exception StandardException thrown on failure to open */ - public BulkTableScanResultSet(long conglomId, + BulkTableScanResultSet(long conglomId, StaticCompiledOpenConglomInfo scoci, Activation activation, GeneratedMethod resultRowAllocator, int resultSetNumber, @@ -105,8 +105,7 @@ int rowsPerRead, boolean oneRowScan, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(conglomId, @@ -133,8 +132,7 @@ rowsPerRead, oneRowScan, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); if (SanityManager.DEBUG) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java Thu Sep 7 14:31:54 2006 @@ -229,7 +229,6 @@ // block, to ensure that it is executed? clearCurrentRow(); next = false; - currentRow = null; super.close(); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java Thu Sep 7 14:31:54 2006 @@ -58,7 +58,7 @@ * rows that needs to be deleted on dependent tables. Using the row location * we got from the index , base row is fetched. */ -public class DependentResultSet extends NoPutResultSetImpl implements CursorResultSet +class DependentResultSet extends NoPutResultSetImpl implements CursorResultSet { @@ -103,7 +103,6 @@ protected GeneratedMethod stopKeyGetter; protected int stopSearchOperator; protected Qualifier[][] qualifiers; - protected GeneratedMethod closeCleanup; public String tableName; public String userSuppliedOptimizerOverrides; public String indexName; @@ -112,7 +111,6 @@ public int rowsPerRead; public boolean forUpdate; private boolean sameStartStopPosition; - private boolean nextDone; public int isolationLevel; public int lockMode; @@ -125,12 +123,11 @@ public boolean coarserLock; public boolean oneRowScan; protected long rowsThisScan; - private long estimatedRowCount; // // class interface // - public DependentResultSet( + DependentResultSet( long conglomId, StaticCompiledOpenConglomInfo scoci, Activation activation, @@ -153,7 +150,6 @@ boolean oneRowScan, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - GeneratedMethod closeCleanup, String parentResultSetId, long fkIndexConglomId, int fkColArrayItem, @@ -227,8 +223,6 @@ //internally for delete cascades, isolation should be set to //REPEATABLE READ irrespective what the user level isolation level is. this.isolationLevel = TransactionController.ISOLATION_REPEATABLE_READ; - - this.closeCleanup = closeCleanup; runTimeStatisticsOn = (activation != null && activation.getLanguageConnectionContext().getRunTimeStatisticsMode()); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java Thu Sep 7 14:31:54 2006 @@ -66,7 +66,7 @@ * * @author jerry (broken out from SortResultSet) */ -public class DistinctGroupedAggregateResultSet extends GroupedAggregateResultSet +class DistinctGroupedAggregateResultSet extends GroupedAggregateResultSet { /** @@ -88,7 +88,7 @@ * * @exception StandardException Thrown on error */ - public DistinctGroupedAggregateResultSet(NoPutResultSet s, + DistinctGroupedAggregateResultSet(NoPutResultSet s, boolean isInSortedOrder, int aggregateItem, int orderingItem, @@ -97,11 +97,10 @@ int maxRowSize, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { super(s, isInSortedOrder, aggregateItem, orderingItem, - a, ra, maxRowSize, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost, c); + a, ra, maxRowSize, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java Thu Sep 7 14:31:54 2006 @@ -54,7 +54,7 @@ * * @author jerry (broken out from SortResultSet) */ -public class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet +class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet { private ColumnOrdering[] order; private int maxRowSize; @@ -84,7 +84,7 @@ * * @exception StandardException Thrown on error */ - public DistinctScalarAggregateResultSet(NoPutResultSet s, + DistinctScalarAggregateResultSet(NoPutResultSet s, boolean isInSortedOrder, int aggregateItem, int orderingItem, @@ -94,14 +94,13 @@ int resultSetNumber, boolean singleInputRow, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { super(s, isInSortedOrder, aggregateItem, a, ra, resultSetNumber, singleInputRow, optimizerEstimatedRowCount, - optimizerEstimatedCost, c); + optimizerEstimatedCost); order = (ColumnOrdering[]) ((FormatableArrayHolder) Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java Thu Sep 7 14:31:54 2006 @@ -68,7 +68,7 @@ * * @author jerry */ -public class DistinctScanResultSet extends HashScanResultSet +class DistinctScanResultSet extends HashScanResultSet { Enumeration element = null; @@ -77,7 +77,7 @@ // // class interface // - public DistinctScanResultSet(long conglomId, + DistinctScanResultSet(long conglomId, StaticCompiledOpenConglomInfo scoci, Activation activation, GeneratedMethod resultRowAllocator, int resultSetNumber, @@ -91,8 +91,7 @@ boolean tableLocked, int isolationLevel, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(conglomId, scoci, activation, resultRowAllocator, resultSetNumber, @@ -108,7 +107,7 @@ false, // forUpdate colRefItem, lockMode, tableLocked, isolationLevel, false, - optimizerEstimatedRowCount, optimizerEstimatedCost, closeCleanup); + optimizerEstimatedRowCount, optimizerEstimatedCost); // Tell super class to eliminate duplicates eliminateDuplicates = true; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java Thu Sep 7 14:31:54 2006 @@ -75,7 +75,6 @@ protected GeneratedMethod rowAllocator; protected AggregatorInfoList aggInfoList; public NoPutResultSet source; - protected GeneratedMethod closeCleanup; protected NoPutResultSet originalSource; // used for run time stats only /** @@ -97,15 +96,13 @@ GeneratedMethod ra, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c + double optimizerEstimatedCost ) throws StandardException { super(a, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); source = s; originalSource = s; - closeCleanup = c; rowAllocator = ra; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java Thu Sep 7 14:31:54 2006 @@ -243,8 +243,7 @@ reuseResult, doesProjection, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -279,8 +278,7 @@ loadFactor, true, // Skip rows with 1 or more null key columns optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -308,8 +306,7 @@ maxRowSize, resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -333,7 +330,7 @@ source, isInSortedOrder, aggregateItem, source.getActivation(), rowAllocator, resultSetNumber, singleInputRow, optimizerEstimatedRowCount, - optimizerEstimatedCost, closeCleanup); + optimizerEstimatedCost); } /** @@ -357,7 +354,7 @@ source, isInSortedOrder, aggregateItem, orderItem, source.getActivation(), rowAllocator, maxRowSize, resultSetNumber, singleInputRow, optimizerEstimatedRowCount, - optimizerEstimatedCost, closeCleanup); + optimizerEstimatedCost); } /** @@ -379,7 +376,7 @@ return new GroupedAggregateResultSet( source, isInSortedOrder, aggregateItem, orderItem, source.getActivation(), rowAllocator, maxRowSize, resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, closeCleanup); + optimizerEstimatedCost); } /** @@ -401,7 +398,7 @@ return new DistinctGroupedAggregateResultSet( source, isInSortedOrder, aggregateItem, orderItem, source.getActivation(), rowAllocator, maxRowSize, resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, closeCleanup); + optimizerEstimatedCost); } @@ -455,8 +452,7 @@ { return new RowResultSet(activation, row, canCacheRow, resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -489,8 +485,7 @@ isTarget, scanIsolationLevel, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -561,8 +556,7 @@ isolationLevel, true, // Skip rows with 1 or more null key columns optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -608,8 +602,7 @@ tableLocked, isolationLevel, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -672,8 +665,7 @@ 1, // rowsPerRead is 1 if not a bulkTableScan oneRowScan, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -744,8 +736,7 @@ rowsPerRead, oneRowScan, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -783,8 +774,7 @@ restriction, forUpdate, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -814,8 +804,7 @@ notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, - closeCleanup); + userSuppliedOptimizerOverrides); } /** @@ -845,8 +834,7 @@ notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, - closeCleanup); + userSuppliedOptimizerOverrides); } /** @@ -880,8 +868,7 @@ notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, - closeCleanup); + userSuppliedOptimizerOverrides); } /** @@ -915,8 +902,7 @@ notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, - closeCleanup); + userSuppliedOptimizerOverrides); } /** @@ -945,8 +931,7 @@ return new MaterializedResultSet(source, source.getActivation(), resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } /** @@ -972,8 +957,7 @@ resultSetNumber, sourceRowWidth, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } else { @@ -997,8 +981,7 @@ return new NormalizeResultSet(source, source.getActivation(), resultSetNumber, erdNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, forUpdate, - closeCleanup); + optimizerEstimatedCost, forUpdate); } /** @@ -1049,8 +1032,7 @@ leftResultSet.getActivation(), resultSetNumber, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } public NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource, @@ -1074,7 +1056,6 @@ optimizerEstimatedCost, opType, all, - closeCleanup, intermediateOrderByColumnsSavedObject, intermediateOrderByDirectionSavedObject); } @@ -1143,8 +1124,7 @@ tableLocked, isolationLevel, optimizerEstimatedRowCount, - optimizerEstimatedCost, - closeCleanup); + optimizerEstimatedCost); } @@ -1213,7 +1193,6 @@ oneRowScan, optimizerEstimatedRowCount, optimizerEstimatedCost, - closeCleanup, parentResultSetId, fkIndexConglomId, fkColArrayItem, Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java Thu Sep 7 14:31:54 2006 @@ -68,7 +68,7 @@ * * @author jerry (broken out from SortResultSet) */ -public class GroupedAggregateResultSet extends GenericAggregateResultSet +class GroupedAggregateResultSet extends GenericAggregateResultSet implements CursorResultSet { /* Run time statistics variables */ @@ -124,7 +124,7 @@ * * @exception StandardException Thrown on error */ - public GroupedAggregateResultSet(NoPutResultSet s, + GroupedAggregateResultSet(NoPutResultSet s, boolean isInSortedOrder, int aggregateItem, int orderingItem, @@ -133,10 +133,9 @@ int maxRowSize, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { - super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost, c); + super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); this.isInSortedOrder = isInSortedOrder; sortTemplateRow = getExecutionFactory().getIndexableRow((ExecRow) rowAllocator.invoke(activation)); order = (ColumnOrdering[]) @@ -476,11 +475,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; sortResultRow = null; sourceExecIndexRow = null; closeSource(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -44,9 +44,9 @@ * Simple subclass of nested loop, differentiated * to ease RunTimeStatistics output generation. */ -public class HashJoinResultSet extends NestedLoopJoinResultSet +class HashJoinResultSet extends NestedLoopJoinResultSet { - public HashJoinResultSet(NoPutResultSet leftResultSet, + HashJoinResultSet(NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, int rightNumCols, @@ -57,12 +57,11 @@ boolean notExistsRightSide, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - String userSuppliedOptimizerOverrides, - GeneratedMethod closeCleanup) + String userSuppliedOptimizerOverrides) { super(leftResultSet, leftNumCols, rightResultSet, rightNumCols, activation, restriction, resultSetNumber, oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, - optimizerEstimatedCost, userSuppliedOptimizerOverrides, closeCleanup); + optimizerEstimatedCost, userSuppliedOptimizerOverrides); } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -44,9 +44,9 @@ * Simple subclass of nested loop left outer join, differentiated * to ease RunTimeStatistics output generation. */ -public class HashLeftOuterJoinResultSet extends NestedLoopLeftOuterJoinResultSet +class HashLeftOuterJoinResultSet extends NestedLoopLeftOuterJoinResultSet { - public HashLeftOuterJoinResultSet( + HashLeftOuterJoinResultSet( NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, @@ -60,14 +60,13 @@ boolean notExistsRightSide, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - String userSuppliedOptimizerOverrides, - GeneratedMethod closeCleanup) + String userSuppliedOptimizerOverrides) { super(leftResultSet, leftNumCols, rightResultSet, rightNumCols, activation, restriction, resultSetNumber, emptyRowFun, wasRightOuterJoin, oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, closeCleanup); + userSuppliedOptimizerOverrides); } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java Thu Sep 7 14:31:54 2006 @@ -109,7 +109,6 @@ private int initialCapacity; private float loadFactor; private int maxCapacity; - private GeneratedMethod closeCleanup; public String tableName; public String userSuppliedOptimizerOverrides; public String indexName; @@ -140,7 +139,7 @@ // // class interface // - public HashScanResultSet(long conglomId, + HashScanResultSet(long conglomId, StaticCompiledOpenConglomInfo scoci, Activation activation, GeneratedMethod resultRowAllocator, int resultSetNumber, @@ -164,8 +163,7 @@ int isolationLevel, boolean skipNullKeyColumns, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(activation, @@ -287,8 +285,6 @@ "Invalid isolation level - " + isolationLevel); } - this.closeCleanup = closeCleanup; - runTimeStatisticsOn = getLanguageConnectionContext().getRunTimeStatisticsMode(); @@ -621,11 +617,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; if (hashtableBuilt) { // This is where we get the scan properties for a subquery Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java Thu Sep 7 14:31:54 2006 @@ -67,7 +67,7 @@ * * @author jerry */ -public class HashTableResultSet extends NoPutResultSetImpl +class HashTableResultSet extends NoPutResultSetImpl implements CursorResultSet { /* Run time statistics variables */ @@ -83,7 +83,6 @@ public Qualifier[][] nextQualifiers; private GeneratedMethod projection; private int[] projectMapping; - private GeneratedMethod closeCleanup; private boolean runTimeStatsOn; private ExecRow mappedResultRow; public boolean reuseResult; @@ -111,7 +110,7 @@ // // class interface // - public HashTableResultSet(NoPutResultSet s, + HashTableResultSet(NoPutResultSet s, Activation a, GeneratedMethod str, Qualifier[][] nextQualifiers, @@ -126,8 +125,7 @@ float loadFactor, boolean skipNullKeyColumns, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) + double optimizerEstimatedCost) throws StandardException { super(a, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -157,7 +155,6 @@ this.initialCapacity = initialCapacity; this.loadFactor = loadFactor; this.skipNullKeyColumns = skipNullKeyColumns; - closeCleanup = c; // Allocate a result row if all of the columns are mapped from the source if (projection == null) @@ -517,10 +514,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; + source.close(); super.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java Thu Sep 7 14:31:54 2006 @@ -64,7 +64,7 @@ * * @author jeff */ -public class IndexRowToBaseRowResultSet extends NoPutResultSetImpl +class IndexRowToBaseRowResultSet extends NoPutResultSetImpl implements CursorResultSet { // set in constructor and not altered during @@ -74,7 +74,6 @@ private GeneratedMethod resultRowAllocator; private GeneratedMethod restriction; private long baseConglomId; - private GeneratedMethod closeCleanup; public FormatableBitSet accessedHeapCols; private FormatableBitSet accessedIndexCols; //caching accessed columns (heap+index) beetle 3865 @@ -109,7 +108,7 @@ // // class interface // - public IndexRowToBaseRowResultSet( + IndexRowToBaseRowResultSet( long conglomId, int scociItem, Activation a, @@ -123,8 +122,7 @@ GeneratedMethod restriction, boolean forUpdate, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(a, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -141,7 +139,6 @@ /* RESOLVE - once we push Qualifiers into the store we * need to clear their Orderable cache on each open/reopen. */ - this.closeCleanup = closeCleanup; // retrieve the valid column list from // the saved objects, if it exists @@ -480,7 +477,6 @@ clearCurrentRow(); baseRowLocation = null; - currentRow = null; } else { @@ -492,7 +488,6 @@ retval = currentRow; } else { - currentRow = null; clearCurrentRow(); baseRowLocation = null; @@ -521,10 +516,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; + if (closeBaseCCHere) { // This check should only be needed in the error case where @@ -647,7 +639,6 @@ setCurrentRow(sourceRow); } else { clearCurrentRow(); - currentRow = null; } return currentRow; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java Thu Sep 7 14:31:54 2006 @@ -2353,8 +2353,8 @@ LanguageProperties.BULK_FETCH_DEFAULT_INT, // rows per read false, // not a 1 row per scan 0d, // estimated rows - 0d, // estimated cost - (GeneratedMethod)null); // close cleanup + 0d // estimated cost + ); tableScan.openCore(); } else Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -42,7 +42,7 @@ * * @author ames */ -public abstract class JoinResultSet extends NoPutResultSetImpl +abstract class JoinResultSet extends NoPutResultSetImpl implements CursorResultSet { /* Run time statistics variables */ @@ -63,7 +63,6 @@ public NoPutResultSet rightResultSet; protected int rightNumCols; protected GeneratedMethod restriction; - protected GeneratedMethod closeCleanup; public boolean oneRowRightSide; public boolean notExistsRightSide; //right side is NOT EXISTS @@ -73,7 +72,7 @@ * class interface * */ - public JoinResultSet(NoPutResultSet leftResultSet, + JoinResultSet(NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, int rightNumCols, @@ -84,8 +83,7 @@ boolean notExistsRightSide, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - String userSuppliedOptimizerOverrides, - GeneratedMethod closeCleanup) + String userSuppliedOptimizerOverrides) { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -96,7 +94,6 @@ this.restriction = restriction; this.oneRowRightSide = oneRowRightSide; this.notExistsRightSide = notExistsRightSide; - this.closeCleanup = closeCleanup; constructorTime += getElapsedMillis(beginTime); this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides; } @@ -204,10 +201,6 @@ if ( isOpen ) { - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - leftResultSet.close(); if (isRightOpen) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java Thu Sep 7 14:31:54 2006 @@ -56,7 +56,7 @@ * * @author jamie */ -public class LastIndexKeyResultSet extends NoPutResultSetImpl +class LastIndexKeyResultSet extends NoPutResultSetImpl { protected ExecRow candidate; @@ -69,7 +69,6 @@ protected GeneratedMethod stopKeyGetter; protected int stopSearchOperator; protected Qualifier[][] qualifiers; - protected GeneratedMethod closeCleanup; public String tableName; public String userSuppliedOptimizerOverrides; public String indexName; @@ -110,7 +109,6 @@ * @param optimizerEstimatedRowCount Estimated total # of rows by * optimizer * @param optimizerEstimatedCost Estimated total cost by optimizer - * @param closeCleanup any cleanup the activation needs to do on close. * * @exception StandardException thrown when unable to create the * result set @@ -129,8 +127,7 @@ boolean tableLocked, int isolationLevel, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup + double optimizerEstimatedCost ) throws StandardException { super(activation, @@ -218,8 +215,6 @@ "Invalid isolation level - " + isolationLevel); } - this.closeCleanup = closeCleanup; - runTimeStatisticsOn = getLanguageConnectionContext().getRunTimeStatisticsMode(); /* Only call row allocators once */ @@ -287,7 +282,6 @@ } else { - currentRow = null; clearCurrentRow(); } @@ -304,7 +298,6 @@ { if (returnedRow || !isOpen) { - currentRow = null; clearCurrentRow(); } else @@ -325,12 +318,7 @@ if (isOpen) { isOpen = false; - currentRow = null; clearCurrentRow(); - if (closeCleanup != null) - { - closeCleanup.invoke(activation); // let activation tidy up - } super.close(); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java Thu Sep 7 14:31:54 2006 @@ -56,7 +56,7 @@ * Return rows from temp table on subsequent scans. */ -public class MaterializedResultSet extends NoPutResultSetImpl +class MaterializedResultSet extends NoPutResultSetImpl implements CursorResultSet { /* @@ -79,9 +79,6 @@ public long createTCTime; public long fetchTCTime; - - private GeneratedMethod closeCleanup; - /** * Constructor for a MaterializedResultSet * @@ -96,8 +93,7 @@ public MaterializedResultSet(NoPutResultSet source, Activation activation, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -106,7 +102,6 @@ // Get the current transaction controller tc = activation.getTransactionController(); - closeCleanup = c; constructorTime += getElapsedMillis(beginTime); } @@ -309,10 +304,6 @@ beginTime = getCurrentTimeMillis(); if ( isOpen ) { - if (closeCleanup != null) - { - closeCleanup.invoke(activation); // let activation tidy up - } currentRow = null; source.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -49,7 +49,7 @@ * result set) MUST be unique for this to work correctly. * */ -public class MergeJoinResultSet extends JoinResultSet +class MergeJoinResultSet extends JoinResultSet { private static final int GREATER_THAN = 1; private static final int EQUAL = 0; @@ -77,7 +77,7 @@ * @param optimizerEstimatedCost self-explanatory * @param closeCleanup self-explanatory */ - public MergeJoinResultSet(NoPutResultSet leftResultSet, + MergeJoinResultSet(NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, int rightNumCols, @@ -94,7 +94,7 @@ super(leftResultSet, leftNumCols, rightResultSet, rightNumCols, activation, restriction, resultSetNumber, oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, - optimizerEstimatedCost, null, closeCleanup); + optimizerEstimatedCost, null); this.leftGreaterThanRight = leftGreaterThanRight; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -45,7 +45,7 @@ * Takes 2 NoPutResultSets and a join filter and returns * the join's rows satisfying the filter as a result set. */ -public class NestedLoopJoinResultSet extends JoinResultSet +class NestedLoopJoinResultSet extends JoinResultSet { private boolean returnedRowMatchingRightSide = false; private ExecRow rightTemplate; @@ -277,7 +277,7 @@ * class interface * */ - public NestedLoopJoinResultSet(NoPutResultSet leftResultSet, + NestedLoopJoinResultSet(NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, int rightNumCols, @@ -288,13 +288,12 @@ boolean notExistsRightSide, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - String userSuppliedOptimizerOverrides, - GeneratedMethod closeCleanup) + String userSuppliedOptimizerOverrides) { super(leftResultSet, leftNumCols, rightResultSet, rightNumCols, activation, restriction, resultSetNumber, oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, - optimizerEstimatedCost, userSuppliedOptimizerOverrides, closeCleanup); + optimizerEstimatedCost, userSuppliedOptimizerOverrides); if (notExistsRightSide) rightTemplate = getExecutionFactory().getValueRow(rightNumCols); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java Thu Sep 7 14:31:54 2006 @@ -48,7 +48,7 @@ * the right when there is no matching row in the right * result set. */ -public class NestedLoopLeftOuterJoinResultSet extends NestedLoopJoinResultSet +class NestedLoopLeftOuterJoinResultSet extends NestedLoopJoinResultSet { protected GeneratedMethod emptyRowFun; /* Was this originally a right outer join? */ @@ -270,7 +270,7 @@ * class interface * */ - public NestedLoopLeftOuterJoinResultSet( + NestedLoopLeftOuterJoinResultSet( NoPutResultSet leftResultSet, int leftNumCols, NoPutResultSet rightResultSet, @@ -284,14 +284,13 @@ boolean notExistsRightSide, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - String userSuppliedOptimizerOverrides, - GeneratedMethod closeCleanup) + String userSuppliedOptimizerOverrides) { super(leftResultSet, leftNumCols, rightResultSet, rightNumCols, activation, restriction, resultSetNumber, oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, optimizerEstimatedCost, - userSuppliedOptimizerOverrides, closeCleanup); + userSuppliedOptimizerOverrides); this.emptyRowFun = emptyRowFun; this.wasRightOuterJoin = wasRightOuterJoin; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java Thu Sep 7 14:31:54 2006 @@ -54,7 +54,7 @@ * result set for the entire statement. */ -public class NormalizeResultSet extends NoPutResultSetImpl +class NormalizeResultSet extends NoPutResultSetImpl implements CursorResultSet { /* @@ -72,8 +72,6 @@ */ private ResultDescription resultDescription; - private GeneratedMethod closeCleanup; - /* info for caching DTSs */ private DataTypeDescriptor[] desiredTypes; @@ -94,8 +92,7 @@ int erdNumber, double optimizerEstimatedRowCount, double optimizerEstimatedCost, - boolean forUpdate, - GeneratedMethod c) throws StandardException + boolean forUpdate) throws StandardException { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -133,7 +130,6 @@ */ startCol = (forUpdate) ? ((numCols - 1)/ 2) + 1 : 1; normalizedRow = activation.getExecutionFactory().getValueRow(numCols); - closeCleanup = c; constructorTime += getElapsedMillis(beginTime); } @@ -227,9 +223,6 @@ beginTime = getCurrentTimeMillis(); if ( isOpen ) { - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } currentRow = null; source.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java Thu Sep 7 14:31:54 2006 @@ -265,7 +265,6 @@ // block, to ensure that it is executed? clearCurrentRow(); - currentRow = null; source.close(); super.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java Thu Sep 7 14:31:54 2006 @@ -54,7 +54,7 @@ * * @author ames */ -public class ProjectRestrictResultSet extends NoPutResultSetImpl +class ProjectRestrictResultSet extends NoPutResultSetImpl implements CursorResultSet { /* Run time statistics variables */ @@ -69,7 +69,6 @@ public boolean doesProjection; private GeneratedMethod projection; private int[] projectMapping; - private GeneratedMethod closeCleanup; private boolean runTimeStatsOn; private ExecRow mappedResultRow; public boolean reuseResult; @@ -81,7 +80,7 @@ // // class interface // - public ProjectRestrictResultSet(NoPutResultSet s, + ProjectRestrictResultSet(NoPutResultSet s, Activation a, GeneratedMethod r, GeneratedMethod p, @@ -91,8 +90,7 @@ boolean reuseResult, boolean doesProjection, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) + double optimizerEstimatedCost) throws StandardException { super(a, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -110,7 +108,6 @@ projectMapping = ((ReferencedColumnsDescriptorImpl) a.getPreparedStatement().getSavedObject(mapRefItem)).getReferencedColumnPositions(); this.reuseResult = reuseResult; this.doesProjection = doesProjection; - closeCleanup = c; // Allocate a result row if all of the columns are mapped from the source if (projection == null) @@ -367,11 +364,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) - { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; + source.close(); super.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java Thu Sep 7 14:31:54 2006 @@ -61,7 +61,6 @@ private boolean canCacheRow; private boolean next; private GeneratedMethod row; - protected GeneratedMethod closeCleanup; private ExecRow cachedRow; // @@ -74,15 +73,13 @@ boolean canCacheRow, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup + double optimizerEstimatedCost ) { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); this.row = row; - this.closeCleanup = closeCleanup; this.canCacheRow = canCacheRow; constructorTime += getElapsedMillis(beginTime); } @@ -97,8 +94,7 @@ boolean canCacheRow, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup + double optimizerEstimatedCost ) { super(activation, resultSetNumber, @@ -106,7 +102,6 @@ beginTime = getCurrentTimeMillis(); this.cachedRow = constantRow; - this.closeCleanup = closeCleanup; this.canCacheRow = canCacheRow; constructorTime += getElapsedMillis(beginTime); } @@ -178,9 +173,6 @@ { beginTime = getCurrentTimeMillis(); if (isOpen) { - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } // we don't want to keep around a pointer to the // row ... so it can be thrown away. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java Thu Sep 7 14:31:54 2006 @@ -63,7 +63,7 @@ * * @author jerry (broken out from SortResultSet) */ -public class ScalarAggregateResultSet extends GenericAggregateResultSet +class ScalarAggregateResultSet extends GenericAggregateResultSet implements CursorResultSet { @@ -97,7 +97,7 @@ * * @exception StandardException Thrown on error */ - public ScalarAggregateResultSet(NoPutResultSet s, + ScalarAggregateResultSet(NoPutResultSet s, boolean isInSortedOrder, int aggregateItem, Activation a, @@ -105,10 +105,9 @@ int resultSetNumber, boolean singleInputRow, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { - super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost, c); + super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); this.isInSortedOrder = isInSortedOrder; // source expected to be non-null, mystery stress test bug // - sometimes get NullPointerException in openCore(). @@ -282,12 +281,8 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } countOfRows = 0; - currentRow = null; sourceExecIndexRow = null; source.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java Thu Sep 7 14:31:54 2006 @@ -119,8 +119,6 @@ private int maxRows; - private GeneratedMethod closeCleanup; - private boolean keepAfterCommit; /* The hash table will contain a different number of extra columns depending @@ -172,8 +170,7 @@ Activation activation, int resultSetNumber, int sourceRowWidth, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); @@ -187,7 +184,6 @@ "maxRows not expected to be -1"); } - closeCleanup = c; constructorTime += getElapsedMillis(beginTime); positionInHashTable = new SQLInteger(); @@ -862,10 +858,6 @@ beginTime = getCurrentTimeMillis(); if ( isOpen ) { - if (closeCleanup != null) - { - closeCleanup.invoke(activation); // let activation tidy up - } currentRow = null; source.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java Thu Sep 7 14:31:54 2006 @@ -45,12 +45,11 @@ * the INTERSECT or EXCEPT of the two input result sets. This also projects out the tag, the last column * of the input rows. */ -public class SetOpResultSet extends NoPutResultSetImpl +class SetOpResultSet extends NoPutResultSetImpl implements CursorResultSet { private final NoPutResultSet leftSource; private final NoPutResultSet rightSource; - private final GeneratedMethod closeCleanup; private final Activation activation; private final int opType; private final boolean all; @@ -78,7 +77,6 @@ double optimizerEstimatedCost, int opType, boolean all, - GeneratedMethod closeCleanup, int intermediateOrderByColumnsSavedObject, int intermediateOrderByDirectionSavedObject) { @@ -90,7 +88,7 @@ this.resultSetNumber = resultSetNumber; this.opType = opType; this.all = all; - this.closeCleanup = closeCleanup; + ExecPreparedStatement eps = activation.getPreparedStatement(); intermediateOrderByColumns = (int[]) eps.getSavedObject(intermediateOrderByColumnsSavedObject); intermediateOrderByDirection = (int[]) eps.getSavedObject(intermediateOrderByDirectionSavedObject); @@ -261,10 +259,7 @@ beginTime = getCurrentTimeMillis(); if ( isOpen ) { - if (closeCleanup != null) - closeCleanup.invoke(activation); // let activation tidy up clearCurrentRow(); - currentRow = null; prevCols = null; leftSource.close(); rightSource.close(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java Thu Sep 7 14:31:54 2006 @@ -111,7 +111,7 @@ * * @author ames, rewrite for aggregates by jamie, aggregate removal by jerry */ -public class SortResultSet extends NoPutResultSetImpl +class SortResultSet extends NoPutResultSetImpl implements CursorResultSet { @@ -123,7 +123,6 @@ // set in constructor and not altered during // life of object. public NoPutResultSet source; - private GeneratedMethod closeCleanup; private GeneratedMethod rowAllocator; private ColumnOrdering[] order; private ColumnOrdering[] savedOrder; @@ -182,8 +181,7 @@ int maxRowSize, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod c) throws StandardException + double optimizerEstimatedCost) throws StandardException { super(a, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); this.distinct = distinct; @@ -192,7 +190,6 @@ originalSource = s; rowAllocator = ra; this.maxRowSize = maxRowSize; - closeCleanup = c; sortTemplateRow = (ExecRow) rowAllocator.invoke(activation); order = (ColumnOrdering[]) ((FormatableArrayHolder) @@ -450,11 +447,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } - currentRow = null; sortResultRow = null; closeSource(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java Thu Sep 7 14:31:54 2006 @@ -72,7 +72,7 @@ * * @author ames */ -public class TableScanResultSet extends NoPutResultSetImpl +class TableScanResultSet extends NoPutResultSetImpl implements CursorResultSet, Cloneable { protected ScanController scanController; @@ -94,7 +94,6 @@ protected GeneratedMethod stopKeyGetter; protected int stopSearchOperator; public Qualifier[][] qualifiers; - protected GeneratedMethod closeCleanup; public String tableName; public String userSuppliedOptimizerOverrides; public String indexName; @@ -157,7 +156,7 @@ // // class interface // - public TableScanResultSet(long conglomId, + TableScanResultSet(long conglomId, StaticCompiledOpenConglomInfo scoci, Activation activation, GeneratedMethod resultRowAllocator, @@ -179,8 +178,7 @@ int rowsPerRead, boolean oneRowScan, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(activation, @@ -324,8 +322,6 @@ "Invalid isolation level - " + isolationLevel); } - this.closeCleanup = closeCleanup; - runTimeStatisticsOn = (activation != null && activation.getLanguageConnectionContext().getRunTimeStatisticsMode()); @@ -796,16 +792,7 @@ // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - if (closeCleanup != null) { - try { - closeCleanup.invoke(activation); // let activation tidy up - } catch (StandardException se) { - if (SanityManager.DEBUG) - SanityManager.THROWASSERT(se); - } - } - - currentRow = null; +; if (scanController != null) { // This is where we get the positioner info for inner tables Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java Thu Sep 7 14:31:54 2006 @@ -49,7 +49,7 @@ * * @author ames */ -public class UnionResultSet extends NoPutResultSetImpl +class UnionResultSet extends NoPutResultSetImpl implements CursorResultSet { /* Run time statistics variables */ @@ -63,7 +63,7 @@ // these are set in the constructor and never altered public NoPutResultSet source1; public NoPutResultSet source2; - protected GeneratedMethod closeCleanup; + // // class interface @@ -76,15 +76,13 @@ Activation activation, int resultSetNumber, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) { super(activation, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost); this.source1 = source1; this.source2 = source2; - this.closeCleanup = closeCleanup; constructorTime += getElapsedMillis(beginTime); } @@ -181,16 +179,13 @@ { beginTime = getCurrentTimeMillis(); if ( isOpen ) { - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } // we don't want to keep around a pointer to the // row ... so it can be thrown away. // REVISIT: does this need to be in a finally // block, to ensure that it is executed? clearCurrentRow(); - currentRow = null; + switch (whichSource) { case 1 : source1.close(); break; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java?view=diff&rev=441232&r1=441231&r2=441232 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java Thu Sep 7 14:31:54 2006 @@ -64,7 +64,7 @@ /** */ -public class VTIResultSet extends NoPutResultSetImpl +class VTIResultSet extends NoPutResultSetImpl implements CursorResultSet, VTIEnvironment { /* Run time statistics variables */ @@ -75,7 +75,6 @@ private ClassInspector classInspector; private GeneratedMethod row; private GeneratedMethod constructor; - protected GeneratedMethod closeCleanup; private PreparedStatement userPS; private ResultSet userVTI; private ExecRow allocatedRow; @@ -112,8 +111,7 @@ boolean isTarget, int scanIsolationLevel, double optimizerEstimatedRowCount, - double optimizerEstimatedCost, - GeneratedMethod closeCleanup) + double optimizerEstimatedCost) throws StandardException { super(activation, resultSetNumber, @@ -137,7 +135,6 @@ compileTimeConstants = (FormatableHashtable) (activation.getPreparedStatement(). getSavedObject(ctcNumber)); - this.closeCleanup = closeCleanup; constructorTime += getElapsedMillis(beginTime); } @@ -353,9 +350,6 @@ { beginTime = getCurrentTimeMillis(); if (isOpen) { - if (closeCleanup != null) { - closeCleanup.invoke(activation); // let activation tidy up - } // we don't want to keep around a pointer to the // row ... so it can be thrown away.