couchbase 3.5.1 → 3.5.2

data/ext/couchbase/core/utils/connection_string.hxx

@@ -28,50 +28,51 @@ namespace couchbase::core::utils
 {
 
 struct connection_string {
-    enum class bootstrap_mode {
-        unspecified,
-        gcccp,
-        http,
-    };
+  enum class bootstrap_mode {
+    unspecified,
+    gcccp,
+    http,
+  };
 
-    enum class address_type {
-        ipv4,
-        ipv6,
-        dns,
-    };
+  enum class address_type {
+    ipv4,
+    ipv6,
+    dns,
+  };
 
-    struct node {
-        std::string address;
-        std::uint16_t port;
-        address_type type;
-        bootstrap_mode mode{ bootstrap_mode::unspecified };
+  struct node {
+    std::string address;
+    std::uint16_t port;
+    address_type type;
+    bootstrap_mode mode{ bootstrap_mode::unspecified };
 
-        bool operator==(const node& rhs) const
-        {
-            return address == rhs.address && port == rhs.port && type == rhs.type && mode == rhs.mode;
-        }
+    auto operator==(const node& rhs) const -> bool
+    {
+      return address == rhs.address && port == rhs.port && type == rhs.type && mode == rhs.mode;
+    }
 
-        bool operator!=(const node& rhs) const
-        {
-            return !(rhs == *this);
-        }
-    };
+    auto operator!=(const node& rhs) const -> bool
+    {
+      return !(rhs == *this);
+    }
+  };
 
-    std::string scheme{ "couchbase" };
-    bool tls{ false };
-    std::map<std::string, std::string> params{};
-    cluster_options options{};
+  std::string scheme{ "couchbase" };
+  bool tls{ false };
+  std::map<std::string, std::string> params{};
+  cluster_options options{};
 
-    std::vector<node> bootstrap_nodes{};
+  std::vector<node> bootstrap_nodes{};
 
-    std::optional<std::string> default_bucket_name{};
-    bootstrap_mode default_mode{ connection_string::bootstrap_mode::gcccp };
-    std::uint16_t default_port{ 11210 };
+  std::optional<std::string> default_bucket_name{};
+  bootstrap_mode default_mode{ connection_string::bootstrap_mode::gcccp };
+  std::uint16_t default_port{ 11210 };
 
-    std::vector<std::string> warnings{};
-    std::optional<std::string> error{};
+  std::vector<std::string> warnings{};
+  std::optional<std::string> error{};
 };
 
-connection_string
-parse_connection_string(const std::string& input, cluster_options options = {});
+auto
+parse_connection_string(const std::string& input,
+                        cluster_options options = {}) -> connection_string;
 } // namespace couchbase::core::utils

data/ext/couchbase/core/utils/crc32.hxx

@@ -10,47 +10,55 @@
 namespace couchbase::core::utils
 {
 static const std::uint32_t crc32tab[256] = {
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
-    0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb,
-    0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8,
-    0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
-    0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
-    0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074,
-    0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e,
-    0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27,
-    0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
-    0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92,
-    0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4,
-    0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
-    0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a,
-    0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37,
-    0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+  0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+  0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+  0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+  0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+  0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+  0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+  0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+  0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+  0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+  0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+  0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+  0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+  0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+  0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+  0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+  0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+  0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+  0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+  0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+  0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
 };
 
-static inline std::uint32_t
-hash_crc32(const char* key, size_t key_length)
+static inline auto
+hash_crc32(const char* key, std::size_t key_length) -> std::uint32_t
 {
-    std::uint32_t crc = UINT32_MAX;
+  std::uint32_t crc = UINT32_MAX;
 
-    for (std::uint64_t x = 0; x < key_length; x++) {
-        crc = (crc >> 8) ^ crc32tab[(crc ^ static_cast<std::uint64_t>(key[x])) & 0xff];
-    }
+  for (std::uint64_t x = 0; x < key_length; x++) {
+    crc = (crc >> 8) ^ crc32tab[(crc ^ static_cast<std::uint64_t>(key[x])) & 0xff];
+  }
 
-    return ((~crc) >> 16) & 0x7fff;
+  return ((~crc) >> 16) & 0x7fff;
 }
 
-static inline std::uint32_t
-hash_crc32(const std::byte* key, size_t key_length)
+static inline auto
+hash_crc32(const std::byte* key, std::size_t key_length) -> std::uint32_t
 {
-    return hash_crc32(reinterpret_cast<const char*>(key), key_length);
+  return hash_crc32(reinterpret_cast<const char*>(key), key_length);
 }
 } // namespace couchbase::core::utils

