16719 Commits

Author SHA1 Message Date
Michael McCandless
23f97c30a0 Merge branch 'master' into immediate_shard_active
Conflicts:
	core/src/main/java/org/elasticsearch/index/engine/Engine.java
	core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
2015-10-07 12:20:27 -04:00
Kevin Kirsche
072f6ae138 Docs: Note that plugin removal usually requires node restart
Closes #13301
Closes #13983
2015-10-07 18:10:29 +02:00
Colin Goodheart-Smithe
a16b025f0a re-enables InnerHits Tests 2015-10-07 16:59:56 +01:00
Michele Palmia
c67552eabc Docs: Fix example about executing filters
Closes #13979
2015-10-07 17:51:30 +02:00
Jason Tedor
5328f145ef Clarify use of System.nanoTime for measuring eviction times 2015-10-07 11:03:29 -04:00
Jason Tedor
ff8f9c9332 Add comment clarifying CacheTests.testCacheStats 2015-10-07 10:56:42 -04:00
Jason Tedor
37becf3dc2 Rename Cache.exceedsSize for clarity 2015-10-07 10:46:09 -04:00
Jason Tedor
44b471b008 Rename LRU and segment locks for clarity 2015-10-07 10:43:56 -04:00
Jason Tedor
1f61384988 Protect against null RemovalListener in setter 2015-10-07 10:40:22 -04:00
Nik Everett
b32022dce1 Merge pull request #13977 from nik9000/doc_breaking_java
Add a note about shard failure in the api
2015-10-07 10:36:50 -04:00
Jason Tedor
0fb908178d Clarify Javadoc comment regarding CacheSegment locks 2015-10-07 10:36:05 -04:00
Colin Goodheart-Smithe
ee5d2847b5 more clean up 2015-10-07 15:34:21 +01:00
Colin Goodheart-Smithe
5b23d9abdc more test clean ups 2015-10-07 15:29:13 +01:00
Michael McCandless
7f435e2f4f feedback 2015-10-07 10:18:52 -04:00
Colin Goodheart-Smithe
3313742826 removed defaultRescoreWindow 2015-10-07 15:09:35 +01:00
Clinton Gormley
884215a782 Added version ID for 2.0.0-rc1 2015-10-07 15:13:09 +02:00
Clinton Gormley
90df3c6195 Added bwc indices for 2.0.0-rc1 2015-10-07 15:13:08 +02:00
Alexander Reelsen
c49fddd6da Release: Fix package repo path to only consist of major version
This is fixes the package repo names from 2.0/2.1/etc to 2.x, so that
all major releases are in a single repository.

Closes #12493
2015-10-07 15:02:52 +02:00
Britta Weber
871df97e18 Merge pull request #13961 from brwe/function-score-unit-tests
Convert some messy function score tests to unit tests
2015-10-07 14:51:22 +02:00
Britta Weber
bb939f819c use searcher.createNormalizedWeight() instead of query.getWeight() and cleanup 2015-10-07 14:46:47 +02:00
Alexander Reelsen
7b02e91e29 Docs: Update repository docs with new major version structure 2015-10-07 14:42:54 +02:00
Clinton Gormley
dc018cf622 Updated docs for 3.0.0-beta 2015-10-07 13:27:46 +02:00
javanna
53f316b540 GeoDistanceRangeQueryBuilder to not change its state when calling toQuery
The geoPoint gets normalized while calling toQuery. That should happen on a copy of the point though, the state of the request should never change as part of toQuery execution. Also updated corresponding test to support point normalization.

Closes #13984
2015-10-07 12:54:24 +02:00
javanna
a024125f8d Java api: GeoDistanceRangeQueryBuilder#getValidationMethod to not take any argument 2015-10-07 12:54:24 +02:00
Britta Weber
ab74e68c5c Merge pull request #13101 from brwe/update-ang
Send response for update request when it timed out
2015-10-07 12:53:22 +02:00
Britta Weber
13d3a3e257 send response for update request when it timed out 2015-10-07 12:51:57 +02:00
Boaz Leskes
bcb3fab6ac Engine: Remove Engine.Create
The `_create` API is handy way to specify an index operation should only be done if the document doesn't exist. This is currently implemented in explicit code paths all the way down to the engine. However, conceptually this is no different than any other versioned operation - instead of requiring a document is on a specific version, we require it to be deleted (or non-existent). This PR removes Engine.Create in favor of a slight extension in the VersionType logic.

