Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628669 - in
 /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests:
 master/subqueryFlattening.out tests/lang/subqueryFlattening.sql
Date: Mon, 18 Feb 2008 09:42:47 -0000
To: derby-commits@db.apache.org
From: dyre@apache.org
Message-Id: <20080218094258.ACB9F1A9832@eris.apache.org>

Author: dyre
Date: Mon Feb 18 01:42:42 2008
New Revision: 628669

URL: http://svn.apache.org/viewvc?rev=628669&view=rev
Log:
DERBY-3301, merging to 10.3: Follow-up patch to fix comments in 
subqueryFlattening.sql so that they match/explain the printed query plans, 
which changed slightly as a result of DERBY-3301. 

Merged with svn merge -r 619590:619591 ../derby-repro

Simple merge with no conflicts; no additional changes were necessary.

Modified:
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subqueryFlattening.sql

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out?rev=628669&r1=628668&r2=628669&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out Mon Feb 18 01:42:42 2008
@@ -1176,7 +1176,8 @@
 			qualifiers:
 None
 ij> -- multilevel subqueries
--- flatten all
+-- only flatten bottom of where exists, any, or in with 
+-- exists, any, or in in its own where clause. DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i where exists
         (select * from idx1 ii 
@@ -1191,7 +1192,8 @@
 	null
 Statement Text: 
 	-- multilevel subqueries
--- flatten all
+-- only flatten bottom of where exists, any, or in with 
+-- exists, any, or in in its own where clause. DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i where exists
         (select * from idx1 ii 
@@ -1490,8 +1492,9 @@
 null		stop position: 
 null		qualifiers:
 None
-ij> -- flatten innermost into exists join, then flatten middle
--- into outer
+ij> -- flatten innermost into exists join, but dont flatten middle into outer as it
+-- is a where exists, any, or in with exists, any, or in in its own where clause. 
+-- DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i 
      where  o.c1 = i.c1 and i.c2 = 1 and exists
@@ -1505,8 +1508,9 @@
 Statement Name: 
 	null
 Statement Text: 
-	-- flatten innermost into exists join, then flatten middle
--- into outer
+	-- flatten innermost into exists join, but dont flatten middle into outer as it
+-- is a where exists, any, or in with exists, any, or in in its own where clause. 
+-- DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i 
      where  o.c1 = i.c1 and i.c2 = 1 and exists

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subqueryFlattening.sql
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subqueryFlattening.sql?rev=628669&r1=628668&r2=628669&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subqueryFlattening.sql (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subqueryFlattening.sql Mon Feb 18 01:42:42 2008
@@ -103,7 +103,8 @@
 values SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS();
 
 -- multilevel subqueries
--- flatten all
+-- only flatten bottom of where exists, any, or in with 
+-- exists, any, or in in its own where clause. DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i where exists
         (select * from idx1 ii 
@@ -115,8 +116,9 @@
         (select * from idx1 ii 
          where o.c1 = i.c1 and i.c2 = ii.c1));
 values SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS();
--- flatten innermost into exists join, then flatten middle
--- into outer
+-- flatten innermost into exists join, but dont flatten middle into outer as it
+-- is a where exists, any, or in with exists, any, or in in its own where clause. 
+-- DERBY-3301.
 select * from outer1 o where exists
     (select * from idx2 i 
      where  o.c1 = i.c1 and i.c2 = 1 and exists