MYCPP-373: Single Document methods implementation

Author: silvakid

devapi/collection_crud.cc

@@ -545,6 +545,14 @@ class Op_collection_modify
     add_where(expr);
   }
 
+  Op_collection_modify(const Op_collection_modify &other)
+    : Op_select(other)
+    , m_coll(other.m_coll)
+    , m_update(other.m_update)
+  {
+    m_update_it = m_update.end();
+  }
+
   Executable_impl* clone() const override
   {
     return new Op_collection_modify(*this);
@@ -639,6 +647,7 @@ class Op_collection_modify
   }
 
   friend mysqlx::CollectionModify;
+  friend mysqlx::CollectionReplace;
 };
 
 
@@ -652,3 +661,28 @@ CollectionModify::CollectionModify(
   }
   CATCH_AND_WRAP
 }
+
+CollectionReplace::CollectionReplace(Collection &coll, const mysqlx::string &id
+, mysqlx::internal::ExprValue &&val)
+{
+  try
+  {
+    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);
+  }
+  CATCH_AND_WRAP
+}

devapi/tests/crud-t.cc

@@ -2204,3 +2204,59 @@ TEST_F(Crud, expr_in_expr)
   EXPECT_EQ( string("baz") , (string)tbl_res.fetchOne()[0]);
 
 }
+
+TEST_F(Crud, single_document)
+{
+  SKIP_IF_NO_XPLUGIN;
+
+  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_EQ(string("foo"), coll.getOne("id1")["name"].get<string>());
+  EXPECT_EQ(string("bar"), coll.getOne("id2")["name"].get<string>());
+  EXPECT_TRUE(coll.getOne("idZ").isNull());
+
+  EXPECT_EQ(1, coll.removeOne("id1").getAffectedItemsCount());
+  EXPECT_EQ(0, coll.removeOne("id1").getAffectedItemsCount());
+
+  EXPECT_TRUE(coll.getOne("id1").isNull());
+
+  // Replace existing document
+  CollectionReplace replace = coll.replaceOne("id3", expr("{\"name\": :name }"))
+                              .bind("name", "qux");
+  EXPECT_EQ(1, replace.execute().getAffectedItemsCount()
+            );
+  EXPECT_EQ(string("qux"), coll.getOne("id3")["name"].get<string>());
+
+  // Ignore _id field on document and replace existing docment
+  // Document passed as string
+  replace = coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }");
+  EXPECT_EQ(1, replace.execute().getAffectedItemsCount());
+  EXPECT_EQ(string("baz"), coll.getOne("id3")["name"].get<string>());
+  EXPECT_EQ(string("id3"), coll.getOne("id3")["_id"].get<string>());
+
+  // should not affect none
+  replace = coll.replaceOne("id4", expr("{\"_id\":\"id4\", \"name\": :name }"));
+  EXPECT_EQ(0, replace.bind("name", "baz").execute().getAffectedItemsCount());
+
+  // Using DbDoc
+  DbDoc doc("{\"_id\":\"id4\", \"name\": \"quux\" }");
+
+  replace = coll.replaceOne("id3", doc);
+  EXPECT_EQ(1,  replace.execute().getAffectedItemsCount());
+  EXPECT_EQ(string("quux"), coll.getOne("id3")["name"].get<string>());
+}
+
+

devapi/tests/first-t.cc

@@ -232,6 +232,14 @@ TEST_F(First, api)
     CollectionModify modify2 = x;
   }
 
+  {
+    CollectionReplace replace = c.replaceOne("...", "...");
+    replace = replace.bind("...", 0);
+    auto x = replace.bind("...", 0);
+    CollectionReplace replace1 = replace;
+    CollectionReplace replace2 = x;
+  }
+
   // Test copy semantics for table operations
 
   {

include/devapi/collection_crud.h

@@ -393,6 +393,7 @@ DLL_WARNINGS_POP
 */
 
 class CollectionModify;
+class CollectionReplace;
 
 namespace internal {
 
@@ -404,6 +405,14 @@ struct Collection_modify_base
   : public Sort< Limit< Bind_parameters< Collection_modify_cmd > > >
 {};
 
+struct Collection_replace_cmd
+  : public Executable<Result, CollectionReplace>
+{};
+
+struct Collection_replace_base
+    : public Bind_parameters< Collection_replace_cmd >
+{};
+
 }  // internal namespace
 
 
@@ -528,6 +537,45 @@ class PUBLIC_API CollectionModify
 };
 
 
+/**
+  Operation which replaces a document, using the id by a new one
+
+  @ingroup devapi_op
+*/
+
+class PUBLIC_API CollectionReplace
+  : public internal::Collection_replace_base
+{
+
+public:
+
+  /**
+    Create operation which replaces document with specified _id in a collection.
+  */
+  CollectionReplace(Collection &base,
+                    const string &id,
+                    internal::ExprValue &&val);
+
+  CollectionReplace(const internal::Collection_replace_cmd &other)
+  {
+    internal::Collection_replace_cmd::operator=(other);
+  }
+
+  CollectionReplace(internal::Collection_replace_cmd &&other)
+  {
+    internal::Collection_replace_cmd::operator=(std::move(other));
+  }
+
+protected:
+
+  using Impl = internal::Collection_modify_impl;
+
+  Impl* get_impl()
+  {
+    return static_cast<Impl*>(internal::Collection_replace_base::get_impl());
+  }
+};
+
 }  // mysqlx namespace
 
 #endif

include/devapi/document.h

@@ -405,7 +405,7 @@ class PUBLIC_API Value : public internal::Printable
   operator DbDoc() const;
 
   template<typename T>
-  T get() { return static_cast<T>(*this); }
+  T get() const { return static_cast<T>(*this); }
 
   //@}
 
@@ -605,7 +605,7 @@ internal::ExprValue expr(V s)
 {
   internal::ExprValue val(s);
   val.m_is_expr = true;
-  return std::move(val);
+  return val;
 }
 
 }  // internal

include/mysql_devapi.h

@@ -400,6 +400,38 @@ class PUBLIC_API Collection
     CATCH_AND_WRAP;
   }
 
+  /**
+    Returns Document with the giver id.
+    Returns empty document if not found.
+  */
+
+  DbDoc getOne(const string &id)
+  {
+    return find("_id = :id").bind("id", id).execute().fetchOne();
+  }
+
+  /**
+    Removes the document with the given id.
+   */
+
+  Result removeOne(const string &id)
+  {
+    return remove("_id = :id").bind("id", id).execute();
+  }
+
+  /**
+    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.
+  */
+
+  CollectionReplace replaceOne(string id, internal::ExprValue &&document)
+  {
+      return CollectionReplace(*this, id, std::move(document));
+  }
+
 };