teiid SVN: r3151 - in branches/7.4.x/engine/src: test/java/org/teiid/query/optimizer and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 14:21:08 -0400 (Wed, 04 May 2011)
New Revision: 3151
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeVirtual.java
branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
Log:
TEIID-1577 fix for attempting to adjust union order by from the non-primary union branch
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeVirtual.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeVirtual.java 2011-05-04 15:03:22 UTC (rev 3150)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeVirtual.java 2011-05-04 18:21:08 UTC (rev 3151)
@@ -228,7 +228,7 @@
if (frame.getFirstChild().getType() == NodeConstants.Types.TUPLE_LIMIT
&& NodeEditor.findParent(parentProject,
NodeConstants.Types.SORT | NodeConstants.Types.DUP_REMOVE,
- NodeConstants.Types.SOURCE) != null) {
+ NodeConstants.Types.SOURCE | NodeConstants.Types.SET_OP) != null) {
return root;
}
@@ -280,24 +280,24 @@
}
}
- PlanNode sort = NodeEditor.findParent(parentProject, NodeConstants.Types.SORT, NodeConstants.Types.SOURCE);
- if (sort != null) { //special handling is needed since we are retaining the child aliases
- List<SingleElementSymbol> childProject = (List<SingleElementSymbol>)NodeEditor.findNodePreOrder(frame, NodeConstants.Types.PROJECT).getProperty(NodeConstants.Info.PROJECT_COLS);
- OrderBy elements = (OrderBy)sort.getProperty(NodeConstants.Info.SORT_ORDER);
- for (OrderByItem item : elements.getOrderByItems()) {
- item.setSymbol(childProject.get(selectSymbols.indexOf(item.getSymbol())));
- }
- sort.getGroups().clear();
- sort.addGroups(GroupsUsedByElementsVisitor.getGroups(elements));
+ if (parentProject.getParent() != null
+ && (parentProject.getParent().getType() != NodeConstants.Types.SET_OP || parentProject.getParent().getFirstChild() == parentProject)) {
+ PlanNode sort = NodeEditor.findParent(parentProject, NodeConstants.Types.SORT, NodeConstants.Types.SOURCE);
+ if (sort != null) { //special handling is needed since we are retaining the child aliases
+ List<SingleElementSymbol> childProject = (List<SingleElementSymbol>)NodeEditor.findNodePreOrder(frame, NodeConstants.Types.PROJECT).getProperty(NodeConstants.Info.PROJECT_COLS);
+ OrderBy elements = (OrderBy)sort.getProperty(NodeConstants.Info.SORT_ORDER);
+ for (OrderByItem item : elements.getOrderByItems()) {
+ item.setSymbol(childProject.get(selectSymbols.indexOf(item.getSymbol())));
+ }
+ sort.getGroups().clear();
+ sort.addGroups(GroupsUsedByElementsVisitor.getGroups(elements));
+ }
+ PlanNode parentSource = NodeEditor.findParent(parentProject, NodeConstants.Types.SOURCE);
+ if (parentSource != null) {
+ FrameUtil.correctSymbolMap(((SymbolMap)frame.getProperty(NodeConstants.Info.SYMBOL_MAP)).asMap(), parentSource);
+ }
}
-
- PlanNode parentSource = NodeEditor.findParent(parentProject, NodeConstants.Types.SOURCE);
-
- if (parentSource != null) {
- FrameUtil.correctSymbolMap(((SymbolMap)frame.getProperty(NodeConstants.Info.SYMBOL_MAP)).asMap(), parentSource);
- }
-
//remove the parent project and the source node
NodeEditor.removeChildNode(parentProject, frame);
if (parentProject.getParent() == null) {
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java 2011-05-04 15:03:22 UTC (rev 3150)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java 2011-05-04 18:21:08 UTC (rev 3151)
@@ -273,6 +273,22 @@
}, TestLimit.NODE_TYPES);
}
+ @Test public void testSimpleMergeUnionSecondBranchWithOrderBy() throws Exception {
+ FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+ BasicSourceCapabilities caps = new BasicSourceCapabilities();
+ caps.setCapabilitySupport(Capability.QUERY_UNION, true);
+ caps.setCapabilitySupport(Capability.QUERY_SELECT_EXPRESSION, true);
+ caps.setCapabilitySupport(Capability.ROW_LIMIT, true);
+ caps.setCapabilitySupport(Capability.QUERY_SET_ORDER_BY, true);
+ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+
+ ProcessorPlan plan = TestOptimizer.helpPlan("select '1' as x, e2 from pm1.g1 union all select e1, e2 from (select e1, 1 as e2 from pm1.g2 limit 1) as x order by x", //$NON-NLS-1$
+ FakeMetadataFactory.example1Cached(), null, capFinder,
+ new String[] {"SELECT '1' AS c_0, pm1.g1.e2 AS c_1 FROM pm1.g1 UNION ALL (SELECT pm1.g2.e1 AS c_0, 1 AS c_1 FROM pm1.g2 LIMIT 1) ORDER BY c_0"}, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
+
+ TestOptimizer.checkNodeTypes(plan, TestOptimizer.FULL_PUSHDOWN);
+ }
+
/**
* Note that the merge is not performed since it would create an expression in the group by clause
*/
14 years, 7 months
teiid SVN: r3150 - in trunk: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 11:03:22 -0400 (Wed, 04 May 2011)
New Revision: 3150
Modified:
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/cache-jbosscache/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/console/pom.xml
trunk/documentation/admin-guide/pom.xml
trunk/documentation/caching-guide/pom.xml
trunk/documentation/client-developers-guide/pom.xml
trunk/documentation/developer-guide/pom.xml
trunk/documentation/docbook/custom.dtd
trunk/documentation/pom.xml
trunk/documentation/quick-start-example/pom.xml
trunk/documentation/reference/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
updating trunk to 7.5
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/adminshell/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/api/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/build/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/cache-jbosscache/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/client/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/client-jdk15/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/common-core/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-file/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-ldap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-salesforce/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/connector-ws/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/salesforce-api/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/sandbox/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-file/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-jdbc/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-ldap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-loopback/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-olap/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-salesforce/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/connectors/translator-ws/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/console/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/admin-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: trunk/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/caching-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: trunk/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/client-developers-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: trunk/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/developer-guide/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: trunk/documentation/docbook/custom.dtd
===================================================================
--- trunk/documentation/docbook/custom.dtd 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/docbook/custom.dtd 2011-05-04 15:03:22 UTC (rev 3150)
@@ -1,4 +1,4 @@
-<!ENTITY versionNumber "7.4">
+<!ENTITY versionNumber "7.5">
<!ENTITY copyrightYear "2011">
<!ENTITY copyrightHolder "Red Hat, Inc.">
<!ENTITY url "http://www.jboss.org/teiid/">
Modified: trunk/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/quick-start-example/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: trunk/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/documentation/reference/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/engine/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/hibernate-dialect/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/jboss-integration/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/metadata/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/runtime/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/common/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/db/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2011-05-04 14:41:19 UTC (rev 3149)
+++ trunk/test-integration/pom.xml 2011-05-04 15:03:22 UTC (rev 3150)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR2-SNAPSHOT</version>
+ <version>7.5.0.Alpha1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
14 years, 7 months
teiid SVN: r3149 - branches.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:41:19 -0400 (Wed, 04 May 2011)
New Revision: 3149
Added:
branches/7.4.x/
Log:
adding 7.4.x branch
14 years, 7 months
teiid SVN: r3148 - trunk/client/src/main/java/org/teiid/jdbc.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:39:32 -0400 (Wed, 04 May 2011)
New Revision: 3148
Modified:
trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
Log:
TEIID-908 minor correction to client statement regex
Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-05-04 14:35:56 UTC (rev 3147)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-05-04 14:39:32 UTC (rev 3148)
@@ -162,9 +162,9 @@
//Map<out/inout/return param index --> index in results>
protected Map outParamIndexMap = new HashMap();
- private static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s*transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SET_STATEMENT = Pattern.compile("\\s*set\\s*(\\w+)\\s*([^;]*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
- private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s*(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern TRANSACTION_STATEMENT = Pattern.compile("\\s*(commit|rollback|(start\\s+transaction))\\s*;?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SET_STATEMENT = Pattern.compile("\\s*set\\s+(\\w+)\\s*([^;]*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
+ private static Pattern SHOW_STATEMENT = Pattern.compile("\\s*show\\s+(\\w*);?", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
/**
* Factory Constructor
* @param driverConnection
14 years, 7 months
teiid SVN: r3147 - in trunk/engine/src: test/java/org/teiid/query/processor/relational and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:35:56 -0400 (Wed, 04 May 2011)
New Revision: 3147
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1576 minor enhancement to more eagerly use the index join.
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-04 14:34:23 UTC (rev 3146)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-04 14:35:56 UTC (rev 3147)
@@ -224,7 +224,8 @@
int schemaSize = this.joinNode.getBufferManager().getSchemaSize(other.getSource().getOutputElements());
int toReserve = this.joinNode.getBufferManager().getMaxProcessingKB();
//check if the other side can be sorted in memory
- if (other.getRowCount()/this.joinNode.getBatchSize() < toReserve/schemaSize) {
+ if (other.getRowCount() <= this.joinNode.getBatchSize()
+ || (possibleIndex.getRowCount() > this.joinNode.getBatchSize() && other.getRowCount()/this.joinNode.getBatchSize() < toReserve/schemaSize)) {
return false;
}
boolean useIndex = false;
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-04 14:34:23 UTC (rev 3146)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-04 14:35:56 UTC (rev 3147)
@@ -247,11 +247,10 @@
while(true) {
try {
TupleBatch batch = join.nextBatch();
- for(int row = currentRow; row <= batch.getEndRow(); row++) {
- List tuple = batch.getTuple(row);
- assertEquals("Rows don't match at " + row, expectedResults[row-1], tuple); //$NON-NLS-1$
+ for(;currentRow <= batch.getEndRow(); currentRow++) {
+ List tuple = batch.getTuple(currentRow);
+ assertEquals("Rows don't match at " + currentRow, expectedResults[currentRow-1], tuple); //$NON-NLS-1$
}
- currentRow += batch.getRowCount();
if(batch.getTerminationFlag()) {
break;
}
@@ -599,7 +598,7 @@
}
@Test public void testMergeJoinOptimization() throws Exception {
- helpTestEnhancedSortMergeJoin(100);
+ helpTestEnhancedSortMergeJoin(99);
}
private void helpTestEnhancedSortMergeJoin(int batchSize)
@@ -679,13 +678,13 @@
Arrays.asList(new Object[] { 7, 7 }),
Arrays.asList(new Object[] { 2, 2 }),
Arrays.asList(new Object[] { 6, 6 }),
- Arrays.asList(new Object[] { 1, 1 })
+ Arrays.asList(new Object[] { 1, 1 }),
};
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
this.join.setJoinStrategy(joinStrategy);
//this.join.setRightDistinct(true);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, 40, 1);
}
@Test public void testMergeJoinOptimizationWithDistinctAlreadySorted() throws Exception {
@@ -717,7 +716,7 @@
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.ALREADY_SORTED);
this.join.setJoinStrategy(joinStrategy);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, 40, 1);
}
@Test public void testRepeatedMerge() throws Exception {
14 years, 7 months
teiid SVN: r3146 - in trunk: documentation/admin-guide/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-04 10:34:23 -0400 (Wed, 04 May 2011)
New Revision: 3146
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
Log:
minor doc updates
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 14:34:23 UTC (rev 3146)
@@ -53,8 +53,8 @@
<LI><B>Enhanced Sort Join</B> - the partitioned merge join was replaced with an enhanced sort join. The enhanced sort join will use the actual row counts from each side of the relation to perform a index based join if one side is small enough, a partial sort of the larger side and a repeated merge join if the tuples are unbalanced but one side is not small enough to form an index, or a standard sort merge join if the tuples are balanced.
<LI><B>JDK1.5 JDBC Client JAR</B> - A retro-translated Teiid client JDBC jar now available to use with JDK 1.5 VM. Note only the JDBC API is supported, not the Admin API, or retrieving query plans as XML.
<LI><B>Security Improvements</B> - UDF and pushdown functions can now be protected with data roles. Also the CommandContext can provide the Subject for custom security checks in UDFs.
- <LI><B>Cache Invalidation</B> - Prepared plan and result set caches can have a maxStaleness value, which will invalidate entries based upon metadata and data changes respectively. See the Admin Guide for more.
- <LI><B>Runtime-updates of Metadata</B> - Alter statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions have been added. A create statement was also added to add INSTEAD OF trigger (update procedures) to views.
+ <LI><B>Cache Invalidation</B> - Prepared plan and result set caches have will invalidate entries based upon metadata and data changes respectively. See the cache configuration maxStaleness setting and the Admin and Developer Guides for more.
+ <LI><B>Runtime-updates of Metadata</B> - ALTER statements have been added to change view/procedure/INSTEAD OF trigger (update procedure) definitions. A CREATE TRIGGER statement is also available to add an INSTEAD OF trigger (update procedures) to views.
System procedures were added to set extension metadata and stat values. By default all effects of metadata updates happen only on running vdbs across the cluster. To make the changes persistent see the Developers Guide Runtime Updates section.
</UL>
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/clustering.xml 2011-05-04 14:34:23 UTC (rev 3146)
@@ -16,6 +16,7 @@
<listitem> <para>Load Balancing: Take look at the Client developers guide on how to use load balancing between multiple nodes.</para> </listitem>
<listitem> <para>Fail Over: Take look at the Client developers guide on how to use fail over between multiple nodes.</para> </listitem>
<listitem> <para>Distributed Caching: This is automatically done for you once you configure it as specified above. </para> </listitem>
+ <listitem> <para>Event distribution: metadata and data modifications will be distributed to all cluster members. </para> </listitem>
</orderedlist>
</para>
Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml
===================================================================
--- trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-05-04 13:32:31 UTC (rev 3145)
+++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-05-04 14:34:23 UTC (rev 3146)
@@ -28,6 +28,7 @@
profiles is required. The default profile is the typical installation location, for example "<jboss-install>/server/default".
The Teiid runtime directory structure matches JBoss profiles directly - it is just an overlay.
</para>
+ <para>The all profile is recommended in a clustered environment to take advantage of clustered caching and cluster safe distribution of events.</para>
</listitem>
<listitem>
14 years, 7 months
teiid SVN: r3145 - trunk/build/kits/jboss-container.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-05-04 09:32:31 -0400 (Wed, 04 May 2011)
New Revision: 3145
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
Log:
TEIID-1511: Adding KI about too many open files
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 00:01:35 UTC (rev 3144)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-05-04 13:32:31 UTC (rev 3145)
@@ -177,7 +177,8 @@
<li>TEIID-1281 - Negative start indexing is not supported by DB2 and Derby databases. Usage of the Teiid SUBSTRING against these sources should not use negative start values.
<li>TEIID-1008 - Most versions of Oracle and MySQL do not support deeply nested correlated references. There is currently no workaround for this issue.
<li>For compatibility with the 7.0 release if a stored procedure parameter list begins with identifier=, then it will be parsed as a named parameter invocation even if the intent was to use a comparison predicate
- as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases.
+ as the first parameter value. The workaround is to use nesting parens, e.g. call proc((identifier=value), ...), which clarifies that this is positional value. This workaround will not be needed in later releases.
+ <li><a url="https://issues.jboss.org/browse/TEIID-1511">TEIID-1511<a/> - When a VDB is deployed and undeployed a socket is left open, which may lead to "too manay open files". Check the defect comments for details.
</ul>
<h4>from 7.0</h4>
<ul>
14 years, 7 months
teiid SVN: r3144 - in trunk/connectors/translator-jdbc/src: test/java/org/teiid/translator/jdbc/teradata and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-05-03 20:01:35 -0400 (Tue, 03 May 2011)
New Revision: 3144
Modified:
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java
trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java
Log:
TEIID-1495
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-03 21:08:27 UTC (rev 3143)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java 2011-05-04 00:01:35 UTC (rev 3144)
@@ -291,12 +291,18 @@
public static class NumericToStringModifier extends FunctionModifier {
private int charSize;
+ private String formatCode;
public NumericToStringModifier(int size) {
this.charSize = size;
+ StringBuilder sb = new StringBuilder();
+ for(int i = 0; i < size; i++) {
+ sb.append('Z');
+ }
+ this.formatCode = sb.toString();
}
@Override
public List<?> translate(Function function) {
- return Arrays.asList("TRIM(BOTH FROM ",function.getParameters().get(0), " (FORMAT 'Z')(CHAR("+this.charSize+")))"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return Arrays.asList("TRIM(BOTH FROM ",function.getParameters().get(0), " (FORMAT '"+this.formatCode+"')(CHAR("+this.charSize+")))"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
}
Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-03 21:08:27 UTC (rev 3143)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/teradata/TestTeradataTranslator.java 2011-05-04 00:01:35 UTC (rev 3144)
@@ -75,11 +75,11 @@
}
@Test public void testByteToString() throws Exception {
- helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class), "string", "TRIM(BOTH FROM 1 (FORMAT 'Z')(CHAR(4)))");
+ helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class), "string", "TRIM(BOTH FROM 1 (FORMAT 'ZZZZ')(CHAR(4)))");
}
@Test public void testDoubleToString() throws Exception {
- helpTest(LANG_FACTORY.createLiteral(new Double(1.0), Double.class), "string", "TRIM(BOTH FROM 1.0 (FORMAT 'Z')(CHAR(25)))");
+ helpTest(LANG_FACTORY.createLiteral(new Double(1.0), Double.class), "string", "TRIM(BOTH FROM 1.0 (FORMAT 'ZZZZZZZZZZZZZZZZZZZZZZZZZ')(CHAR(25)))");
}
@Test public void testInDecompose() throws Exception {
14 years, 7 months
teiid SVN: r3143 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-03 17:08:27 -0400 (Tue, 03 May 2011)
New Revision: 3143
Modified:
trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1576 fix for incorrect results with enhanced sort merge join
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -293,10 +293,10 @@
List outputTuple = outputTuple(this.processingSortLeft==SortOption.NOT_SORTED?partitionedTuple:reorderedTuple,
this.processingSortLeft==SortOption.NOT_SORTED?reorderedTuple:partitionedTuple);
boolean matches = this.joinNode.matchesCriteria(outputTuple);
+ this.sortedTuple = null;
if (matches) {
this.joinNode.addBatchRow(outputTuple);
}
- this.sortedTuple = null;
}
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -223,17 +223,21 @@
}
public static void doProcess(ProcessorPlan plan, ProcessorDataManager dataManager, List[] expectedResults, CommandContext context) throws Exception {
- BufferManagerImpl bufferMgr = BufferManagerFactory.createBufferManager();
- bufferMgr.setProcessorBatchSize(context.getProcessorBatchSize());
- bufferMgr.setConnectorBatchSize(context.getProcessorBatchSize());
- context.getNextRand(0);
+ BufferManager bufferMgr = context.getBufferManager();
+ if (bufferMgr == null) {
+ BufferManagerImpl bm = BufferManagerFactory.createBufferManager();
+ bm.setProcessorBatchSize(context.getProcessorBatchSize());
+ bm.setConnectorBatchSize(context.getProcessorBatchSize());
+ context.setBufferManager(bm);
+ bufferMgr = bm;
+ }
+ context.getNextRand(0);
if (context.getTempTableStore() == null) {
context.setTempTableStore(new TempTableStore(context.getConnectionID()));
}
if (context.getGlobalTableStore() == null) {
context.setGlobalTableStore(new TempTableStore("SYSTEM"));
}
- context.setBufferManager(bufferMgr);
if (!(dataManager instanceof TempTableDataManager)) {
SessionAwareCache<CachedResults> cache = new SessionAwareCache<CachedResults>();
cache.setBufferManager(bufferMgr);
Modified: trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-03 16:48:28 UTC (rev 3142)
+++ trunk/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2011-05-03 21:08:27 UTC (rev 3143)
@@ -599,7 +599,12 @@
}
@Test public void testMergeJoinOptimization() throws Exception {
- this.joinType = JoinType.JOIN_INNER;
+ helpTestEnhancedSortMergeJoin(100);
+ }
+
+ private void helpTestEnhancedSortMergeJoin(int batchSize)
+ throws TeiidComponentException, TeiidProcessingException {
+ this.joinType = JoinType.JOIN_INNER;
int rows = 100;
List[] data = new List[rows];
for(int i=0; i<rows; i++) {
@@ -632,7 +637,11 @@
helpCreateJoin();
this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
this.join.setJoinStrategy(joinStrategy);
- helpTestJoinDirect(expected, 100, 1);
+ helpTestJoinDirect(expected, batchSize, 1);
+ }
+
+ @Test public void testMergeJoinOptimizationMultiBatch() throws Exception {
+ helpTestEnhancedSortMergeJoin(10);
}
@Test public void testMergeJoinOptimizationNoRows() throws Exception {
14 years, 7 months
teiid SVN: r3142 - in trunk: adminshell and 37 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-05-03 12:48:28 -0400 (Tue, 03 May 2011)
New Revision: 3142
Modified:
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/cache-jbosscache/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/console/pom.xml
trunk/documentation/admin-guide/pom.xml
trunk/documentation/caching-guide/pom.xml
trunk/documentation/client-developers-guide/pom.xml
trunk/documentation/developer-guide/pom.xml
trunk/documentation/pom.xml
trunk/documentation/quick-start-example/pom.xml
trunk/documentation/reference/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/adminshell/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/api/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/build/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/cache-jbosscache/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/client/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/client-jdk15/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/common-core/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-file/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-ldap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-salesforce/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/connector-ws/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/salesforce-api/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/sandbox/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-file/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-jdbc/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-ldap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-loopback/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-olap/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-salesforce/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/connectors/translator-ws/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/console/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/documentation/admin-guide/pom.xml
===================================================================
--- trunk/documentation/admin-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/admin-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: trunk/documentation/caching-guide/pom.xml
===================================================================
--- trunk/documentation/caching-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/caching-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: trunk/documentation/client-developers-guide/pom.xml
===================================================================
--- trunk/documentation/client-developers-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/client-developers-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: trunk/documentation/developer-guide/pom.xml
===================================================================
--- trunk/documentation/developer-guide/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/developer-guide/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: trunk/documentation/pom.xml
===================================================================
--- trunk/documentation/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/documentation/quick-start-example/pom.xml
===================================================================
--- trunk/documentation/quick-start-example/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/quick-start-example/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: trunk/documentation/reference/pom.xml
===================================================================
--- trunk/documentation/reference/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/documentation/reference/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/engine/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/hibernate-dialect/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/jboss-integration/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/metadata/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -5,15 +5,15 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
<site.url>http://www.jboss.org/teiid</site.url>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.4.0.CR1</developerConnection>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/runtime/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/common/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/db/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2011-05-03 16:47:11 UTC (rev 3141)
+++ trunk/test-integration/pom.xml 2011-05-03 16:48:28 UTC (rev 3142)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.0.CR1</version>
+ <version>7.4.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
14 years, 7 months