ej 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce4928c5040658e1671941f3a3e7091895098b4
-  data.tar.gz: c57ecc1f55a53acc4ea546244d5be96aea4d4ca5
+  metadata.gz: a0d23dab3ff243a967dac0c83855aec202e66335
+  data.tar.gz: 512d2f7a5191fda2bda9c825e7eadcf435457c27
 SHA512:
-  metadata.gz: 6705c528ab2e663560dc5d24e470fc0fa5396ef89840fe2cecb4c20b2aba69f7db3d33d33f518617018e6c52d95ae7a37cf40cf8a1500201280a4659987fc2d3
-  data.tar.gz: f36e354799a3b42370f45005ad2827dfa9f1f674ddfcc6ded150736a5086761ac5729b2aff28e2e1a049355c01f4fc1bdf59ccfb71a68702ac2ff3cd55ae807f
+  metadata.gz: 41ffacc81eb4bdb1bdbea0cc2c9b6acade8f3f88ca1185fd07bdf778c35abea78a5058aa0f4d7b4c852f3dc0458addfabdbf7ce688223fa4feca205f1662d9b1
+  data.tar.gz: 3e34edf2b15359fc9b4f4729c55006fa40a5ff92dd399489fc0f89ab01b993c74fbae42b6c8400268133baecfbb3bd11db291a73a843ebf730228ebdd5c0fca6

data/lib/ej/commands.rb

@@ -18,7 +18,8 @@ module Ej
     class_option :profile, aliases: '-p', type: :string, default: 'default', desc: 'profile by .ejrc'
     class_option :debug, aliases: '-d', type: :string, default: false, desc: 'debug mode'
     map '-s' => :search
-    map '-c' => :facet
+    map '-f' => :facet
+    map '-c' => :count
     map '-I' => :bulk
     map '-l' => :indices
     map '-a' => :aliases
@@ -54,12 +55,19 @@ module Ej
       puts_json(@core.search(options['type'], query, options['size'], options['from'], options['source_only']))
     end
 
-    desc 'total [lucene query]', 'search'
+    desc 'total [lucene query]', 'total'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
-    def total(query = nil)
+    def count(query = nil)
       puts_json(@core.search(options['type'], query, 0, 0, false))
     end
 
+    desc 'distinct [lucene query]', 'distinct'
+    option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
+    option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
+    def distinct(term)
+      puts_json(@core.distinct(term, options['type'], options['query']))
+    end
+
     desc 'move', 'move index'
     option :source, type: :string, aliases: '--source', required: true, desc: 'source host'
     option :dest, type: :string, aliases: '--dest', required: true, desc: 'dest host'
@@ -74,7 +82,7 @@ module Ej
       @core.dump(options['query'])
     end
 
-    desc '-c', 'facet'
+    desc '-f', 'facet'
     option :query, type: :string, aliases: '-q', default: '*', desc: 'query'
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
     def facet(term)
@@ -123,11 +131,6 @@ module Ej
       puts_json(@core.indices)
     end
 
-    desc 'count', 'count'
-    def count
-      puts_json(@core.count)
-    end
-
     desc 'stats', 'count'
     def stats
       puts_json(@core.stats)

data/lib/ej/core.rb

@@ -24,6 +24,12 @@ module Ej
       source_only ? get_sources(results) : results
     end
 
+    def distinct(term, type, query)
+      body = { size: 0, "aggs"=>{ term + "_count"=>{"cardinality"=>{"field"=>term}}}}
+      body[:query] = { query_string: { query: query } } unless query.nil?
+      @client.search index: @index, type: type, body: body
+    end
+
     def move(source, dest, query)
       per = 30000
       source_client = Elasticsearch::Client.new hosts: source, index: @index, logger: @logger
@@ -34,11 +40,14 @@ module Ej
         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)
+        p data.hits.hits.size
         break if data.hits.hits.empty?
         bulk_message = []
         data.hits.hits.each do |doc|
-          bulk_message << { 'index' => { '_index' => doc._index, '_type' => doc._type, '_id' => doc._id } }
-          bulk_message << doc._source
+          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?
         num += 1
@@ -116,10 +125,6 @@ module Ej
       @client.cat.indices format: 'json'
     end
 
-    def count
-      @client.cat.count index: @index, format: 'json'
-    end
-
     def stats
       @client.indices.stats index: @index
     end

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,6 @@ files:
 - README.md
 - Rakefile
 - bin/ej
-- contrib/completion/_ej
 - ej.gemspec
 - lib/ej.rb
 - lib/ej/commands.rb

data/contrib/completion/_ej

@@ -1,3 +0,0 @@
-#compdef myq
-
-compadd `ej help | grep myq | cut -d " " -f 3-4`