bucket_manager.rb in couchbase-3.3.0

- old
+ new

@@ -214,10 +214,11 @@
             ejection_policy: settings.ejection_policy,
             max_expiry: settings.max_expiry,
             compression_mode: settings.compression_mode,
             minimum_durability_level: settings.minimum_durability_level,
             conflict_resolution_type: settings.conflict_resolution_type,
+            storage_backend: settings.storage_backend,
           }, options.to_backend
         )
       end
 
       # Updates the bucket settings
@@ -240,10 +241,11 @@
             bucket_type: settings.bucket_type,
             ejection_policy: settings.ejection_policy,
             max_expiry: settings.max_expiry,
             compression_mode: settings.compression_mode,
             minimum_durability_level: settings.minimum_durability_level,
+            storage_backend: settings.storage_backend,
           }, options.to_backend
         )
       end
 
       # Removes a bucket
@@ -329,11 +331,11 @@
           bucket.bucket_type = entry[:bucket_type]
           bucket.max_expiry = entry[:max_expiry]
           bucket.eviction_policy = entry[:eviction_policy]
           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.instance_variable_set(:@healthy, entry[:nodes].all? { |node| node[:status] == "healthy" })
         end
       end
     end
 
     class BucketSettings
@@ -355,10 +357,13 @@
       attr_accessor :replica_indexes
 
       # @return [:couchbase, :memcached, :ephemeral] the type of the bucket. Defaults to +:couchbase+
       attr_accessor :bucket_type
 
+      # @return [nil, :couchstore, :magma] the type of the storage backend of the bucket
+      attr_accessor :storage_backend
+
       # Eviction policy to use
       #
       # :full:: During ejection, only the value will be ejected (key and metadata will remain in memory). Value Ejection
       #         needs more system memory, but provides better performance than Full Ejection. This value is only valid for
       #         buckets of type +:couchbase+.
@@ -381,11 +386,11 @@
       attr_accessor :max_expiry
 
       # @return [:off, :passive, :active] the compression mode to use
       attr_accessor :compression_mode
 
-      # @return [:timestamp, :sequence_number] conflict resolution policy
+      # @return [:timestamp, :sequence_number, :custom] conflict resolution policy
       attr_accessor :conflict_resolution_type
 
       # @return [nil, :none, :majority, :majority_and_persist_to_active, :persist_to_majority] the minimum durability level
       attr_accessor :minimum_durability_level
 
@@ -421,9 +426,10 @@
         @replica_indexes = false
         @max_expiry = 0
         @compression_mode = :passive
         @conflict_resolution_type = :sequence_number
         @eviction_policy = :value_only
+        @storage_backend = nil
         yield self if block_given?
       end
     end
   end
 end