couchbase 3.4.3 → 3.4.4

data/ext/couchbase/core/impl/drop_query_index.cxx

@@ -21,88 +21,167 @@
 #include "core/cluster.hxx"
 #include "core/operations/management/query_index_drop.hxx"
 
-namespace couchbase::core::impl
+namespace couchbase
 {
 template<typename Response>
 static manager_error_context
 build_context(Response& resp)
 {
-    return { resp.ctx.ec,
-             resp.ctx.last_dispatched_to,
-             resp.ctx.last_dispatched_from,
-             resp.ctx.retry_attempts,
-             std::move(resp.ctx.retry_reasons),
-             std::move(resp.ctx.client_context_id),
-             resp.ctx.http_status,
-             std::move(resp.ctx.http_body),
-             std::move(resp.ctx.path) };
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
 }
 
-void
-initiate_drop_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                          std::string bucket_name,
-                          std::string index_name,
-                          drop_query_index_options::built options,
-                          query_context query_context,
-                          std::string collection_name,
-                          drop_query_index_handler&& handler)
+static core::operations::management::query_index_drop_request
+build_drop_primary_index_request(std::string bucket_name, const drop_primary_query_index_options::built& options)
+{
+    core::operations::management::query_index_drop_request request{
+        std::move(bucket_name), "", "", options.index_name.value_or(""), {}, true, options.ignore_if_not_exists, {}, options.timeout,
+    };
+    return request;
+}
+
+static core::operations::management::query_index_drop_request
+build_drop_index_request(std::string bucket_name, std::string index_name, const drop_query_index_options::built& options)
+{
+    core::operations::management::query_index_drop_request request{
+        std::move(bucket_name), "", "", std::move(index_name), {}, false, options.ignore_if_not_exists, {}, options.timeout,
+    };
+    return request;
+}
+
+static core::operations::management::query_index_drop_request
+build_drop_primary_index_request(std::string bucket_name,
+                                 std::string scope_name,
+                                 std::string collection_name,
+                                 const drop_primary_query_index_options::built& options)
+{
+    core::operations::management::query_index_drop_request request{
+        "",
+        "",
+        std::move(collection_name),
+        options.index_name.value_or(""),
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
+        true,
+        options.ignore_if_not_exists,
+        {},
+        options.timeout,
+    };
+    return request;
+}
+
+static core::operations::management::query_index_drop_request
+build_drop_index_request(std::string bucket_name,
+                         std::string scope_name,
+                         std::string collection_name,
+                         std::string index_name,
+                         const drop_query_index_options::built& options)
 {
-    core->execute(
-      operations::management::query_index_drop_request{
-        bucket_name,
+    core::operations::management::query_index_drop_request request{
         "",
-        collection_name,
-        index_name,
-        query_context,
+        "",
+        std::move(collection_name),
+        std::move(index_name),
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
         false,
         options.ignore_if_not_exists,
         {},
         options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_drop_response resp) { handler(build_context(resp)); });
+    };
+    return request;
+}
+
+void
+query_index_manager::drop_primary_index(std::string bucket_name,
+                                        const couchbase::drop_primary_query_index_options& options,
+                                        couchbase::drop_query_index_handler&& handler)
+{
+    auto request = build_drop_primary_index_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_drop_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::drop_primary_index(std::string bucket_name, const couchbase::drop_primary_query_index_options& options)
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_primary_index(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
 }
 
 void
-initiate_drop_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                          std::string bucket_name,
-                          std::string index_name,
-                          couchbase::drop_query_index_options::built options,
-                          drop_query_index_handler&& handler)
+query_index_manager::drop_index(std::string bucket_name,
+                                std::string index_name,
+                                const couchbase::drop_query_index_options& options,
+                                couchbase::drop_query_index_handler&& handler)
 {
-    initiate_drop_query_index(core, std::move(bucket_name), std::move(index_name), options, {}, "", std::move(handler));
+    auto request = build_drop_index_request(std::move(bucket_name), std::move(index_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_drop_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::drop_index(std::string bucket_name, std::string index_name, const couchbase::drop_query_index_options& options)
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_index(std::move(bucket_name), std::move(index_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
 }
 
 void
-initiate_drop_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                  std::string bucket_name,
-                                  couchbase::drop_primary_query_index_options::built options,
-                                  query_context query_ctx,
-                                  std::string collection_name,
-                                  drop_primary_query_index_handler&& handler)
+collection_query_index_manager::drop_primary_index(const drop_primary_query_index_options& options,
+                                                   drop_query_index_handler&& handler) const
 {
-    core->execute(
-      operations::management::query_index_drop_request{
-        bucket_name,
-        "",
-        collection_name,
-        options.index_name.value_or(""),
-        query_ctx,
-        true,
-        options.ignore_if_not_exists,
-        {},
-        options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_drop_response resp) { handler(build_context(resp)); });
+    auto request = build_drop_primary_index_request(bucket_name_, scope_name_, collection_name_, options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_drop_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
 }
+
+auto
+collection_query_index_manager::drop_primary_index(const couchbase::drop_primary_query_index_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_primary_index(options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
 void
-initiate_drop_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                  std::string bucket_name,
-                                  couchbase::drop_primary_query_index_options::built options,
-                                  drop_primary_query_index_handler&& handler)
+collection_query_index_manager::drop_index(std::string index_name,
+                                           const drop_query_index_options& options,
+                                           drop_query_index_handler&& handler) const
 {
-    return initiate_drop_primary_query_index(core, std::move(bucket_name), options, {}, "", std::move(handler));
+    auto request = build_drop_index_request(bucket_name_, scope_name_, collection_name_, std::move(index_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_drop_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
 }
 
-} // namespace couchbase::core::impl
+auto
+collection_query_index_manager::drop_index(std::string index_name, const couchbase::drop_query_index_options& options)
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_index(std::move(index_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/flush_bucket.cxx

@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#include <couchbase/manager_error_context.hxx>
+#include <utility>
+
+#include "core/cluster.hxx"
+#include "core/operations/management/bucket_flush.hxx"
+#include "couchbase/bucket_manager.hxx"
+
+namespace couchbase
+{
+template<typename Response>
+static manager_error_context
+build_context(Response& resp)
+{
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
+}
+
+static core::operations::management::bucket_flush_request
+build_flush_bucket_request(std::string bucket_name, const flush_bucket_options::built& options)
+{
+    core::operations::management::bucket_flush_request request{ std::move(bucket_name), {}, options.timeout };
+    return request;
+}
+
+void
+bucket_manager::flush_bucket(std::string bucket_name, const flush_bucket_options& options, flush_bucket_handler&& handler) const
+{
+    auto request = build_flush_bucket_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::bucket_flush_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+bucket_manager::flush_bucket(std::string bucket_name, const flush_bucket_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    flush_bucket(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/get_all_buckets.cxx

@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#include <couchbase/manager_error_context.hxx>
+#include <utility>
+
+#include "core/cluster.hxx"
+#include "core/operations/management/bucket_get_all.hxx"
+#include "couchbase/bucket_manager.hxx"
+
+namespace couchbase
+{
+template<typename Response>
+static manager_error_context
+build_context(Response& resp)
+{
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
+}
+
+static core::operations::management::bucket_get_all_request
+build_get_all_buckets_request(const get_all_buckets_options::built& options)
+{
+    core::operations::management::bucket_get_all_request request{ {}, options.timeout };
+    return request;
+}
+
+static couchbase::management::cluster::bucket_settings
+map_bucket_settings(const couchbase::core::management::cluster::bucket_settings& bucket)
+{
+    couchbase::management::cluster::bucket_settings bucket_settings{};
+    bucket_settings.name = bucket.name;
+    bucket_settings.ram_quota_mb = bucket.ram_quota_mb;
+    bucket_settings.max_expiry = bucket.max_expiry;
+    bucket_settings.minimum_durability_level = bucket.minimum_durability_level;
+    bucket_settings.num_replicas = bucket.num_replicas;
+    bucket_settings.replica_indexes = bucket.replica_indexes;
+    bucket_settings.flush_enabled = bucket.flush_enabled;
+    switch (bucket.conflict_resolution_type) {
+        case core::management::cluster::bucket_conflict_resolution::unknown:
+            bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::unknown;
+            break;
+        case core::management::cluster::bucket_conflict_resolution::timestamp:
+            bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::timestamp;
+            break;
+        case core::management::cluster::bucket_conflict_resolution::sequence_number:
+            bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::sequence_number;
+            break;
+        case core::management::cluster::bucket_conflict_resolution::custom:
+            bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::custom;
+            break;
+    }
+    switch (bucket.eviction_policy) {
+        case core::management::cluster::bucket_eviction_policy::unknown:
+            bucket_settings.eviction_policy = management::cluster::bucket_eviction_policy::unknown;
+            break;
+        case core::management::cluster::bucket_eviction_policy::full:
+            bucket_settings.eviction_policy = management::cluster::bucket_eviction_policy::full;
+            break;
+        case core::management::cluster::bucket_eviction_policy::value_only:
+            bucket_settings.eviction_policy = management::cluster::bucket_eviction_policy::value_only;
+            break;
+        case core::management::cluster::bucket_eviction_policy::no_eviction:
+            bucket_settings.eviction_policy = management::cluster::bucket_eviction_policy::no_eviction;
+            break;
+        case core::management::cluster::bucket_eviction_policy::not_recently_used:
+            bucket_settings.eviction_policy = management::cluster::bucket_eviction_policy::not_recently_used;
+            break;
+    }
+    switch (bucket.compression_mode) {
+        case core::management::cluster::bucket_compression::unknown:
+            bucket_settings.compression_mode = management::cluster::bucket_compression::unknown;
+            break;
+        case core::management::cluster::bucket_compression::off:
+            bucket_settings.compression_mode = management::cluster::bucket_compression::off;
+            break;
+        case core::management::cluster::bucket_compression::active:
+            bucket_settings.compression_mode = management::cluster::bucket_compression::active;
+            break;
+        case core::management::cluster::bucket_compression::passive:
+            bucket_settings.compression_mode = management::cluster::bucket_compression::passive;
+            break;
+    }
+    switch (bucket.bucket_type) {
+        case core::management::cluster::bucket_type::unknown:
+            bucket_settings.bucket_type = management::cluster::bucket_type::unknown;
+            break;
+        case core::management::cluster::bucket_type::couchbase:
+            bucket_settings.bucket_type = management::cluster::bucket_type::couchbase;
+            break;
+        case core::management::cluster::bucket_type::memcached:
+            bucket_settings.bucket_type = management::cluster::bucket_type::memcached;
+            break;
+        case core::management::cluster::bucket_type::ephemeral:
+            bucket_settings.bucket_type = management::cluster::bucket_type::ephemeral;
+            break;
+    }
+    switch (bucket.storage_backend) {
+        case core::management::cluster::bucket_storage_backend::unknown:
+            bucket_settings.storage_backend = management::cluster::bucket_storage_backend::unknown;
+            break;
+        case core::management::cluster::bucket_storage_backend::couchstore:
+            bucket_settings.storage_backend = management::cluster::bucket_storage_backend::couchstore;
+            break;
+        case core::management::cluster::bucket_storage_backend::magma:
+            bucket_settings.storage_backend = management::cluster::bucket_storage_backend::magma;
+            break;
+    }
+    return bucket_settings;
+}
+
+static std::vector<couchbase::management::cluster::bucket_settings>
+map_all_bucket_settings(const std::vector<couchbase::core::management::cluster::bucket_settings>& buckets)
+{
+    std::vector<couchbase::management::cluster::bucket_settings> buckets_settings{};
+    for (const auto& bucket : buckets) {
+        auto converted_bucket = map_bucket_settings(bucket);
+        buckets_settings.emplace_back(converted_bucket);
+    }
+    return buckets_settings;
+}
+
+void
+bucket_manager::get_all_buckets(const get_all_buckets_options& options, get_all_buckets_handler&& handler) const
+{
+    auto request = build_get_all_buckets_request(options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::bucket_get_all_response resp) mutable {
+        return handler(build_context(resp), map_all_bucket_settings(resp.buckets));
+    });
+}
+
+auto
+bucket_manager::get_all_buckets(const get_all_buckets_options& options) const
+  -> std::future<std::pair<manager_error_context, std::vector<management::cluster::bucket_settings>>>
+{
+    auto barrier = std::make_shared<std::promise<std::pair<manager_error_context, std::vector<management::cluster::bucket_settings>>>>();
+    get_all_buckets(options,
+                    [barrier](auto ctx, auto result) mutable { barrier->set_value(std::make_pair(std::move(ctx), std::move(result))); });
+    return barrier->get_future();
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/get_all_query_indexes.cxx

@@ -17,60 +17,90 @@
 
 #include <couchbase/manager_error_context.hxx>
 #include <couchbase/query_index_manager.hxx>
+#include <utility>
 
 #include "core/cluster.hxx"
 #include "core/operations/management/query_index_build.hxx"
 #include "core/operations/management/query_index_get_all.hxx"
 
-namespace couchbase::core::impl
+namespace couchbase
 {
 template<typename Response>
 static manager_error_context
 build_context(Response& resp)
 {
-    return { resp.ctx.ec,
-             resp.ctx.last_dispatched_to,
-             resp.ctx.last_dispatched_from,
-             resp.ctx.retry_attempts,
-             std::move(resp.ctx.retry_reasons),
-             std::move(resp.ctx.client_context_id),
-             resp.ctx.http_status,
-             std::move(resp.ctx.http_body),
-             std::move(resp.ctx.path) };
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
+}
+
+static core::operations::management::query_index_get_all_request
+build_get_all_indexes_request(std::string bucket_name, const get_all_query_indexes_options::built& options)
+{
+    core::operations::management::query_index_get_all_request request{ std::move(bucket_name), "", "", {}, {}, options.timeout };
+    return request;
+}
+
+static core::operations::management::query_index_get_all_request
+build_get_all_indexes_request(std::string bucket_name,
+                              std::string scope_name,
+                              std::string collection_name,
+                              const get_all_query_indexes_options::built& options)
+{
+    core::operations::management::query_index_get_all_request request{
+        "", "", std::move(collection_name), core::query_context(std::move(bucket_name), std::move(scope_name)), {}, options.timeout
+    };
+    return request;
 }
 
 void
-initiate_get_all_query_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                               std::string bucket_name,
-                               couchbase::get_all_query_indexes_options::built options,
-                               query_context query_ctx,
-                               std::string collection_name,
-                               get_all_query_indexes_handler&& handler)
+query_index_manager::get_all_indexes(std::string bucket_name,
+                                     const couchbase::get_all_query_indexes_options& options,
+                                     couchbase::get_all_query_indexes_handler&& handler) const
 {
-    core->execute(
-      operations::management::query_index_get_all_request{
-        bucket_name,
-        "",
-        collection_name,
-        query_ctx,
-        {},
-        options.timeout,
-      },
-      [handler = std::move(handler)](operations::management::query_index_get_all_response resp) {
-          if (resp.ctx.ec) {
-              return handler(build_context(resp), {});
-          }
-          handler(build_context(resp), resp.indexes);
-      });
+    auto request = build_get_all_indexes_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_get_all_response resp) mutable {
+                       return handler(build_context(resp), resp.indexes);
+                   });
+}
+
+auto
+query_index_manager::get_all_indexes(std::string bucket_name, const couchbase::get_all_query_indexes_options& options) const
+  -> std::future<std::pair<manager_error_context, std::vector<management::query::index>>>
+{
+    auto barrier = std::make_shared<std::promise<std::pair<manager_error_context, std::vector<management::query::index>>>>();
+    get_all_indexes(std::move(bucket_name), options, [barrier](auto ctx, auto result) mutable {
+        barrier->set_value(std::make_pair(std::move(ctx), std::move(result)));
+    });
+    return barrier->get_future();
 }
 
 void
-initiate_get_all_query_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                               std::string bucket_name,
-                               couchbase::get_all_query_indexes_options::built options,
-                               get_all_query_indexes_handler&& handler)
+collection_query_index_manager::get_all_indexes(const get_all_query_indexes_options& options, get_all_query_indexes_handler&& handler) const
 {
-    initiate_get_all_query_indexes(core, std::move(bucket_name), options, {}, "", std::move(handler));
+    auto request = build_get_all_indexes_request(bucket_name_, scope_name_, collection_name_, options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_get_all_response resp) mutable {
+                       return handler(build_context(resp), resp.indexes);
+                   });
 }
 
-} // namespace couchbase::core::impl
+auto
+collection_query_index_manager::get_all_indexes(const couchbase::get_all_query_indexes_options& options) const
+  -> std::future<std::pair<manager_error_context, std::vector<couchbase::management::query::index>>>
+{
+    auto barrier = std::make_shared<std::promise<std::pair<manager_error_context, std::vector<management::query::index>>>>();
+    get_all_indexes(options,
+                    [barrier](auto ctx, auto result) mutable { barrier->set_value(std::make_pair(std::move(ctx), std::move(result))); });
+    return barrier->get_future();
+}
+} // namespace couchbase