data/ext/couchbase/core/utils/duration_parser.cxx

@@ -22,30 +22,30 @@ namespace couchbase::core::utils
 /**
  * leading_int consumes the leading [0-9]* from s.
  */
-static bool
-leading_int(std::string& s, std::int64_t& v)
+static auto
+leading_int(std::string& s, std::int64_t& v) -> bool
 {
-    v = 0;
-    std::size_t i = 0;
-    for (; i < s.size(); ++i) {
-        auto c = s[i];
+  v = 0;
+  std::size_t i = 0;
+  for (; i < s.size(); ++i) {
+    auto c = s[i];
 
-        if (c < '0' || c > '9') {
-            break;
-        }
+    if (c < '0' || c > '9') {
+      break;
+    }
 
-        if (v > std::int64_t((1LLU << 63U) - 1LLU) / 10) {
-            return false;
-        }
+    if (v > std::int64_t((1LLU << 63U) - 1LLU) / 10) {
+      return false;
+    }
 
-        v = v * 10 + std::int64_t(c) - '0';
+    v = v * 10 + std::int64_t(c) - '0';
 
-        if (v < 0) {
-            return false;
-        }
+    if (v < 0) {
+      return false;
     }
-    s = s.substr(i);
-    return true;
+  }
+  s = s.substr(i);
+  return true;
 }
 
 /**
@@ -58,136 +58,145 @@ leading_int(std::string& s, std::int64_t& v)
 static void
 leading_fraction(std::string& s, std::int64_t& x, std::uint32_t& scale)
 {
-    std::size_t i = 0;
-    scale = 1;
+  std::size_t i = 0;
+  scale = 1;
 
-    bool overflow = false;
+  bool overflow = false;
 
-    for (; i < s.size(); ++i) {
-        auto c = s[i];
-
-        if (c < '0' || c > '9') {
-            break;
-        }
-
-        if (overflow) {
-            continue;
-        }
-
-        if (x > std::int64_t((1LLU << 63LLU) - 1LLU) / 10) {
-            // It's possible for overflow to give a positive number, so take care.
-            overflow = true;
-            continue;
-        }
-
-        auto y = x * 10 + std::int64_t(c) - '0';
-        if (y < 0) {
-            overflow = true;
-            continue;
-        }
-
-        x = y;
-        scale *= 10;
+  for (; i < s.size(); ++i) {
+    auto c = s[i];
+
+    if (c < '0' || c > '9') {
+      break;
     }
 
-    s = s.substr(i);
+    if (overflow) {
+      continue;
+    }
+
+    if (x > std::int64_t((1LLU << 63LLU) - 1LLU) / 10) {
+      // It's possible for overflow to give a positive number, so take care.
+      overflow = true;
+      continue;
+    }
+
+    auto y = x * 10 + std::int64_t(c) - '0';
+    if (y < 0) {
+      overflow = true;
+      continue;
+    }
+
+    x = y;
+    scale *= 10;
+  }
+
+  s = s.substr(i);
 }
 
-std::chrono::nanoseconds
-parse_duration(const std::string& text)
+auto
+parse_duration(const std::string& text) -> std::chrono::nanoseconds
 {
-    // [-+]?([0-9]*(\.[0-9]*)?[a-z]+)+
-    std::string s = text;
-    std::chrono::nanoseconds d{ 0 };
-    bool neg{ false };
-
-    // Consume [-+]?
-    if (!s.empty()) {
-        auto c = s[0];
-
-        if (c == '-' || c == '+') {
-            neg = c == '-';
-            s = s.substr(1);
-        }
+  // [-+]?([0-9]*(\.[0-9]*)?[a-z]+)+
+  std::string s = text;
+  std::chrono::nanoseconds d{ 0 };
+  bool neg{ false };
+
+  // Consume [-+]?
+  if (!s.empty()) {
+    auto c = s[0];
+
+    if (c == '-' || c == '+') {
+      neg = c == '-';
+      s = s.substr(1);
     }
-    if (neg) {
-        throw duration_parse_error("negative durations are not supported: " + text);
+  }
+  if (neg) {
+    throw duration_parse_error("negative durations are not supported: " + text);
+  }
+
+  // Special case: if all that is left is "0", this is zero.
+  if (s == "0") {
+    return std::chrono::nanoseconds::zero();
+  }
+
+  if (s.empty()) {
+    throw duration_parse_error("invalid duration: " + text);
+  }
+
+  while (!s.empty()) {
+    // The next character must be [0-9.]
+    if (!(s[0] == '.' || ('0' <= s[0] && s[0] <= '9'))) {
+      throw duration_parse_error("invalid duration: " + text);
+    }
+
+    // Consume [0-9]*
+    auto pl = s.size();
+
+    std::int64_t v{ 0 }; // integer before decimal point
+    if (!leading_int(s, v)) {
+      throw duration_parse_error("invalid duration (leading_int overflow): " + text);
+    }
+
+    bool pre = pl != s.size(); // whether we consumed anything before a period
+
+    std::int64_t f{ 0 };      // integer after decimal point
+    std::uint32_t scale{ 1 }; // value = v + f/scale
+
+    // Consume (\.[0-9]*)?
+    bool post = false;
+    if (!s.empty() && s[0] == '.') {
+      s = s.substr(1);
+      pl = s.size();
+      leading_fraction(s, f, scale);
+      post = pl != s.size();
     }
 
-    // Special case: if all that is left is "0", this is zero.
-    if (s == "0") {
-        return std::chrono::nanoseconds::zero();
+    if (!pre && !post) {
+      // no digits (e.g. ".s" or "-.s")
+      throw duration_parse_error("invalid duration: " + text);
     }
 
-    if (s.empty()) {
-        throw duration_parse_error("invalid duration: " + text);
+    // Consume unit.
+    std::size_t i = 0;
+    for (; i < s.size(); ++i) {
+      auto c = s[i];
+      if (c == '.' || ('0' <= c && c <= '9')) {
+        break;
+      }
     }
+    if (i == 0) {
+      throw duration_parse_error("missing unit in duration: " + text);
+    }
+
+    auto u = s.substr(0, i);
+    s = s.substr(i);
 
-    while (!s.empty()) {
-        // The next character must be [0-9.]
-        if (!(s[0] == '.' || ('0' <= s[0] && s[0] <= '9'))) {
-            throw duration_parse_error("invalid duration: " + text);
-        }
-
-        // Consume [0-9]*
-        auto pl = s.size();
-
-        std::int64_t v{ 0 }; // integer before decimal point
-        if (!leading_int(s, v)) {
-            throw duration_parse_error("invalid duration (leading_int overflow): " + text);
-        }
-
-        bool pre = pl != s.size(); // whether we consumed anything before a period
-
-        std::int64_t f{ 0 };      // integer after decimal point
-        std::uint32_t scale{ 1 }; // value = v + f/scale
-
-        // Consume (\.[0-9]*)?
-        bool post = false;
-        if (!s.empty() && s[0] == '.') {
-            s = s.substr(1);
-            pl = s.size();
-            leading_fraction(s, f, scale);
-            post = pl != s.size();
-        }
-
-        if (!pre && !post) {
-            // no digits (e.g. ".s" or "-.s")
-            throw duration_parse_error("invalid duration: " + text);
-        }
-
-        // Consume unit.
-        std::size_t i = 0;
-        for (; i < s.size(); ++i) {
-            auto c = s[i];
-            if (c == '.' || ('0' <= c && c <= '9')) {
-                break;
-            }
-        }
-        if (i == 0) {
-            throw duration_parse_error("missing unit in duration: " + text);
-        }
-
-        auto u = s.substr(0, i);
-        s = s.substr(i);
-
-        if (u == "ns") {
-            d += std::chrono::nanoseconds(v); /* no sub-nanoseconds, ignore 'f' */
-        } else if (u == "us" || u == "µs" /* U+00B5 = micro symbol */ || u == "μs" /* U+03BC = Greek letter mu */) {
-            d += std::chrono::microseconds(v) + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::microseconds(f)) / scale;
-        } else if (u == "ms") {
-            d += std::chrono::milliseconds(v) + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(f)) / scale;
-        } else if (u == "s") {
-            d += std::chrono::seconds(v) + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(f)) / scale;
-        } else if (u == "m") {
-            d += std::chrono::minutes(v) + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::minutes(f)) / scale;
-        } else if (u == "h") {
-            d += std::chrono::hours(v) + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::hours(f)) / scale;
-        } else {
-            throw duration_parse_error(std::string("unknown unit ").append(u).append(" in duration ").append(text));
-        }
+    if (u == "ns") {
+      d += std::chrono::nanoseconds(v); /* no sub-nanoseconds, ignore 'f' */
+    } else if (u == "us" || u == "µs" /* U+00B5 = micro symbol */ ||
+               u == "μs" /* U+03BC = Greek letter mu */) {
+      d +=
+        std::chrono::microseconds(v) +
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::microseconds(f)) / scale;
+    } else if (u == "ms") {
+      d +=
+        std::chrono::milliseconds(v) +
+        std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(f)) / scale;
+    } else if (u == "s") {
+      d += std::chrono::seconds(v) +
+           std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(f)) / scale;
+    } else if (u == "m") {
+      d += std::chrono::minutes(v) +
+           std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::minutes(f)) / scale;
+    } else if (u == "h") {
+      d += std::chrono::hours(v) +
+           std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::hours(f)) / scale;
+    } else {
+      throw duration_parse_error(
+        std::string("unknown unit ").append(u).append(" in duration ").append(text));
     }
