Merge tag 'wl12721'

Author: rsomla1

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", {}, {}) \
 
 
 

cdk/parser/tests/parser-t.cc

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -890,6 +890,7 @@ const Expr_Test exprs[] =
   { parser::Parser_mode::DOCUMENT, "-2*3+4.1%5 >> 6 & 7 >= 8 and true or docName not in ('foo%', 'bar%')"},
   { parser::Parser_mode::DOCUMENT, "-2*3+4.1%5 >> 6 & 7 >= 8 and true or docName not between 'foo%' AND 'bar%'"},
   { parser::Parser_mode::DOCUMENT, "-2*3+4.1%5 >> 6 & 7 >= 8 and true or docName not regexp 'foo.*'"},
+  { parser::Parser_mode::DOCUMENT, "-2*3+4.1%5 >> 6 & 7 >= 8 and true or docName not overlaps [foo, bar]"},
   { parser::Parser_mode::DOCUMENT, "-2*3+4.1%5 >> 6 & 7 >= 8 and true or Schema.Table.docName = null"},
   { parser::Parser_mode::DOCUMENT, "not (name <= 'foo' or not bar)"},
   { parser::Parser_mode::DOCUMENT, "colName.Xpto[1].a[*].* + .1e-2"},
@@ -911,6 +912,9 @@ const Expr_Test exprs[] =
   { parser::Parser_mode::TABLE   , "CHARSET(CHAR(0x65))"},
   { parser::Parser_mode::TABLE   , "'abc' NOT LIKE 'ABC1'"},
   { parser::Parser_mode::TABLE   , "'a' REGEXP '^[a-d]'"},
+  { parser::Parser_mode::TABLE   , "'a' OVERLAPS [a,d]"},
+  { parser::Parser_mode::TABLE   , "`overlaps` oVeRlApS [foo, bar]"},
+  { parser::Parser_mode::TABLE   , R"("overlaps" not OvErLaPs [foo, bar])"},
   { parser::Parser_mode::TABLE   , "'a' NOT RLIKE '^[a-d]'"},
   { parser::Parser_mode::TABLE   , "POSITION('bar' IN 'foobarbar')"},
   { parser::Parser_mode::TABLE   , "TRIM('barxxyz')"},
@@ -923,6 +927,9 @@ const Expr_Test exprs[] =
   { parser::Parser_mode::DOCUMENT, "$.field1 IN $.field2"},
   { parser::Parser_mode::DOCUMENT, "$.field1 NOT IN $.field2"},
   { parser::Parser_mode::DOCUMENT, "a IN (b)"},
+  //Commented untill WL12774 fixes it:
+//  { parser::Parser_mode::DOCUMENT, "`overlaps` oVeRlApS [foo, bar]"},
+//  { parser::Parser_mode::DOCUMENT, "`like` NOT LIKE :like"},
   { parser::Parser_mode::TABLE   , "cast(column as json) IN doc->'$.field.array'"},
   { parser::Parser_mode::TABLE   , "cast(column as json) NOT IN doc->'$.field.array'"},
   { parser::Parser_mode::TABLE   , "column->'$.field' IN [1,2,3]"},
@@ -1131,7 +1138,12 @@ const Expr_Test negative_exprs[] =
   { parser::Parser_mode::TABLE, "$.a**[0]"                   },
   { parser::Parser_mode::TABLE, "$.a**[*]"                   },
   { parser::Parser_mode::TABLE, "$.a**.bar"                  },
-  { parser::Parser_mode::TABLE, "$.a**.foo"                  }
+  { parser::Parser_mode::TABLE, "$.a**.foo"                  },
+
+  //Operators
+  { parser::Parser_mode::DOCUMENT, "overlaps [a,b,c]"        },
+  { parser::Parser_mode::DOCUMENT, "not overlaps [a,b,c]"    },
+  { parser::Parser_mode::DOCUMENT, "[a,b,c] not overlaps"    },
 };
 
 

common/CMakeLists.txt

@@ -34,3 +34,5 @@ add_library(common STATIC
 )
 
 target_link_libraries(common cdk uuid_gen)
+
+add_subdirectory(tests)

common/tests/CMakeLists.txt

@@ -0,0 +1,58 @@
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0, as
+# published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an
+# additional permission to link the program and your derivative works
+# with the separately licensed software that they have included with
+# MySQL.
+#
+# Without limiting anything contained in the foregoing, this file,
+# which is part of MySQL Connector/C++, is also subject to the
+# Universal FOSS Exception, version 1.0, a copy of which can be found at
+# http://oss.oracle.com/licenses/universal-foss-exception.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+#
+# Note: We must clear compile flags - the ones used to build the connector
+# are not good for building client code that uses the connector.
+#
+
+set_property(
+  DIRECTORY .
+  PROPERTY COMPILE_DEFINITIONS ""
+)
+
+if(WIN32)
+  add_definitions(
+    -D_CRT_SECURE_NO_WARNINGS
+    -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+  )
+
+endif()
+
+#Add cdk includes because we are using their source tests
+add_test_includes(${PROJECT_SOURCE_DIR}/cdk/include)
+add_test_includes(${PROJECT_SOURCE_DIR}/cdk/extra/rapidjson/include)
+add_test_includes(${PROJECT_BINARY_DIR}/cdk/include)
+
+ADD_TEST_LIBRARIES(cdk_parser)
+
+ADD_NG_TEST(common-t
+  ${PROJECT_SOURCE_DIR}/cdk/parser/tests/parser-t.cc
+)
+
+

devapi/tests/crud-t.cc

@@ -2836,3 +2836,80 @@ 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());
+
+  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());
+
+  res = coll.find(R"(food not overlaps "Meat")").execute();
+  EXPECT_EQ(2, res.count());
+
+  try {
+    coll.find(R"(food not overlaps and "Meat")").execute();
+    FAIL() << "No error thrown";
+  } catch (Error& e) {
+    std::cout << "Expected: " << e << std::endl;
+  }
+
+  try {
+    coll.find(R"(food and overlaps "Meat")").execute();
+    FAIL() << "No error thrown";
+  } catch (Error& e) {
+    std::cout << "Expected: " << e << std::endl;
+  }
+
+}