Merge remote-tracking branch 'origin/trinity'

Change-Id: I9b1596ae6680f765cac4f16e9536412f7a253d67

Author: miaobingjie

planner/build_scan_covering.go

@@ -478,7 +478,7 @@ couter:
 		for tc, _ := range coveringEntries {
 			if sc != tc {
 				te := coveringEntries[tc].idxEntry
-				if be := bestIndexBySargableKeys(se, te, se.nEqCond, te.nEqCond); be != nil {
+				if be := bestIndexBySargableKeys(se, te, se.nEqCond, te.nEqCond, false); be != nil {
 					if be == te {
 						delete(coveringEntries, sc)
 						continue couter

planner/build_scan_secondary.go

@@ -586,6 +586,9 @@ func (this *builder) sargableIndexes(indexes []datastore.Index, pred, subset, vp
 				nvectors++
 				entry.SetFlags(IE_VECTOR_KEY_SARGABLE, true)
 			}
+			if hasRedundantSargKeys(keys, skeys) {
+				entry.SetFlags(IE_HAS_REDUNDANT_SARG_KEY, true)
+			}
 
 			if n > 0 {
 				sargables[index] = entry
@@ -804,7 +807,7 @@ func narrowerOrEquivalent(se, te *indexEntry, shortest, corrSubq bool, predFc ma
 
 	snk, snc := matchedKeysConditions(se, te, shortest, predFc)
 
-	be := bestIndexBySargableKeys(se, te, se.nEqCond, te.nEqCond)
+	be := bestIndexBySargableKeys(se, te, se.nEqCond, te.nEqCond, shortest)
 	if be == te { // te is better index
 		return false
 	}
@@ -1248,6 +1251,23 @@ func hasArrayIndexKey(keys expression.Expressions) bool {
 	return false
 }
 
+func hasRedundantSargKeys(keys datastore.IndexKeys, skeys []bool) bool {
+	for i := 0; i < len(keys); i++ {
+		if i >= len(skeys) || !skeys[i] {
+			continue
+		}
+		for j := i + 1; j < len(keys); j++ {
+			if j >= len(skeys) || !skeys[j] {
+				continue
+			}
+			if keys[i].Expr.DependsOn(keys[j].Expr) || keys[j].Expr.DependsOn(keys[i].Expr) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func (this *builder) chooseIntersectScan(sargables map[datastore.Index]*indexEntry,
 	node *algebra.KeyspaceTerm, vector bool) map[datastore.Index]*indexEntry {
 
@@ -1274,7 +1294,31 @@ func (this *builder) chooseIntersectScan(sargables map[datastore.Index]*indexEnt
 		this.advisorValidate(), len(this.baseKeyspaces) == 1, vector, this.context)
 }
 
-func bestIndexBySargableKeys(se, te *indexEntry, snc, tnc int) *indexEntry {
+func bestIndexBySargableKeys(se, te *indexEntry, snc, tnc int, shortest bool) *indexEntry {
+	be := bestIndexBySargKeys(se, te, snc, tnc)
+	if !shortest && be != nil {
+		s_pushdown := se.PushDownProperty()
+		t_pushdown := te.PushDownProperty()
+		s_redundantSargKey := se.HasFlag(IE_HAS_REDUNDANT_SARG_KEY)
+		t_redundantSargKey := te.HasFlag(IE_HAS_REDUNDANT_SARG_KEY)
+		if be == se && s_redundantSargKey {
+			if t_pushdown > s_pushdown {
+				be = te
+			} else if t_pushdown == s_pushdown {
+				be = nil
+			}
+		} else if be == te && t_redundantSargKey {
+			if s_pushdown > t_pushdown {
+				be = se
+			} else if s_pushdown == t_pushdown {
+				be = nil
+			}
+		}
+	}
+	return be
+}
+
+func bestIndexBySargKeys(se, te *indexEntry, snc, tnc int) *indexEntry {
 	si := 0
 	ti := 0
 	for si < len(se.skeys) && ti < len(te.skeys) {

planner/index_entry.go

@@ -46,6 +46,7 @@ const (
 	IE_VECTOR_KEY_SKIP_ORDER
 	IE_NONEQ_COND
 	IE_VECTOR_RERANK
+	IE_HAS_REDUNDANT_SARG_KEY
 )
 
 type indexEntry struct {

test/gsi/test_cases/indexga/case_indexga_bugs.json

@@ -180,5 +180,25 @@
                 "c3": 10
             }
         ]
+    },
+    {
+        "testcase": "MB-67549",
+        "ignore": "index_id",
+        "explain": {
+            "disabled": false,
+            "results": [
+                {
+                    "present": true
+                }
+            ],
+            "statement": "SELECT true AS present FROM $explan AS p WHERE ANY v WITHIN p.plan.`~children` SATISFIES v.`#operator` LIKE 'IndexScan%' AND v.`index_group_aggs` IS NOT MISSING AND v.`index_order` IS NOT MISSING END"
+        },
+        "statements": "SELECT abs(c3) AS abs, count(1) AS cnt FROM orders WHERE test_id = 'indexga' AND type = 'bugs' AND abs(c3) > 10 GROUP BY abs(c3) ORDER BY abs",
+        "results": [
+            {
+                "abs": 15,
+                "cnt": 2
+            }
+        ]
     }
 ]

test/gsi/test_cases/indexga/indexga_test.go

@@ -37,12 +37,14 @@ func TestGroupagg(t *testing.T) {
 	runStmt(qc, "CREATE INDEX ixga201 ON orders(c1, a1, c2, c3) WHERE test_id = 'indexga' AND type = 'bugs'")
 	runStmt(qc, "CREATE INDEX ixga202 ON orders(c10, DISTINCT a1) WHERE test_id = 'indexga' AND type = 'bugs'")
 	runStmt(qc, "CREATE INDEX ixga203 ON orders(c3, abs(c3)) WHERE test_id = 'indexga' AND type = 'bugs'")
+	runStmt(qc, "CREATE INDEX ixga204 ON orders(abs(c3)) WHERE test_id = 'indexga' AND type = 'bugs'")
 
 	runMatch("case_indexga_bugs.json", false, true, qc, t)
 
 	runStmt(qc, "DROP INDEX orders.ixga201")
 	runStmt(qc, "DROP INDEX orders.ixga202")
 	runStmt(qc, "DROP INDEX orders.ixga203")
+	runStmt(qc, "DROP INDEX orders.ixga204")
 
 	// misc bugs with primary index
 	runStmt(qc, "CREATE PRIMARY INDEX oprimary ON orders")