There are however a couple of side effects:
- DocumentAlreadyExistsException is removed and VersionConflictException is used instead (with an improved error message)
- Update will reject version parameters if the upsert option is used (it doesn't compute anyway).
- Translog.Create is also removed infavor of Translog.Index (that's OK because their binary format was the same, so we can just read Translog.Index of the translog file)

Closes #13955
2015-10-07 12:37:34 +02:00
Britta Weber
8a590d46b8 Merge pull request #13772 from brwe/remove-CONF_FILE
Remove option to configure custom config file via CONF_FILE or -Des.default.conf
2015-10-07 10:34:14 +02:00
Michael McCandless
934827d25f fold feedback 2015-10-06 17:19:39 -04:00
Nik Everett
36a6211523 [doc] Add a note about shard failure in the api
Closes #13674
2015-10-06 16:24:39 -04:00
David Pilato
f0252f34e9 Enhance plugin-descriptor.properties guide
* extract doc from the descriptor
* make obvious that plugin authors will have to release a new version for each elasticsearch version
2015-10-06 22:12:45 +02:00
Britta Weber
2473e7499b name variables and don't always use the timeout 2015-10-06 20:37:44 +02:00
Greg Marzouka
9200c446a1 Merge pull request #13946 from elastic/fix/indices-get-restspec
Add options for indices.get feature
2015-10-06 14:28:11 -04:00
Britta Weber
a80a03f098 Merge pull request #13973 from brwe/conf-file-migration-doc
add paragraph about removal of conf file option
2015-10-06 19:39:15 +02:00
Britta Weber
df81497e9f add paragraph about removal of conf file option 2015-10-06 19:36:48 +02:00
Alex
4077a322c5 Docs: Fix typo - datehistogram
date_histogram in place of datehistogram

Closes #13886
2015-10-06 19:22:21 +02:00
Britta Weber
71aefd5a06 remove option to configure custom config file via CONF_FILE or -Des.default.conf
It is rarely used and was not consistently handled by different distributions anyway.
This commit also adds a test for specifying CONF_DIR when installing plugins and
starting elasticsearch.

relates to #12712 and #12954
closes #5329
closes #13715
2015-10-06 19:02:43 +02:00
Alexander Reelsen
b7ae59d8af Docs: Removed obsoleted MVEL paragraph 2015-10-06 18:55:34 +02:00
javanna
9d1c45f3e0 [TEST] Minor SearchSourceBuilderTests infra changes 2015-10-06 18:13:05 +02:00
javanna
cbcc23b8be [TEST] Simplify SearchSourceBuilderTests setup
Mappings and many modules are not needed here compared to AbstractQueryTestCase, as we will never call toQuery in this other test. Parsing is independent from indices and types as well.
2015-10-06 17:45:41 +02:00
Britta Weber
aa19a4134d vagrant tests: fix plugin outupt test
package installation creates the plugin directory already so when a plugin
is installed it prints the additional line
Plugins directory [/tmp/elasticsearch/plugins] does not exist. Creating...
2015-10-06 17:37:25 +02:00
javanna
1915c74e93 Merge branch 'master' into feature/search-request-refactoring 2015-10-06 16:21:58 +02:00
Robert Muir
a798f4f711 prevent test failures from jython localization bugs.
see #13967
2015-10-06 10:17:19 -04:00
javanna
108f5c5701 Count Request: minScore can be null, its getter should be Float rather than float 2015-10-06 16:16:57 +02:00
javanna
c2fc65352a [TEST] move variable assignment one line above 2015-10-06 16:00:06 +02:00
javanna
fcc60609ae Count api: simplify default handling
For minScore and terminateAfter we can just rely on defaults set to SearchSourceBuilder.
2015-10-06 15:55:34 +02:00
Colin Goodheart-Smithe
10a559348b more fixes for tests 2015-10-06 14:50:48 +01:00
javanna
86be9db7b9 Fix some RequestBuilder#toString that produced broken json
Also restored a couple of old tests around search and count request builder that used to get wiped when calling toString.
2015-10-06 15:46:11 +02:00
Colin Goodheart-Smithe
669a5893bb fixed some NORELEASE comments in tests 2015-10-06 14:36:50 +01:00
Nik Everett
e71bc472cc Merge pull request #13821 from nik9000/jayatana_test
Test that Jayatana is ignored
2015-10-06 09:14:28 -04:00