scalastic 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0c2019184cf395101e628c12380028c616cecb
-  data.tar.gz: fb827f64ffcc8cb8b9beeef11839fae4eb0537bc
+  metadata.gz: 7a323230b42e70b738a01c5ad1dcdba2ce284155
+  data.tar.gz: 2fe66cdd753c110c60daa3bbd17355d72a5eecd4
 SHA512:
-  metadata.gz: 916ca019138061d26daf42ac486ee8f346dc16b01c5b869525ad09ec064e88728910e1207b55ebf691ff3d5ef7544c6af4a1bde6f45d681d16a8546e90e93296
-  data.tar.gz: 5511b43df76519259a6625a5ca1b8f18562766f83cc0ac9d52c936fdd4e1c54c7495f6a8df87ef468205692689819d90b5ab289c38b7833916e36d5b0cf24832
+  metadata.gz: d9bbd87a04f3ab5ebd0012bd6e47bb28f1572e706fa12ea1abbca9f6289773bc47bfd2932907dae3ebd26215173fbca93b231b8239a7a9b9b22db0af8fb2e5b0
+  data.tar.gz: f042ba5eb5743a51684643c032fa6421a2b2c088cf438c2772e08c515147265f49b1f2c42cdf2ddca20d109641b21da2aea3656c01cadfd29ea0b3a523e0be03

data/lib/scalastic/config.rb

@@ -24,7 +24,7 @@ module Scalastic
 
     def get_partition_id(alias_name)
       m = partition_regex.match(alias_name)
-      m && m[1].to_i
+      m && m[1]
     end
 
     def partition_prefix=(value)
@@ -39,7 +39,7 @@ module Scalastic
 
     def partition_selector_type=(value)
       value = value.to_s
-      raise(ArgumentError, "Unsupported selector type: #{value}. Supported types are: (string, long)") unless %w(string long).include?(value)
+      raise(ArgumentError, "Unsupported selector type: #{value}. Supported types are: (string, long)") unless %w(string long integer).include?(value)
       @partition_selector_type = value
     end
 

data/lib/scalastic/partition.rb

@@ -3,6 +3,9 @@ require 'scalastic/partition_selector'
 
 module Scalastic
   class Partition
+    Endpoint = Struct.new(:index, :routing)
+    Endpoints = Struct.new(:index, :search)
+
     attr_reader(:es_client)
     attr_reader(:config)
     attr_reader(:id)
@@ -82,6 +85,32 @@ module Scalastic
       "ES partition #{id}"
     end
 
+    def get_endpoints
+      sa = config.search_endpoint(id)
+      ia = config.index_endpoint(id)
+      aliases = es_client.indices.get_aliases name: [sa, ia].join(',')
+      sas = aliases.map{|i, d| [i, d['aliases'][sa]]}.reject{|_i, sa| sa.nil?}
+      ias = aliases.map{|i, d| [i, d['aliases'][ia]]}.reject{|_i, ia| ia.nil?}
+      Endpoints.new(
+        ias.map{|i, ia| Endpoint.new(i, ia['index_routing']).freeze}.first,
+        sas.map{|i, sa| Endpoint.new(i, sa['search_routing']).freeze}.freeze
+      ).freeze
+    end
+
+    def index_to(args)
+      ie = config.index_endpoint(id)
+      eps = get_endpoints
+      actions = []
+      actions << {remove: {index: eps.index.index, alias: ie}} if eps.index
+      actions << {add: EsActionsGenerator.new_index_alias(config, args.merge(id: id))} unless args.nil?
+      #TODO: log a warning if there're no updates
+      es_client.indices.update_aliases(body: {actions: actions}) if actions.any?
+    end
+
+    def readonly?
+      get_endpoints.index.nil?
+    end
+
     private
 
     def operation_name(entry)

data/lib/scalastic/partitions_client.rb

@@ -25,7 +25,8 @@ module Scalastic
     end
 
     def delete(args = {})
-      id = args[:id] || raise(ArgumentError, 'Missing required argument :id')
+      id = args[:id].to_s
+      raise(ArgumentError, 'Missing required argument :id') if id.nil? || id.empty?
       pairs = es_client.indices.get_aliases.map{|i, d| d['aliases'].keys.select{|a| config.get_partition_id(a) == id}.map{|a| [i, a]}}.flatten(1)
       unless pairs.any?
         #TODO: log a warning

data/lib/scalastic/version.rb

@@ -1,3 +1,3 @@
 module Scalastic
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/regression/regression_tests/endpoints.rb