+  }
 
-    return d;
+  return d;
 }
 } // namespace couchbase::core::utils

data/ext/couchbase/core/utils/duration_parser.hxx

@@ -25,21 +25,21 @@ namespace couchbase::core::utils
 {
 class duration_parse_error : public std::runtime_error
 {
-  public:
-    explicit duration_parse_error(const std::string& msg)
-      : std::runtime_error(msg)
-    {
-    }
+public:
+  explicit duration_parse_error(const std::string& msg)
+    : std::runtime_error(msg)
+  {
+  }
 };
 
 /**
  * Parses a duration string.
  *
- * A duration string is a possibly signed sequence of decimal numbers, each with optional fraction and a unit suffix,
- * such as "300ms", "-1.5h" or "2h45m".
+ * A duration string is a possibly signed sequence of decimal numbers, each with optional fraction
+ * and a unit suffix, such as "300ms", "-1.5h" or "2h45m".
  *
  * Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
  */
-std::chrono::nanoseconds
-parse_duration(const std::string& text);
+auto
+parse_duration(const std::string& text) -> std::chrono::nanoseconds;
 } // namespace couchbase::core::utils

data/ext/couchbase/core/utils/join_strings.hxx

@@ -26,20 +26,20 @@ namespace couchbase::core::utils
  * Joins a list of strings together.
  */
 template<typename Range>
