ej 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0063005854bb2ad94ce28e13961b24585ba9e57
-  data.tar.gz: 2daf05f3e58689c358bccc6d3b7eb823ff50f17a
+  metadata.gz: c59e2d9ef69659e78965bdf47966eb4dbc290d1b
+  data.tar.gz: 5c38f14f40b51b17b2aadb74764a4e5b385a9d97
 SHA512:
-  metadata.gz: 532189d20341f8c92157aa0918f4cdac32aad56ee51cd69e1114f35cff24c5f72cade7216cb1de5b4c8dc7343390c7cc1fa51442774fd86c15c3d20c73f3b423
-  data.tar.gz: c02c791cadded15a269ac2cdf59558a147215f23ba8b85efc7190c8c34208258f42814fd37b57c6cbd855773b0b2247bd123915731f472d65276c617a1d048ff
+  metadata.gz: a574e5a65c979ab40fabe18b5c3ec74f37d00a7982e1987e916379319b8b87b4901e01c2d2b34875e5a8782a7bda475091b7b4cc9d8a759c5bb3627582a14fc8
+  data.tar.gz: 773b7994f96c5f98ae1782d6189b1816be4f3148317d6ded743bfb77822e5e81044f0186e1c54b32cb78c479687be6690fbc4bd3636aff4510b6499e352d1851

data/lib/ej/commands.rb

@@ -73,6 +73,13 @@ module Ej
       puts_json(@core.facet(term, options['size'], options['query']))
     end
 
+    desc 'aggs', 'aggs'
+    option :query, type: :string, aliases: '-q', default: '*', desc: 'query'
+    option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
+    def aggs(term)
+      puts_json(@core.aggs(term, options['size'], options['query']))
+    end
+
     desc 'min', 'term'
     option :term, type: :string, aliases: '-k', desc: 'terms'
     def min

data/lib/ej/core.rb

@@ -8,9 +8,9 @@ require 'pp'
 
 module Ej
   class Core
+    DEFAULT_PER = 30000
     def initialize(host, index, debug)
-      @logger =  Logger.new($stderr)
-      @logger.level = debug ? Logger::DEBUG : Logger::INFO
+      @logger =  debug ? Logger.new($stderr) : nil
       @index = index
       @client = Elasticsearch::Client.new hosts: host, logger: @logger, index: @index
     end
@@ -32,30 +32,34 @@ module Ej
     end
 
     def move(source, dest, query)
-      per = 30000
-      source_client = Elasticsearch::Client.new hosts: source, index: @index, logger: @logger
-      dest_client = Elasticsearch::Client.new hosts: dest, logger: @logger
+      per = DEFAULT_PER
       num = 0
+      logger = Logger.new($stdout)
+      source_client = Elasticsearch::Client.new hosts: source, index: @index
+      dest_client = Elasticsearch::Client.new hosts: dest
       while true
         from = num * per
         body = { size: per, from: from }
         body[:query] = { query_string: { query: query } } unless query.nil?
         data = Hashie::Mash.new(source_client.search index: @index, body: body)
-        break if data.hits.hits.empty?
+        docs = data.hits.hits
+        total = data.hits.total
+        break if docs.empty?
         bulk_message = []
-        data.hits.hits.each do |doc|
+        docs.each do |doc|
           source = doc.delete('_source')
           doc.delete('_score')
           bulk_message << { index: doc.to_h }
           bulk_message << source
         end
         dest_client.bulk body: bulk_message unless bulk_message.empty?
+        logger.info("move complete #{from + docs.size}/#{total}")
         num += 1
       end
     end
 
     def dump(query)
-      per = 30000
+      per = DEFAULT_PER
       num = 0
       bulk_message = []
       while true
@@ -63,8 +67,9 @@ module Ej
         body = { size: per, from: from }
         body[:query] = { query_string: { query: query } } unless query.nil?
         data = Hashie::Mash.new(@client.search index: @index, body: body)
-        break if data.hits.hits.empty?
-        data.hits.hits.each do |doc|
+        docs = data.hits.hits
+        break if docs.empty?
+        docs.each do |doc|
           source = doc.delete('_source')
           doc.delete('_score')
           bulk_message << Yajl::Encoder.encode({ 'index' => doc.to_h })
@@ -91,6 +96,18 @@ module Ej
       @client.search index: @index, body: body
     end
 
+    def aggs(term, size, query)
+      body = {"size"=>0,
+               "query"=>
+                {"filtered"=>
+                  {"query"=>{"query_string"=>{"query"=> query}},
+                   "filter"=>{"bool"=>{"must"=>[], "must_not"=>[]}}}},
+               "aggs"=>
+                {"agg_" + term =>
+                  {"terms"=>{"field"=>term, "size"=>size, "order"=>{"_count"=>"desc"}}}}}
+      @client.search index: @index, body: body
+    end
+
     def min(term)
       body = {
         aggs: {

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler