MB-36088 - Refactored much of data type comparisons and added N1QL-li…

…ke collate to fast matcher

fastMatcher.go

@@ -14,10 +14,11 @@ type slotData struct {
 var emptySlotData slotData
 
 type FastMatcher struct {
-	def     MatchDef
-	slots   []slotData
-	buckets *binTreeState
-	tokens  jsonTokenizer
+	def         MatchDef
+	slots       []slotData
+	buckets     *binTreeState
+	tokens      jsonTokenizer
+	collateUsed bool
 }
 
 func NewFastMatcher(def *MatchDef) *FastMatcher {
@@ -292,11 +293,10 @@ func (m *FastMatcher) matchOp(op *OpNode, litVal *FastVal) error {
 	}
 
 	// Mark the result of this operation
+	m.buckets.MarkNode(bucketIdx, opRes)
+
 	if !validOp {
-		// TODO FIX
-		m.buckets.MarkNode(bucketIdx, false)
-	} else {
-		m.buckets.MarkNode(bucketIdx, opRes)
+		m.collateUsed = true
 	}
 
 	// Check if running this values ops has resolved the entirety
@@ -832,6 +832,15 @@ func (m *FastMatcher) Match(data []byte) (bool, error) {
 	return m.buckets.IsTrue(0), nil
 }
 
+func (m *FastMatcher) MatchWithStatus(data []byte) (bool, int, error) {
+	var statusFlags int
+	matched, err := m.Match(data)
+	if m.collateUsed {
+		statusFlags |= MatcherCollateUsed
+	}
+	return matched, statusFlags, err
+}
+
 func (m *FastMatcher) ExpressionMatched(expressionIdx int) bool {
 	binTreeIdx := m.def.MatchBuckets[expressionIdx]
 	return m.buckets.IsResolved(binTreeIdx) &&

fastMatcher_test.go

@@ -178,6 +178,7 @@ func TestMatcherMissingNotEquals(t *testing.T) {
 		"5b47eb098eee4b4c4330ec64",
 		"5b47eb0936ff92a567a0307e",
 		"5b47eb096b1d911c0b9492fb",
+		"5b47eb0950e9076fc0aecd52",
 	})
 }