costIndexScanAnd no longer returns a single filter on success, it returns all of them. costIndexScanOr should check for that.

Author: nicktobey

sql/analyzer/costed_index_scan.go

@@ -1269,7 +1269,7 @@ func (c *indexCoster) costIndexScanOr(filter *iScanOr, s sql.Statistic, buckets
 			if err != nil {
 				return nil, nil, false, err
 			}
-			if ids.Len() != 1 || !ids.Contains(int(child.Id())) {
+			if ids.Len() != child.childCnt() {
 				// scan option missed some filters
 				return nil, nil, false, nil
 			}