Author: shawkins Date: 2012-04-20 12:35:02 -0400 (Fri, 20 Apr 2012) New Revision: 4025 Modified: branches/8.0.x/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java branches/8.0.x/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html branches/8.0.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java branches/8.0.x/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java Log: TEIID-2010 removing unused methods Modified: branches/8.0.x/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java =================================================================== --- branches/8.0.x/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -192,18 +192,10 @@ return delegate.supportsBatchedUpdates(); } @Override - public boolean supportsBetweenCriteria() { - return delegate.supportsBetweenCriteria(); - } - @Override public boolean supportsBulkUpdate() { return delegate.supportsBulkUpdate(); } @Override - public boolean supportsCaseExpressions() { - return delegate.supportsCaseExpressions(); - } - @Override public boolean supportsCommonTableExpressions() { return delegate.supportsCommonTableExpressions(); } Modified: branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java =================================================================== --- branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -377,15 +377,6 @@ } /** - * Support indicates connector accepts criteria of form (element BETWEEN constant AND constant) - * <br>NOT CURRENTLY USED - between is rewritten as compound compare criteria - * @since 4.0 - */ - public boolean supportsBetweenCriteria() { - return false; - } - - /** * Support indicates connector accepts criteria of form (element = constant) * @since 3.1 SP2 */ @@ -633,16 +624,6 @@ } /** - * Support indicates connector can accept queries with non-searched - * CASE <expression> WHEN <expression> ... END - * <br>NOT CURRENTLY USED - case is pushed down as searched case - * @since 4.0 - */ - public boolean supportsCaseExpressions() { - return false; - } - - /** * Support indicates connector can accept queries with searched CASE WHEN <criteria> ... END * @since 4.0 */ Modified: branches/8.0.x/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html =================================================================== --- branches/8.0.x/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html 2012-04-20 16:35:02 UTC (rev 4025) @@ -74,7 +74,8 @@ <li>The translator API facilities for iterator/bulk updates were combined and updated. Multi-valued literals were replaced by the Parameter class with an associated value iterator available on the BatchedCommand. The IteratorValueSource class was also removed. <li>VARBINARY, OPTIONS, and OUT were added as reserved words. - <li>AbstractMetadataRecord and its sub-classes use a case-insensitive map for properties rather than a LinkedHashMap. Thus, property key lookups are now case-insensitive. + <li>AbstractMetadataRecord and its sub-classes use a case-insensitive map for properties rather than a LinkedHashMap. Thus, property key lookups are now case-insensitive. + <li>Removed the unused ExecutionFactory methods supportsBetweenCriteria and supportsCaseExpression. </ul> <h4>from 7.7</h4> Modified: branches/8.0.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -128,17 +128,6 @@ } @Override - public boolean supportsBetweenCriteria() { - return false; - } - - @Override - public boolean supportsCaseExpressions() { - //https://issues.apache.org/jira/browse/HIVE-164 - return true; - } - - @Override public boolean supportsCorrelatedSubqueries() { //https://issues.apache.org/jira/browse/HIVE-784 return false; Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -325,16 +325,6 @@ } @Override - public boolean supportsBetweenCriteria() { - return true; - } - - @Override - public boolean supportsCaseExpressions() { - return true; - } - - @Override public boolean supportsCompareCriteriaEquals() { return true; } Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -85,12 +85,6 @@ } @Override - public boolean supportsBetweenCriteria() { - return false; - } - - - @Override public boolean supportsLikeCriteriaEscapeCharacter() { return false; } @@ -161,11 +155,6 @@ } @Override - public boolean supportsCaseExpressions() { - return false; - } - - @Override public boolean supportsSearchedCaseExpressions() { return false; } Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/derby/DerbyExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -171,16 +171,7 @@ return supportedFunctions; } - /** - * Derby supports only SearchedCaseExpression, not CaseExpression. - * @since 5.0 - */ @Override - public boolean supportsCaseExpressions() { - return false; - } - - @Override public boolean supportsRowLimit() { return this.getDatabaseVersion().compareTo(TEN_5) >= 0; } Modified: branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/ModeShapeExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -194,11 +194,6 @@ } @Override - public boolean supportsCaseExpressions() { - return false; - } - - @Override public boolean supportsCorrelatedSubqueries() { return false; } Modified: branches/8.0.x/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java =================================================================== --- branches/8.0.x/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/connectors/translator-loopback/src/main/java/org/teiid/translator/loopback/LoopbackExecutionFactory.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -27,11 +27,11 @@ import org.teiid.language.Command; import org.teiid.metadata.RuntimeMetadata; -import org.teiid.translator.Translator; -import org.teiid.translator.TranslatorException; import org.teiid.translator.Execution; import org.teiid.translator.ExecutionContext; import org.teiid.translator.ExecutionFactory; +import org.teiid.translator.Translator; +import org.teiid.translator.TranslatorException; import org.teiid.translator.TranslatorProperty; /** @@ -111,8 +111,8 @@ } @Override - public List getSupportedFunctions() { - List functions = Arrays.asList(new String[] { + public List<String> getSupportedFunctions() { + List<String> functions = Arrays.asList(new String[] { "+", "-", "*", "/", "abs", "acos", "asin", "atan", "atan2", "ceiling", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ "bitand", "bitnot", "bitor", "bitxor", "cos", "cot", "degrees", "cos", "cot", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ "degrees", "exp", "floor", "log", "log10", "mod", "pi", "power", "radians", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ @@ -174,16 +174,6 @@ } @Override - public boolean supportsBetweenCriteria() { - return true; - } - - @Override - public boolean supportsCaseExpressions() { - return true; - } - - @Override public boolean supportsCompareCriteriaEquals() { return true; } Modified: branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java =================================================================== --- branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-04-20 16:29:16 UTC (rev 4024) +++ branches/8.0.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-04-20 16:35:02 UTC (rev 4025) @@ -81,7 +81,6 @@ tgtCaps.setCapabilitySupport(Capability.QUERY_AGGREGATES_DISTINCT, srcCaps.supportsAggregatesDistinct()); tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_SCALAR, srcCaps.supportsScalarSubqueries()); tgtCaps.setCapabilitySupport(Capability.QUERY_SUBQUERIES_CORRELATED, srcCaps.supportsCorrelatedSubqueries()); - tgtCaps.setCapabilitySupport(Capability.QUERY_CASE, srcCaps.supportsCaseExpressions()); tgtCaps.setCapabilitySupport(Capability.QUERY_SEARCHED_CASE, srcCaps.supportsSearchedCaseExpressions()); tgtCaps.setCapabilitySupport(Capability.QUERY_UNION, srcCaps.supportsUnions()); tgtCaps.setCapabilitySupport(Capability.QUERY_INTERSECT, srcCaps.supportsIntersect());