Update C++ core (#83)

Notable changes:
* OpenSSL and CentOS 7 (#382)
* CXXCBC-144: Search query on collections should not require you to pass in the scope name (#379)
* CXXCBC-145: Search query request raw option not used (#380)
* CXXCBC-310: Transaction fit test errors (#378)
* CXXCBC-194: Support ExtThreadSafe transaction extension. (#374, #376)
* CXXCBC-316: Core txn get_optional after query issue (#385)
* CXXCBC-310: Fixed race condition in transaction_context state machine (#386)

Author: avsej

Couchbase/Transactions.php

@@ -63,7 +63,7 @@ public function run(callable $logic, ?TransactionOptions $options = null): Trans
                 $logic($transaction->transactionAttemptContext());
             } catch (Exception $exception) {
                 $transaction->rollback();
-                throw new TransactionFailedException("Exception caught during execution of transaction logic", 0, $exception);
+                throw new TransactionFailedException("Exception caught during execution of transaction logic. " . $exception->getMessage(), 0, $exception);
             }
 
             try {

config.m4

@@ -39,7 +39,7 @@ PHP_ADD_MAKEFILE_FRAGMENT
 AC_CONFIG_COMMANDS_POST([
   echo "
 CMAKE                  : ${CMAKE}
-CMAKE_BUILD_TYPE       : ${COUCHBASE_CMAKE_BUILD_TYPE:-RelWithDebInfo}
+CMAKE_BUILD_TYPE       : ${COUCHBASE_CMAKE_BUILD_TYPE:-Release}
 CMAKE_SOURCE_DIRECTORY : ${COUCHBASE_CMAKE_SOURCE_DIRECTORY}
 CMAKE_BUILD_DIRECTORY  : ${COUCHBASE_CMAKE_BUILD_DIRECTORY}
 CMAKE_C_COMPILER       : ${CC}

package.xml

@@ -13,7 +13,7 @@
         <email>sergey@couchbase.com</email>
         <active>yes</active>
     </lead>
-    <date>2023-02-22</date>
+    <date>2023-03-14</date>
     <version>
         <release>4.1.1</release>
         <api>4.0.0</api>
@@ -439,6 +439,7 @@
                             <file role="src" name="build_config.hxx.in"/>
                             <file role="src" name="build_version.hxx.in"/>
                             <file role="src" name="test_filesystem.cpp.in"/>
+                            <file role="src" name="test_openssl.cxx"/>
                         </dir>
                         <dir name="core">
                             <dir name="crypto">
@@ -530,6 +531,7 @@
                                 <file role="src" name="streaming_json_lexter_error_category.cxx"/>
                                 <file role="src" name="touch.cxx"/>
                                 <file role="src" name="transaction_error_category.cxx"/>
+                                <file role="src" name="transaction_get_result.cxx"/>
                                 <file role="src" name="transaction_op_error_category.cxx"/>
                                 <file role="src" name="unlock.cxx"/>
                                 <file role="src" name="upsert.cxx"/>

src/deps/couchbase-cxx-client

@@ -159,13 +159,19 @@ struct transactions_error_category : std::error_category {
 
     [[nodiscard]] std::string message(int ev) const noexcept override
     {
-        switch (transactions_errc(ev)) {
+        switch (static_cast<transactions_errc>(ev)) {
             case transactions_errc::operation_failed:
                 return "operation_failed";
             case transactions_errc::std_exception:
                 return "std_exception";
             case transactions_errc::unexpected_exception:
                 return "unexpected_exception";
+            case transactions_errc::failed:
+                return "failed";
+            case transactions_errc::expired:
+                return "expired";
+            case transactions_errc::commit_ambiguous:
+                return "commit_ambiguous";
         }
         return "FIXME: unknown error code in transactions category (recompile with newer library)";
     }

src/wrapper/core_error_info.hxx

@@ -566,6 +566,7 @@ zval_to_links(const zval* document)
     std::optional<std::string> atr_collection_name;
     std::optional<std::string> staged_transaction_id;
     std::optional<std::string> staged_attempt_id;
+    std::optional<std::string> staged_operation_id;
     std::optional<std::vector<std::byte>> staged_content;
     std::optional<std::string> cas_pre_txn;
     std::optional<std::string> revid_pre_txn;
@@ -581,6 +582,7 @@ zval_to_links(const zval* document)
     cb_assign_string(atr_collection_name, links, "atr_collection_name");
     cb_assign_string(staged_transaction_id, links, "staged_transaction_id");
     cb_assign_string(staged_attempt_id, links, "staged_attempt_id");
+    cb_assign_string(staged_operation_id, links, "staged_operation_id");
     cb_assign_binary(staged_content, links, "staged_content");
     cb_assign_string(cas_pre_txn, links, "cas_pre_txn");
     cb_assign_string(revid_pre_txn, links, "revid_pre_txn");
@@ -595,21 +597,22 @@ zval_to_links(const zval* document)
         forward_compat_json = core::utils::json::parse(forward_compat.value());
     }
 
-    core::transactions::transaction_links links_(atr_id,
-                                                 atr_bucket_name,
-                                                 atr_scope_name,
-                                                 atr_collection_name,
-                                                 staged_transaction_id,
-                                                 staged_attempt_id,
-                                                 staged_content,
-                                                 cas_pre_txn,
-                                                 revid_pre_txn,
-                                                 exptime_pre_txn,
-                                                 crc32_of_staging,
-                                                 op,
-                                                 forward_compat_json,
-                                                 is_deleted);
-    return { links_, {} };
+    return { core::transactions::transaction_links{ atr_id,
+                                                    atr_bucket_name,
+                                                    atr_scope_name,
+                                                    atr_collection_name,
+                                                    staged_transaction_id,
+                                                    staged_attempt_id,
+                                                    staged_operation_id,
+                                                    staged_content,
+                                                    cas_pre_txn,
+                                                    revid_pre_txn,
+                                                    exptime_pre_txn,
+                                                    crc32_of_staging,
+                                                    op,
+                                                    forward_compat_json,
+                                                    is_deleted },
+             {} };
 }
 
 static std::pair<std::optional<core::transactions::document_metadata>, core_error_info>

src/wrapper/transaction_context_resource.cxx

@@ -235,9 +235,7 @@ function (TransactionAttemptContext $attempt) use ($idToRemove, $idToReplace, $i
                     function () use ($idToRemove, $collection, $attempt) {
                         $attempt->get($collection, $idToRemove);
                     },
-                    TransactionException::class,
-                    null,
-                    "/doc not found/"
+                    Couchbase\Exception\DocumentNotFoundException::class
                 );
             }
         );