Added few Span queries #1320

mhernik · 2017-06-02T18:20:04Z

I added 4 span queries:

SpanMulti
SpanNear
SpanOr
SpanTerm

ruflin · 2017-06-02T18:49:09Z

Wow, you not only added 1 span query but all of them. Something seems to fail with the tests.

ruflin · 2017-06-02T20:17:43Z

@alekitto @mhernik Could it be that the two of you are working on the same thing at the same time? #1319

mhernik · 2017-06-03T13:22:43Z

Hi,
Yeah, I was doing some last minute changes on machine without docker, so without running tests. I'll bo back to it on Monday.
@alekitto Seems like it. What a coincidence, a 4 year old issue, and 2 PRs for it on same day :)

alekitto · 2017-06-03T13:40:43Z

@mhernik Yeah, what a coincidence! I think we can merge our work, as my PR is still missing span_near and span_or queries, as some functional tests you've already written. What do you think about it?

Updated DSL queries Test implementation of new classes

mhernik · 2017-06-05T19:00:39Z

Hi,
I've updated PR to pass the tests.
@alekitto We definitely should merge our work! What do you propose? Do you want to make a PR to my fork?

ruflin · 2017-06-06T10:20:28Z

+1 on merging the work. PR to @mhernik branch sounds like a good idea to me.

merge span query work

ruflin · 2017-06-13T07:20:45Z

@mhernik @alekitto Please ping me when you think this is ready for review.

mhernik · 2017-06-13T07:28:14Z

@alekitto is further working on span_within and span_not queries. Will ping you, when it's ready!

mhernik · 2017-07-07T07:24:39Z

Hi @ruflin,
Actually I got him @alekitto wrong. He said that he's working on on span_within and span_not queries, but will create additional PR for that. So that PR is ready now for review! :)

ruflin

LGTM. Only a few minor comments.

ruflin · 2017-07-10T12:34:06Z

lib/Elastica/Query/SpanFirst.php

+     *
+     * @return $this
+     */
+    protected function _addQuery($type, $args)


This more looks like _setQuery as in case a second query is set, it will overwrite the previous one.

ruflin · 2017-07-10T12:34:34Z

lib/Elastica/Query/SpanFirst.php