@@ -0,0 +1,52 @@
+module RegressionTests
+  module Endpoints
+    extend self
+
+    def cleanup
+      client = Elasticsearch::Client.new
+      %w(endpoints_1 endpoints_2).each do |i|
+        client.indices.delete index: i if client.indices.exists? index: i
+      end
+    end
+
+    def run
+      client = Elasticsearch::Client.new
+      partitions = client.partitions
+
+      client.indices.create index: 'endpoints_1'
+      client.indices.create index: 'endpoints_2'
+      partitions.prepare_index index: 'endpoints_1'
+      partitions.prepare_index index: 'endpoints_2'
+
+      p = partitions[1]
+      raise 'Partition should not exist!' if p.exists?
+      raise 'Partition should be read only!' unless p.readonly?
+
+      eps = p.get_endpoints
+      raise 'Index endpoint is not nil!' unless eps.index.nil?
+      raise 'Search endpoints must be empty!' if eps.search.any?
+
+      p.index_to index: 'endpoints_1'
+      eps = p.get_endpoints
+      raise 'Partition shoudl exist!' unless p.exists?
+      raise 'Unexpected index endpoint' unless eps.index == Scalastic::Partition::Endpoint.new('endpoints_1', nil)
+      raise 'Partition should not be read only!' if p.readonly?
+
+      p.index_to index: 'endpoints_2', routing: 123
+      eps = p.get_endpoints
+      raise 'Unexpected index endpoint' unless eps.index == Scalastic::Partition::Endpoint.new('endpoints_2', '123')
+
+      p.index_to nil
+      raise 'Partition should not exist' if p.exists?
+      raise 'Partition is not read only' unless p.readonly?
+
+      p.extend_to index: 'endpoints_1'
+      eps = p.get_endpoints
+      raise 'Unexpected search endpoints' unless eps.search == [Scalastic::Partition::Endpoint.new('endpoints_1', nil)]
+      p.extend_to index: 'endpoints_2', routing: '22'
+      eps = p.get_endpoints
+      expected = [Scalastic::Partition::Endpoint.new('endpoints_1', nil), Scalastic::Partition::Endpoint.new('endpoints_2', '22')]
+      raise 'Unexpected search endpoints' unless eps.search.size == expected.size && expected.all?{|ep| eps.search.include?(ep)}
+    end
+  end
+end

data/regression/regression_tests/index_destinations.rb

@@ -0,0 +1,40 @@
+module RegressionTests
+  module IndexDestinations
+    extend self
+
+    def cleanup
+      client = Elasticsearch::Client.new
+      client.indices.delete index: 'destinations_1' if client.indices.exists? index: 'destinations_1'
+      client.indices.delete index: 'destinations_2' if client.indices.exists? index: 'destinations_2'
+    end
+
+    def run
+      client = Elasticsearch::Client.new
+      partitions = client.partitions
+
+      client.indices.create index: 'destinations_1'
+      client.indices.create index: 'destinations_2'
+
+      partitions.prepare_index index: 'destinations_1'
+      partitions.prepare_index index: 'destinations_2'
+
+      p = partitions.create id: 1, index: 'destinations_1'
+      p.extend_to(index: 'destinations_2')
+
+      expected = {"destinations_1"=>{"aliases"=>{"scalastic_1_search"=>{"filter"=>{"term"=>{"scalastic_partition_id"=>1}}}}}, "destinations_2"=>{"aliases"=>{"scalastic_1_index"=>{}, "scalastic_1_search"=>{"filter"=>{"term"=>{"scalastic_partition_id"=>1}}}}}}
+      actual = client.indices.get_aliases index: 'destinations_1,destinations_2', name: 'scalastic_1_*'
+      raise "Expected #{expected}, got: #{actual}" unless expected == actual
+
+      p = partitions[2]
+      raise 'Partition should not exist!' if p.exists?
+      p = partitions.create id: 2, index: 'destinations_1'
+      raise 'Partition should exist!' unless p.exists?
+
+      p.index_to nil
+
+      expected = {"destinations_1"=>{"aliases"=>{"scalastic_2_search"=>{"filter"=>{"term"=>{"scalastic_partition_id"=>2}}}}}, "destinations_2"=>{"aliases"=>{}}}
+      actual = client.indices.get_aliases index: 'destinations_1,destinations_2', name: "scalastic_2_*"
+      raise "Expected: #{expected}, got: #{actual}" unless expected == actual
+    end
+  end
+end

data/regression/regression_tests/list_partitions.rb

@@ -28,8 +28,9 @@ module RegressionTests
       sleep 1.5
 
       # List all partitions
-      ids = partitions.to_a.map{|p| p.id}
-      raise "Unexpected partitions: #{ids}" unless ids.sort == [1,2,3]
+      ids = partitions.to_a.map{|p| p.id}.sort
+      expected_ids = %w(1 2 3)
+      raise "Expected partitions #{expected_ids}, got #{ids}" unless ids == expected_ids
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalastic
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Aliaksei Baturytski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,9 @@ files:
 - regression/regression_tests/delete_by_query.rb
 - regression/regression_tests/delete_partition.rb
 - regression/regression_tests/document_get.rb
+- regression/regression_tests/endpoints.rb
 - regression/regression_tests/extend_partition.rb
+- regression/regression_tests/index_destinations.rb
 - regression/regression_tests/list_partitions.rb
 - regression/regression_tests/nested_selector.rb
 - regression/regression_tests/nested_selector_bulk.rb