made existing SELECT query test cases not includint OR to use optimiz…

…er and these passed. (under all column having skip list index condition)
ryogrid · Oct 5, 2023 · a9c8144 · a9c8144
1 parent 2b873ca
commit a9c8144
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/planner/optimizer/selinger_optimizer.go b/planner/optimizer/selinger_optimizer.go
@@ -550,6 +550,19 @@ func rewiteColNameStrOfBinaryOpExp(tableMap map[string][]*string, exp interface{
 	}
 }
 
+func CheckIncludesORInPredicate(exp interface{}) bool {
+	switch casted := exp.(type) {
+	case *parser.BinaryOpExpression:
+		if casted.LogicalOperationType_ == expression.OR {
+			return true
+		} else {
+			return CheckIncludesORInPredicate(casted.Left_) || CheckIncludesORInPredicate(casted.Right_)
+		}
+	default:
+		return false
+	}
+}
+
 func genTableMapAndColList(c *catalog.Catalog, qi *parser.QueryInfo) (map[string][]*string, []*parser.SelectFieldExpression) {
 	tableMap := make(map[string][]*string, 0)
 	colList := make([]*parser.SelectFieldExpression, 0)
@@ -623,8 +636,10 @@ func RewriteQueryInfo(c *catalog.Catalog, qi *parser.QueryInfo) (*parser.QueryIn
 		return nil, err
 	}
 
-	// attach predicate of ON clause to one of WHERE clause
-	qi.WhereExpression_ = qi.WhereExpression_.AppendBinaryOpExpWithAnd(qi.OnExpressions_)
+	if !(qi.OnExpressions_.Left_ == nil && qi.OnExpressions_.Right_ == nil) {
+		// attach predicate of ON clause to one of WHERE clause
+		qi.WhereExpression_ = qi.WhereExpression_.AppendBinaryOpExpWithAnd(qi.OnExpressions_)
+	}
 
 	return qi, nil
 }
diff --git a/planner/simple_planner.go b/planner/simple_planner.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ryogrid/SamehadaDB/execution/expression"
 	"github.com/ryogrid/SamehadaDB/execution/plans"
 	"github.com/ryogrid/SamehadaDB/parser"
+	"github.com/ryogrid/SamehadaDB/planner/optimizer"
 	"github.com/ryogrid/SamehadaDB/storage/access"
 	"github.com/ryogrid/SamehadaDB/storage/buffer"
 	"github.com/ryogrid/SamehadaDB/storage/index/index_constants"
@@ -89,6 +90,11 @@ func (pner *SimplePlanner) MakeSelectPlanWithoutJoin() (error, plans.Plan) {
 	return nil, plans.NewSeqScanPlanNode(pner.catalog_, outSchema, predicate, tableMetadata.OID())
 }
 
+func (pner *SimplePlanner) MakeOptimizedSelectPlanWithJoin() (error, plans.Plan) {
+	optPlan, err := optimizer.NewSelingerOptimizer(pner.qi, pner.catalog_).Optimize()
+	return err, optPlan
+}
+
 func (pner *SimplePlanner) MakeSelectPlanWithJoin() (error, plans.Plan) {
 	tblNameL := *pner.qi.JoinTables_[0]
 	tableMetadataL := pner.catalog_.GetTableByName(tblNameL)
@@ -218,10 +224,15 @@ func (pner *SimplePlanner) MakeSelectPlanWithJoin() (error, plans.Plan) {
 }
 
 func (pner *SimplePlanner) MakeSelectPlan() (error, plans.Plan) {
-	if len(pner.qi.JoinTables_) == 1 {
-		return pner.MakeSelectPlanWithoutJoin()
+	if optimizer.CheckIncludesORInPredicate(pner.qi.WhereExpression_) {
+		// optimizer does not support OR, so use planning logic without optimization...
+		if len(pner.qi.JoinTables_) == 1 {
+			return pner.MakeSelectPlanWithoutJoin()
+		} else {
+			return pner.MakeSelectPlanWithJoin()
+		}
 	} else {
-		return pner.MakeSelectPlanWithJoin()
+		return pner.MakeOptimizedSelectPlanWithJoin()
 	}
 }
 
@@ -258,7 +269,8 @@ func (pner *SimplePlanner) MakeCreateTablePlan() (error, plans.Plan) {
 
 	columns := make([]*column.Column, 0)
 	for _, cdefExp := range pner.qi.ColDefExpressions_ {
-		columns = append(columns, column.NewColumn(*cdefExp.ColName_, *cdefExp.ColType_, false, index_constants.INDEX_KIND_INVALID, types.PageID(-1), nil))
+		//columns = append(columns, column.NewColumn(*cdefExp.ColName_, *cdefExp.ColType_, false, index_constants.INDEX_KIND_INVALID, types.PageID(-1), nil))
+		columns = append(columns, column.NewColumn(*cdefExp.ColName_, *cdefExp.ColType_, false, index_constants.INDEX_KIND_SKIP_LIST, types.PageID(-1), nil))
 	}
 	schema_ := schema.NewSchema(columns)
 

diff --git a/samehada/samehada.go b/samehada/samehada.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ryogrid/SamehadaDB/execution/plans"
 	"github.com/ryogrid/SamehadaDB/parser"
 	"github.com/ryogrid/SamehadaDB/planner"
+	"github.com/ryogrid/SamehadaDB/planner/optimizer"
 	"github.com/ryogrid/SamehadaDB/recovery/log_recovery"
 	"github.com/ryogrid/SamehadaDB/samehada/samehada_util"
 	"github.com/ryogrid/SamehadaDB/storage/access"
@@ -157,6 +158,7 @@ func (sdb *SamehadaDB) ExecuteSQL(sqlStr string) (error, [][]interface{}) {
 
 func (sdb *SamehadaDB) ExecuteSQLRetValues(sqlStr string) (error, [][]*types.Value) {
 	qi := parser.ProcessSQLStr(&sqlStr)
+	qi, _ = optimizer.RewriteQueryInfo(sdb.catalog_, qi)
 	txn := sdb.shi_.transaction_manager.Begin(nil)
 	err, plan := sdb.planner_.MakePlan(qi, txn)