PCBC-915: fix timestamp as expiry in mutation options (#88)

Author: avsej

Couchbase/InsertOptions.php

@@ -28,6 +28,7 @@ class InsertOptions
     private Transcoder $transcoder;
     private ?int $timeoutMilliseconds = null;
     private ?int $expirySeconds = null;
+    private ?int $expiryTimestamp = null;
     private ?string $durabilityLevel = null;
     private ?int $durabilityTimeoutSeconds = null;
 
@@ -76,7 +77,7 @@ public function timeout(int $milliseconds): InsertOptions
     public function expiry($seconds): InsertOptions
     {
         if ($seconds instanceof DateTimeInterface) {
-            $this->expirySeconds = $seconds->getTimestamp();
+            $this->expiryTimestamp = $seconds->getTimestamp();
         } else {
             $this->expirySeconds = (int)$seconds;
         }
@@ -151,6 +152,7 @@ public static function export(?InsertOptions $options): array
         return [
             'timeoutMilliseconds' => $options->timeoutMilliseconds,
             'expirySeconds' => $options->expirySeconds,
+            'expiryTimestamp' => $options->expiryTimestamp,
             'durabilityLevel' => $options->durabilityLevel,
             'durabilityTimeoutSeconds' => $options->durabilityTimeoutSeconds,
         ];

Couchbase/MutateInOptions.php

@@ -31,6 +31,7 @@ class MutateInOptions
     private ?string $durabilityLevel = null;
     private ?string $cas = null;
     private ?int $expirySeconds = null;
+    private ?int $expiryTimestamp = null;
     private ?bool $preserveExpiry = null;
     private string $storeSemantics;
 
@@ -94,7 +95,7 @@ public function cas(string $cas): MutateInOptions
     public function expiry($seconds): MutateInOptions
     {
         if ($seconds instanceof DateTimeInterface) {
-            $this->expirySeconds = $seconds->getTimestamp();
+            $this->expiryTimestamp = $seconds->getTimestamp();
         } else {
             $this->expirySeconds = (int)$seconds;
         }
@@ -201,6 +202,7 @@ public static function export(?MutateInOptions $options): array
         return [
             'timeoutMilliseconds' => $options->timeoutMilliseconds,
             'expirySeconds' => $options->expirySeconds,
+            'expiryTimestamp' => $options->expiryTimestamp,
             'preserveExpiry' => $options->preserveExpiry,
             'cas' => $options->cas,
             'durabilityLevel' => $options->durabilityLevel,

Couchbase/ReplaceOptions.php

@@ -28,6 +28,7 @@ class ReplaceOptions
     private Transcoder $transcoder;
     private ?int $timeoutMilliseconds = null;
     private ?int $expirySeconds = null;
+    private ?int $expiryTimestamp = null;
     private ?bool $preserveExpiry = null;
     private ?string $durabilityLevel = null;
     private ?string $cas = null;
@@ -77,7 +78,7 @@ public function timeout(int $milliseconds): ReplaceOptions
     public function expiry($seconds): ReplaceOptions
     {
         if ($seconds instanceof DateTimeInterface) {
-            $this->expirySeconds = $seconds->getTimestamp();
+            $this->expiryTimestamp = $seconds->getTimestamp();
         } else {
             $this->expirySeconds = (int)$seconds;
         }
@@ -179,6 +180,7 @@ public static function export(?ReplaceOptions $options): array
         return [
             'timeoutMilliseconds' => $options->timeoutMilliseconds,
             'expirySeconds' => $options->expirySeconds,
+            'expiryTimestamp' => $options->expiryTimestamp,
             'preserveExpiry' => $options->preserveExpiry,
             'durabilityLevel' => $options->durabilityLevel,
             'cas' => $options->cas,

src/wrapper/conversion_utilities.hxx

@@ -158,15 +158,22 @@ cb_set_expiry(Options& opts, const zval* options)
     if (auto [e, value] = cb_get_integer<std::uint64_t>(options, "expirySeconds"); e.ec) {
         return e;
     } else if (value) {
-        opts.expiry(std::chrono::seconds{ value.value() });
+        try {
+            opts.expiry(std::chrono::seconds{ value.value() });
+        } catch (const std::system_error& ec) {
+            return { ec.code(), ERROR_LOCATION, ec.what() };
+        }
         return {};
     }
 
     if (auto [e, value] = cb_get_integer<std::uint64_t>(options, "expiryTimestamp"); e.ec) {
         return e;
     } else if (value) {
-        opts.expiry(std::chrono::system_clock::time_point{ std::chrono::seconds{ value.value() } });
-        return {};
+        try {
+            opts.expiry(std::chrono::system_clock::time_point{ std::chrono::seconds{ value.value() } });
+        } catch (const std::system_error& ec) {
+            return { ec.code(), ERROR_LOCATION, ec.what() };
+        }
     }
     return {};
 }

tests/KeyValueInsertTest.php

@@ -19,6 +19,8 @@
 declare(strict_types=1);
 
 use Couchbase\Exception\DocumentExistsException;
+use Couchbase\GetOptions;
+use Couchbase\InsertOptions;
 
 include_once __DIR__ . "/Helpers/CouchbaseTestCase.php";
 
@@ -34,4 +36,22 @@ public function testInsertFailsIfDocumentExistsAlready()
         $this->expectException(DocumentExistsException::class);
         $collection->insert($id, ["answer" => "foo"]);
     }
+
+    public function testCanInsertWithExpiry()
+    {
+        $expiry = 300;
+
+        $options = new InsertOptions();
+        $expiryDate = (new \DateTimeImmutable())->modify('+' . $expiry . ' seconds');
+        $options->expiry($expiryDate);
+
+        $collection = $this->defaultCollection();
+        $id = $this->uniqueId();
+
+        $collection->insert($id, ["answer" => 42], $options);
+
+        $opts = (GetOptions::build())->withExpiry(true);
+        $res = $collection->get($id, $opts);
+        $this->assertGreaterThan((new DateTime())->getTimestamp(), $res->expiryTime()->getTimestamp());
+    }
 }