move uniqueness check to each subclass

Author: fimac

lib/cipherstash/client.rb

@@ -155,10 +155,6 @@ def create_collection(name, schema)
         }
 
         indexes = schema.fetch("indexes", {}).map do |idx_name, idx_settings|
-          if Index.invalid_unique_constraint?(idx_settings["unique"], idx_settings["kind"])
-            raise CipherStash::Client::Error::InvalidSchemaError, "Unique constraint not allowed on type #{idx_settings["kind"].inspect}" 
-          end
-
           # New match, dynamic-match, and field-dynamic-match indexes should use filter indexes.
           # ORE match indexes require specifically using a *-ore-match index.
           idx_settings["kind"] = case idx_settings["kind"]

lib/cipherstash/index.rb

@@ -35,19 +35,6 @@ def subclass_from_kind(kind)
         end
       end
 
-      def invalid_unique_constraint?(unique, kind)
-        [
-          "match",
-          "ore-match",
-          "filter-match",
-          "field-dynamic-match",
-          "field-dynamic-filter-match",
-          "field-dynamic-ore-match",
-          "dynamic-match",
-          "dynamic-filter-match",
-          "dynamic-ore-match"].include?(kind) && unique
-      end
-
       def generate(id, settings, schema_versions)
         subclass = subclass_from_kind(settings["mapping"]["kind"])
         subclass.new(id, settings, schema_versions)
@@ -56,6 +43,10 @@ def generate(id, settings, schema_versions)
       def settings(name, base_settings, schema)
         subclass = subclass_from_kind(base_settings["kind"])
 
+        if base_settings.key?("unique") && !subclass.uniqueness_supported?
+          raise CipherStash::Client::Error::InvalidSchemaError, "Unique constraint not allowed on type #{base_settings["kind"].inspect}" 
+        end
+
         {
           meta: subclass.meta(name),
           mapping: subclass.mapping(base_settings, schema),
@@ -144,6 +135,14 @@ def orderable?
       # that do
       false
     end
+    
+    # Does this index support a unique constraint?
+    #
+    # @return [bool]
+    #
+    def uniqueness_supported?
+      false
+    end
 
     # Examine the given record and send back index vectors.
     #

lib/cipherstash/index/dynamic_filter_match.rb

@@ -26,6 +26,10 @@ def self.meta(name)
         def orderable?
           false
         end
+        
+        def self.uniqueness_supported?
+          false
+        end
 
         def analyze(uuid, record)
           blid = blob_from_uuid(uuid)

lib/cipherstash/index/dynamic_ore_match.rb

@@ -22,6 +22,10 @@ def orderable?
         false
       end
 
+      def self.uniqueness_supported?
+        false
+      end
+
       def analyze(uuid, record)
         blid = blob_from_uuid(uuid)
         raw_terms = collect_string_fields(record).map(&:last)

lib/cipherstash/index/exact.rb

@@ -26,6 +26,10 @@ def orderable?
         false
       end
 
+      def self.uniqueness_supported?
+        true
+      end
+
       def analyze(uuid, record)
         blid = blob_from_uuid(uuid)
 

lib/cipherstash/index/field_dynamic_exact.rb

@@ -18,6 +18,10 @@ def self.meta(name)
         self.ore_meta(name)
       end
 
+      def self.uniqueness_supported?
+        false
+      end
+
       def analyze(uuid, record)
         blid = blob_from_uuid(uuid)
 

lib/cipherstash/index/field_dynamic_filter_match.rb

@@ -23,6 +23,10 @@ def self.meta(name)
           self.filter_meta(name)
         end
 
+        def self.uniqueness_supported?
+          false
+        end
+
         def analyze(uuid, record)
           blid = blob_from_uuid(uuid)
 

lib/cipherstash/index/field_dynamic_ore_match.rb

@@ -18,6 +18,10 @@ def self.meta(name)
         self.ore_meta(name)
       end
 
+      def self.uniqueness_supported?
+        false
+      end
+
       def analyze(uuid, record)
         blid = blob_from_uuid(uuid)
 

lib/cipherstash/index/filter_match.rb

@@ -27,6 +27,10 @@ def orderable?
           false
         end
 
+        def self.uniqueness_supported?
+          false
+        end
+
         def analyze(uuid, record)
           blid = blob_from_uuid(uuid)
 

lib/cipherstash/index/ore_match.rb

@@ -22,6 +22,10 @@ def orderable?
         false
       end
 
+      def self.uniqueness_supported?
+        false
+      end
+
       def analyze(uuid, record)
         blid = blob_from_uuid(uuid)