db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1303451 - in /db/derby/code/branches/10.7: ./ java/engine/org/apache/derby/impl/sql/compile/FromVTI.java java/engine/org/apache/derby/vti/RestrictedVTI.java java/engine/org/apache/derby/vti/Restriction.java
Date Wed, 21 Mar 2012 15:54:01 GMT
Author: mamta
Date: Wed Mar 21 15:54:01 2012
New Revision: 1303451

URL: http://svn.apache.org/viewvc?rev=1303451&view=rev
Log:
DERBY-5369 Restricted Table Function support should pass NOT EQUAL restrictions to initScan

Backporting 1160858 from trunk to 10.7 branch. Revision 1160858 touched RestrictedVTITest.java.
The method changed in that test was added as part of DERBY-5370 which has not been backported
to 10.7. Hence this backport to 10.7 will be without the change to RestrictedVTITest.java




Modified:
    db/derby/code/branches/10.7/   (props changed)
    db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
    db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/RestrictedVTI.java
    db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/Restriction.java

Propchange: db/derby/code/branches/10.7/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1160858

Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java?rev=1303451&r1=1303450&r2=1303451&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
(original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
Wed Mar 21 15:54:01 2012
@@ -1471,8 +1471,8 @@ public class FromVTI extends FromTable i
         case RelationalOperator.LESS_THAN_RELOP:      return Restriction.ColumnQualifier.ORDER_OP_LESSTHAN;
         case RelationalOperator.IS_NULL_RELOP:        return Restriction.ColumnQualifier.ORDER_OP_ISNULL;
         case RelationalOperator.IS_NOT_NULL_RELOP:    return Restriction.ColumnQualifier.ORDER_OP_ISNOTNULL;
+        case RelationalOperator.NOT_EQUALS_RELOP:     return Restriction.ColumnQualifier.ORDER_OP_NOT_EQUALS;
 
-        case RelationalOperator.NOT_EQUALS_RELOP:
         default:
             if ( SanityManager.DEBUG )
             {

Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/RestrictedVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/RestrictedVTI.java?rev=1303451&r1=1303450&r2=1303451&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/RestrictedVTI.java (original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/RestrictedVTI.java Wed Mar
21 15:54:01 2012
@@ -41,7 +41,7 @@ import java.sql.SQLException;
  * because they don't have to fetch all columns and rows. This can mean
  * performance boosts for queries which only need a subset of the Table
  * Function's columns and for queries which compare those columns to constant
- * expressions using the <, <=, =, >, and >= operators. This can also mean
+ * expressions using the <, <=, =, >, >=, and != operators. This can also mean
  * performance boosts for LIKE and BETWEEN operations on Table Function
  * columns. For more information, see the commentary on
  * <a href="https://issues.apache.org/jira/browse/DERBY-4357">DERBY-4357</a>.

Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/Restriction.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/Restriction.java?rev=1303451&r1=1303450&r2=1303451&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/Restriction.java (original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/vti/Restriction.java Wed Mar
21 15:54:01 2012
@@ -149,8 +149,11 @@ public abstract class Restriction implem
         /**	 Ordering operation constant representing 'IS NOT NULL' **/
         public static final int ORDER_OP_ISNOTNULL = 6;
 
+        /**	 Ordering operation constant representing '!=' **/
+        public static final int ORDER_OP_NOT_EQUALS = 7;
+
         // Visible forms of the constants above
-        private String[] OPERATOR_SYMBOLS = new String[] {  "<", "=", "<=", ">",
">=", "IS NULL", "IS NOT NULL" };
+        private String[] OPERATOR_SYMBOLS = new String[] {  "<", "=", "<=", ">",
">=", "IS NULL", "IS NOT NULL", "!=" };
 
         ////////////////////////////////////////////////////////////////////////////////////////
         //



Mime
View raw message