Skip to content

Commit

Permalink
Merge pull request #3 from newapplesho/feature/AddDisMaxQuery
Browse files Browse the repository at this point in the history
Added DisMaxQuery
  • Loading branch information
mumez authored Oct 26, 2016
2 parents e9a5a54 + 3be7dfe commit a37f13a
Show file tree
Hide file tree
Showing 23 changed files with 82 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
versions
version113: spec
<version: '1.1.3' imports: #('1.1-baseline')>
spec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
versions
version114: spec
<version: '1.1.4' imports: #('1.1-baseline')>
spec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
versions
version116: spec
<version: '1.1.6' imports: #('1.1-baseline')>
spec
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
versions
version117: spec
<version: '1.1.7' imports: #('1.1-baseline')>
spec
for: #common
do: [
spec blessing: #stable.
spec author: 'ShoYoshida'.
spec
project: 'ZincHTTPComponents' with: #stable;
project: 'JSON' with: #stable.
spec
baseline: 'Elasticsearch' with: [ spec repository:'github://newapplesho/elasticsearch-smalltalk:v1.1.7/pharo-repository' ];
import: 'Elasticsearch']
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@
"version113:" : "ShoYoshida 1/19/2016 16:41",
"version114:" : "ShoYoshida 1/30/2016 14:55",
"version116:" : "ShoYoshida 6/17/2016 09:52",
"version117:" : "MasashiUmezawa 10/26/2016 12:01",
"version11:" : "ShoYoshida 1/9/2016 11:43" } }
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'ConfigurationOfElasticsearch-ShoYoshida.41' message 'Elasticsearch 2.x support' id 'd18a0283-6784-4fd1-a1ed-eef3ae95dbdc' date '17 June 2016' time '9:56:57.272187 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.40' message 'empty log message' id '29fd720f-a325-4a8b-a1cd-ee90dcb6c958' date '17 June 2016' time '9:52:07.131026 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.39' message 'Added ESPrefixQuery. Fixed ESSearch.' id '81dbd526-c3f9-49f6-b149-4fcb34241393' date '30 January 2016' time '2:56:14.079347 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.38' message 'ESSearch>>count should use Search API instead of Count API.- Count API will be obsolete elasticsearch 2.x- Cannot use min_score on Count APIContribution by Masashi Umezawa' id 'dba6dd45-c28f-43d5-b18b-2568c6ac1508' date '19 January 2016' time '4:43:57.955307 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.37' message 'Updated ConfigurationOfElasticsearch' id '7fc08ba4-b887-47b4-ad9a-639bae9e8f61' date '14 January 2016' time '1:03:59.289325 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.36' message 'Updated ConfigurationOfElasticsearch- Added Regexp Filter, Prefix Filter, Exists Filter' id '019050a7-75eb-446a-8a54-a1cf4c51f421' date '12 January 2016' time '10:07:24.978188 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.35' message 'empty log message' id 'c8fe2cbf-9dd5-4f7c-82ba-33940773dba7' date '12 January 2016' time '9:46:41.134925 pm' author 'ShoYoshida' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'ConfigurationOfElasticsearch-MasashiUmezawa.42' message 'Added 1.1.7 description' id 'b0ebb3d4-6c98-4240-953a-ee3e215be37f' date '26 October 2016' time '12:02:49.153662 pm' author 'MasashiUmezawa' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.41' message 'Elasticsearch 2.x support' id 'd18a0283-6784-4fd1-a1ed-eef3ae95dbdc' date '17 June 2016' time '9:56:57.272187 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.40' message 'empty log message' id '29fd720f-a325-4a8b-a1cd-ee90dcb6c958' date '17 June 2016' time '9:52:07.131026 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.39' message 'Added ESPrefixQuery. Fixed ESSearch.' id '81dbd526-c3f9-49f6-b149-4fcb34241393' date '30 January 2016' time '2:56:14.079347 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.38' message 'ESSearch>>count should use Search API instead of Count API.- Count API will be obsolete elasticsearch 2.x- Cannot use min_score on Count APIContribution by Masashi Umezawa' id 'dba6dd45-c28f-43d5-b18b-2568c6ac1508' date '19 January 2016' time '4:43:57.955307 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.37' message 'Updated ConfigurationOfElasticsearch' id '7fc08ba4-b887-47b4-ad9a-639bae9e8f61' date '14 January 2016' time '1:03:59.289325 am' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.36' message 'Updated ConfigurationOfElasticsearch- Added Regexp Filter, Prefix Filter, Exists Filter' id '019050a7-75eb-446a-8a54-a1cf4c51f421' date '12 January 2016' time '10:07:24.978188 pm' author 'ShoYoshida' ancestors ((name 'ConfigurationOfElasticsearch-ShoYoshida.35' message 'empty log message' id 'c8fe2cbf-9dd5-4f7c-82ba-33940773dba7' date '12 January 2016' time '9:46:41.134925 pm' author 'ShoYoshida' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
instance creation
queries: aCollection
^self new queries: aCollection; yourself
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
printing
jsonWriteContentBeginOn: aStream

aStream nextPutAll: '{ "dis_max": '
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
printing
jsonWriteContentEndOn: aStream

aStream nextPutAll: '}'
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
printing
jsonWriteContentValueOn: aStream
self modifiers jsonWriteOn: aStream.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
queries: aCollection
self modifiers at:'queries' put: aCollection
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
queries
^self modifiers at:'queries' ifAbsentPut: [ #() ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
tieBreaker: aNumber
^ self modifiers at: 'tie_breaker' put: aNumber
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
tieBreaker
^ self modifiers at: 'tie_breaker' ifAbsentPut: [ 0 ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"class" : {
"queries:" : "MasashiUmezawa 10/26/2016 11:19" },
"instance" : {
"jsonWriteContentBeginOn:" : "MasashiUmezawa 10/26/2016 11:38",
"jsonWriteContentEndOn:" : "MasashiUmezawa 10/26/2016 11:38",
"jsonWriteContentValueOn:" : "MasashiUmezawa 10/26/2016 11:27",
"queries" : "MasashiUmezawa 10/26/2016 11:15",
"queries:" : "MasashiUmezawa 10/26/2016 11:14",
"tieBreaker" : "MasashiUmezawa 10/26/2016 11:17",
"tieBreaker:" : "MasashiUmezawa 10/26/2016 11:16" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "Elasticsearch-Core-QueryDSL",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "ESDisMaxQuery",
"pools" : [
],
"super" : "ESQuery",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
acccessing
type: aString
^ self modifiers at: 'type' put: aString
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
"jsonWriteContentValueOn:" : "ShoYoshida 1/9/2016 10:34",
"queryType" : "ShoYoshida 1/9/2016 10:19",
"tieBreaker:" : "PaulDeBruicker 5/10/2013 07:24",
"type:" : "MasashiUmezawa 10/26/2016 11:30",
"useDisMax:" : "PaulDeBruicker 5/10/2013 07:23" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
boost
^self modifiers at: 'boost' ifAbsentPut: []
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
printing
jsonStringContents
self subclassResponsibility
^ String streamContents: [:str | self jsonWriteOn: str]
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
},
"instance" : {
"analyzer:" : "PaulDeBruicker 4/26/2013 08:36",
"boost" : "MasashiUmezawa 10/26/2016 11:18",
"boost:" : "ShoYoshida 1/9/2016 09:58",
"defaultField" : "ShoYoshida 1/8/2016 18:12",
"field" : "ShoYoshida 1/8/2016 18:11",
"field:" : "PaulDeBruicker 4/26/2013 06:42",
"hasField" : "PaulDeBruicker 4/26/2013 06:45",
"hasModifiers" : "ShoYoshida 1/11/2016 10:50",
"jsonStringContents" : "PaulDeBruicker 1/7/2014 16:40",
"jsonStringContents" : "MasashiUmezawa 10/25/2016 20:16",
"jsonWriteContentBeginOn:" : "ShoYoshida 1/9/2016 10:33",
"jsonWriteContentEndOn:" : "ShoYoshida 1/9/2016 10:33",
"jsonWriteContentOn:" : "ShoYoshida 1/8/2016 18:31",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Elasticsearch-Core-ShoYoshida.19' message 'empty log message' id '9e569114-81c0-4e0d-9ac0-20a6e342a283' date '20 June 2016' time '3:40:24.177299 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.18' message 'empty log message' id '00eac1ba-c6b0-4b65-810c-8e6e2a852dc7' date '20 June 2016' time '3:28:16.388827 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.17' message 'Contribution by Kazuki Minaminani' id 'ec7fbcec-9857-4f65-971f-4deb711616e3' date '16 June 2016' time '8:21:36.867741 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.16' message 'empty log message' id '160d8a21-3e7d-4e11-a4a7-f3f8af59daa6' date '16 June 2016' time '1:48:45.873925 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.15' message 'Added ESPrefixQuery. Fixed ESSearch.' id '529244c7-e77e-4aff-9bdd-4cf06047f8aa' date '30 January 2016' time '2:48:56.685885 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.14' message 'empty log message' id 'c25cd701-b7e2-40f7-af4f-a16955704999' date '19 January 2016' time '3:55:59.787789 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.13' message 'empty log message' id 'acccc9dc-dc83-40fc-aa8f-1e50fb6b46dc' date '19 January 2016' time '3:55:16.75174 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.12' message 'Avoid using Count API which will be obsolete soon' id '9b47c425-8f93-4162-9975-ef307e3d21f5' date '19 January 2016' time '3:53:02.984237 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-ShoYoshida.11' message 'empty log message' id '84a2d67c-c84d-4ad0-b47d-f57af74954b6' date '14 January 2016' time '1:03:22.22627 am' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.10' message 'empty log message' id 'ab5c5a45-0f25-40b9-b6dc-2bd2f976a83b' date '12 January 2016' time '9:42:01.837099 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.9' message 'empty log message' id 'fa43f947-7e37-4a07-83a5-7b3dce262aed' date '11 January 2016' time '8:53:11.821772 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.8' message 'Fixed ESRangeFilterTest' id '93016c20-c5bc-4325-916f-afb7b99f9421' date '11 January 2016' time '7:43:09.200377 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.7' message 'empty log message' id '243ad2ef-82e2-4599-8678-13844b1d95af' date '11 January 2016' time '7:18:54.830299 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.6' message 'empty log message' id '3c9047e3-91df-4f8d-9edf-ec9ad8ab47a6' date '11 January 2016' time '6:54:05.933854 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.5' message 'empty log message' id 'a1a92b62-ad03-4cf0-aa44-5bb97b80b630' date '11 January 2016' time '3:27:00.569096 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.4' message 'empty log message' id 'dea2e654-e1f9-4a4e-831a-45a95118c474' date '11 January 2016' time '11:36:33.955283 am' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.3' message 'fixed ESMultiMatchQuery ' id '27783b19-1502-4a88-8b75-b57b614ff672' date '7 January 2016' time '10:47:23.134807 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.2' message 'empty log message' id 'bf97c308-89a0-4167-a60e-8a000d3d0ecb' date '7 January 2016' time '5:53:54.374513 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.1' message 'empty log message' id 'cd1c144e-ddd9-4e2f-b5e5-a99b63d3b11c' date '7 January 2016' time '2:46:30.059234 pm' author 'ShoYoshida' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Elasticsearch-Core-MasashiUmezawa.21' message 'empty log message' id 'fba04475-a8f0-4f44-95e9-c484fc7f04ad' date '26 October 2016' time '11:52:04.428055 am' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.20' message 'Added DisMaxQuery' id 'd4bb0337-bd17-4ff9-9d54-53458bcd3792' date '26 October 2016' time '11:46:44.734177 am' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-ShoYoshida.19' message 'empty log message' id '9e569114-81c0-4e0d-9ac0-20a6e342a283' date '20 June 2016' time '3:40:24.177299 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.18' message 'empty log message' id '00eac1ba-c6b0-4b65-810c-8e6e2a852dc7' date '20 June 2016' time '3:28:16.388827 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.17' message 'Contribution by Kazuki Minaminani' id 'ec7fbcec-9857-4f65-971f-4deb711616e3' date '16 June 2016' time '8:21:36.867741 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.16' message 'empty log message' id '160d8a21-3e7d-4e11-a4a7-f3f8af59daa6' date '16 June 2016' time '1:48:45.873925 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.15' message 'Added ESPrefixQuery. Fixed ESSearch.' id '529244c7-e77e-4aff-9bdd-4cf06047f8aa' date '30 January 2016' time '2:48:56.685885 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.14' message 'empty log message' id 'c25cd701-b7e2-40f7-af4f-a16955704999' date '19 January 2016' time '3:55:59.787789 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.13' message 'empty log message' id 'acccc9dc-dc83-40fc-aa8f-1e50fb6b46dc' date '19 January 2016' time '3:55:16.75174 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-MasashiUmezawa.12' message 'Avoid using Count API which will be obsolete soon' id '9b47c425-8f93-4162-9975-ef307e3d21f5' date '19 January 2016' time '3:53:02.984237 pm' author 'MasashiUmezawa' ancestors ((name 'Elasticsearch-Core-ShoYoshida.11' message 'empty log message' id '84a2d67c-c84d-4ad0-b47d-f57af74954b6' date '14 January 2016' time '1:03:22.22627 am' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.10' message 'empty log message' id 'ab5c5a45-0f25-40b9-b6dc-2bd2f976a83b' date '12 January 2016' time '9:42:01.837099 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.9' message 'empty log message' id 'fa43f947-7e37-4a07-83a5-7b3dce262aed' date '11 January 2016' time '8:53:11.821772 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.8' message 'Fixed ESRangeFilterTest' id '93016c20-c5bc-4325-916f-afb7b99f9421' date '11 January 2016' time '7:43:09.200377 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.7' message 'empty log message' id '243ad2ef-82e2-4599-8678-13844b1d95af' date '11 January 2016' time '7:18:54.830299 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.6' message 'empty log message' id '3c9047e3-91df-4f8d-9edf-ec9ad8ab47a6' date '11 January 2016' time '6:54:05.933854 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.5' message 'empty log message' id 'a1a92b62-ad03-4cf0-aa44-5bb97b80b630' date '11 January 2016' time '3:27:00.569096 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.4' message 'empty log message' id 'dea2e654-e1f9-4a4e-831a-45a95118c474' date '11 January 2016' time '11:36:33.955283 am' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.3' message 'fixed ESMultiMatchQuery ' id '27783b19-1502-4a88-8b75-b57b614ff672' date '7 January 2016' time '10:47:23.134807 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.2' message 'empty log message' id 'bf97c308-89a0-4167-a60e-8a000d3d0ecb' date '7 January 2016' time '5:53:54.374513 pm' author 'ShoYoshida' ancestors ((name 'Elasticsearch-Core-ShoYoshida.1' message 'empty log message' id 'cd1c144e-ddd9-4e2f-b5e5-a99b63d3b11c' date '7 January 2016' time '2:46:30.059234 pm' author 'ShoYoshida' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

0 comments on commit a37f13a

Please sign in to comment.