zelastic 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b9d19442778ad53fe696cbcf6d202b9216cd53
-  data.tar.gz: 3e8e17c98cc6ee0332449e232c7de492dc94f79e
+  metadata.gz: 04e31f09152172933b5800dfd711a673e6d22c6c
+  data.tar.gz: d943d84ef9ee7770c4597b4853f75cfd83ec9ab1
 SHA512:
-  metadata.gz: a7186c7a3dd66d97bc7567e33023742c2fda9718846d8e58c2bbe9c17ef18055858e7e5fb0b600d3629b365c300350e6b694068368a40599ccaf9be41c931d74
-  data.tar.gz: bd24900db1022ef69a0a457c03f50e3e2a1ec884e4eba60ddd2084a3555ba0e9921a99b39293dacc1436ebcf441de40eab8184f4269229c93127990dbe2a46e2
+  metadata.gz: c81a965e8b108be4ff1b4cacdee26fceb6a2164af583e93b06bd9d1919aa9bffb5d29a39220d01c26d0b41f6f0f60da6dffefa6e23b47d4a54edc748344b861e
+  data.tar.gz: f5ce82aac1b74cbac4526c36bdecf4694b39fc7ac2b1f234298fc635aa883e51f22552954963383b785f15558f27c2e1307d34359c2e5c620ecb34ea300a46ea

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.5.0 - Aug 3rd, 2018
+---
+
+- An _ESTIMATED_ % completion of ES re-indexing is logged, as the new index gets populated (#5)
+
+
 v0.4.0 - May 29th, 2018
 ---
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.4.0)
+    zelastic (0.5.0)
       activesupport
 
 GEM

data/lib/zelastic/index_manager.rb

@@ -10,24 +10,23 @@ module Zelastic
     end
 
     def create_index(unique_name)
-      full_name = [config.read_alias, unique_name].join('_')
+      index_name = index_name_from_unique(unique_name)
 
       client.indices.create(
-        index: full_name,
+        index: index_name,
         body: config.index_definition
       )
 
-      client.indices.put_alias(index: full_name, name: config.write_alias)
+      client.indices.put_alias(index: index_name, name: config.write_alias)
     end
 
     def populate_index(unique_name = nil, batch_size: 3000)
-      index_name = if unique_name
-                     [config.read_alias, unique_name].join('_')
-                   else
-                     config.write_alias
-                   end
+      index_name = index_name_from_unique(unique_name)
 
-      config.data_source.find_in_batches(batch_size: batch_size) do |batch|
+      config.data_source.find_in_batches(batch_size: batch_size).with_index do |batch, i|
+        logger.info(
+          "ES: (ESTIMATED: #{indexed_percent(batch_size, i + 1)}%) Indexing #{config.type} records"
+        )
         indexer.index_batch(batch, client: client, index_name: index_name)
       end
     end
@@ -106,5 +105,21 @@ module Zelastic
     def indexer
       @indexer ||= Indexer.new(config)
     end
+
+    def index_name_from_unique(unique_name)
+      if unique_name
+        [config.read_alias, unique_name].join('_')
+      else
+        config.write_alias
+      end
+    end
+
+    def current_index_size
+      @current_index_size ||= client.count(index: config.read_alias, type: config.type)['count']
+    end
+
+    def indexed_percent(batch_size, batch_number)
+      (batch_size * batch_number.to_f / current_index_size * 100).round(2)
+    end
   end
 end

data/lib/zelastic/indexer.rb

@@ -18,12 +18,10 @@ module Zelastic
     end
 
     def index_batch(batch, client: nil, index_name: nil)
-      logger.info("ES: Indexing #{config.type} record")
-
       version = current_version
-      execute_bulk(client: client, index_name: index_name) do |index_name|
+      execute_bulk(client: client, index_name: index_name) do |index|
         batch.map do |record|
-          index_command(index: index_name, version: version, record: record)
+          index_command(index: index, version: version, record: record)
         end
       end
     end

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport