diff --git a/ext/couchbase b/ext/couchbase index b5b51451..6c567a0a 160000 --- a/ext/couchbase +++ b/ext/couchbase @@ -1 +1 @@ -Subproject commit b5b5145145e656d70962fe3cbb78f5af53eaaf63 +Subproject commit 6c567a0af3c13d0a31f1528cb26b0f390f9809a7 diff --git a/ext/rcb_buckets.cxx b/ext/rcb_buckets.cxx index f81be58d..fad836ae 100644 --- a/ext/rcb_buckets.cxx +++ b/ext/rcb_buckets.cxx @@ -506,6 +506,18 @@ cb_extract_bucket_settings(const core::management::cluster::bucket_settings& ent break; } } + switch (entry.storage_backend) { + case core::management::cluster::bucket_storage_backend::couchstore: + rb_hash_aset( + bucket, rb_id2sym(rb_intern("storage_backend")), rb_id2sym(rb_intern("couchstore"))); + break; + case core::management::cluster::bucket_storage_backend::magma: + rb_hash_aset(bucket, rb_id2sym(rb_intern("storage_backend")), rb_id2sym(rb_intern("magma"))); + break; + case core::management::cluster::bucket_storage_backend::unknown: + rb_hash_aset(bucket, rb_id2sym(rb_intern("storage_backend")), Qnil); + break; + } if (entry.history_retention_collection_default.has_value()) { rb_hash_aset(bucket, rb_id2sym(rb_intern("history_retention_collection_default")), diff --git a/lib/couchbase/management/bucket_manager.rb b/lib/couchbase/management/bucket_manager.rb index fddd2830..ddd159ee 100644 --- a/lib/couchbase/management/bucket_manager.rb +++ b/lib/couchbase/management/bucket_manager.rb @@ -206,7 +206,6 @@ def initialize(backend) def create_bucket(settings, options = Options::Bucket::CreateBucket.new) @backend.bucket_create( { - name: settings.name, flush_enabled: settings.flush_enabled, ram_quota_mb: settings.ram_quota_mb, @@ -342,6 +341,7 @@ def extract_bucket_settings(entry) bucket.minimum_durability_level = entry[:minimum_durability_level] bucket.compression_mode = entry[:compression_mode] bucket.instance_variable_set(:@healthy, entry[:nodes].all? { |node| node[:status] == "healthy" }) + bucket.storage_backend = entry[:storage_backend] bucket.history_retention_collection_default = entry[:history_retention_collection_default] bucket.history_retention_bytes = entry[:history_retention_bytes] bucket.history_retention_duration = entry[:history_retention_duration]