+     */
+    public function __construct($match = null, $end = null)
+    {
+        if (null !== $match) {


is_null? http://php.net/manual/en/function.is-null.php

ruflin · 2017-07-10T12:34:48Z

lib/Elastica/Query/SpanMulti.php

+     *
+     * @return $this
+     */
+    protected function _addQuery($type, $args)


See prev. comment.

ruflin · 2017-07-10T12:37:27Z

@mhernik Could you check the review above and squash the commits into 1?

* Update elasticsearch-php dependency to 5.2 * Update incompatible test * Update README page * Update CHANGELOG

* Update liniting added filter path option added filter path option added changelog entry and asserts to config test

…n#1296)

…uflin#1293) (ruflin#1294)

…er volume sharing solved, now snapshot tests are working (ruflin#1298)

Added a new param to Client::request and Request::_construct to allow setting the content-type of the data being sent. This defaults to "application/json" and is only overidden by Bulk and MultiSearch where it should be application/x-ndjson. Sadly I'm not sure how to test this properly. I'm not a big a big fan of adding a new param like that. Ideally we should refactor the $data param of Request::_construct to accept a array (defaults to application/json) or a new RequestBody object where the client could set the content-type alongside the the string. closes ruflin#1301

…build for php56 (ruflin#1303)

…1306)

…d MultiMatch (ruflin#1305)

… Aggregation (ruflin#1304) Add ability to set other_bucket and other_bucket_key parameters on filters aggregation. https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html#_literal_other_literal_bucket

…n#1313)

added changelog entry and asserts to config test added SpanOrTest added SpanMulti span functions in dsl query updated removed unnecessary attributes reverted docker ip range Changelog update Changelog update

Updated DSL queries Test implementation of new classes add span_term, span_multi, span_first query CR

mhernik · 2017-07-24T08:49:23Z

Hi @ruflin. Looks like squashing also merged other people's commits into mine PR.
I think it will be better to make a new PR, or is there a way to fix it?

ruflin · 2017-07-24T11:50:05Z

@mhernik You should be able to rebase. But if that becomes too messy, just open a new PR.

ruflin · 2017-07-25T08:20:54Z

@mhernik It looks like the PR still only contains your changes, right? So if I squash it it will be only 1 commit afterwards. But you should be able to rebase too I think if you want to have it clean in the PR.

ruflin · 2017-07-25T09:03:42Z

@mhernik I merged this as I really wanted to have it in as I plan a release the next hours / days. I hope this works for you.

mhernik · 2017-07-25T09:22:14Z

Sure. Sorry I didn't fix this squashing. Glad I could help.

…

On Tue, Jul 25, 2017 at 11:03 AM, Nicolas Ruflin ***@***.***> wrote: @mhernik <https://github.com/mhernik> I merged this as I really wanted to have it in as I plan a release the next hours / days. I hope this works for you. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1320 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AEk9i2G99hjxNQYL28kz0_6Ac5543CKfks5sRa9xgaJpZM4NunnX> .

ruflin · 2017-07-25T10:18:06Z

@mhernik Do you know what is going to happen with #1319

mhernik · 2017-07-25T12:59:26Z

I think @alekitto wants to make another PR with missing queries. All that was done in this branch was merger to mine in PR #1319

…

On Tue, Jul 25, 2017 at 12:18 PM, Nicolas Ruflin ***@***.***> wrote: @mhernik <https://github.com/mhernik> Do you know what is going to happen with #1319 <#1319> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1320 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AEk9i5_RA4gEoo-TW0hwN_YVOBNVwDehks5sRcDggaJpZM4NunnX> .

alekitto · 2017-07-25T13:01:29Z

I'll rebase my work upon master and push the work into #1319 in a day.

Marek Hernik and others added 12 commits April 22, 2017 20:11

added filter path option

8a2ed45

added filter path option

12c0747

added changelog entry and asserts to config test

84a8172

Merge branch 'master' of github.com:ruflin/Elastica

24d0131

added changelog entry and asserts to config test

a493aab

added SpanOrTest

2d7932f

added SpanMulti

9905565

span functions in dsl query updated

d2288eb

removed unnecessary attributes

faafff3

reverted docker ip range

b551f4e

Changelog update

75757e5

Changelog update

a5c0a45

Marek Hernik added 2 commits June 5, 2017 18:31

Merge branch 'master' of github.com:ruflin/Elastica

eb21660

Introduced AbstractSpanQuery class

99e538c

Updated DSL queries Test implementation of new classes

add span_term, span_multi, span_first query

d402edb

alekitto mentioned this pull request Jun 6, 2017

merge span query work mhernik/Elastica#1

Merged

Merge pull request #1 from alekitto/mhernik-rebase

7c39fa6

merge span query work

mhernik changed the title ~~Added few Span queries~~ [WIP] Added few Span queries Jun 13, 2017

mhernik changed the title ~~[WIP] Added few Span queries~~ Added few Span queries Jul 7, 2017

ruflin reviewed Jul 10, 2017

View reviewed changes

ruflin and others added 19 commits July 24, 2017 10:29

Update elasticsearch test version to 5.2 (ruflin#1245)

c1724d1

* Update elasticsearch-php dependency to 5.2 * Update incompatible test * Update README page * Update CHANGELOG

Prepare release-5.2.0 (ruflin#1286)

489c313

* Update liniting added filter path option added filter path option added changelog entry and asserts to config test

Use correct Put class for updating settings. Fixes ruflin#1295 (rufli…

65f3dd4

…n#1296)

using official nginx image and use of php:7.1 instead of php:7.1-rc (r…

8e96e29

…uflin#1293) (ruflin#1294)

lib/Elastica/Search.php should not be executable (ruflin#1299)

0c84ae5

update docker-compose.yml to version 2 and create ES cluster and dock…

8273d56

…er volume sharing solved, now snapshot tests are working (ruflin#1298)

Fix a problem with Travis build, installing libpcre to avoid failing …

1323e51

…build for php56 (ruflin#1303)

remove xpack.monitoring. no more intermittent fails in tests (ruflin#…

61f7e9c

…1306)

make use of default values with constants consistent between Match an…

6ad5616

…d MultiMatch (ruflin#1305)

update Cluster\Health properties and its own test (ruflin#1309)

bbaa0cf

add query to setMapping in Type Class (ruflin#1216) (ruflin#1312)

c322413

Added support to parent id query [ruflin#1287] (ruflin#1308)

2085ce1

Adding the missing Content-Type key in the headers for ES 5.3+ (rufli…

3b111b2

…n#1313)

Added Reindex and deprecated CrossIndex (ruflin#1311) (ruflin#1315)

cdd9710

added changelog entry and asserts to config test added SpanOrTest added SpanMulti span functions in dsl query updated removed unnecessary attributes reverted docker ip range Changelog update Changelog update

Fixed bad parameter value to refresh document (ruflin#1318)

29a21dc

Introduced AbstractSpanQuery class

8b1795f

Updated DSL queries Test implementation of new classes add span_term, span_multi, span_first query CR

Merge remote-tracking branch 'origin/master'

1c760aa

ruflin merged commit eee063c into ruflin:master Jul 25, 2017

ruflin mentioned this pull request Jul 25, 2017

Add span queries #1319

Merged

9 tasks

deguif mentioned this pull request Dec 7, 2021

Feature: need span_near query #537

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added few Span queries #1320

Added few Span queries #1320

mhernik commented Jun 2, 2017

ruflin commented Jun 2, 2017

ruflin commented Jun 2, 2017

mhernik commented Jun 3, 2017

alekitto commented Jun 3, 2017

mhernik commented Jun 5, 2017

ruflin commented Jun 6, 2017

ruflin commented Jun 13, 2017

mhernik commented Jun 13, 2017

mhernik commented Jul 7, 2017

ruflin left a comment

ruflin Jul 10, 2017

ruflin Jul 10, 2017

ruflin Jul 10, 2017

ruflin commented Jul 10, 2017

mhernik commented Jul 24, 2017

ruflin commented Jul 24, 2017

ruflin commented Jul 25, 2017

ruflin commented Jul 25, 2017

mhernik commented Jul 25, 2017 via email

ruflin commented Jul 25, 2017

mhernik commented Jul 25, 2017 via email

alekitto commented Jul 25, 2017

Added few Span queries #1320

Added few Span queries #1320

Conversation

mhernik commented Jun 2, 2017

ruflin commented Jun 2, 2017

ruflin commented Jun 2, 2017

mhernik commented Jun 3, 2017

alekitto commented Jun 3, 2017

mhernik commented Jun 5, 2017

ruflin commented Jun 6, 2017

ruflin commented Jun 13, 2017

mhernik commented Jun 13, 2017

mhernik commented Jul 7, 2017

ruflin left a comment

Choose a reason for hiding this comment

ruflin Jul 10, 2017

Choose a reason for hiding this comment

ruflin Jul 10, 2017

Choose a reason for hiding this comment

ruflin Jul 10, 2017

Choose a reason for hiding this comment

ruflin commented Jul 10, 2017

mhernik commented Jul 24, 2017

ruflin commented Jul 24, 2017

ruflin commented Jul 25, 2017

ruflin commented Jul 25, 2017

mhernik commented Jul 25, 2017 via email

ruflin commented Jul 25, 2017

mhernik commented Jul 25, 2017 via email

alekitto commented Jul 25, 2017