couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/transactions/transaction_query_options.hxx

@@ -27,251 +27,256 @@ class transaction_context;
 /**
  * The transaction_query_options are options specific to a query.
  *
- * Some of the options will override the corresponding elements in the @ref transactions_query_config section of the
+ * Some of the options will override the corresponding elements in the @ref
+ * transactions_query_config section of the
  * @ref transactions_config.
  */
 class transaction_query_options
 {
-  public:
-    transaction_query_options()
-    {
-        // set defaults specific to query in transactions.
-        opts_.metrics(true);
-    }
+public:
+  transaction_query_options()
+  {
+    // set defaults specific to query in transactions.
+    opts_.metrics(true);
+  }
 
-    /**
-     * Set an option which isn't exposed explicitly in transaction_query_options.
-     *
-     * @see query_options::raw for details.
-     *
-     * @tparam Value type of the value.
-     * @param key The name of the option.
-     * @param value The value of this option.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    template<typename Value>
-    transaction_query_options& raw(const std::string& key, const Value& value)
-    {
-        opts_.raw(key, value);
-        return *this;
-    }
+  /**
+   * Set an option which isn't exposed explicitly in transaction_query_options.
+   *
+   * @see query_options::raw for details.
+   *
+   * @tparam Value type of the value.
+   * @param key The name of the option.
+   * @param value The value of this option.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  template<typename Value>
+  auto raw(const std::string& key, const Value& value) -> transaction_query_options&
+  {
+    opts_.raw(key, value);
+    return *this;
+  }
 
-    /**
-     * Set ad_hoc.
-     *
-     * Inform query service that this query is, or is not, a prepared statement query.   @see query_options::adhoc for
-     * detailed discussion.
-     *
-     * @param value if set to false this query will be turned into a prepared statement query.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& ad_hoc(bool value)
-    {
-        opts_.adhoc(value);
-        return *this;
-    }
+  /**
+   * Set ad_hoc.
+   *
+   * Inform query service that this query is, or is not, a prepared statement query.   @see
+   * query_options::adhoc for detailed discussion.
+   *
+   * @param value if set to false this query will be turned into a prepared statement query.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto ad_hoc(bool value) -> transaction_query_options&
+  {
+    opts_.adhoc(value);
+    return *this;
+  }
 
-    /**
-     * Set the query_scan_consistency for this query.
-     *
-     * @see query_options::scan_consistency for details.
-     *
-     * @param scan_consistency Desired scan consistency.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& scan_consistency(query_scan_consistency scan_consistency)
-    {
-        opts_.scan_consistency(scan_consistency);
-        return *this;
-    }
+  /**
+   * Set the query_scan_consistency for this query.
+   *
+   * @see query_options::scan_consistency for details.
+   *
+   * @param scan_consistency Desired scan consistency.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto scan_consistency(query_scan_consistency scan_consistency) -> transaction_query_options&
+  {
+    opts_.scan_consistency(scan_consistency);
+    return *this;
+  }
 
-    /**
-     * Set the profile mode for this query.
-     *
-     * @see query_options::profile for details.
-     *
-     * @param mode desired profile mode.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& profile(query_profile mode)
-    {
-        opts_.profile(mode);
-        return *this;
-    }
+  /**
+   * Set the profile mode for this query.
+   *
+   * @see query_options::profile for details.
+   *
+   * @param mode desired profile mode.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto profile(query_profile mode) -> transaction_query_options&
+  {
+    opts_.profile(mode);
+    return *this;
+  }
 
-    /**
-     * Set a client id for this query.
-     *
-     * @see query_options::client_context_id for details.
-     *
-     * @param id Desired id
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& client_context_id(const std::string& id)
-    {
-        opts_.client_context_id(id);
-        return *this;
-    }
+  /**
+   * Set a client id for this query.
+   *
+   * @see query_options::client_context_id for details.
+   *
+   * @param id Desired id
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto client_context_id(const std::string& id) -> transaction_query_options&
+  {
+    opts_.client_context_id(id);
+    return *this;
+  }
 
-    /**
-     * Set the scan_wait time
-     *
-     * @see query_options::scan_wait for details.
-     *
-     * @param scan_wait Desired time for scan_wait.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& scan_wait(std::chrono::milliseconds scan_wait)
-    {
-        opts_.scan_wait(scan_wait);
-        return *this;
-    }
+  /**
+   * Set the scan_wait time
+   *
+   * @see query_options::scan_wait for details.
+   *
+   * @param scan_wait Desired time for scan_wait.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto scan_wait(std::chrono::milliseconds scan_wait) -> transaction_query_options&
+  {
+    opts_.scan_wait(scan_wait);
+    return *this;
+  }
 
-    /**
-     * Set the readonly hint for this query.
-     *
-     * @see query_options::readonly
-     *
-     * @param readonly True if query doesn't mutate documents.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& readonly(bool readonly)
-    {
-        opts_.readonly(readonly);
-        return *this;
-    }
+  /**
+   * Set the readonly hint for this query.
+   *
+   * @see query_options::readonly
+   *
+   * @param readonly True if query doesn't mutate documents.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto readonly(bool readonly) -> transaction_query_options&
+  {
+    opts_.readonly(readonly);
+    return *this;
+  }
 
-    /**
-     * Set the scan cap for this query.
-     *
-     * @see query_options::scan_cap for details.
-     *
-     * @param cap Desired cap.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& scan_cap(std::uint64_t cap)
-    {
-        opts_.scan_cap(cap);
-        return *this;
-    }
+  /**
+   * Set the scan cap for this query.
+   *
+   * @see query_options::scan_cap for details.
+   *
+   * @param cap Desired cap.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto scan_cap(std::uint64_t cap) -> transaction_query_options&
+  {
+    opts_.scan_cap(cap);
+    return *this;
+  }
 
-    /**
-     * Set pipeline_batch size for this query.
-     *
-     * @see query_options::pipeline_batch for details.
-     *
-     * @param batch desired batch size.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& pipeline_batch(std::uint64_t batch)
-    {
-        opts_.pipeline_batch(batch);
-        return *this;
-    }
+  /**
+   * Set pipeline_batch size for this query.
+   *
+   * @see query_options::pipeline_batch for details.
+   *
+   * @param batch desired batch size.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto pipeline_batch(std::uint64_t batch) -> transaction_query_options&
+  {
+    opts_.pipeline_batch(batch);
+    return *this;
+  }
 
-    /**
-     * Set pipeline cap for this query.
-     *
-     * @see query_options::pipeline_cap for details.
-     *
-     * @param cap desired cap.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& pipeline_cap(std::uint64_t cap)
-    {
-        opts_.pipeline_cap(cap);
-        return *this;
-    }
+  /**
+   * Set pipeline cap for this query.
+   *
+   * @see query_options::pipeline_cap for details.
+   *
+   * @param cap desired cap.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto pipeline_cap(std::uint64_t cap) -> transaction_query_options&
+  {
+    opts_.pipeline_cap(cap);
+    return *this;
+  }
 
-    /**
-     * Set positional parameters for this query.
-     *
-     * @see query_options::positional_parameters for details.
-     *
-     * @tparam Parameters Types of the parameters
-     * @param parameters the sequence of positional parameters for this query.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    template<typename... Parameters>
-    auto positional_parameters(const Parameters&... parameters)
-    {
-        opts_.positional_parameters(parameters...);
-        return *this;
-    }
+  /**
+   * Set positional parameters for this query.
+   *
+   * @see query_options::positional_parameters for details.
+   *
+   * @tparam Parameters Types of the parameters
+   * @param parameters the sequence of positional parameters for this query.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  template<typename... Parameters>
+  auto positional_parameters(const Parameters&... parameters)
+  {
+    opts_.positional_parameters(parameters...);
+    return *this;
+  }
 
-    /**
-     * Set named parameters for this query.
-     *
-     * @see query_options::named_parameters for details.
-     *
-     * @tparam Parameters Types of the parameter pairs.
-     * @param parameters the sequence of name-value pairs. Each value will be encoded into JSON.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    template<typename... Parameters>
-    transaction_query_options& named_parameters(const Parameters&... parameters)
-    {
-        opts_.named_parameters(parameters...);
-        return *this;
-    }
+  /**
+   * Set named parameters for this query.
+   *
+   * @see query_options::named_parameters for details.
+   *
+   * @tparam Parameters Types of the parameter pairs.
+   * @param parameters the sequence of name-value pairs. Each value will be encoded into JSON.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  template<typename... Parameters>
+  auto named_parameters(const Parameters&... parameters) -> transaction_query_options&
+  {
+    opts_.named_parameters(parameters...);
+    return *this;
+  }
 
-    /**
-     * Set metrics for this query.
-     *
-     * If true, the query results will contain metrics.  This is true by default for transactional queries.
-     * @see query_options::metrics for details.
-     *
-     * @param metrics True if metrics are desired.
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& metrics(bool metrics)
-    {
-        opts_.metrics(metrics);
-        return *this;
-    }
+  /**
+   * Set metrics for this query.
+   *
+   * If true, the query results will contain metrics.  This is true by default for transactional
+   * queries.
+   * @see query_options::metrics for details.
+   *
+   * @param metrics True if metrics are desired.
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto metrics(bool metrics) -> transaction_query_options&
+  {
+    opts_.metrics(metrics);
+    return *this;
+  }
 
-    /**
-     * Set max parallelism for this query.
-     *
-     * @see query_options::max_parallelism for details.
-     *
-     * @param max Desired max parallelism
-     * @return reference to this object, convenient for chaining calls.
-     */
-    transaction_query_options& max_parallelism(std::uint64_t max)
-    {
-        opts_.max_parallelism(max);
-        return *this;
-    }
+  /**
+   * Set max parallelism for this query.
+   *
+   * @see query_options::max_parallelism for details.
+   *
+   * @param max Desired max parallelism
+   * @return reference to this object, convenient for chaining calls.
+   */
+  auto max_parallelism(std::uint64_t max) -> transaction_query_options&
+  {
+    opts_.max_parallelism(max);
+    return *this;
+  }
 
-    /** @private */
-    transaction_query_options& encoded_raw_options(std::map<std::string, codec::binary, std::less<>> options)
-    {
-        opts_.encoded_raw_options(options);
-        return *this;
-    }
+  /** @private */
+  auto encoded_raw_options(std::map<std::string, codec::binary, std::less<>> options)
+    -> transaction_query_options&
+  {
+    opts_.encoded_raw_options(options);
+    return *this;
+  }
 
-    /** @private */
-    transaction_query_options& encoded_positional_parameters(std::vector<codec::binary> parameters)
-    {
-        opts_.encoded_positional_parameters(parameters);
-        return *this;
-    }
+  /** @private */
+  auto encoded_positional_parameters(std::vector<codec::binary> parameters)
+    -> transaction_query_options&
+  {
+    opts_.encoded_positional_parameters(parameters);
+    return *this;
+  }
 
-    /** @private */
-    transaction_query_options& encoded_named_parameters(std::map<std::string, codec::binary, std::less<>> parameters)
-    {
-        opts_.encoded_named_parameters(parameters);
-        return *this;
-    }
+  /** @private */
+  auto encoded_named_parameters(std::map<std::string, codec::binary, std::less<>> parameters)
+    -> transaction_query_options&
+  {
+    opts_.encoded_named_parameters(parameters);
+    return *this;
+  }
 
-    /** @private */
-    const query_options& get_query_options() const
-    {
-        return opts_;
-    }
+  /** @private */
+  auto get_query_options() const -> const query_options&
+  {
+    return opts_;
+  }
 
-  private:
-    query_options opts_{};
+private:
+  query_options opts_{};
 };
 } // namespace couchbase::transactions

