Author: kahatlen Date: Wed Nov 2 11:20:11 2011 New Revision: 1196542 URL: http://svn.apache.org/viewvc?rev=1196542&view=rev Log: DERBY-4845: Improve the dependency tracking for our build targets Move ResultSetStatistics interface from impl to iapi in order to remove dependencies on impl packages in iapi code. Added: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatistics.java - copied, changed from r1196522, db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java Removed: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/xplain/XPLAINVisitor.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINDefaultVisitor.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatistics.java (from r1196522, db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java) URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatistics.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatistics.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java&r1=1196522&r2=1196542&rev=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -1,6 +1,6 @@ /* - Derby - Class org.apache.derby.impl.sql.execute.rts.ResultSetStatistics + Derby - Class org.apache.derby.iapi.sql.execute.ResultSetStatistics Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -19,7 +19,7 @@ */ -package org.apache.derby.impl.sql.execute.rts; +package org.apache.derby.iapi.sql.execute; import org.apache.derby.iapi.sql.execute.xplain.XPLAINable; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java Wed Nov 2 11:20:11 2011 @@ -28,7 +28,6 @@ import org.apache.derby.iapi.sql.ResultS import org.apache.derby.iapi.sql.execute.RunTimeStatistics; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; /** * ResultSetStatisticsFactory provides a wrapper around all of Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/xplain/XPLAINVisitor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/xplain/XPLAINVisitor.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/xplain/XPLAINVisitor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/xplain/XPLAINVisitor.java Wed Nov 2 11:20:11 2011 @@ -25,7 +25,7 @@ import java.sql.SQLException; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.sql.Activation; import org.apache.derby.iapi.sql.execute.RunTimeStatistics; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; /** * Classes, which implement this interface have the ability to explain the * gathered ResultSetStatistics. A Visitor pattern is used to traverse the Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java Wed Nov 2 11:20:11 2011 @@ -106,7 +106,7 @@ import org.apache.derby.impl.sql.execute import org.apache.derby.impl.sql.execute.rts.RealUpdateResultSetStatistics; import org.apache.derby.impl.sql.execute.rts.RealVTIStatistics; import org.apache.derby.impl.sql.execute.rts.RealRowCountStatistics; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.impl.sql.execute.rts.RunTimeStatisticsImpl; import org.apache.derby.impl.sql.execute.rts.RealWindowResultSetStatistics; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import java.security.AccessController; import java.security.PrivilegedAction; import org.apache.derby.catalog.UUID; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; import org.apache.derby.catalog.UUID; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java Wed Nov 2 11:20:11 2011 @@ -22,6 +22,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.catalog.UUID; import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor; import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.i18n.MessageService; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java Wed Nov 2 11:20:11 2011 @@ -20,6 +20,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java Wed Nov 2 11:20:11 2011 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.execute.rts; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.io.Formatable; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINDefaultVisitor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINDefaultVisitor.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINDefaultVisitor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINDefaultVisitor.java Wed Nov 2 11:20:11 2011 @@ -30,7 +30,7 @@ import org.apache.derby.iapi.sql.conn.Co import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; import org.apache.derby.iapi.sql.execute.RunTimeStatistics; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; /** * This is the Default Visitor which produces explain information like the * old getRuntimeStatistics() approach.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java Wed Nov 2 11:20:11 2011 @@ -45,7 +45,7 @@ import org.apache.derby.impl.sql.catalog import org.apache.derby.impl.sql.catalog.XPLAINStatementTimingsDescriptor; import org.apache.derby.iapi.sql.execute.RunTimeStatistics; import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; /** * This is the Visitor, which explains the information and stores the statistics in Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java?rev=1196542&r1=1196541&r2=1196542&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java Wed Nov 2 11:20:11 2011 @@ -36,7 +36,7 @@ import org.apache.derby.iapi.sql.execute import org.apache.derby.iapi.sql.execute.RunTimeStatistics; -import org.apache.derby.impl.sql.execute.rts.ResultSetStatistics; +import org.apache.derby.iapi.sql.execute.ResultSetStatistics; import java.util.Properties;