MB-32987 - Fix handling of nested arrays of various objs and types, a…

…nd to keep parsing once embedded objs are done

fastMatcher.go

@@ -629,7 +629,11 @@ func (m *FastMatcher) matchObjectOrArray(token tokenType, tokenData []byte, node
  }
 
  switch token {
- case endToken:
+ case tknObjectEnd:
+ return nil, false
+ case tknArrayEnd:
+ return nil, false
+ case tknEnd:
  return nil, true
  case tknListDelim:
  arrayIndex++
@@ -643,6 +647,7 @@ func (m *FastMatcher) matchObjectOrArray(token tokenType, tokenData []byte, node
  if err != nil {
  return err, true
  }
+ // Keep this here to catch any empty array or empty objs
  if token == endToken {
  return nil, true
  }
@@ -656,12 +661,14 @@ func (m *FastMatcher) matchObjectOrArray(token tokenType, tokenData []byte, node
  case tknEscString:
  keyBytes = keyLitParse.ParseEscString(tokenData)
  case tknArrayStart:
- fallthrough
+ // Do nothing
  case tknObjectStart:
- // In case of embedded objects or arrays
- return m.matchExec(token, tokenData, node), false
+ // Do nothing
  default:
- panic(fmt.Sprintf("expected literal, received: %v", token))
+ // If it's an array, it's possible that we're grabbing a literal like int or float, and we should not panic
+ if !arrayMode {
+ panic(fmt.Sprintf("expected literal, received: %v", token))
+ }
  }
 
  if arrayMode {
@@ -674,7 +681,7 @@ func (m *FastMatcher) matchObjectOrArray(token tokenType, tokenData []byte, node
  }
 
  if token != tknObjectKeyDelim {
- panic("expected object key delimiter")
+ panic(fmt.Sprintf("expected object key delimiter: got %v, %v", token, string(tokenData)))
  }
 
  token, tokenData, err = m.tokens.Step()

filterExprParser_test.go

@@ -483,6 +483,33 @@ func TestFilterExpressionParser(t *testing.T) {
  _, err = GetFilterExpressionMatcher(testStr)
  assert.Nil(err)
 
+ // MB-32987 - some combinations of nested arrays and objects tests
+ fe = &FilterExpression{}
+ err = parser.ParseString("achievements[0] = 49 AND achievements[1] = 58 AND achievements[2] = 108 AND arrOfObjs[0].`1D` = 50 AND floatArrs[0] = 1.1", fe)
+ assert.Nil(err)
+ expr, err = fe.OutputExpression()
+ assert.Nil(err)
+ matchDef = trans.Transform([]Expression{expr})
+ assert.NotNil(matchDef)
+ m = NewFastMatcher(matchDef)
+ userData = map[string]interface{}{
+ "category": 1,
+ "email": "[email protected]",
+ "city": "258171",
+ "name": "25134e ced17f",
+ "coins": 354.32,
+ "alt_email": "[email protected]",
+ "body": "testBody",
+ "achievements": [6]int{49, 58, 108, 141, 177, 229},
+ "floatArrs": [6]float64{1.1, 2.2, 3.3, 4.4, 5.5, 6.6},
+ "arrOfObjs": [1]map[string]interface{}{{"1D": 50}},
+ "nestedArr": [1][2]int{{61, 62}},
+ "realm": "f41e4a",
+ }
+ udMarsh, _ = json.Marshal(userData)
+ match, err = m.Match(udMarsh)
+ assert.True(match)
+
  // Negative
  _, _, err = NewFilterExpressionParser("fieldpath.`path = fieldPath2")
  assert.NotNil(err)