WL12721: DevAPI: Add overlaps and not_overlaps as operator

Author: silvakid

cdk/parser/expr_parser.cc

@@ -1569,6 +1569,7 @@ Expression* Expr_parser_base::parse_ilri(Processor *prc)
   next.insert(Op::BETWEEN);
   next.insert(Op::REGEXP);
   next.insert(Op::SOUNDS_LIKE);
+  next.insert(Op::OVERLAPS);
 
   const Token *t = consume_token(next);
 
@@ -1580,7 +1581,7 @@ Expression* Expr_parser_base::parse_ilri(Processor *prc)
   if (!t)
   {
     if (neg)
-      parse_error("Expected IN, (R)LIKE, BETWEEN or REGEXP after NOT");
+      parse_error("Expected IN, (R)LIKE, BETWEEN, OVERLAPS or REGEXP after NOT");
 
     // If prc is NULL return already stored expression.
 
@@ -1650,7 +1651,10 @@ Expression* Expr_parser_base::parse_ilri(Processor *prc)
     if (neg)
       op = Op::NOT_REGEXP;
     break;
-
+  case Op::OVERLAPS:
+      if (neg)
+    op = Op::NOT_OVERLAPS;
+      break;
   default: break;
   }
 
@@ -1747,6 +1751,11 @@ Expression* Expr_parser_base::parse_ilri(Processor *prc)
       parse(COMP, aprc->list_el());
       break;
 
+    case Op::OVERLAPS:
+    case Op::NOT_OVERLAPS:
+      parse(COMP, aprc->list_el());
+      break;
+
     case Op::BETWEEN:
     case Op::NOT_BETWEEN:
       parse(COMP, aprc->list_el());

cdk/parser/expr_parser.h

@@ -71,6 +71,7 @@ POP_SYS_WARNINGS_CDK
     X(RLIKE, "rlike") \
     X(INTERVAL, "interval") \
     X(REGEXP, "regexp") \
+    X(OVERLAPS, "overlaps")\
     X(ESCAPE, "escape") \
     X(HEX, "hex") \
     X(BIN, "bin") \
@@ -176,7 +177,9 @@ POP_SYS_WARNINGS_CDK
   X(REGEXP, "regexp", {}, {Keyword::REGEXP}) \
   X(NOT_REGEXP, "not_regexp", {}, {}) \
   X(CAST, "cast", {}, {Keyword::CAST}) \
-  X(SOUNDS_LIKE, "sounds like", {}, {Keyword::SOUNDS})
+  X(SOUNDS_LIKE, "sounds like", {}, {Keyword::SOUNDS})\
+  X(OVERLAPS, "overlaps", {}, {Keyword::OVERLAPS}) \
+  X(NOT_OVERLAPS, "not_overlaps", {}, {}) \
 
 
 

devapi/tests/crud-t.cc

@@ -2836,3 +2836,60 @@ TEST_F(Crud, PS)
   }
 
 }
+
+TEST_F(Crud, overlaps)
+{
+  SKIP_IF_NO_XPLUGIN;
+  SKIP_IF_SERVER_VERSION_LESS(8, 0, 15)
+
+  cout << "Creating collection..." << endl;
+
+  Schema sch = getSchema("test");
+  Collection coll = sch.createCollection("c1", true);
+
+  coll.remove("true").execute();
+
+
+  coll.add("{ \"name\": \"foo\", \"age\": 2, \
+           \"food\": [\"Milk\", \"Soup\"] }")
+      .add("{ \"name\": \"baz\", \"age\": 2, \
+           \"food\": [\"Beer\", \"Soup\"] }")
+      .execute();
+
+  auto res = coll.find(R"(food overlaps ["Soup"])").execute();
+  EXPECT_EQ(2, res.count());
+
+  res = coll.find(R"(food overlaps ["Milk", "Soup"])").execute();
+  EXPECT_EQ(2, res.count());
+
+  res = coll.find(R"(food overlaps ["Milk"])").execute();
+  EXPECT_EQ(1, res.count());
+  EXPECT_EQ(string("foo"),res.fetchOne()["name"]);
+
+  res = coll.find(R"(food overlaps ["Beer"])").execute();
+  EXPECT_EQ(1, res.count());
+  EXPECT_EQ(string("baz"),res.fetchOne()["name"]);
+
+  res = coll.find(R"(food overlaps ["Meat"])").execute();
+  EXPECT_EQ(0, res.count());
+
+  // Not Overlaps tests
+
+  res = coll.find(R"(food not overlaps ["Soup"])").execute();
+  EXPECT_EQ(0, res.count());
+
+  res = coll.find(R"(food not overlaps ["Milk", "Soup"])").execute();
+  EXPECT_EQ(0, res.count());
+
+  res = coll.find(R"(food not overlaps ["Milk"])").execute();
+  EXPECT_EQ(1, res.count());
+  EXPECT_EQ(string("baz"),res.fetchOne()["name"]);
+
+  res = coll.find(R"(food not overlaps ["Beer"])").execute();
+  EXPECT_EQ(1, res.count());
+  EXPECT_EQ(string("foo"),res.fetchOne()["name"]);
+
+  res = coll.find(R"(food not overlaps ["Meat"])").execute();
+  EXPECT_EQ(2, res.count());
+
+}