Fixed bug in cross product rewriting that resulted in conditions being pushed to deep. Also added MIT License.

Author: hannes

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2018 DuckDB Contributors (see https://github.com/cwida/duckdb/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/planner/operator/logical_join.cpp

@@ -19,15 +19,15 @@ JoinSide LogicalJoin::GetJoinSide(LogicalOperator *op,
 		        colref->binding.table_index) !=
 		    op->children[0]->referenced_tables.end()) {
 			return JoinSide::LEFT;
+		} else if (op->children[1]->referenced_tables.find(
+		               colref->binding.table_index) !=
+		           op->children[1]->referenced_tables.end()) {
+			return JoinSide::RIGHT;
 		} else {
-			if (op->children[1]->referenced_tables.find(
-			        colref->binding.table_index) !=
-			    op->children[1]->referenced_tables.end()) {
-				return JoinSide::RIGHT;
-			} else {
-				return JoinSide::NONE;
-			}
+			// if its neither in left nor right its both not none
+			return JoinSide::BOTH;
 		}
+
 	} else {
 		JoinSide join_side = JoinSide::NONE;
 		for (auto &child : expr->children) {

test/sql/tpcds/tpcds.cpp

@@ -15,11 +15,12 @@ TEST_CASE("Test TPC-DS SF0 Query Compilation", "[tpcds]") {
 
 	// this is to make sure we do not get regressions in query compilation
 	vector<size_t> compiling_queries = {
-	    1,  2,  3,  5,  6,  7,  8,  9,  10, 13, 14, 15, 16,  17,  18, 19, 20,
-	    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35,  36,  37, 38, 40,
-	    41, 42, 43, 44, 46, 47, 49, 50, 52, 54, 56, 58, 59,  60,  62, 63, 64,
-	    65, 66, 68, 69, 70, 72, 73, 75, 76, 77, 79, 80, 81,  82,  83, 84, 85,
-	    86, 87, 88, 89, 91, 92, 94, 95, 96, 97, 98, 99, 100, 101, 103};
+	    1,  2,  3,  4,  5,  6,  7,  8,  9,  10,  11,  13, 14, 15, 16,
+	    17, 18, 19, 20, 22, 23, 24, 25, 26, 27,  28,  29, 30, 31, 32,
+	    33, 34, 35, 36, 37, 38, 40, 41, 42, 43,  44,  46, 47, 49, 50,
+	    52, 54, 56, 58, 59, 60, 62, 63, 64, 65,  66,  68, 69, 70, 72,
+	    73, 75, 76, 77, 78, 79, 80, 81, 82, 83,  84,  85, 86, 87, 88,
+	    89, 91, 92, 94, 95, 96, 97, 98, 99, 100, 101, 103};
 	for (size_t q : compiling_queries) {
 		result = con.Query(tpcds::get_query(q));
 		REQUIRE(result->success);