WL11930 Core API v1 alignment

Author: silvakid

devapi/tests/crud-t.cc

@@ -1324,7 +1324,7 @@ TEST_F(Crud, doc_path)
   EXPECT_EQ(string("February"), static_cast<string>(doc["date"]["monthName"]));
   EXPECT_EQ(4, static_cast<int>(doc["date"]["days"][0]));
 
-  coll.modify("true").arrayDelete("date.days[0]").execute();
+  coll.modify("true").unset("date.days[0]").execute();
   docs = coll.find().execute();
   doc = docs.fetchOne();
   EXPECT_EQ(2, static_cast<int>(doc["date"]["days"][0]));
@@ -1788,11 +1788,11 @@ TEST_F(Crud, diagnostic)
     cout << w << endl;
   }
 
-  EXPECT_EQ(2U, res.getWarningCount());
+  EXPECT_EQ(2U, res.getWarningsCount());
 
   std::vector<Warning> warnings = res.getWarnings();
 
-  for (unsigned i = 0; i < res.getWarningCount(); ++i)
+  for (unsigned i = 0; i < res.getWarningsCount(); ++i)
   {
     EXPECT_EQ(warnings[i].getCode(), res.getWarning(i).getCode());
   }

devapi/tests/first-t.cc

@@ -586,7 +586,7 @@ TEST_F(First, warnings_multi_rset)
     when during result transfer the warnings will be reported.
   */
 
-  EXPECT_NO_THROW(res.getWarningCount());
+  EXPECT_NO_THROW(res.getWarningsCount());
   EXPECT_NO_THROW(res.getWarnings());
 
   res.nextResult();
@@ -601,7 +601,7 @@ TEST_F(First, warnings_multi_rset)
   std::vector<Warning> warnings = res.getWarnings();
 
   EXPECT_EQ(1, warnings.size());
-  EXPECT_EQ(1, res.getWarningCount());
+  EXPECT_EQ(1, res.getWarningsCount());
 
   for(auto warn : warnings)
   {
@@ -733,7 +733,7 @@ TEST_F(First, sqlresult)
                                     .bind(L"baz")
                                     .execute();
 
-    EXPECT_EQ(3, res.getAffectedRowsCount());
+    EXPECT_EQ(3, res.getAffectedItemsCount());
     EXPECT_EQ(1, res.getAutoIncrementValue());
   }
 
@@ -747,20 +747,20 @@ TEST_F(First, sqlresult)
                                     .bind(L"baz")
                                     .execute();
 
-    EXPECT_EQ(3, res.getAffectedRowsCount());
+    EXPECT_EQ(3, res.getAffectedItemsCount());
     EXPECT_EQ(4, res.getAutoIncrementValue());
   }
 
   {
     SqlResult res =  get_sess().sql(L"SELECT * from test.t")
                      .execute();
 
-    EXPECT_THROW(res.getAffectedRowsCount(), mysqlx::Error);
+    EXPECT_THROW(res.getAffectedItemsCount(), mysqlx::Error);
     EXPECT_THROW(res.getAutoIncrementValue(), mysqlx::Error);
 
     while (res.nextResult());
 
-    EXPECT_EQ(0, res.getAffectedRowsCount());
+    EXPECT_EQ(0, res.getAffectedItemsCount());
     EXPECT_EQ(0, res.getAutoIncrementValue());
   }
 

include/mysqlx/devapi/collection_crud.h

@@ -537,23 +537,6 @@ class CollectionModify
     CATCH_AND_WRAP
   }
 
-  /**
-    Delete an element from an array field of a document.
-
-    The `field` parameter should be a document path pointing at a location
-    inside an array field. The element at the indicated location is removed from
-    the array.
-  */
-
-  CollectionModify& arrayDelete(const Field &field)
-  {
-    try {
-      get_impl()->add_operation(Impl::ARRAY_DELETE, std::wstring(field));
-      return *this;
-    }
-    CATCH_AND_WRAP
-  }
-
   /**
     Apply JSON Patch to a target JSON document.
 

include/mysqlx/devapi/result.h

@@ -76,7 +76,7 @@ class Result_common
 
   /// Get the number of warnings stored in the result.
 
-  unsigned getWarningCount() const
+  unsigned getWarningsCount() const
   {
     try {
       return Base::get_warning_count();
@@ -108,6 +108,17 @@ class Result_common
   // TODO: expose this in the API?
   //using WarningsIterator = Result_detail::iterator;
 
+  /**
+    Get the count of affected items (rows or doucuments) from manipulation statements.
+  */
+
+  uint64_t getAffectedItemsCount() const
+  {
+    try {
+      return Result_detail::get_affected_rows();
+    } CATCH_AND_WRAP
+  }
+
 protected:
 
   // Wrap base ctors/assginment with catch handlers
@@ -169,17 +180,6 @@ class Result
 
   Result() = default;
 
-  /**
-    Get the count of affected items from manipulation statements.
-  */
-
-  uint64_t getAffectedItemsCount() const
-  {
-    try {
-      return Result_detail::get_affected_rows();
-    } CATCH_AND_WRAP
-  }
-
   /**
     Get the auto-increment value if one was generated by a table insert
     statement.
@@ -711,19 +711,6 @@ class SqlResult
   }
 
 
-  /**
-    Get the count of affected items from data manipulation statements.
-  */
-
-  uint64_t getAffectedRowsCount()
-  {
-    try {
-      return Result_detail::get_affected_rows();
-    }
-    CATCH_AND_WRAP
-  }
-
-
   /**
     Get the auto-increment value if one was generated by a table insert
     statement.