Add a test for 4 table join

Author: chenboy

src/optimizer/binding.cpp

@@ -173,7 +173,6 @@ bool GroupExprBindingIterator::HasNext() {
 }
 
 std::shared_ptr<OperatorExpression> GroupExprBindingIterator::Next() {
-  LOG_DEBUG("Current_binding size :%lu", current_binding_->Children().size());
   return current_binding_;
 }
 

src/optimizer/memo.cpp

@@ -33,7 +33,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
   // If leaf, then just return
   if (gexpr->Op().GetType() == OpType::Leaf) {
     const LeafOperator *leaf = gexpr->Op().As<LeafOperator>();
-    assert(target_group == UNDEFINED_GROUP ||
+    PL_ASSERT(target_group == UNDEFINED_GROUP ||
            target_group == leaf->origin_group);
     gexpr->SetGroupID(leaf->origin_group);
     return nullptr;
@@ -43,7 +43,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
   auto it = group_expressions_.find(gexpr.get());
 
   if (it != group_expressions_.end()) {
-    assert(target_group == UNDEFINED_GROUP ||
+    PL_ASSERT(target_group == UNDEFINED_GROUP ||
            target_group == (*it)->GetGroupID());
     gexpr->SetGroupID((*it)->GetGroupID());
     return *it;

src/optimizer/operators.cpp

@@ -426,7 +426,7 @@ Operator PhysicalSeqScan::make(
     oid_t get_id, std::shared_ptr<catalog::TableCatalogObject> table,
     std::string alias, std::vector<AnnotatedExpression> predicates,
     bool update) {
-  assert(table != nullptr);
+  PL_ASSERT(table != nullptr);
   PhysicalSeqScan *scan = new PhysicalSeqScan;
   scan->table_ = table;
   scan->table_alias = alias;
@@ -465,7 +465,7 @@ Operator PhysicalIndexScan::make(
     oid_t index_id, std::vector<oid_t> key_column_id_list,
     std::vector<ExpressionType> expr_type_list,
     std::vector<type::Value> value_list) {
-  assert(table != nullptr);
+  PL_ASSERT(table != nullptr);
   PhysicalIndexScan *scan = new PhysicalIndexScan;
   scan->table_ = table;
   scan->is_for_update = update;

test/sql/optimizer_sql_test.cpp

@@ -494,6 +494,7 @@ TEST_F(OptimizerSQLTests, SelectConstantTest) {
 }
 
 TEST_F(OptimizerSQLTests, JoinTest) {
+  // The original table
   // TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test VALUES (1, 22, 333);");
   // TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test VALUES (2, 11, 000);");
   // TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test VALUES (3, 33, 444);");
@@ -519,6 +520,16 @@ TEST_F(OptimizerSQLTests, JoinTest) {
   TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test2 VALUES (3, 22, 555);");
   TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test2 VALUES (4, 00, 000);");
 
+  // Create the fourth table
+  TestingSQLUtil::ExecuteSQLQuery(
+      "CREATE TABLE test3(a INT PRIMARY KEY, b INT, c INT);");
+
+  // Insert tuples into table
+  TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test3 VALUES (1, 22, 000);");
+  TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test3 VALUES (2, 11, 333);");
+  TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test3 VALUES (3, 22, 555);");
+  TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test3 VALUES (4, 00, 000);");
+
   /************************* Basic Queries (only joins)
    * *******************************/
   // Product
@@ -637,6 +648,14 @@ TEST_F(OptimizerSQLTests, JoinTest) {
       "GROUP BY test.a "
       "ORDER BY test.a",
       {"22", "1", "11", "2", "22", "3", "0", "4"}, true);
+
+  // Basic 4 table join
+  TestUtil(
+      "SELECT test.a, test1.a, test2.a, test3.c FROM test, test1, test2, test3 "
+      "WHERE test.a = test2.a AND test2.a = test1.a and test.b = test3.b",
+      {"1", "1", "1", "0", "1", "1", "1", "555", "2", "2", "2", "333", "4",
+       "4", "4", "0"},
+      false);
 }
 
 TEST_F(OptimizerSQLTests, IndexTest) {