-std::string
-join_strings(const Range& values, const std::string& sep)
+auto
+join_strings(const Range& values, const std::string& sep) -> std::string
 {
-    std::stringstream stream;
-    auto sentinel = std::end(values);
-    if (auto it = std::begin(values); it != sentinel) {
-        stream << *it;
-        ++it;
-        while (it != sentinel) {
-            stream << sep << *it;
-            ++it;
-        }
+  std::stringstream stream;
+  auto sentinel = std::end(values);
+  if (auto it = std::begin(values); it != sentinel) {
+    stream << *it;
+    ++it;
+    while (it != sentinel) {
+      stream << sep << *it;
+      ++it;
     }
-    return stream.str();
+  }
+  return stream.str();
 }
 
 /**
@@ -47,20 +47,20 @@ join_strings(const Range& values, const std::string& sep)
  */
 template<typename Range>
 
-std::string
-join_strings_fmt(const Range& values, const std::string& sep)
+auto
+join_strings_fmt(const Range& values, const std::string& sep) -> std::string
 {
-    std::stringstream stream;
-    auto sentinel = std::end(values);
-    if (auto it = std::begin(values); it != sentinel) {
-        stream << fmt::format("{}", *it);
-        ++it;
-        while (it != sentinel) {
-            stream << sep << fmt::format("{}", *it);
-            ++it;
-        }
+  std::stringstream stream;
+  auto sentinel = std::end(values);
+  if (auto it = std::begin(values); it != sentinel) {
+    stream << fmt::format("{}", *it);
+    ++it;
+    while (it != sentinel) {
+      stream << sep << fmt::format("{}", *it);
+      ++it;
     }
-    return stream.str();
+  }
+  return stream.str();
 }
 
 } // namespace couchbase::core::utils