gitlab-elasticsearch-git 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e809a9160b2028a663c05b3b90f64600ffd8f586
-  data.tar.gz: 299cb60d6f23e70f4970e1aef248acf3d95e6416
+  metadata.gz: a1ed1a40fac4c237888663a8b9a15606a77c09d0
+  data.tar.gz: 28c65fcdcb6953ed270d4c6e4d5ee91137e7fa04
 SHA512:
-  metadata.gz: 45defe4936e8c8de624174cc9aadcc25e46b1f6bccc95d37f267e2b7b617c3704c7756b4c539f7e6e6f232d9505edf066d899885350dfb702ae8e0890427bf90
-  data.tar.gz: 7af8adfc3a1912e441f2018946e171f63c5c76291f706dd230d8693c93a6132b5b3dda21bd1c5d2e5ad24d6d6f8924e465299041cf8a34c78babbdb281f4b291
+  metadata.gz: 69199b236f9ee39ea45b38928272cf3c968af829a49d3c27c87b4f0a4b8b9c783d3b7b7f95ce255b9b22e8d433cc6834ce1797c25150fac60c1d798dd446960d
+  data.tar.gz: f164040b0925cabbdce3c4f37d5818141d084665001ea55f800284a2b04e69e8f0b2534533f88074de9192921f749627f09ebba367eaa2f7256d0a4b56425011

data/.gitlab-ci.yml

@@ -1,7 +1,7 @@
 image: "ruby:2.3"
 
 services:
-  - elasticsearch:latest
+  - elasticsearch:5.1
 
 variables:
   ELASTICSEARCH_HOST: "elasticsearch"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-elasticsearch-git (1.0.0)
+    gitlab-elasticsearch-git (1.1.0)
       activemodel (~> 4.2)
       activesupport (~> 4.2)
       charlock_holmes (~> 0.7)
@@ -22,7 +22,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    builder (3.2.2)
+    builder (3.2.3)
     charlock_holmes (0.7.3)
     coderay (1.1.0)
     diff-lcs (1.2.5)
@@ -95,4 +95,4 @@ DEPENDENCIES
   rugged (~> 0.24)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/elasticsearch/git/repository.rb

@@ -21,55 +21,52 @@ module Elasticsearch
         include Elasticsearch::Git::Model
         include Elasticsearch::Git::EncoderHelper
 
-        mapping _timestamp: { enabled: true }, _parent: { type: 'project' } do
+        mapping _parent: { type: 'project' } do
           indexes :blob do
-            indexes :id,          type: :string,
+            indexes :id,          type: :text,
                                   index_options: 'offsets',
                                   analyzer: :sha_analyzer
-            indexes :rid,         type: :string,
-                                  index: :not_analyzed
-            indexes :oid,         type: :string,
+            indexes :rid,         type: :keyword
+            indexes :oid,         type: :text,
                                   index_options: 'offsets',
                                   analyzer: :sha_analyzer
-            indexes :commit_sha,  type: :string,
+            indexes :commit_sha,  type: :text,
                                   index_options: 'offsets',
                                   analyzer: :sha_analyzer
-            indexes :path,        type: :string,
+            indexes :path,        type: :text,
                                   analyzer: :path_analyzer
-            indexes :file_name,   type: :string,
+            indexes :file_name,   type: :text,
                                   analyzer: :code_analyzer,
                                   search_analyzer: :code_search_analyzer
-            indexes :content,     type: :string,
+            indexes :content,     type: :text,
                                   index_options: 'offsets',
                                   analyzer: :code_analyzer,
                                   search_analyzer: :code_search_analyzer
-            indexes :language,    type: :string,
-                                  index: :not_analyzed
+            indexes :language,    type: :keyword
           end
 
           indexes :commit do
-            indexes :id,          type: :string,
+            indexes :id,          type: :text,
                                   index_options: 'offsets',
                                   analyzer: :sha_analyzer
-            indexes :rid,         type: :string,
-                                  index: :not_analyzed
-            indexes :sha,         type: :string,
+            indexes :rid,         type: :keyword
+            indexes :sha,         type: :text,
                                   index_options: 'offsets',
                                   analyzer: :sha_analyzer
 
             indexes :author do
-              indexes :name,      type: :string, index_options: 'offsets'
-              indexes :email,     type: :string, index_options: 'offsets'
+              indexes :name,      type: :text, index_options: 'offsets'
+              indexes :email,     type: :text, index_options: 'offsets'
               indexes :time,      type: :date, format: :basic_date_time_no_millis
             end
 
             indexes :commiter do
-              indexes :name,      type: :string, index_options: 'offsets'
-              indexes :email,     type: :string, index_options: 'offsets'
+              indexes :name,      type: :text, index_options: 'offsets'
+              indexes :email,     type: :text, index_options: 'offsets'
               indexes :time,      type: :date, format: :basic_date_time_no_millis
             end
 
-            indexes :message,     type: :string, index_options: 'offsets'
+            indexes :message,     type: :text, index_options: 'offsets'
           end
         end
 
@@ -465,16 +462,7 @@ module Elasticsearch
 
           options[:order] = :default if options[:order].blank?
 
-          order = case options[:order].to_sym
-                  when :recently_indexed
-                    { _timestamp: { order: :desc, mode: :min } }
-                  when :last_indexed
-                    { _timestamp: { order: :asc,  mode: :min } }
-                  else
-                    {}
-                  end
-
-          query_hash[:sort] = order.blank? ? [:_score] : [order, :_score]
+          query_hash[:sort] = [:_score]
 
           res = self.__elasticsearch__.search(query_hash)
           {
@@ -527,26 +515,16 @@ module Elasticsearch
 
           options[:order] = :default if options[:order].blank?
 
-          order = case options[:order].to_sym
-                  when :recently_indexed
-                    { _timestamp: { order: :desc, mode: :min } }
-                  when :last_indexed
-                    { _timestamp: { order: :asc, mode: :min } }
-                  else
-                    {}
-                  end
-
-          query_hash[:sort] = order.blank? ? [:_score] : [order, :_score]
+          query_hash[:sort] = [:_score]
 
           if options[:highlight]
             query_hash[:highlight] = {
               pre_tags: ["gitlabelasticsearch→"],
               post_tags: ["←gitlabelasticsearch"],
+              order: "score",
               fields: {
                 "blob.content" => {},
                 "blob.file_name" => {},
-                "type" => "fvh",
-                "boundary_chars" => "\n"
               }
             }
           end

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/spec/support/elastic_helper.rb

@@ -5,7 +5,7 @@ module ElasticHelper
   end
 
   def remove_index(index_name)
-    system("curl -XDELETE '#{elastic_url}/#{index_name}/' > /dev/null 2>&1")
+    system("curl -XDELETE '#{elastic_url}#{index_name}/' > /dev/null 2>&1")
   end
 
   def elastic_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Elasticsearch integrations for git repositories.