Author: shawkins Date: 2012-02-17 11:12:11 -0500 (Fri, 17 Feb 2012) New Revision: 3890 Modified: trunk/test-integration/perf/pom.xml trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java trunk/test-integration/pom.xml Log: forward merge from 7.7 Modified: trunk/test-integration/perf/pom.xml =================================================================== --- trunk/test-integration/perf/pom.xml 2012-02-16 16:09:23 UTC (rev 3889) +++ trunk/test-integration/perf/pom.xml 2012-02-17 16:12:11 UTC (rev 3890) @@ -3,26 +3,11 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.7.0.CR1</version> + <version>8.0.0.beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-perf</artifactId> - <name>Common Integration Tests</name> + <name>Performance Integration Tests</name> <description>Performance tests that do not require external dependencies</description> - <dependencies> - <dependency> - <artifactId>teiid-cache-jbosscache</artifactId> - <groupId>org.jboss.teiid</groupId> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - </dependencies> - </project> \ No newline at end of file Modified: trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java =================================================================== --- trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java 2012-02-16 16:09:23 UTC (rev 3889) +++ trunk/test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java 2012-02-17 16:12:11 UTC (rev 3890) @@ -83,7 +83,6 @@ import org.teiid.query.sql.lang.OrderBy; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; -import org.teiid.query.sql.symbol.SingleElementSymbol; import org.teiid.query.unittest.RealMetadataFactory; import org.teiid.query.util.CommandContext; @@ -203,7 +202,7 @@ return data; } - public void helpTestSort(Mode mode, int expectedRowCount, List<? extends SingleElementSymbol> sortElements, List<?>[] data, List<? extends SingleElementSymbol> elems, BufferManager bufferManager) throws TeiidComponentException, TeiidProcessingException { + public void helpTestSort(Mode mode, int expectedRowCount, List<? extends Expression> sortElements, List<?>[] data, List<? extends Expression> elems, BufferManager bufferManager) throws TeiidComponentException, TeiidProcessingException { CommandContext context = new CommandContext ("pid", "test", null, null, 1); //$NON-NLS-1$ //$NON-NLS-2$ BlockingFakeRelationalNode dataNode = new BlockingFakeRelationalNode(0, data); @@ -221,7 +220,7 @@ process(sortNode, expectedRowCount); } - public void helpTestEquiJoin(int expectedRowCount, List<?>[] leftData, List<?>[] rightData, List<? extends SingleElementSymbol> elems, BufferManager bufferManager, JoinStrategy joinStrategy, JoinType joinType) throws TeiidComponentException, TeiidProcessingException { + public void helpTestEquiJoin(int expectedRowCount, List<?>[] leftData, List<?>[] rightData, List<? extends Expression> elems, BufferManager bufferManager, JoinStrategy joinStrategy, JoinType joinType) throws TeiidComponentException, TeiidProcessingException { CommandContext context = new CommandContext ("pid", "test", null, null, 1); //$NON-NLS-1$ //$NON-NLS-2$ FakeRelationalNode dataNode1 = new FakeRelationalNode(1, leftData); Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2012-02-16 16:09:23 UTC (rev 3889) +++ trunk/test-integration/pom.xml 2012-02-17 16:12:11 UTC (rev 3890) @@ -18,6 +18,18 @@ <apache.ant.version>1.7.0</apache.ant.version> </properties> + + <profiles> + <profile> + <!-- + This profile is activated manually, as in "mvn ... -P release ..." + --> + <id>perf</id> + <modules> + <module>perf</module> + </modules> + </profile> + </profiles> <dependencies> <dependency>