fix order by index scan rule (#662)

* fix order by index scan rule

Signed-off-by: Alex Chi <[email protected]>

* update custom rules

Signed-off-by: Alex Chi <[email protected]>

---------

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

src/include/catalog/catalog.h

@@ -12,6 +12,7 @@
 
 #pragma once
 
+#include <exception>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -249,6 +250,7 @@ class Catalog {
     auto *table_meta = GetTable(table_name);
     for (auto iter = table_meta->table_->MakeIterator(); !iter.IsEnd(); ++iter) {
       auto [meta, tuple] = iter.GetTuple();
+      // we have to silently ignore the error here for a lot of reasons...
       index->InsertEntry(tuple.KeyFromTuple(schema, key_schema, key_attrs), tuple.GetRid(), txn);
     }
 

src/optimizer/optimizer_custom_rules.cpp

@@ -14,6 +14,8 @@ auto Optimizer::OptimizeCustom(const AbstractPlanNodeRef &plan) -> AbstractPlanN
   p = OptimizeNLJAsHashJoin(p);
   p = OptimizeOrderByAsIndexScan(p);
   p = OptimizeSortLimitAsTopN(p);
+  p = OptimizeMergeFilterScan(p);
+  p = OptimizeSeqScanAsIndexScan(p);
   return p;
 }
 

src/optimizer/order_by_index_scan.cpp

@@ -58,20 +58,10 @@ auto Optimizer::OptimizeOrderByAsIndexScan(const AbstractPlanNodeRef &plan) -> A
       const auto indices = catalog_.GetTableIndexes(table_info->name_);
 
       for (const auto *index : indices) {
-        const auto &columns = index->key_schema_.GetColumns();
-        // check index key schema == order by columns
-        bool valid = true;
-        if (columns.size() == order_by_column_ids.size()) {
-          for (size_t i = 0; i < columns.size(); i++) {
-            if (columns[i].GetName() != table_info->schema_.GetColumn(order_by_column_ids[i]).GetName()) {
-              valid = false;
-              break;
-            }
-          }
-          if (valid) {
-            return std::make_shared<IndexScanPlanNode>(optimized_plan->output_schema_, table_info->oid_,
-                                                       index->index_oid_);
-          }
+        const auto &columns = index->index_->GetKeyAttrs();
+        if (order_by_column_ids == columns) {
+          return std::make_shared<IndexScanPlanNode>(optimized_plan->output_schema_, table_info->oid_,
+                                                     index->index_oid_);
         }
       }
     }