couchbase 3.4.3 → 3.4.4

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

@@ -0,0 +1,155 @@
+/* -*- 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 "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_create_request
+build_create_bucket_request(couchbase::core::management::cluster::bucket_settings bucket_settings,
+                            const create_bucket_options::built& options)
+{
+    core::operations::management::bucket_create_request request{ std::move(bucket_settings), {}, options.timeout };
+    return request;
+}
+
+static couchbase::core::management::cluster::bucket_settings
+map_bucket_settings(const couchbase::management::cluster::bucket_settings& bucket)
+{
+
+    couchbase::core::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 management::cluster::bucket_conflict_resolution::unknown:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::unknown;
+            break;
+        case management::cluster::bucket_conflict_resolution::timestamp:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::timestamp;
+            break;
+        case management::cluster::bucket_conflict_resolution::sequence_number:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::sequence_number;
+            break;
+        case management::cluster::bucket_conflict_resolution::custom:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::custom;
+            break;
+    }
+    switch (bucket.eviction_policy) {
+        case management::cluster::bucket_eviction_policy::unknown:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::unknown;
+            break;
+        case management::cluster::bucket_eviction_policy::full:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::full;
+            break;
+        case management::cluster::bucket_eviction_policy::value_only:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::value_only;
+            break;
+        case management::cluster::bucket_eviction_policy::no_eviction:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::no_eviction;
+            break;
+        case management::cluster::bucket_eviction_policy::not_recently_used:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::not_recently_used;
+            break;
+    }
+    switch (bucket.compression_mode) {
+        case management::cluster::bucket_compression::unknown:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::unknown;
+            break;
+        case management::cluster::bucket_compression::active:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::active;
+            break;
+        case management::cluster::bucket_compression::passive:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::passive;
+            break;
+        case management::cluster::bucket_compression::off:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::off;
+            break;
+    }
+    switch (bucket.bucket_type) {
+        case management::cluster::bucket_type::unknown:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::unknown;
+            break;
+        case management::cluster::bucket_type::couchbase:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::couchbase;
+            break;
+        case management::cluster::bucket_type::memcached:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::memcached;
+            break;
+        case management::cluster::bucket_type::ephemeral:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::ephemeral;
+            break;
+    }
+    switch (bucket.storage_backend) {
+        case management::cluster::bucket_storage_backend::unknown:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::unknown;
+            break;
+        case management::cluster::bucket_storage_backend::magma:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::magma;
+            break;
+        case management::cluster::bucket_storage_backend::couchstore:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::couchstore;
+            break;
+    }
+    return bucket_settings;
+}
+
+void
+bucket_manager::create_bucket(const management::cluster::bucket_settings& bucket_settings,
+                              const create_bucket_options& options,
+                              create_bucket_handler&& handler) const
+{
+    auto request = build_create_bucket_request(map_bucket_settings(bucket_settings), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::bucket_create_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+bucket_manager::create_bucket(const management::cluster::bucket_settings& bucket_settings, const create_bucket_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_bucket(bucket_settings, options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -21,41 +21,36 @@
 #include "core/cluster.hxx"
 #include "core/operations/management/query_index_create.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_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                            std::string bucket_name,
-                            std::string index_name,
-                            std::vector<std::string> fields,
-                            couchbase::create_query_index_options::built options,
-                            query_context query_ctx,
-                            std::string collection_name,
-                            create_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_index_request(std::string bucket_name,
+                           std::string index_name,
+                           std::vector<std::string> fields,
+                           create_query_index_options::built options)
 {
-    core->execute(
-      operations::management::query_index_create_request{
-        bucket_name,
+    core::operations::management::query_index_create_request request{
+        std::move(bucket_name),
+        "",
         "",
-        collection_name,
-        index_name,
-        fields,
-        query_ctx,
+        std::move(index_name),
+        std::move(fields),
+        {},
         false,
         options.ignore_if_exists,
         options.condition,
@@ -63,39 +58,70 @@ initiate_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
         options.num_replicas,
         {},
         options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_create_response resp) { handler(build_context(resp)); });
+    };
+    return request;
 }
 
-void
-initiate_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                            std::string bucket_name,
-                            std::string index_name,
-                            std::vector<std::string> fields,
-                            couchbase::create_query_index_options::built options,
-                            create_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_primary_index_request(std::string bucket_name, create_primary_query_index_options::built options)
 {
-    initiate_create_query_index(
-      core, std::move(bucket_name), std::move(index_name), std::move(fields), options, {}, "", std::move(handler));
+    core::operations::management::query_index_create_request request{
+        std::move(bucket_name),
+        "",
+        "",
+        options.index_name.value_or(""),
+        {},
+        {},
+        true,
+        options.ignore_if_exists,
+        {},
+        options.deferred,
+        options.num_replicas,
+        {},
+        options.timeout,
+    };
+    return request;
 }
 
-void
-initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                    std::string bucket_name,
-                                    couchbase::create_primary_query_index_options::built options,
-                                    query_context query_ctx,
-                                    std::string collection_name,
-                                    create_primary_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_index_request(std::string bucket_name,
+                           std::string scope_name,
+                           std::string collection_name,
+                           std::string index_name,
+                           std::vector<std::string> fields,
+                           create_query_index_options::built options)
+{
+    core::operations::management::query_index_create_request request{
+        "",
+        "",
+        std::move(collection_name),
+        std::move(index_name),
+        std::move(fields),
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
+        false,
+        options.ignore_if_exists,
+        options.condition,
+        options.deferred,
+        options.num_replicas,
+        {},
+        options.timeout,
+    };
+    return request;
+}
+
+static core::operations::management::query_index_create_request
+build_create_primary_index_request(std::string bucket_name,
+                                   std::string scope_name,
+                                   std::string collection_name,
+                                   create_primary_query_index_options::built options)
 {
-    core->execute(
-      operations::management::query_index_create_request{
-        bucket_name,
+    core::operations::management::query_index_create_request request{
         "",
-        collection_name,
+        "",
+        std::move(collection_name),
         options.index_name.value_or(""),
         {},
-        query_ctx,
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
         true,
         options.ignore_if_exists,
         {},
@@ -103,17 +129,104 @@ initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> co
         options.num_replicas,
         {},
         options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_create_response resp) { handler(build_context(resp)); });
+    };
+    return request;
 }
 
 void
-initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                    std::string bucket_name,
-                                    couchbase::create_primary_query_index_options::built options,
-                                    create_primary_query_index_handler&& handler)
+query_index_manager::create_index(std::string bucket_name,
+                                  std::string index_name,
+                                  std::vector<std::string> fields,
+                                  const couchbase::create_query_index_options& options,
+                                  couchbase::create_primary_query_index_handler&& handler) const
+{
+    auto request = build_create_index_request(std::move(bucket_name), std::move(index_name), std::move(fields), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::create_index(std::string bucket_name,
+                                  std::string index_name,
+                                  std::vector<std::string> fields,
+                                  const couchbase::create_query_index_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_index(std::move(bucket_name), std::move(index_name), std::move(fields), options, [barrier](auto ctx) mutable {
+        barrier->set_value(std::move(ctx));
+    });
+    return barrier->get_future();
+}
+
+void
+query_index_manager::create_primary_index(std::string bucket_name,
+                                          const create_primary_query_index_options& options,
+                                          create_query_index_handler&& handler)
+{
+    auto request = build_create_primary_index_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::create_primary_index(std::string bucket_name, const create_primary_query_index_options& options)
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_primary_index(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
+void
+collection_query_index_manager::create_index(std::string index_name,
+                                             std::vector<std::string> fields,
+                                             const create_query_index_options& options,
+                                             create_query_index_handler&& handler) const
+{
+    auto request =
+      build_create_index_request(bucket_name_, scope_name_, collection_name_, std::move(index_name), std::move(fields), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+collection_query_index_manager::create_index(std::string index_name,
+                                             std::vector<std::string> fields,
+                                             const couchbase::create_query_index_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_index(std::move(index_name), std::move(fields), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
+void
+collection_query_index_manager::create_primary_index(const create_primary_query_index_options& options,
+                                                     create_query_index_handler&& handler) const
+{
+    auto request = build_create_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_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+collection_query_index_manager::create_primary_index(const couchbase::create_primary_query_index_options& options)
+  -> std::future<manager_error_context>
 {
-    initiate_create_primary_query_index(core, std::move(bucket_name), std::move(options), {}, "", std::move(handler));
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_primary_index(options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
 }
-} // namespace couchbase::core::impl
+} // namespace couchbase

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

@@ -41,7 +41,8 @@ dns_srv_tracker::dns_srv_tracker(asio::io_context& ctx, std::string address, con
 void
 dns_srv_tracker::get_srv_nodes(utils::movable_function<void(origin::node_list, std::error_code)> callback)
 {
-    CB_LOG_TRACE("query DNS-SRV: address=\"{}\", service=\"{}\"", address_, service_);
+    CB_LOG_DEBUG(
+      "Query DNS-SRV: address=\"{}\", service=\"{}\", nameserver=\"{}:{}\"", address_, service_, config_.nameserver(), config_.port());
     dns_client_.query_srv(
       address_,
       service_,

data/ext/couchbase/core/impl/drop_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_drop.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_drop_request
+build_drop_bucket_request(std::string bucket_name, const drop_bucket_options::built& options)
+{
+    core::operations::management::bucket_drop_request request{ std::move(bucket_name), {}, options.timeout };
+    return request;
+}
+
+void
+bucket_manager::drop_bucket(std::string bucket_name, const drop_bucket_options& options, drop_bucket_handler&& handler) const
+{
+    auto request = build_drop_bucket_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::bucket_drop_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+bucket_manager::drop_bucket(std::string bucket_name, const drop_bucket_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_bucket(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase