PCBC-934: fix setting timeout for transaction (#113)

Author: avsej

Couchbase/TransactionOptions.php

@@ -26,6 +26,7 @@ class TransactionOptions
 {
     private ?string $durabilityLevel = null;
     private ?int $timeoutMilliseconds = null;
+    private ?int $keyValueTimeoutMilliseconds = null;
 
     /**
      * Specifies the timeout for the transaction.
@@ -41,6 +42,20 @@ public function timeout(int $milliseconds): TransactionOptions
         return $this;
     }
 
+    /**
+     * Specifies the default timeout for KV operations, in milliseconds.
+     *
+     * @param int $milliseconds
+     *
+     * @return TransactionsOptins
+     * @since 4.1.4
+     */
+    public function keyValueTimeout(int $milliseconds): TransactionsOptions
+    {
+        $this->keyValueTimeoutMilliseconds = $milliseconds;
+        return $this;
+    }
+
     /**
      * Specifies the level of synchronous durability level.
      *
@@ -75,6 +90,7 @@ public static function export(?TransactionOptions $options): array
         }
         return [
             'timeout' => $options->timeoutMilliseconds,
+            'keyValueTimeout' => $options->keyValueTimeoutMilliseconds,
             'durabilityLevel' => $options->durabilityLevel,
         ];
     }

package.xml

@@ -13,7 +13,7 @@
         <email>sergey@couchbase.com</email>
         <active>yes</active>
     </lead>
-    <date>2023-05-23</date>
+    <date>2023-05-25</date>
     <version>
         <release>4.1.4</release>
         <api>4.0.0</api>
@@ -25,6 +25,7 @@
     <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache V2</license>
     <notes>
         * Add `couchbase::` namespace to `durability_level`, fixes using Sync Durability. (#102)
+        * PCBC-934: Fixed setting timeout for transaction.
 
         Notable changes in core C++
         ---------------------------

src/wrapper/transaction_context_resource.cxx

@@ -800,7 +800,8 @@ apply_options(transactions::transaction_options& config, zval* options)
 
     ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(options), key, value)
     {
-        ASSIGN_DURATION_OPTION("timeout", config.kv_timeout, key, value);
+        ASSIGN_DURATION_OPTION("timeout", config.expiration_time, key, value);
+        ASSIGN_DURATION_OPTION("keyValueTimeout", config.kv_timeout, key, value);
         if (zend_binary_strcmp(ZSTR_VAL(key), ZSTR_LEN(key), ZEND_STRL("durabilityLevel")) == 0) {
             if (value == nullptr || Z_TYPE_P(value) == IS_NULL) {
                 continue;

src/wrapper/transactions_resource.cxx

@@ -153,6 +153,7 @@ apply_options(couchbase::transactions::transactions_config& config, zval* option
 
     ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(options), key, value)
     {
+        ASSIGN_DURATION_OPTION("timeout", config.expiration_time, key, value);
         ASSIGN_DURATION_OPTION("keyValueTimeout", config.kv_timeout, key, value);
         if (zend_binary_strcmp(ZSTR_VAL(key), ZSTR_LEN(key), ZEND_STRL("durabilityLevel")) == 0) {
             if (value == nullptr || Z_TYPE_P(value) == IS_NULL) {