teiid SVN: r4330 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor/relational and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2012-08-16 11:15:12 -0400 (Thu, 16 Aug 2012)
New Revision: 4330
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1956 an additional fix for having the same element repeated in equi-join criteria
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-16 14:53:55 UTC (rev 4329)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-16 15:15:12 UTC (rev 4330)
@@ -165,7 +165,7 @@
}
its.closeSource();
this.reverseIndexes = new int[elements.size()];
- for (int i = 0; i < reverseIndexes.length; i++) {
+ for (int i = 0; i < reorderedSortIndex.length; i++) {
int oldIndex = reorderedSortIndex[i];
this.reverseIndexes[oldIndex] = i + (!state.isDistinct()&&i>=keyLength-1?1:0);
}
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-16 14:53:55 UTC (rev 4329)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-16 15:15:12 UTC (rev 4330)
@@ -598,6 +598,64 @@
helpTestJoin();
}
+ @Test public void testMergeJoinOptimizationRepeatedElements() throws Exception {
+ this.joinType = JoinType.JOIN_INNER;
+ this.leftTuples = createMultiColTuples(9, 2);
+ this.rightTuples = new List[100];
+ for (int i = 0; i < rightTuples.length; i++) {
+ rightTuples[i] = new ArrayList(this.leftTuples[i%this.leftTuples.length]);
+ if (i == 0) {
+ rightTuples[i].add(1, rightTuples[i].get(0));
+ } else {
+ rightTuples[i].add(1, (Integer)rightTuples[i].get(0) + 1);
+ }
+ }
+
+ expected = new List[] {
+ Arrays.asList(new Object[] { 0, 17, 0, 0, 17 }),
+ };
+ ElementSymbol es1 = new ElementSymbol("e1"); //$NON-NLS-1$
+ es1.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es2 = new ElementSymbol("e2"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es3 = new ElementSymbol("e3"); //$NON-NLS-1$
+ es1.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es4 = new ElementSymbol("e4"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es5 = new ElementSymbol("e5"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+
+ leftNode = new FakeRelationalNode(1, leftTuples);
+ leftNode.setElements(Arrays.asList(es1, es2));
+
+ rightNode = new FakeRelationalNode(2, rightTuples);
+ rightNode.setElements(Arrays.asList(es3, es4, es5));
+
+ List joinElements = new ArrayList();
+ joinElements.addAll(leftNode.getElements());
+ joinElements.addAll(rightNode.getElements());
+
+ join = new JoinNode(3);
+ join.setElements(joinElements);
+ join.setJoinType(joinType);
+ join.setJoinExpressions(Arrays.asList(es1, es1, es2), Arrays.asList(es3, es4, es5));
+ join.setJoinStrategy(joinStrategy);
+ this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
+ this.join.setJoinStrategy(joinStrategy);
+ helpTestJoinDirect(expected, 10, 1);
+ }
+
+ private List[] createMultiColTuples(int rows, int cols) {
+ List[] data = new List[rows];
+ for(int i=0; i<rows; i++) {
+ data[i] = new ArrayList();
+ for (int j = 0; j < cols; j++) {
+ data[i].add(((i+j)*17) % 47);
+ }
+ }
+ return data;
+ }
+
@Test public void testMergeJoinOptimization() throws Exception {
helpTestEnhancedSortMergeJoin(99);
}
12 years, 4 months
- 1
- 0
teiid SVN: r4329 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 8 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-16 10:53:55 -0400 (Thu, 16 Aug 2012)
New Revision: 4329
Added:
trunk/engine/src/main/java/org/teiid/query/util/Options.java
Modified:
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java
trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java
trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
Log:
TEIID-2149 changing the applicability of subqueryUnnestDefault
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-08-16 14:53:55 UTC (rev 4329)
@@ -10,7 +10,7 @@
<P><A HREF="http://www.teiid.org/"><IMG SRC="https://www.jboss.org/dms/teiid/images/teiid-banner.png" NAME="graphics1" ALT="Teiid" ALIGN=BOTTOM WIDTH=800></A>
<H1>Teiid ${project.version} Release Notes</H1>
-<P>Teiid ${project.version} adds metadata and integration features.
+<P>Teiid ${project.version} adds performance and integration features.
<H2>Overview</H2>
<UL>
@@ -25,8 +25,6 @@
<LI><A HREF="#About">About JBoss</A>
</UL>
<H2><A NAME="Highlights"></A>Highlights</H2>
-<UL>
-</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
<ul>
@@ -35,6 +33,12 @@
<li>decodeinteger/decodestring have been deprecated. A CASE expression should be used instead.
</ul>
+<h4>from 8.1</h4>
+<ul>
+ <li>TEIID-2149 <B>Subquery Unnesting</B> - the optimizer will not consult the subqueryUnnestDefault property if it can make a cost based decision to replace a subquery with a merge join.
+Use the subquery hints, DJ, MJ, and NO_UNNEST to override this behavior if needed.
+<ul>
+
<h4>from 8.0</h4>
<ul>
<li>org.teiid.metadata.Schema holds FunctionMethods by uuid rather than name to accommodate overridden method signatures.
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -43,6 +43,7 @@
import org.teiid.core.id.IDGenerator;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.process.AuthorizationValidator.CommandType;
import org.teiid.dqp.internal.process.multisource.MultiSourceCapabilitiesFinder;
@@ -85,6 +86,7 @@
import org.teiid.query.tempdata.GlobalTableStore;
import org.teiid.query.tempdata.TempTableStore;
import org.teiid.query.util.CommandContext;
+import org.teiid.query.util.Options;
import org.teiid.query.validator.AbstractValidationVisitor;
import org.teiid.query.validator.ValidationVisitor;
import org.teiid.query.validator.Validator;
@@ -245,6 +247,9 @@
context.setResultSetCacheEnabled(this.resultSetCacheEnabled);
context.setUserRequestSourceConcurrency(this.userRequestConcurrency);
context.setSubject(workContext.getSubject());
+ Options options = new Options();
+ options.setProperties(System.getProperties());
+ PropertiesUtils.setBeanProperties(options, options.getProperties(), "org.teiid"); //$NON-NLS-1$
this.context.setSession(workContext.getSession());
this.context.setRequestId(this.requestId);
this.context.setDQPWorkContext(this.workContext);
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -74,9 +74,6 @@
public final class RuleMergeCriteria implements OptimizerRule {
- public static final String UNNEST_DEFAULT = "org.teiid.subqueryUnnestDefault"; //$NON-NLS-1$
- private final boolean UNNEST = Boolean.getBoolean(UNNEST_DEFAULT);
-
/**
* Used to replace correlated references
*/
@@ -246,7 +243,7 @@
float sourceCost = NewCalculateCostUtil.computeCostForTree(current.getFirstChild(), metadata);
Criteria crit = (Criteria)current.getProperty(NodeConstants.Info.SELECT_CRITERIA);
- PlannedResult plannedResult = findSubquery(crit);
+ PlannedResult plannedResult = findSubquery(crit, true);
if (plannedResult.query == null) {
return current;
}
@@ -338,7 +335,7 @@
}
}
- public PlannedResult findSubquery(Criteria crit) throws TeiidComponentException, QueryMetadataException {
+ public PlannedResult findSubquery(Criteria crit, boolean unnest) throws TeiidComponentException, QueryMetadataException {
PlannedResult result = new PlannedResult();
if (crit instanceof SubquerySetCriteria) {
//convert to the quantified form
@@ -350,12 +347,12 @@
result.type = crit.getClass();
result.mergeJoin = ssc.getSubqueryHint().isMergeJoin();
result.makeInd = ssc.getSubqueryHint().isDepJoin();
- if (!UNNEST && !result.mergeJoin) {
+ if (!unnest && !result.mergeJoin) {
return result;
}
crit = new SubqueryCompareCriteria(ssc.getExpression(), ssc.getCommand(), SubqueryCompareCriteria.EQ, SubqueryCompareCriteria.SOME);
} else if (crit instanceof CompareCriteria) {
- if (!UNNEST) {
+ if (!unnest) {
return result;
}
//convert to the quantified form
@@ -406,7 +403,7 @@
//the correlations can only be in where (if no group by or aggregates) or having
result.mergeJoin = exists.getSubqueryHint().isMergeJoin();
result.makeInd = exists.getSubqueryHint().isDepJoin();
- if (!UNNEST && !result.mergeJoin) {
+ if (!unnest && !result.mergeJoin) {
return result;
}
result.query = (Query)exists.getCommand();
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -256,7 +256,7 @@
}
ExistsCriteria ec = new ExistsCriteria();
ec.setSubqueryHint(new ExistsCriteria.SubqueryHint());
- ec.getSubqueryHint().setDepJoin(true);
+ ec.getSubqueryHint().setDepJoin();
ec.setCommand(query);
Criteria existing = stagableQuery.getCriteria();
stagableQuery.setCriteria(Criteria.combineCriteria(existing, ec));
Modified: trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -219,7 +219,7 @@
} else if (parts[i].equalsIgnoreCase(SubqueryHint.NOUNNEST)) {
hint.setNoUnnest(true);
} else if (parts[i].equalsIgnoreCase(SubqueryHint.DJ)) {
- hint.setDepJoin(true);
+ hint.setDepJoin();
}
}
return hint;
Modified: trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -113,6 +113,17 @@
DataTypeManager.DefaultDataTypes.BIG_INTEGER, DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.LONG,
DataTypeManager.DefaultDataTypes.FLOAT, DataTypeManager.DefaultDataTypes.DOUBLE));
+ // Constants used in simplifying mathematical criteria
+ private final static Integer INTEGER_ZERO = new Integer(0);
+ private final static Double DOUBLE_ZERO = new Double(0);
+ private final static Float FLOAT_ZERO = new Float(0);
+ private final static Long LONG_ZERO = new Long(0);
+ private final static BigInteger BIG_INTEGER_ZERO = new BigInteger("0"); //$NON-NLS-1$
+ private final static BigDecimal BIG_DECIMAL_ZERO = new BigDecimal("0"); //$NON-NLS-1$
+ private final static Short SHORT_ZERO = new Short((short)0);
+ private final static Byte BYTE_ZERO = new Byte((byte)0);
+ private boolean rewriteAggs = true;
+
private QueryMetadataInterface metadata;
private CommandContext context;
@@ -425,7 +436,7 @@
names.add(gs.getName());
}
for (Iterator<Criteria> crits = current.iterator(); crits.hasNext();) {
- PlannedResult plannedResult = rmc.findSubquery(crits.next());
+ PlannedResult plannedResult = rmc.findSubquery(crits.next(), context!=null?context.getOptions().isSubqueryUnnestDefault():false);
if (plannedResult.not || plannedResult.query == null || plannedResult.query.getProcessorPlan() != null
|| plannedResult.query.getWith() != null) {
continue;
@@ -1289,17 +1300,6 @@
return false;
}
- // Constants used in simplifying mathematical criteria
- private Integer INTEGER_ZERO = new Integer(0);
- private Double DOUBLE_ZERO = new Double(0);
- private Float FLOAT_ZERO = new Float(0);
- private Long LONG_ZERO = new Long(0);
- private BigInteger BIG_INTEGER_ZERO = new BigInteger("0"); //$NON-NLS-1$
- private BigDecimal BIG_DECIMAL_ZERO = new BigDecimal("0"); //$NON-NLS-1$
- private Short SHORT_ZERO = new Short((short)0);
- private Byte BYTE_ZERO = new Byte((byte)0);
- private boolean rewriteAggs = true;
-
/**
* @param criteria
* @return CompareCriteria
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/ExistsCriteria.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -64,8 +64,8 @@
return noUnnest;
}
- public void setDepJoin(boolean depJoin) {
- this.depJoin = depJoin;
+ public void setDepJoin() {
+ this.depJoin = true;
this.mergeJoin = true;
}
Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -146,6 +146,8 @@
private ClassLoader classLoader;
private List<Exception> warnings = null;
+
+ private Options options = null;
}
private GlobalState globalState = new GlobalState();
@@ -814,5 +816,16 @@
public void setTupleSourceCache(TupleSourceCache tupleSourceCache) {
this.tupleSourceCache = tupleSourceCache;
}
+
+ public Options getOptions() {
+ if (this.globalState.options == null) {
+ this.globalState.options = new Options();
+ }
+ return this.globalState.options;
+ }
+
+ public void setOptions(Options options) {
+ this.globalState.options = options;
+ }
}
Added: trunk/engine/src/main/java/org/teiid/query/util/Options.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/util/Options.java (rev 0)
+++ trunk/engine/src/main/java/org/teiid/query/util/Options.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.query.util;
+
+import java.util.Properties;
+
+/**
+ * A holder for options
+ */
+public class Options {
+
+ public static final String UNNEST_DEFAULT = "org.teiid.subqueryUnnestDefault"; //$NON-NLS-1$
+
+ private Properties properties;
+ private boolean subqueryUnnestDefault;
+
+ public Properties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
+
+ public boolean isSubqueryUnnestDefault() {
+ return subqueryUnnestDefault;
+ }
+
+ public void setSubqueryUnnestDefault(boolean subqueryUnnestDefault) {
+ this.subqueryUnnestDefault = subqueryUnnestDefault;
+ }
+
+ public Options subqueryUnnestDefault(boolean s) {
+ this.subqueryUnnestDefault = s;
+ return this;
+ }
+
+}
Property changes on: trunk/engine/src/main/java/org/teiid/query/util/Options.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -25,7 +25,6 @@
import static org.junit.Assert.*;
import static org.teiid.query.optimizer.TestOptimizer.*;
-import org.junit.After;
import org.junit.Test;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
@@ -37,10 +36,11 @@
import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability;
-import org.teiid.query.optimizer.relational.rules.RuleMergeCriteria;
import org.teiid.query.processor.ProcessorPlan;
import org.teiid.query.rewriter.TestQueryRewriter;
import org.teiid.query.unittest.RealMetadataFactory;
+import org.teiid.query.util.CommandContext;
+import org.teiid.query.util.Options;
import org.teiid.translator.ExecutionFactory;
import org.teiid.translator.SourceSystemFunctions;
@@ -392,9 +392,9 @@
}
/**
- * Check that subquery is not pushed if the subquery cannot all be pushed to the source.
+ * Check that subquery is not pushed if the subquery cannot all be pushed to the source. Automatically converted to a merge join
*/
- @Test public void testNoPushSubqueryInWhereClause1() {
+ @Test public void testNoPushSubqueryInWhereClause1() throws Exception {
FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
BasicSourceCapabilities caps = getTypicalCapabilities();
caps.setCapabilitySupport(Capability.CRITERIA_IN_SUBQUERY, true);
@@ -403,25 +403,25 @@
ProcessorPlan plan = helpPlan("Select e1 from pm1.g1 where e1 in (select max(e1) FROM pm1.g2)", RealMetadataFactory.example1Cached(), //$NON-NLS-1$
null, capFinder,
- new String[] { "SELECT e1 FROM pm1.g1" }, SHOULD_SUCCEED); //$NON-NLS-1$
+ new String[] { "SELECT g_0.e1 AS c_0 FROM pm1.g1 AS g_0 ORDER BY c_0" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
checkNodeTypes(plan, new int[] {
1, // Access
0, // DependentAccess
- 1, // DependentSelect
+ 0, // DependentSelect
0, // DependentProject
0, // DupRemove
0, // Grouping
0, // NestedLoopJoinStrategy
- 0, // MergeJoinStrategy
+ 1, // MergeJoinStrategy
0, // Null
- 0, // PlanExecution
+ 1, // PlanExecution
1, // Project
0, // Select
0, // Sort
0 // UnionAll
});
}
-
+
/**
* Check that subquery is not pushed if the subquery is from a different model
* than the outer query.
@@ -768,16 +768,18 @@
}
@Test public void testSubqueryRewriteToJoinDistinct() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select distinct e1 from pm1.g1 as x where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = x.e1)", "SELECT DISTINCT e1 FROM pm1.g1 AS x, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE x.e1 = X__1.e1", RealMetadataFactory.example1Cached());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select distinct e1 from pm1.g1 as x where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = x.e1)", "SELECT DISTINCT e1 FROM pm1.g1 AS x, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE x.e1 = X__1.e1", RealMetadataFactory.example1Cached(), cc);
}
/**
* Agg does not depend on cardinality
*/
@Test public void testSubqueryRewriteToJoinGroupBy() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select max(e1) from pm1.g1 as x where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = x.e1) group by e2", "SELECT MAX(e1) FROM pm1.g1 AS x, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE x.e1 = X__1.e1 GROUP BY e2", RealMetadataFactory.example1Cached());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select max(e1) from pm1.g1 as x where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = x.e1) group by e2", "SELECT MAX(e1) FROM pm1.g1 AS x, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE x.e1 = X__1.e1 GROUP BY e2", RealMetadataFactory.example1Cached(), cc);
}
/**
@@ -788,8 +790,9 @@
}
@Test public void testSubqueryRewriteToJoin() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = pm3.g1.e1)", "SELECT e1 FROM pm3.g1, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE pm3.g1.e1 = X__1.e1", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where exists (select pm1.g1.e1 FROM pm1.g1 where e1 = pm3.g1.e1)", "SELECT e1 FROM pm3.g1, (SELECT pm1.g1.e1 FROM pm1.g1) AS X__1 WHERE pm3.g1.e1 = X__1.e1", RealMetadataFactory.example4(), cc);
}
@Test public void testSubqueryRewriteToJoin1() throws Exception {
@@ -816,13 +819,15 @@
}
@Test public void testDontRewriteToJoinWithOtherCriteria() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e1 in /*+ NO_UNNEST */ (select pm1.g1.e1 FROM pm1.g1 where e2 < pm3.g1.e2)", "SELECT e1 FROM pm3.g1 WHERE pm3.g1.e1 IN /*+ NO_UNNEST */ (SELECT pm1.g1.e1 FROM pm1.g1 WHERE e2 < pm3.g1.e2)", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e1 in /*+ NO_UNNEST */ (select pm1.g1.e1 FROM pm1.g1 where e2 < pm3.g1.e2)", "SELECT e1 FROM pm3.g1 WHERE pm3.g1.e1 IN /*+ NO_UNNEST */ (SELECT pm1.g1.e1 FROM pm1.g1 WHERE e2 < pm3.g1.e2)", RealMetadataFactory.example4(), cc);
}
@Test public void testSubqueryRewriteToJoinWithAggregate() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (select max(e2) FROM pm1.g1 where pm3.g1.e1 = e1)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1 FROM pm1.g1 GROUP BY e1) AS X__1 WHERE (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (select max(e2) FROM pm1.g1 where pm3.g1.e1 = e1)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1 FROM pm1.g1 GROUP BY e1) AS X__1 WHERE (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4(), cc);
}
/**
@@ -834,13 +839,15 @@
}
@Test public void testSubqueryRewriteToJoinWithAggregate2() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (select max(e2) FROM pm1.g1 WHERE pm3.g1.e1 = e1 HAVING min(e3) < pm3.g1.e3)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1, MIN(e3) AS expr3 FROM pm1.g1 GROUP BY e1) AS X__1 WHERE (X__1.expr3 < pm3.g1.e3) AND (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (select max(e2) FROM pm1.g1 WHERE pm3.g1.e1 = e1 HAVING min(e3) < pm3.g1.e3)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1, MIN(e3) AS expr3 FROM pm1.g1 GROUP BY e1) AS X__1 WHERE (X__1.expr3 < pm3.g1.e3) AND (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4(), cc);
}
@Test public void testSubqueryRewriteToJoinWithGroupingExpression() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select distinct e1 from pm3.g1 where exists (select 1 FROM pm1.g1 group by e4 || 'x' HAVING min(e3) || (e4 || 'x') = pm3.g1.e3)", "SELECT DISTINCT e1 FROM pm3.g1, (SELECT 1 AS expr1, MIN(e3) AS expr2, concat(convert(e4, string), 'x') AS expr3, concat(convert(MIN(e3), string), concat(convert(e4, string), 'x')) AS expr FROM pm1.g1 GROUP BY concat(convert(e4, string), 'x')) AS X__1 WHERE convert(pm3.g1.e3, string) = X__1.expr", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select distinct e1 from pm3.g1 where exists (select 1 FROM pm1.g1 group by e4 || 'x' HAVING min(e3) || (e4 || 'x') = pm3.g1.e3)", "SELECT DISTINCT e1 FROM pm3.g1, (SELECT 1 AS expr1, MIN(e3) AS expr2, concat(convert(e4, string), 'x') AS expr3, concat(convert(MIN(e3), string), concat(convert(e4, string), 'x')) AS expr FROM pm1.g1 GROUP BY concat(convert(e4, string), 'x')) AS X__1 WHERE convert(pm3.g1.e3, string) = X__1.expr", RealMetadataFactory.example4(), cc);
}
/**
@@ -876,8 +883,9 @@
}
@Test public void testSubqueryExpressionJoin() throws Exception {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
- TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (Select max(e2) from pm2.g2 where e1 = pm3.g1.e1 having convert(min(e2), string) > pm3.g1.e1)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1, MIN(e2) AS expr3 FROM pm2.g2 GROUP BY e1) AS X__1 WHERE (convert(X__1.expr3, string) > pm3.g1.e1) AND (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4());
+ CommandContext cc = new CommandContext();
+ cc.setOptions(new Options().subqueryUnnestDefault(true));
+ TestQueryRewriter.helpTestRewriteCommand("Select e1 from pm3.g1 where pm3.g1.e2 < (Select max(e2) from pm2.g2 where e1 = pm3.g1.e1 having convert(min(e2), string) > pm3.g1.e1)", "SELECT e1 FROM pm3.g1, (SELECT MAX(e2) AS expr1, e1, MIN(e2) AS expr3 FROM pm2.g2 GROUP BY e1) AS X__1 WHERE (convert(X__1.expr3, string) > pm3.g1.e1) AND (pm3.g1.e2 < X__1.expr1) AND (pm3.g1.e1 = X__1.e1)", RealMetadataFactory.example4(), cc);
}
/**
@@ -933,7 +941,6 @@
* Same as above, but the source is much larger, so a semi-join is favorable
*/
@Test public void testSemiJoinExistsCosting() {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.TRUE.toString());
ProcessorPlan plan = helpPlan("Select e1 from pm2.g2 as o where not exists (select 1 from pm3.g1 where e1 = o.e1 having o.e2 = count(e2))", RealMetadataFactory.example4(), //$NON-NLS-1$
new String[] { "SELECT g_0.e1 AS c_0, g_0.e2 AS c_1 FROM pm2.g2 AS g_0 ORDER BY c_0, c_1" }); //$NON-NLS-1$
checkNodeTypes(plan, new int[] {
@@ -977,10 +984,6 @@
checkJoinCounts(plan, 0, 1);
}
- @After public void tearDown() {
- System.setProperty(RuleMergeCriteria.UNNEST_DEFAULT, Boolean.FALSE.toString());
- }
-
@Test public void testAntiSemiJoinInHint() {
ProcessorPlan plan = helpPlan("Select e1 from pm1.g2 as o where e2 NOT IN /*+ MJ */ (select count(e2) from pm3.g1 where e1 = o.e1)", RealMetadataFactory.example4(), //$NON-NLS-1$
new String[] { "SELECT g_0.e2 AS c_0, g_0.e1 AS c_1 FROM pm1.g2 AS g_0 ORDER BY c_1, c_0" }); //$NON-NLS-1$
Modified: trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2012-08-16 13:32:05 UTC (rev 4328)
+++ trunk/engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java 2012-08-16 14:53:55 UTC (rev 4329)
@@ -173,11 +173,15 @@
}
public static Command helpTestRewriteCommand(String original, String expected, QueryMetadataInterface metadata) throws TeiidException {
- Command command = QueryParser.getQueryParser().parseCommand(original);
- QueryResolver.resolveCommand(command, metadata);
- Command rewriteCommand = QueryRewriter.rewrite(command, metadata, null);
- assertEquals("Rewritten command was not expected", expected, rewriteCommand.toString()); //$NON-NLS-1$
- return rewriteCommand;
+ return helpTestRewriteCommand(original, expected, metadata, null);
+ }
+
+ public static Command helpTestRewriteCommand(String original, String expected, QueryMetadataInterface metadata, CommandContext cc) throws TeiidException {
+ Command command = QueryParser.getQueryParser().parseCommand(original);
+ QueryResolver.resolveCommand(command, metadata);
+ Command rewriteCommand = QueryRewriter.rewrite(command, metadata, cc);
+ assertEquals("Rewritten command was not expected", expected, rewriteCommand.toString()); //$NON-NLS-1$
+ return rewriteCommand;
}
@Test public void testRewriteUnknown() {
12 years, 4 months
- 1
- 0
teiid SVN: r4328 - in trunk: engine/src/main/java/org/teiid/common/buffer and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-16 09:32:05 -0400 (Thu, 16 Aug 2012)
New Revision: 4328
Added:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/SaveOnReadInputStream.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestSaveOnReadInputStream.java
Modified:
trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java
trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
Log:
TEIID-2148 adding a saveonreadinputstream
Modified: trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -32,6 +32,16 @@
import javax.xml.transform.stream.StreamResult;
public class StandardXMLTranslator extends XMLTranslator {
+
+ private static ThreadLocal<TransformerFactory> threadLocalTransformerFactory = new ThreadLocal<TransformerFactory>() {
+ protected TransformerFactory initialValue() {
+ return TransformerFactory.newInstance();
+ }
+ };
+
+ public static TransformerFactory getThreadLocalTransformerFactory() {
+ return threadLocalTransformerFactory.get();
+ }
private Source source;
@@ -41,7 +51,7 @@
@Override
public void translate(Writer writer) throws TransformerException, IOException {
- Transformer t = TransformerFactory.newInstance().newTransformer();
+ Transformer t = threadLocalTransformerFactory.get().newTransformer();
t.transform(source, new StreamResult(writer));
}
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -42,6 +42,7 @@
private int count;
private boolean bytesWritten;
private boolean closed;
+ private byte[] singleByte = new byte[1];
public FileStoreOutputStream(int size) {
this.buffer = new byte[size];
@@ -49,7 +50,8 @@
@Override
public void write(int b) throws IOException {
- write(new byte[b], 0, 1);
+ singleByte[0] = (byte)b;
+ write(singleByte, 0, 1);
}
@Override
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -47,11 +47,19 @@
}
@Override
- public InputStream getInputStream() throws IOException {
+ public InputStream getInputStream() {
+ return getInputStream(0);
+ }
+
+ public InputStream getInputStream(long start) {
if (fsos != null && !fsos.bytesWritten()) {
- return new ByteArrayInputStream(fsos.getBuffer(), 0, fsos.getCount());
+ if (start > Integer.MAX_VALUE) {
+ throw new AssertionError("Invalid start " + start); //$NON-NLS-1$
+ }
+ int s = (int)start;
+ return new ByteArrayInputStream(fsos.getBuffer(), s, fsos.getCount() - s);
}
- return lobBuffer.createInputStream(0);
+ return lobBuffer.createInputStream(start);
}
@Override
@@ -89,7 +97,7 @@
}
@Override
- public void free() throws IOException {
+ public void free() {
lobBuffer.remove();
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -23,6 +23,8 @@
package org.teiid.dqp.internal.process;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.List;
@@ -33,6 +35,7 @@
import javax.activation.DataSource;
import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
import org.teiid.client.SourceWarning;
import org.teiid.common.buffer.BlockedException;
@@ -52,7 +55,7 @@
import org.teiid.core.types.TransformationException;
import org.teiid.core.types.XMLType;
import org.teiid.core.util.Assertion;
-import org.teiid.core.util.ObjectConverterUtil;
+import org.teiid.core.util.ReaderInputStream;
import org.teiid.dqp.internal.datamgr.ConnectorWork;
import org.teiid.dqp.internal.process.DQPCore.CompletionListener;
import org.teiid.dqp.internal.process.DQPCore.FutureWork;
@@ -221,28 +224,42 @@
FileStore fs = dtm.getBufferManager().createFileStore("bytes"); //$NON-NLS-1$
//TODO: guess at the encoding from the content type
FileStoreInputStreamFactory fsisf = new FileStoreInputStreamFactory(fs, Streamable.ENCODING);
-
+
try {
- ObjectConverterUtil.write(fsisf.getOuputStream(), ((DataSource)value).getInputStream(), -1);
+ SaveOnReadInputStream is = new SaveOnReadInputStream(((DataSource)value).getInputStream(), fsisf);
+ return new BlobType(new BlobImpl(is.getInputStreamFactory()));
} catch (IOException e) {
- throw new TransformationException(QueryPlugin.Event.TEIID30500, e, e.getMessage());
+ throw new TransformationException(QueryPlugin.Event.TEIID30500, e, e.getMessage());
}
- return new BlobType(new BlobImpl(fsisf));
}
if (value instanceof Source) {
- if (value instanceof InputStreamFactory) {
- return new XMLType(new SQLXMLImpl((InputStreamFactory)value));
+ if (!(value instanceof InputStreamFactory)) {
+ if (value instanceof StreamSource) {
+ StreamSource ss = (StreamSource)value;
+ InputStream is = ss.getInputStream();
+ Reader r = ss.getReader();
+ if (is == null && r != null) {
+ is = new ReaderInputStream(r, Streamable.CHARSET);
+ }
+ final FileStore fs = dtm.getBufferManager().createFileStore("xml"); //$NON-NLS-1$
+ final FileStoreInputStreamFactory fsisf = new FileStoreInputStreamFactory(fs, Streamable.ENCODING);
+
+ value = new SaveOnReadInputStream(is, fsisf).getInputStreamFactory();
+ } else {
+ //maybe dom or some other source we want to get out of memory
+ StandardXMLTranslator sxt = new StandardXMLTranslator((Source)value);
+ SQLXMLImpl sqlxml;
+ try {
+ sqlxml = XMLSystemFunctions.saveToBufferManager(dtm.getBufferManager(), sxt);
+ } catch (TeiidComponentException e) {
+ throw new TeiidRuntimeException(e);
+ } catch (TeiidProcessingException e) {
+ throw new TeiidRuntimeException(e);
+ }
+ return new XMLType(sqlxml);
+ }
}
- StandardXMLTranslator sxt = new StandardXMLTranslator((Source)value);
- SQLXMLImpl sqlxml;
- try {
- sqlxml = XMLSystemFunctions.saveToBufferManager(dtm.getBufferManager(), sxt);
- } catch (TeiidComponentException e) {
- throw new TeiidRuntimeException(e);
- } catch (TeiidProcessingException e) {
- throw new TeiidRuntimeException(e);
- }
- return new XMLType(sqlxml);
+ return new XMLType(new SQLXMLImpl((InputStreamFactory)value));
}
return DataTypeManager.convertToRuntimeType(value);
}
Added: trunk/engine/src/main/java/org/teiid/dqp/internal/process/SaveOnReadInputStream.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/SaveOnReadInputStream.java (rev 0)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/SaveOnReadInputStream.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.dqp.internal.process;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.teiid.common.buffer.FileStoreInputStreamFactory;
+import org.teiid.common.buffer.FileStore.FileStoreOutputStream;
+import org.teiid.core.types.InputStreamFactory;
+
+/**
+ * An {@link InputStream} wrapper that saves the input on read and provides a {@link InputStreamFactory}.
+ */
+final class SaveOnReadInputStream extends FilterInputStream {
+
+ class SwitchingInputStream extends FilterInputStream {
+
+ protected SwitchingInputStream() {
+ super(SaveOnReadInputStream.this);
+ }
+
+ public void setIn(InputStream is) {
+ this.in = is;
+ }
+
+ }
+
+ private SwitchingInputStream sis = new SwitchingInputStream();
+ private final FileStoreInputStreamFactory fsisf;
+ private FileStoreOutputStream fsos;
+ private boolean saved;
+ private boolean read;
+ private boolean returned;
+
+ InputStreamFactory inputStreamFactory = new InputStreamFactory() {
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ if (!saved) {
+ if (!returned) {
+ returned = true;
+ return sis;
+ }
+ //save the rest of the stream
+ SaveOnReadInputStream.this.fsos.flush();
+ long start = SaveOnReadInputStream.this.fsisf.getLength();
+ SaveOnReadInputStream.this.close(); //force the pending read
+ InputStream is = SaveOnReadInputStream.this.fsisf.getInputStream(start);
+ sis.setIn(is);
+ }
+ return fsisf.getInputStream();
+ }
+
+ @Override
+ public StorageMode getStorageMode() {
+ if (!saved) {
+ try {
+ getInputStream().close();
+ } catch (IOException e) {
+ return StorageMode.OTHER;
+ }
+ }
+ return fsisf.getStorageMode();
+ }
+ };
+
+ SaveOnReadInputStream(InputStream in,
+ FileStoreInputStreamFactory fsisf) {
+ super(in);
+ this.fsisf = fsisf;
+ fsos = fsisf.getOuputStream();
+ }
+
+ @Override
+ public int read() throws IOException {
+ read = true;
+ int i = super.read();
+ read = false;
+ if (i > 0) {
+ fsos.write(i);
+ } else {
+ saved = true;
+ }
+ return i;
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len)
+ throws IOException {
+ read = true;
+ int bytes = super.read(b, off, len);
+ read = false;
+ if (bytes > 0) {
+ fsos.write(b, off, bytes);
+ } else if (bytes == -1) {
+ saved = true;
+ }
+ return bytes;
+ }
+
+ @Override
+ public void close() throws IOException {
+ try {
+ if (!saved && !read) {
+ byte[] bytes = new byte[1<<13];
+ while (!saved) {
+ read(bytes, 0, bytes.length);
+ }
+ }
+ fsos.close();
+ } finally {
+ if (!saved) {
+ fsisf.free();
+ saved = true;
+ }
+ super.close();
+ }
+ }
+
+ InputStreamFactory getInputStreamFactory() {
+ return inputStreamFactory;
+ }
+}
\ No newline at end of file
Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/SaveOnReadInputStream.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -88,6 +88,7 @@
import org.teiid.core.types.ClobImpl;
import org.teiid.core.types.ClobType;
import org.teiid.core.types.SQLXMLImpl;
+import org.teiid.core.types.StandardXMLTranslator;
import org.teiid.core.types.Streamable;
import org.teiid.core.types.XMLTranslator;
import org.teiid.core.types.XMLType;
@@ -326,11 +327,6 @@
}
}
- private static ThreadLocal<TransformerFactory> threadLocalTransformerFactory = new ThreadLocal<TransformerFactory>() {
- protected TransformerFactory initialValue() {
- return TransformerFactory.newInstance();
- }
- };
static ThreadLocal<XMLOutputFactory> threadLocalOutputFactory = new ThreadLocal<XMLOutputFactory>() {
protected XMLOutputFactory initialValue() {
return newXmlOutputFactory();
@@ -370,7 +366,7 @@
styleSource = convertToSource(styleSheet);
xmlSource = convertToSource(xml);
final Source xmlParam = xmlSource;
- TransformerFactory factory = threadLocalTransformerFactory.get();
+ TransformerFactory factory = StandardXMLTranslator.getThreadLocalTransformerFactory();
final Transformer transformer = factory.newTransformer(styleSource);
//this creates a non-validated sqlxml - it may not be valid xml/root-less xml
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -22,10 +22,11 @@
package org.teiid.dqp.internal.process;
+import static org.junit.Assert.*;
+
import java.util.ArrayList;
-import junit.framework.TestCase;
-
+import org.junit.Test;
import org.mockito.Mockito;
import org.teiid.client.RequestMessage;
import org.teiid.client.RequestMessage.StatementType;
@@ -46,32 +47,19 @@
import org.teiid.query.tempdata.TempTableStore.TransactionMode;
import org.teiid.query.unittest.RealMetadataFactory;
+public class TestRequest {
-
-/**
- * @since 4.2
- */
-public class TestRequest extends TestCase {
-
private static final TempTableStore TEMP_TABLE_STORE = new TempTableStore("1", TransactionMode.ISOLATE_WRITES); //$NON-NLS-1$
private final static String QUERY = "SELECT * FROM pm1.g1"; //$NON-NLS-1$
/**
- * Constructor for TestRequest.
- * @param name
- */
- public TestRequest(String name) {
- super(name);
- }
-
- /**
* Test Request.validateEntitlement().
* Make sure that this can be called both before and after metadata is initialized.
* See defect 17209.
* @throws Exception
* @since 4.2
*/
- public void testValidateEntitlement() throws Exception {
+ @Test public void testValidateEntitlement() throws Exception {
QueryMetadataInterface metadata = RealMetadataFactory.example1Cached();
Request request = new Request();
@@ -99,7 +87,7 @@
* @throws Exception
* @since 4.2
*/
- public void testProcessRequest() throws Exception {
+ @Test public void testProcessRequest() throws Exception {
QueryMetadataInterface metadata = RealMetadataFactory.example1Cached();
//Try before plan is cached.
@@ -115,7 +103,7 @@
helpProcessMessage(message, null, workContext);
}
- public void testCommandContext() throws Exception {
+ @Test public void testCommandContext() throws Exception {
QueryMetadataInterface metadata = RealMetadataFactory.example1Cached();
//Try before plan is cached.
@@ -153,7 +141,7 @@
* @throws Exception
* @since 4.2
*/
- public void testProcessRequestPreparedStatement() throws Exception {
+ @Test public void testProcessRequestPreparedStatement() throws Exception {
QueryMetadataInterface metadata = RealMetadataFactory.example1Cached();
SessionAwareCache<PreparedPlan> cache = new SessionAwareCache<PreparedPlan>();
Added: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestSaveOnReadInputStream.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestSaveOnReadInputStream.java (rev 0)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestSaveOnReadInputStream.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.dqp.internal.process;
+
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.Test;
+import org.teiid.common.buffer.BufferManagerFactory;
+import org.teiid.common.buffer.FileStore;
+import org.teiid.common.buffer.FileStoreInputStreamFactory;
+import org.teiid.core.types.InputStreamFactory;
+import org.teiid.core.types.Streamable;
+import org.teiid.core.types.InputStreamFactory.StorageMode;
+import org.teiid.core.util.ObjectConverterUtil;
+
+@SuppressWarnings("nls")
+public class TestSaveOnReadInputStream {
+
+ @Test public void testSave() throws IOException {
+ SaveOnReadInputStream soris = getSaveOnReadInputStream();
+ InputStreamFactory isf = soris.getInputStreamFactory();
+ InputStream is = isf.getInputStream();
+ assertEquals("hello world", new String(ObjectConverterUtil.convertToByteArray(is), Streamable.CHARSET));
+ InputStream is2 = isf.getInputStream();
+ assertEquals("hello world", new String(ObjectConverterUtil.convertToByteArray(is2), Streamable.CHARSET));
+ }
+
+ @Test public void testPartialReadSave() throws IOException {
+ SaveOnReadInputStream soris = getSaveOnReadInputStream();
+ InputStreamFactory isf = soris.getInputStreamFactory();
+ InputStream is = isf.getInputStream();
+ is.read();
+
+ InputStream is2 = isf.getInputStream();
+ assertEquals("ello world", new String(ObjectConverterUtil.convertToByteArray(is), Streamable.CHARSET));
+ assertEquals("hello world", new String(ObjectConverterUtil.convertToByteArray(is2), Streamable.CHARSET));
+ InputStream is3 = isf.getInputStream();
+ assertEquals("hello world", new String(ObjectConverterUtil.convertToByteArray(is3), Streamable.CHARSET));
+ }
+
+ @Test public void testStorageMode() throws IOException {
+ SaveOnReadInputStream soris = getSaveOnReadInputStream();
+ InputStreamFactory isf = soris.getInputStreamFactory();
+
+ assertEquals(StorageMode.MEMORY, isf.getStorageMode());
+
+ InputStream is = isf.getInputStream();
+ assertEquals("hello world", new String(ObjectConverterUtil.convertToByteArray(is), Streamable.CHARSET));
+ }
+
+ private SaveOnReadInputStream getSaveOnReadInputStream() {
+ FileStore fs = BufferManagerFactory.getStandaloneBufferManager().createFileStore("test");
+ FileStoreInputStreamFactory factory = new FileStoreInputStreamFactory(fs, Streamable.ENCODING);
+
+ InputStream is = new ByteArrayInputStream("hello world".getBytes(Streamable.CHARSET));
+
+ SaveOnReadInputStream soris = new SaveOnReadInputStream(is, factory);
+ return soris;
+ }
+
+}
Property changes on: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestSaveOnReadInputStream.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-15 18:44:50 UTC (rev 4327)
+++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-16 13:32:05 UTC (rev 4328)
@@ -37,7 +37,6 @@
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
import javax.transaction.RollbackException;
import javax.transaction.Synchronization;
12 years, 4 months
- 1
- 0
teiid SVN: r4327 - in branches/8.1.x/engine/src: test/java/org/teiid/query/processor/relational and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-15 14:44:50 -0400 (Wed, 15 Aug 2012)
New Revision: 4327
Modified:
branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
TEIID-1956 an additional fix for having the same element repeated in equi-join criteria
Modified: branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
===================================================================
--- branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-15 16:15:52 UTC (rev 4326)
+++ branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java 2012-08-15 18:44:50 UTC (rev 4327)
@@ -208,7 +208,7 @@
}
its.closeSource();
this.reverseIndexes = new int[elements.size()];
- for (int i = 0; i < reverseIndexes.length; i++) {
+ for (int i = 0; i < reorderedSortIndex.length; i++) {
int oldIndex = reorderedSortIndex[i];
this.reverseIndexes[oldIndex] = i + (!state.isDistinct()&&i>=keyLength-1?1:0);
}
Modified: branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-15 16:15:52 UTC (rev 4326)
+++ branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java 2012-08-15 18:44:50 UTC (rev 4327)
@@ -599,6 +599,64 @@
helpTestJoin();
}
+ @Test public void testMergeJoinOptimizationRepeatedElements() throws Exception {
+ this.joinType = JoinType.JOIN_INNER;
+ this.leftTuples = createMultiColTuples(9, 2);
+ this.rightTuples = new List[100];
+ for (int i = 0; i < rightTuples.length; i++) {
+ rightTuples[i] = new ArrayList(this.leftTuples[i%this.leftTuples.length]);
+ if (i == 0) {
+ rightTuples[i].add(1, rightTuples[i].get(0));
+ } else {
+ rightTuples[i].add(1, (Integer)rightTuples[i].get(0) + 1);
+ }
+ }
+
+ expected = new List[] {
+ Arrays.asList(new Object[] { 0, 17, 0, 0, 17 }),
+ };
+ ElementSymbol es1 = new ElementSymbol("e1"); //$NON-NLS-1$
+ es1.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es2 = new ElementSymbol("e2"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es3 = new ElementSymbol("e3"); //$NON-NLS-1$
+ es1.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es4 = new ElementSymbol("e4"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+ ElementSymbol es5 = new ElementSymbol("e5"); //$NON-NLS-1$
+ es2.setType(DataTypeManager.DefaultDataClasses.INTEGER);
+
+ leftNode = new FakeRelationalNode(1, leftTuples);
+ leftNode.setElements(Arrays.asList(es1, es2));
+
+ rightNode = new FakeRelationalNode(2, rightTuples);
+ rightNode.setElements(Arrays.asList(es3, es4, es5));
+
+ List joinElements = new ArrayList();
+ joinElements.addAll(leftNode.getElements());
+ joinElements.addAll(rightNode.getElements());
+
+ join = new JoinNode(3);
+ join.setElements(joinElements);
+ join.setJoinType(joinType);
+ join.setJoinExpressions(Arrays.asList(es1, es1, es2), Arrays.asList(es3, es4, es5));
+ join.setJoinStrategy(joinStrategy);
+ this.joinStrategy = new EnhancedSortMergeJoinStrategy(SortOption.SORT, SortOption.SORT);
+ this.join.setJoinStrategy(joinStrategy);
+ helpTestJoinDirect(expected, 10, 1);
+ }
+
+ private List[] createMultiColTuples(int rows, int cols) {
+ List[] data = new List[rows];
+ for(int i=0; i<rows; i++) {
+ data[i] = new ArrayList();
+ for (int j = 0; j < cols; j++) {
+ data[i].add(((i+j)*17) % 47);
+ }
+ }
+ return data;
+ }
+
@Test public void testMergeJoinOptimization() throws Exception {
helpTestEnhancedSortMergeJoin(99);
}
12 years, 4 months
- 1
- 0
teiid SVN: r4326 - in branches/8.1.x/engine/src: test/java/org/teiid/common/buffer and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-15 12:15:52 -0400 (Wed, 15 Aug 2012)
New Revision: 4326
Modified:
branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java
branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
branches/8.1.x/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java
Log:
TEIID-2147 fixing the reported storage mode for the filestore lobs
Modified: branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java
===================================================================
--- branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java 2012-08-15 14:51:07 UTC (rev 4325)
+++ branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java 2012-08-15 16:15:52 UTC (rev 4326)
@@ -42,6 +42,7 @@
private int count;
private boolean bytesWritten;
private boolean closed;
+ private byte[] singleByte = new byte[1];
public FileStoreOutputStream(int size) {
this.buffer = new byte[size];
@@ -49,7 +50,8 @@
@Override
public void write(int b) throws IOException {
- write(new byte[b], 0, 1);
+ singleByte[0] = (byte)b;
+ write(singleByte, 0, 1);
}
@Override
Modified: branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java
===================================================================
--- branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-15 14:51:07 UTC (rev 4325)
+++ branches/8.1.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2012-08-15 16:15:52 UTC (rev 4326)
@@ -90,12 +90,13 @@
@Override
public void free() throws IOException {
+ fsos = null;
lobBuffer.remove();
}
@Override
public StorageMode getStorageMode() {
- if (fsos == null) {
+ if (fsos == null || fsos.bytesWritten()) {
return StorageMode.PERSISTENT;
}
return StorageMode.MEMORY;
Modified: branches/8.1.x/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java
===================================================================
--- branches/8.1.x/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2012-08-15 14:51:07 UTC (rev 4325)
+++ branches/8.1.x/engine/src/test/java/org/teiid/common/buffer/TestLobManager.java 2012-08-15 16:15:52 UTC (rev 4326)
@@ -31,12 +31,14 @@
import java.util.List;
import org.junit.Test;
+import org.teiid.common.buffer.FileStore.FileStoreOutputStream;
import org.teiid.common.buffer.LobManager.ReferenceMode;
import org.teiid.common.buffer.impl.BufferManagerImpl;
import org.teiid.core.types.BlobImpl;
import org.teiid.core.types.BlobType;
import org.teiid.core.types.ClobImpl;
import org.teiid.core.types.ClobType;
+import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.InputStreamFactory;
import org.teiid.core.types.Streamable;
import org.teiid.core.util.ObjectConverterUtil;
@@ -65,12 +67,25 @@
return new ReaderInputStream(new StringReader("Blob contents Two"), Charset.forName(Streamable.ENCODING));
}
- }));
+ }));
- LobManager lobManager = new LobManager(new int[] {0, 1}, fs);
+ FileStore fs1 = buffMgr.createFileStore("blob");
+ FileStoreInputStreamFactory fsisf = new FileStoreInputStreamFactory(fs1, Streamable.ENCODING);
+ FileStoreOutputStream fsos = fsisf.getOuputStream();
+ byte[] b = new byte[DataTypeManager.MAX_LOB_MEMORY_BYTES + 1];
+ fsos.write(b);
+ fsos.close();
+ BlobType blob1 = new BlobType(new BlobImpl(fsisf));
+
+ assertNotNull(blob1.getReferenceStreamId());
+
+ LobManager lobManager = new LobManager(new int[] {0, 1, 2}, fs);
lobManager.setMaxMemoryBytes(4);
- List<?> tuple = Arrays.asList(clob, blob);
+ List<?> tuple = Arrays.asList(clob, blob, blob1);
lobManager.updateReferences(tuple, ReferenceMode.CREATE);
+
+ assertNotNull(blob1.getReferenceStreamId());
+
lobManager.persist();
Streamable<?>lob = lobManager.getLobReference(clob.getReferenceStreamId());
12 years, 4 months
- 1
- 0
teiid SVN: r4325 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2012-08-15 10:51:07 -0400 (Wed, 15 Aug 2012)
New Revision: 4325
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java
Log:
TEIID-2146 Dependent join independent dup removal issue
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-14 18:27:24 UTC (rev 4324)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-15 14:51:07 UTC (rev 4325)
@@ -116,10 +116,10 @@
if (setState.maxNdv <= 0 || setState.maxNdv >= distinctCount) {
continue;
}
- if (dvs.getTupleBuffer().getSchema().size() > 1) {
+ if (dvs.getTupleBuffer().getSchema().size() > 1 && dependentSetStates.size() > 1) {
distinctCount = 0;
ValueIterator vi = dvs.getValueIterator(setState.valueExpression);
- if (dvs.getTupleBuffer().getSchema().indexOf(setState.valueExpression) == 0) {
+ if (setState.valueExpression.equals(dependentSetStates.get(0).valueExpression)) {
Object last = null;
while (vi.hasNext()) {
Object next = vi.next();
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-14 18:27:24 UTC (rev 4324)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-15 14:51:07 UTC (rev 4325)
@@ -126,7 +126,7 @@
sortTypes.add(orderByItem.isAscending());
nullOrderings.add(orderByItem.getNullOrdering());
}
- if (items.size() < schema.size() && mode != Mode.SORT) {
+ if (items.size() < schema.size() && mode == Mode.DUP_REMOVE_SORT) {
List<Expression> toAdd = new ArrayList<Expression>(schema);
toAdd.removeAll(sortElements);
sortElements.addAll(toAdd);
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-14 18:27:24 UTC (rev 4324)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-15 14:51:07 UTC (rev 4325)
@@ -37,6 +37,7 @@
import org.teiid.query.optimizer.TestOptimizer;
import org.teiid.query.optimizer.TestOptimizer.ComparisonMode;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
+import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability;
import org.teiid.query.processor.relational.JoinNode;
@@ -949,5 +950,33 @@
// Run query
TestProcessor.helpProcess(plan, dataManager, expected);
}
-
+
+ @Test public void testIndependentDupRemoval() {
+ // Create query
+ String sql = "SELECT pm1.g1.e1, pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE pm2.g1.e1=pm1.g1.e1 AND pm1.g1.e2<pm2.g1.e2 order by pm1.g1.e1 option makedep pm1.g1"; //$NON-NLS-1$
+
+ // Create expected results
+ List[] expected = new List[] {
+ Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$
+ Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$
+ };
+
+ BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities();
+ caps.setSourceProperty(Capability.MAX_IN_CRITERIA_SIZE, 1);
+ caps.setSourceProperty(Capability.MAX_DEPENDENT_PREDICATES, 1);
+ caps.setCapabilitySupport(Capability.QUERY_ORDERBY, false);
+
+ QueryMetadataInterface fakeMetadata = RealMetadataFactory.example1Cached();
+
+ Command command = TestProcessor.helpParse(sql);
+ ProcessorPlan plan = TestProcessor.helpGetPlan(command, fakeMetadata, new DefaultCapabilitiesFinder(caps));
+
+ // Construct data manager with data
+ FakeDataManager dataManager = new FakeDataManager();
+ TestProcessor.sampleData1(dataManager);
+
+ // Run query
+ TestProcessor.helpProcess(plan, dataManager, expected);
+ }
+
}
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-14 18:27:24 UTC (rev 4324)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-15 14:51:07 UTC (rev 4325)
@@ -245,24 +245,16 @@
@Test public void testBasicSortRemoveDup() throws Exception {
List[] expected = new List[] {
Arrays.asList(new Object[] { new Integer(0), "0" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(0), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(1), "2" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(1), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(2), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(2), "4" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(3), "3" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(3), "6" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(4), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(5), "2" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(5), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(6), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(6), "4" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(7), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(8), "2" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(9), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(9), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(10), "4" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(10), "9" }) //$NON-NLS-1$
};
helpTestBasicSort(expected, Mode.DUP_REMOVE);
12 years, 4 months
- 1
- 0
teiid SVN: r4324 - trunk/build/kits/jboss-as7/docs/teiid.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-14 14:27:24 -0400 (Tue, 14 Aug 2012)
New Revision: 4324
Modified:
trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
Log:
converting trunk to 8.2
Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-08-14 18:27:10 UTC (rev 4323)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-08-14 18:27:24 UTC (rev 4324)
@@ -26,15 +26,6 @@
</UL>
<H2><A NAME="Highlights"></A>Highlights</H2>
<UL>
- <li>TEIID-1366 <B>VDB Reuse</B> a vdb.xml can now declare imported vdbs to reuse metadata.
- <LI>TEIID-2061 <B>Comparable Object</B> - the system property org.teiid.comparableObject can be set to use OBJECT values in comparison/sorting/grouping operations. It is expected that the object values correctly implement Comparable.compareTo.
- <LI>TEIID-2083 <B>Admin Metadata</B> - you can now retrieve metadata in DDL from the admin api via the getSchema method.
- <LI>TEIID-2105 <B>Improved VDB loading</B> - vdb loading logic was refined to make administration easier. ExecutionFactory now has is/setSourceRequiredForMetadata() to indicate whether a source connection is needed for the getMetadata call.
- <LI>TEIID-1598 <B>Translator Result Caching</B> - translators can interact with the result set caching facility via a CacheDirective. See the Developer's Guide for more.
- <LI>TEIID-2077 <B>Result reuse</B> - the engine will automatically detect if the same source query is used multiple times in a plan and reuse the result rather than issuing another query.
- <LI>TEIID-2113 <B>Misc parser improvements</B> - the parser will now accept the LATERAL keyword for defining a LATERAL join (previously we just used the TABLE keyword), unary negation is now supported e.g. -col1, the FOR keyword is optional for TEXTAGG,
-and the BNF documentation was dramatically improved.
- <LI>TEIID-2036 <B>Dependent Join Array Comparison</B> - platforms supporting array comparisons can have multi-attribute dependent joins pushed down as array comparisons. Oracle, PG, and H2 translators are already marked as supporting array types.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
@@ -241,279 +232,7 @@
<h2><a name="Details">Detailed Release Notes</a></h2>
Detailed Release Notes - Teiid - Version ${project.version}
-
-<h2> Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-7'>TEIID-7</a>] - Control of BigDecimal precision and scale
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-17'>TEIID-17</a>] - Root criteria with sibling roots
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-32'>TEIID-32</a>] - Support null values in proc relational joins
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-37'>TEIID-37</a>] - Parse function for XSD datatypes for Web service procedures
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-42'>TEIID-42</a>] - Correlated subqueries in XML criteria
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-63'>TEIID-63</a>] - Recursion Editor RECORD Feature When Limit Exceeded Does Not Work
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-69'>TEIID-69</a>] - Fully implement Hash Join
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-102'>TEIID-102</a>] - Metadata search with * or ? may return the wrong results
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-122'>TEIID-122</a>] - Min/Max cardinality should be enforced during document generation
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-987'>TEIID-987</a>] - Problem regarding how often availability is called on the Facet
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1058'>TEIID-1058</a>] - SessionCleanupThread causes deadlocks when server is clustered
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1371'>TEIID-1371</a>] - Translator does not unload correctly
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1465'>TEIID-1465</a>] - Join between char and varchar
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1600'>TEIID-1600</a>] - Exact numeric issues
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1838'>TEIID-1838</a>] - Change to source model connection through AdminApi using assignToModel() does not reflect in jdbc queries to that source model
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1863'>TEIID-1863</a>] - Default Salesforce URL in teiid-connector-salesforce.rar needs update to SF v22
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1864'>TEIID-1864</a>] - TIMESTAMPADD of SQL_TSI_FRAC_SECOND fails for Sybase 15 with JConnect 6.0.5 driver
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1867'>TEIID-1867</a>] - Duplicate metadata for multisource models
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1868'>TEIID-1868</a>] - Internal Materialized View - Load/Refresh and Assertion Failed
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1869'>TEIID-1869</a>] - Simple capabilities with PostgreSQL 8.3 using decodeinteger causes comm failure
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1870'>TEIID-1870</a>] - Querying random number from DB2 v97 does not push down to source
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1871'>TEIID-1871</a>] - Teiid is handling MySQL5.0 returning DAYNAME as a blob
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1872'>TEIID-1872</a>] - Implicit temp table creation fails with insert and explicit columns
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1873'>TEIID-1873</a>] - Security documentation does not provide adequate information to integrate additional domains for authentication
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1876'>TEIID-1876</a>] - Netezza translator using INTNNOT when it should use INT4NOT
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1878'>TEIID-1878</a>] - Problem with accessing custom generated materialized views
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1879'>TEIID-1879</a>] - Teradata Query Testing - Unhandled exception causing SOCKET CLOSED condition
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1882'>TEIID-1882</a>] - EOFException with 7.6 client against a 7.4 server
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1883'>TEIID-1883</a>] - Query timeout is superceded by synch ttl
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1884'>TEIID-1884</a>] - COMMAND Logging incorrectly reporting END USER COMMAND record count in EDS for forward only resultsets
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1895'>TEIID-1895</a>] - Properly escape the column references for Excel based data
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1899'>TEIID-1899</a>] - Getting Assertion when running Inner Merge Join query with SELECT COUNT(*) on top
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1900'>TEIID-1900</a>] - Teiid client jar file is not complete: NoClassDefFoundError: org/jboss/modules/ModuleLoadException
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1904'>TEIID-1904</a>] - Prepared statement for SOURCE_NAME in multi-source mode throws exception Message:Unable to evaluate
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1905'>TEIID-1905</a>] - Dymamic VDB does not work in 8.0
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1906'>TEIID-1906</a>] - Settting a VDB with data roles from Teiid Designer 7.5 iand deploying to Teiid 8 get a parser error
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1907'>TEIID-1907</a>] - SQLStringVisitor should create call visitNode on Select
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1937'>TEIID-1937</a>] - teiid encouters java.io.StreamCorruptedException
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1952'>TEIID-1952</a>] - Oracle native driver preparedstatement char parameters are required to be padded
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1953'>TEIID-1953</a>] - Greenplum DB - BQT correlated subquery failures
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1954'>TEIID-1954</a>] - System Schema does not show metadata for Indexes in the SYS.Keys or SYS.KeyColumns table
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1956'>TEIID-1956</a>] - WHERE clause throws org.teiid.jdbc.TeiidSQLException: Index: 2, Size: 1
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1957'>TEIID-1957</a>] - Resource Adapter's not passing deployment the validation checks in 7.1.0-Final
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1960'>TEIID-1960</a>] - Client recieving java.lang.IndexOutOfBoundsException in
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1961'>TEIID-1961</a>] - A translator override that is not used by a physical model will cause an exception on the server when the vdb is deployed
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1962'>TEIID-1962</a>] - EDS Ingres10 as Source - LOCATE function not returning correct query results
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1964'>TEIID-1964</a>] - Queries which exceed the query timeout value are reported as canceled with no reference to the reason (timed out)
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1966'>TEIID-1966</a>] - supportsInCriteria is ignored
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1968'>TEIID-1968</a>] - NPE in GoupingNode
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1969'>TEIID-1969</a>] - Missing message for key JDBCQueryExecution.Error_executing_query__1
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1972'>TEIID-1972</a>] - Non-stagable cardinality dependent aggregate should prevent the creation of a staged grouping
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1974'>TEIID-1974</a>] - Function RAND() should be RANDOM(int, int) for Teradata
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1975'>TEIID-1975</a>] - Failure description is incomplete
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1976'>TEIID-1976</a>] - Metadata TYPE_NAME value is null for String Columns
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1978'>TEIID-1978</a>] - SalesForce getDeleted function does not return deleted objects list
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1981'>TEIID-1981</a>] - Admin API does not correctly in Domain mode
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1983'>TEIID-1983</a>] - BaseDelegatingTranslator should delegate properties from setSupports* methods
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1986'>TEIID-1986</a>] - Exception on the slave node during materialization table load
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1987'>TEIID-1987</a>] - Exception Processing Web Service Response
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1990'>TEIID-1990</a>] - UNION pushdown
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1994'>TEIID-1994</a>] - Regression in latest 7.7.1 code
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1998'>TEIID-1998</a>] - Deployed translator JAR fails to be loaded when used in the VDB
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2001'>TEIID-2001</a>] - Skip loading of Function/Other models during the Index Based VDBs
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2002'>TEIID-2002</a>] - Dynmamic Metadata load failure with Sales Force data source
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2003'>TEIID-2003</a>] - NPE processing order by in rule collapse source
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2005'>TEIID-2005</a>] - Source query for Oracle sequence adds an alias, which will return "sequence doesn't exist" errors
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2007'>TEIID-2007</a>] - JDBC warnings are not properly handled
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2017'>TEIID-2017</a>] - CLONE - wrong type on model in VDB definition
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2018'>TEIID-2018</a>] - VDB resources are not associated
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2020'>TEIID-2020</a>] - Running Sybase procedure with jconnect driver in Teiid fails
-</li>
-</ul>
-
-<h2> Enhancement
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1809'>TEIID-1809</a>] - Teiid maven build needs to work off of Jboss parent pom
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1859'>TEIID-1859</a>] - Add a capability to restrict comparisons
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1865'>TEIID-1865</a>] - Thread-safe JDBC connection
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1898'>TEIID-1898</a>] - In Version 8, can the Teiid-<version>-client.jar (JDBC driver) be renamed because it causes confusion with the Teiid-client-<version>.jar used in the server
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1916'>TEIID-1916</a>] - Add support for alternate collation
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1959'>TEIID-1959</a>] - Add a way to exclude tables/procedures from JDBC import
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1984'>TEIID-1984</a>] - GetUpdated and GetDeleted SF procedures should be supported in dynamic vdbs
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1985'>TEIID-1985</a>] - Additional avenues for plan information
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2006'>TEIID-2006</a>] - Add a JDBC/ODBC statement to set the command payload
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2009'>TEIID-2009</a>] - Allow for the possiblity of rewriten user commands by the AuthoriztionValidator
-</li>
-</ul>
-
-<h2> Feature Request
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-144'>TEIID-144</a>] - ENHANCEMENT: Entitlements on XML Document Models
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-151'>TEIID-151</a>] - ENHANCEMENT: Need a way to stop building node in a recursive XML document when the node is repeated
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-170'>TEIID-170</a>] - Fully implement joining of parent and child mapping classes
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-174'>TEIID-174</a>] - add support to MMCallableStatement for named parameter methods
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-176'>TEIID-176</a>] - Auto-Staging tables should be shared in some circumstances
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-185'>TEIID-185</a>] - Add Option For MTOM in Web Services
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-223'>TEIID-223</a>] - XML output elements should be minimized
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-417'>TEIID-417</a>] - Add REST Support to Data Services
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-499'>TEIID-499</a>] - pushdown of parsedate, parsetime, parsetimestamp
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1280'>TEIID-1280</a>] - Allow views/procedures to be defined without designer
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1352'>TEIID-1352</a>] - Produce Admin API jar containing only Interfaces.
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1560'>TEIID-1560</a>] - Add support for user defined / pushdown aggregate functions
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1720'>TEIID-1720</a>] - Support for JBoss AS 7.x as host environment
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1801'>TEIID-1801</a>] - Async Event Processing: Reset and Re-run plan
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1819'>TEIID-1819</a>] - Reading multi entity data from a single data file
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1834'>TEIID-1834</a>] - Add support for a comparable binary type
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1850'>TEIID-1850</a>] - Add support for GreenPlum Database as a source
-</li>
-</ul>
-
-<h2> Quality Risk
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-3'>TEIID-3</a>] - Allow connectors to specify function capability for specific type signature
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1022'>TEIID-1022</a>] - Index metadata should not treat cardinality 0 as unknown
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1604'>TEIID-1604</a>] - Rationalize the context objects
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1837'>TEIID-1837</a>] - Replication should distribute load off of the coordinator
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1841'>TEIID-1841</a>] - week function in teiid not returning expected value
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1842'>TEIID-1842</a>] - Remove translate criteria based update procedures
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1894'>TEIID-1894</a>] - Consolidate bulk/iterator based inserts
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1950'>TEIID-1950</a>] - teiid client settings properties overrides don't work with signed jars
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1995'>TEIID-1995</a>] - Misleading error message
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2008'>TEIID-2008</a>] - Allow client max object size to be settable
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2010'>TEIID-2010</a>] - Remove unused translator supports.
-</li>
-</ul>
-
-<h2> Task
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1839'>TEIID-1839</a>] - Redo the weather example
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1875'>TEIID-1875</a>] - Convert community docs to confluence
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1889'>TEIID-1889</a>] - Standardize logging in Teiid
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1901'>TEIID-1901</a>] - Redo Quick Start guide for Teiid 8.0 changes
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1924'>TEIID-1924</a>] - Update the documents for Teiid 8.0
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1955'>TEIID-1955</a>] - Update to work with JBoss AS 7.1-Final
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1967'>TEIID-1967</a>] - Bind EventDistributor to JNDI tree
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1971'>TEIID-1971</a>] - Provide delegating Metadata Repository implementation class
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2000'>TEIID-2000</a>] - Provide install script for Teiid to be installed in the domain mode
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2004'>TEIID-2004</a>] - Support 1.7 JDBC methods
-</li>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-2019'>TEIID-2019</a>] - Remove all references to "javax.xml.bind" classes in the Teiid and support stream based xml
-</li>
-</ul>
-
-<h2> Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.jboss.org/browse/TEIID-1540'>TEIID-1540</a>] - Add the ability to delegate one shot dependent joins to the translators
-</li>
-</ul>
-
-
-
+
<h2><a name="Documentation">Documentation and Help</a></h2>
The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org.
12 years, 4 months
- 1
- 0
teiid SVN: r4323 - in trunk/engine/src: test/java/org/teiid/query/sql/lang and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-14 14:27:10 -0400 (Tue, 14 Aug 2012)
New Revision: 4323
Modified:
trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java
trunk/engine/src/test/java/org/teiid/query/sql/lang/TestMatchCriteria.java
Log:
TEIID-2138 adding an emulation option to match criteria
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java 2012-08-14 17:45:39 UTC (rev 4322)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/MatchCriteria.java 2012-08-14 18:27:10 UTC (rev 4323)
@@ -31,6 +31,7 @@
import org.teiid.core.util.EquivalenceUtil;
import org.teiid.core.util.HashCodeUtil;
import org.teiid.core.util.LRUCache;
+import org.teiid.core.util.PropertiesUtils;
import org.teiid.language.Like.MatchMode;
import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.LanguageVisitor;
@@ -62,8 +63,10 @@
/** The internal null escape character */
public static final char NULL_ESCAPE_CHAR = 0;
+ static char DEFAULT_ESCAPE_CHAR = PropertiesUtils.getBooleanProperty(System.getProperties(), "org.teiid.backslashDefaultMatchEscape", false)?'\\':NULL_ESCAPE_CHAR; //$NON-NLS-1$
+
/** The escape character or '' if there is none */
- private char escapeChar = NULL_ESCAPE_CHAR;
+ private char escapeChar = DEFAULT_ESCAPE_CHAR;
/** Negation flag. Indicates whether the criteria expression contains a NOT. */
private boolean negated;
Modified: trunk/engine/src/test/java/org/teiid/query/sql/lang/TestMatchCriteria.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/sql/lang/TestMatchCriteria.java 2012-08-14 17:45:39 UTC (rev 4322)
+++ trunk/engine/src/test/java/org/teiid/query/sql/lang/TestMatchCriteria.java 2012-08-14 18:27:10 UTC (rev 4323)
@@ -22,20 +22,15 @@
package org.teiid.query.sql.lang;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
import org.teiid.core.util.UnitTestUtil;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.symbol.*;
+import org.teiid.query.sql.symbol.Constant;
+import org.teiid.query.sql.symbol.ElementSymbol;
-import junit.framework.*;
+public class TestMatchCriteria {
-public class TestMatchCriteria extends TestCase {
-
- // ################################## FRAMEWORK ################################
-
- public TestMatchCriteria(String name) {
- super(name);
- }
-
// ################################## TEST HELPERS ################################
public static MatchCriteria example(String element, String str) {
@@ -62,13 +57,13 @@
// ################################## ACTUAL TESTS ################################
- public void testEquals1() {
+ @Test public void testEquals1() {
MatchCriteria c1 = example("abc"); //$NON-NLS-1$
MatchCriteria c2 = example("abc"); //$NON-NLS-1$
assertTrue("Equivalent match criteria don't compare as equal: " + c1 + ", " + c2, c1.equals(c2)); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testEquals2() {
+ @Test public void testEquals2() {
MatchCriteria c1 = example("abc", '#'); //$NON-NLS-1$
c1.setNegated(true);
MatchCriteria c2 = example("abc", '#'); //$NON-NLS-1$
@@ -76,46 +71,46 @@
assertTrue("Equivalent match criteria don't compare as equal: " + c1 + ", " + c2, c1.equals(c2)); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testEquals3() {
+ @Test public void testEquals3() {
MatchCriteria c1 = example("abc", '#'); //$NON-NLS-1$
c1.setNegated(true);
MatchCriteria c2 = (MatchCriteria) c1.clone();
assertTrue("Equivalent match criteria don't compare as equal: " + c1 + ", " + c2, c1.equals(c2)); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testEquals4() {
+ @Test public void testEquals4() {
MatchCriteria c1 = example("abc"); //$NON-NLS-1$
MatchCriteria c2 = example("abc", '#'); //$NON-NLS-1$
assertTrue("Different match criteria compare as equal: " + c1 + ", " + c2, ! c1.equals(c2)); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testEquals5() {
+ @Test public void testEquals5() {
MatchCriteria c1 = example("e1", "abc"); //$NON-NLS-1$ //$NON-NLS-2$
MatchCriteria c2 = example("e2", "abc"); //$NON-NLS-1$ //$NON-NLS-2$
assertTrue("Different match criteria compare as equal: " + c1 + ", " + c2, ! c1.equals(c2)); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testSelfEquivalence(){
+ @Test public void testSelfEquivalence(){
MatchCriteria c1 = example("abc"); //$NON-NLS-1$
int equals = 0;
UnitTestUtil.helpTestEquivalence(equals, c1, c1);
}
- public void testEquivalence(){
+ @Test public void testEquivalence(){
MatchCriteria c1 = example("abc"); //$NON-NLS-1$
MatchCriteria c2 = example("abc"); //$NON-NLS-1$
int equals = 0;
UnitTestUtil.helpTestEquivalence(equals, c1, c2);
}
- public void testCloneEquivalence(){
+ @Test public void testCloneEquivalence(){
MatchCriteria c1 = example("abc"); //$NON-NLS-1$
MatchCriteria c2 = (MatchCriteria)c1.clone();
int equals = 0;
UnitTestUtil.helpTestEquivalence(equals, c1, c2);
}
- public void testNonEquivalence1(){
+ @Test public void testNonEquivalence1(){
//test transitivity with two nonequal Objects
MatchCriteria c1 = example("e1", "abc"); //$NON-NLS-1$ //$NON-NLS-2$
MatchCriteria c2 = example("ozzy", '#'); //$NON-NLS-1$
@@ -123,7 +118,7 @@
UnitTestUtil.helpTestEquivalence(equals, c1, c2);
}
- public void testNonEquivalence2(){
+ @Test public void testNonEquivalence2(){
MatchCriteria c1 = example("abc", '#'); //$NON-NLS-1$
c1.setNegated(true);
MatchCriteria c2 = example("abc", '#'); //$NON-NLS-1$
12 years, 4 months
- 1
- 0
teiid SVN: r4322 - in branches/8.1.x/engine/src: test/java/org/teiid/query/processor and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-14 13:45:39 -0400 (Tue, 14 Aug 2012)
New Revision: 4322
Modified:
branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java
Log:
TEIID-2146 fix for incorrect results with dependent join
Modified: branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
===================================================================
--- branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-14 17:39:45 UTC (rev 4321)
+++ branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2012-08-14 17:45:39 UTC (rev 4322)
@@ -117,10 +117,10 @@
if (setState.maxNdv <= 0 || setState.maxNdv >= distinctCount) {
continue;
}
- if (dvs.getTupleBuffer().getSchema().size() > 1) {
+ if (dvs.getTupleBuffer().getSchema().size() > 1 && dependentSetStates.size() > 1) {
distinctCount = 0;
ValueIterator vi = dvs.getValueIterator(setState.valueExpression);
- if (dvs.getTupleBuffer().getSchema().indexOf(setState.valueExpression) == 0) {
+ if (setState.valueExpression.equals(dependentSetStates.get(0).valueExpression)) {
Object last = null;
while (vi.hasNext()) {
Object next = vi.next();
Modified: branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
===================================================================
--- branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-14 17:39:45 UTC (rev 4321)
+++ branches/8.1.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java 2012-08-14 17:45:39 UTC (rev 4322)
@@ -128,7 +128,7 @@
sortTypes.add(orderByItem.isAscending());
nullOrderings.add(orderByItem.getNullOrdering());
}
- if (items.size() < schema.size() && mode != Mode.SORT) {
+ if (items.size() < schema.size() && mode == Mode.DUP_REMOVE_SORT) {
List<Expression> toAdd = new ArrayList<Expression>(schema);
toAdd.removeAll(sortElements);
sortElements.addAll(toAdd);
Modified: branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java
===================================================================
--- branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-14 17:39:45 UTC (rev 4321)
+++ branches/8.1.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java 2012-08-14 17:45:39 UTC (rev 4322)
@@ -1097,5 +1097,33 @@
List<? extends List<?>> vals = s.getDependentValues().values().iterator().next();
assertEquals(1, vals.size());
}
+
+ @Test public void testIndependentDupRemoval() {
+ // Create query
+ String sql = "SELECT pm1.g1.e1, pm1.g1.e2, pm2.g1.e2 FROM pm1.g1, pm2.g1 WHERE pm2.g1.e1=pm1.g1.e1 AND pm1.g1.e2<pm2.g1.e2 order by pm1.g1.e1 option makedep pm1.g1"; //$NON-NLS-1$
+
+ // Create expected results
+ List[] expected = new List[] {
+ Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$
+ Arrays.asList(new Object[] { "a", 0, 3 }), //$NON-NLS-1$
+ };
+
+ BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities();
+ caps.setSourceProperty(Capability.MAX_IN_CRITERIA_SIZE, 1);
+ caps.setSourceProperty(Capability.MAX_DEPENDENT_PREDICATES, 1);
+ caps.setCapabilitySupport(Capability.QUERY_ORDERBY, false);
+
+ QueryMetadataInterface fakeMetadata = RealMetadataFactory.example1Cached();
+
+ Command command = TestProcessor.helpParse(sql);
+ ProcessorPlan plan = TestProcessor.helpGetPlan(command, fakeMetadata, new DefaultCapabilitiesFinder(caps));
+
+ // Construct data manager with data
+ FakeDataManager dataManager = new FakeDataManager();
+ TestProcessor.sampleData1(dataManager);
+
+ // Run query
+ TestProcessor.helpProcess(plan, dataManager, expected);
+ }
}
Modified: branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java
===================================================================
--- branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-14 17:39:45 UTC (rev 4321)
+++ branches/8.1.x/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java 2012-08-14 17:45:39 UTC (rev 4322)
@@ -245,24 +245,16 @@
@Test public void testBasicSortRemoveDup() throws Exception {
List[] expected = new List[] {
Arrays.asList(new Object[] { new Integer(0), "0" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(0), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(1), "2" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(1), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(2), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(2), "4" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(3), "3" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(3), "6" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(4), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(5), "2" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(5), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(6), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(6), "4" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(7), "3" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(8), "2" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(9), "1" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(9), "5" }), //$NON-NLS-1$
Arrays.asList(new Object[] { new Integer(10), "4" }), //$NON-NLS-1$
- Arrays.asList(new Object[] { new Integer(10), "9" }) //$NON-NLS-1$
};
helpTestBasicSort(expected, Mode.DUP_REMOVE);
12 years, 4 months
- 1
- 0
teiid SVN: r4321 - in branches/8.1.x/documentation: javadocs and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-08-14 13:39:45 -0400 (Tue, 14 Aug 2012)
New Revision: 4321
Modified:
branches/8.1.x/documentation/javadocs/
branches/8.1.x/documentation/pom.xml
Log:
correcting pom
Property changes on: branches/8.1.x/documentation/javadocs
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
bin
+ .project
.settings
bin
target
.classpath
Modified: branches/8.1.x/documentation/pom.xml
===================================================================
--- branches/8.1.x/documentation/pom.xml 2012-08-14 16:39:46 UTC (rev 4320)
+++ branches/8.1.x/documentation/pom.xml 2012-08-14 17:39:45 UTC (rev 4321)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.alpha2-SNAPSHOT</version>
+ <version>8.1.0.CR2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
12 years, 4 months
- 1
- 0