wl10981: added addOrReplace() method

Author: Bogdan Degtyariov

devapi/collection_crud.cc

@@ -85,13 +85,15 @@ class Op_collection_add
   std::vector<mysqlx::GUID> m_id_list;
   bool  m_generated_id;
   unsigned m_pos;
+  bool m_upsert = false;
 
 
-  Op_collection_add(Collection &coll)
+  Op_collection_add(Collection &coll, bool upsert = false)
     : Op_base(coll)
     , m_coll(coll)
     , m_generated_id(true)
     , m_pos(0)
+    , m_upsert(upsert)
   {}
 
   Executable_impl* clone() const override
@@ -116,7 +118,8 @@ class Op_collection_add
     // Issue coll_add statement where documents are described by list
     // of expressions defined by this instance.
 
-    return new cdk::Reply(get_cdk_session().coll_add(m_coll, *this, NULL));
+    return new cdk::Reply(get_cdk_session()
+                          .coll_add(m_coll, *this, NULL, m_upsert));
   }
 
 
@@ -214,6 +217,7 @@ class Op_collection_add
 
 
   friend mysqlx::CollectionAdd;
+  friend mysqlx::internal::CollectionReplace;
 };
 
 
@@ -664,26 +668,46 @@ CollectionModify::CollectionModify(
 
 internal::CollectionReplace::CollectionReplace(Collection &coll,
                                                const mysqlx::string &id,
-                                               mysqlx::internal::ExprValue &&val)
+                                               mysqlx::internal::ExprValue &&val,
+                                               bool upsert)
 {
   try
   {
-    reset(new Op_collection_modify(coll, "_id = :id"));
-
-    if (val.isExpression() || val.getType() != Value::STRING)
+    if (upsert)
     {
-      get_impl()->add_operation(Op_collection_modify::SET,
-                                "$",
-                                std::move(val));
+      Op_collection_add *add_impl = new Op_collection_add(coll, upsert);
+      reset(add_impl);
+      string str = val;
+      str.erase(str.rfind('}'));
+
+      std::stringstream sstream;
+      // If ':' is present in the string the document is not empty
+      if (str.find(':'))
+        sstream << ", ";
+      // It is safe to append the _id at the end
+      sstream << "\"_id\": \"" << id << "\"}";
+      str.append((string)sstream.str());
+      add_impl->add_json(str);
     }
     else
     {
-      get_impl()->add_operation(Op_collection_modify::SET,
-                                "$",
-                                internal::expr(std::move(val)));
+      reset(new Op_collection_modify(coll, "_id = :id"));
+
+      if (val.isExpression() || val.getType() != Value::STRING)
+      {
+        get_impl()->add_operation(Op_collection_modify::SET,
+                                  "$",
+                                  std::move(val));
+      }
+      else
+      {
+        get_impl()->add_operation(Op_collection_modify::SET,
+                                  "$",
+                                  internal::expr(std::move(val)));
+      }
+
+      get_impl()->add_param("id", id);
     }
-
-    get_impl()->add_param("id", id);
   }
   CATCH_AND_WRAP
 }

devapi/tests/crud-t.cc

@@ -2209,7 +2209,7 @@ TEST_F(Crud, single_document)
 {
   SKIP_IF_NO_XPLUGIN;
 
-  SKIP_IF_SERVER_VERSION_LESS(8, 0, 2);
+  SKIP_IF_SERVER_VERSION_LESS(8, 0, 3);
 
   cout << "Creating session..." << endl;
 
@@ -2241,7 +2241,7 @@ TEST_F(Crud, single_document)
 
   // Ignore _id field on document and replace existing docment
   // Document passed as string
-  EXPECT_EQ(1, coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }"));
+  EXPECT_TRUE(coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }"));
   EXPECT_EQ(string("baz"), coll.getOne("id3")["name"].get<string>());
   EXPECT_EQ(string("id3"), coll.getOne("id3")["_id"].get<string>());
 
@@ -2255,4 +2255,33 @@ TEST_F(Crud, single_document)
   EXPECT_EQ(string("quux"), coll.getOne("id3")["name"].get<string>());
 }
 
+TEST_F(Crud, add_or_replace)
+{
+  SKIP_IF_NO_XPLUGIN;
+  SKIP_IF_SERVER_VERSION_LESS(8, 0, 3)
+
+  cout << "Creating session..." << endl;
+
+  Session sess(this);
+
+  cout << "Session accepted, creating collection..." << endl;
+
+  Schema sch = sess.getSchema("test");
+  sess.dropCollection("test", "c1");
+  Collection coll = sch.createCollection("c1", true);
+
+  coll.add("{\"_id\":\"id1\", \"name\":\"foo\" }")
+    .add("{\"_id\":\"id2\", \"name\":\"bar\" }")
+    .add("{\"_id\":\"id3\", \"name\":\"baz\" }")
+    .execute();
+
+  EXPECT_TRUE(coll.addOrReplace("id4", "{\"name\":\"zaz\"}"));
+  // Check that the document was added
+  EXPECT_EQ(string("zaz"), coll.getOne("id4")["name"].get<string>());
+
+  EXPECT_FALSE(coll.addOrReplace("id4", "{\"name\":\"zzz\"}"));
+  // Check that the document was replaced
+  EXPECT_EQ(string("zzz"), coll.getOne("id4")["name"].get<string>());
+
+}
 

include/devapi/collection_crud.h

@@ -429,7 +429,8 @@ class PUBLIC_API CollectionReplace
   */
   CollectionReplace(Collection &base,
                     const string &id,
-                    internal::ExprValue &&val);
+                    internal::ExprValue &&val,
+                    bool upsert = false);
 
   CollectionReplace(const internal::Collection_replace_cmd &other)
   {

include/mysql_devapi.h

@@ -420,11 +420,12 @@ class PUBLIC_API Collection
   }
 
   /**
-    Returns an operation which, when executed, replaces document with given id
-    in the collection with new document doc. Parameter doc can be either DbDoc
-    object, or JSON string, or expr(docexpr) where docexpr is like JSON string
-    but field values are expressions. It is possible to bind values of named
-    parameters with .bind() before executing the statement.
+    Replaces the document identified by id if it exists and returns true.
+    Otherwise false is returned. Parameter document can be either DbDoc object,
+    or JSON string, or expr(docexpr) where docexpr is like JSON
+    string but field values are expressions.
+    It is not possible to bind values of named parameters with .bind()
+    because the statement gets executed upon calling of this function.
   */
 
   bool replaceOne(string id, internal::ExprValue &&document)
@@ -433,6 +434,22 @@ class PUBLIC_API Collection
           internal::CollectionReplace(*this, id, std::move(document)).execute().getAffectedItemsCount() == 1;
   }
 
+  /**
+    Adds a new document and returns true if a document identified
+    by id does not exist. Otherwise an existing document is
+    replaced and false is returned.
+    Parameter document can be either DbDoc object,
+    or JSON string, or expr(docexpr) where docexpr is like JSON
+    string but field values are expressions.
+    It is not possible to bind values of named parameters with .bind()
+    because the statement gets executed upon calling of this function.
+  */
+
+  bool addOrReplace(string id, internal::ExprValue &&document)
+  {
+      return internal::CollectionReplace(*this, id, std::move(document), true).execute().getAffectedItemsCount() == 1;
+  }
+
 };