data/ext/couchbase/couchbase/transactions/transaction_query_result.hxx

@@ -16,25 +16,24 @@
 #pragma once
 
 #include <couchbase/query_result.hxx>
-#include <couchbase/transaction_op_error_context.hxx>
 
 namespace couchbase::transactions
 {
 /**
- * Transactional queries will return a transaction_query_result.   Note that this is currently identical
- * to a @ref query_result.   See @ref query_result for details.
+ * Transactional queries will return a transaction_query_result.   Note that this is currently
+ * identical to a @ref query_result.   See @ref query_result for details.
  */
 class transaction_query_result : public query_result
 {
-  public:
-    transaction_query_result(query_meta_data meta_data, std::vector<codec::binary> rows)
-      : query_result(std::move(meta_data), std::move(rows))
-    {
-    }
+public:
+  transaction_query_result(query_meta_data meta_data, std::vector<codec::binary> rows)
+    : query_result(std::move(meta_data), std::move(rows))
+  {
+  }
 
-    transaction_query_result()
-      : query_result()
-    {
-    }
+  transaction_query_result()
+    : query_result()
+  {
+  }
 };
 } // namespace couchbase::transactions

data/ext/couchbase/couchbase/transactions/transaction_result.hxx

@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include <couchbase/transaction_error_context.hxx>
 #include <string>
 
 namespace couchbase::transactions
@@ -28,7 +27,7 @@ namespace couchbase::transactions
  * returned by @ref couchbase::transactions::transactions::run()
  */
 struct transaction_result {
-    std::string transaction_id;
-    bool unstaging_complete;
+  std::string transaction_id;
+  bool unstaging_complete;
 };
 } // namespace couchbase::transactions