Merge branch '6.x' into ccr-6.x

* 6.x: Refactor internal engine [Docs] Fix note in bucket_selector Added release notes for 6.0.0-rc2 [Docs] Fix indentation of examples (#27168) [Docs] Clarify `span_not` query behavior for non-overlapping matches (#27150) [Docs] Remove first person "I" from getting started (#27155)
elastic · Oct 30, 2017 · 57ece57 · 57ece57
2 parents 03225b4 + 39ef2c4
commit 57ece57
Show file tree

Hide file tree

Showing 13 changed files with 575 additions and 291 deletions.
diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/core/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -572,7 +572,11 @@ public CommitStats commitStats() {
         return new CommitStats(getLastCommittedSegmentInfos());
     }
 
-    /** get the sequence number service */
+    /**
+     * The sequence number service for this engine.
+     *
+     * @return the sequence number service
+     */
     public abstract SequenceNumbersService seqNoService();
 
     /**

diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
diff --git a/core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbersService.java b/core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbersService.java
@@ -66,7 +66,7 @@ public SequenceNumbersService(
      *
      * @return the next assigned sequence number
      */
-    public long generateSeqNo() {
+    public final long generateSeqNo() {
         return localCheckpointTracker.generateSeqNo();
     }
 

diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
diff --git a/core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java
@@ -316,7 +316,7 @@ public long addDocument(Iterable<? extends IndexableField> doc) throws IOExcepti
                             assert documentFailureMessage != null;
                             throw new IOException(documentFailureMessage);
                         }
-                    }, null, config);
+                    }, null, null, config);
         }
     }
 

diff --git a/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java
@@ -638,6 +638,7 @@ public long addDocument(final Iterable<? extends IndexableField> doc) throws IOE
                                 }
                             },
                     null,
+                    null,
                     config);
         }
 

diff --git a/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc b/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc
@@ -6,7 +6,7 @@ in the parent multi-bucket aggregation. The specified metric must be numeric and
 If the script language is `expression` then a numeric return value is permitted. In this case 0.0 will be evaluated as `false`
 and all other values will evaluate to true.
 
-Note: The bucket_selector aggregation, like all pipeline aggregations, executions after all other sibling aggregations. This means that
+NOTE: The bucket_selector aggregation, like all pipeline aggregations, executions after all other sibling aggregations. This means that
 using the bucket_selector aggregation to filter the returned buckets in the response does not save on execution time running the aggregations.
 
 ==== Syntax

diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
@@ -13,7 +13,7 @@ Here are a few sample use-cases that Elasticsearch could be used for:
 * You run a price alerting platform which allows price-savvy customers to specify a rule like "I am interested in buying a specific electronic gadget and I want to be notified if the price of gadget falls below $X from any vendor within the next month". In this case you can scrape vendor prices, push them into Elasticsearch and use its reverse-search (Percolator) capability to match price movements against customer queries and eventually push the alerts out to the customer once matches are found.
 * You have analytics/business-intelligence needs and want to quickly investigate, analyze, visualize, and ask ad-hoc questions on a lot of data (think millions or billions of records). In this case, you can use Elasticsearch to store your data and then use Kibana (part of the Elasticsearch/Logstash/Kibana stack) to build custom dashboards that can visualize aspects of your data that are important to you. Additionally, you can use the Elasticsearch aggregations functionality to perform complex business intelligence queries against your data.
 
-For the rest of this tutorial, I will guide you through the process of getting Elasticsearch up and running, taking a peek inside it, and performing basic operations like indexing, searching, and modifying your data. At the end of this tutorial, you should have a good idea of what Elasticsearch is, how it works, and hopefully be inspired to see how you can use it to either build sophisticated search applications or to mine intelligence from your data.
+For the rest of this tutorial, you will be guided through the process of getting Elasticsearch up and running, taking a peek inside it, and performing basic operations like indexing, searching, and modifying your data. At the end of this tutorial, you should have a good idea of what Elasticsearch is, how it works, and hopefully be inspired to see how you can use it to either build sophisticated search applications or to mine intelligence from your data.
 --
 
 == Basic Concepts
@@ -660,7 +660,7 @@ Now that we've gotten a glimpse of the basics, let's try to work on a more reali
 --------------------------------------------------
 // NOTCONSOLE
 
-For the curious, I generated this data from http://www.json-generator.com/[`www.json-generator.com/`] so please ignore the actual values and semantics of the data as these are all randomly generated.
+For the curious, this data was generated using http://www.json-generator.com/[`www.json-generator.com/`], so please ignore the actual values and semantics of the data as these are all randomly generated.
 
 [float]
 === Loading the Sample Dataset
@@ -1284,4 +1284,4 @@ There are many other aggregations capabilities that we won't go into detail here
 
 == Conclusion
 
-Elasticsearch is both a simple and complex product. We've so far learned the basics of what it is, how to look inside of it, and how to work with it using some of the REST APIs. I hope that this tutorial has given you a better understanding of what Elasticsearch is and more importantly, inspired you to further experiment with the rest of its great features!
+Elasticsearch is both a simple and complex product. We've so far learned the basics of what it is, how to look inside of it, and how to work with it using some of the REST APIs. Hopefully this tutorial has given you a better understanding of what Elasticsearch is and more importantly, inspired you to further experiment with the rest of its great features!
diff --git a/docs/reference/query-dsl/common-terms-query.asciidoc b/docs/reference/query-dsl/common-terms-query.asciidoc
@@ -76,7 +76,7 @@ GET /_search
         "common": {
             "body": {
                 "query": "this is bonsai cool",
-                    "cutoff_frequency": 0.001
+                "cutoff_frequency": 0.001
             }
         }
     }
@@ -100,8 +100,8 @@ GET /_search
         "common": {
             "body": {
                 "query": "nelly the elephant as a cartoon",
-                    "cutoff_frequency": 0.001,
-                    "low_freq_operator": "and"
+                "cutoff_frequency": 0.001,
+                "low_freq_operator": "and"
             }
         }
     }
@@ -200,11 +200,11 @@ GET /_search
         "common": {
             "body": {
                 "query": "nelly the elephant not as a cartoon",
-                    "cutoff_frequency": 0.001,
-                    "minimum_should_match": {
-                        "low_freq" : 2,
-                        "high_freq" : 3
-                    }
+                "cutoff_frequency": 0.001,
+                "minimum_should_match": {
+                    "low_freq" : 2,
+                    "high_freq" : 3
+                }
             }
         }
     }
@@ -261,11 +261,11 @@ GET /_search
         "common": {
             "body": {
                 "query": "how not to be",
-                    "cutoff_frequency": 0.001,
-                    "minimum_should_match": {
-                        "low_freq" : 2,
-                        "high_freq" : 3
-                    }
+                "cutoff_frequency": 0.001,
+                "minimum_should_match": {
+                    "low_freq" : 2,
+                    "high_freq" : 3
+                }
             }
         }
     }

diff --git a/docs/reference/query-dsl/span-not-query.asciidoc b/docs/reference/query-dsl/span-not-query.asciidoc
@@ -1,7 +1,9 @@
 [[query-dsl-span-not-query]]
 === Span Not Query
 
-Removes matches which overlap with another span query. The span not
+Removes matches which overlap with another span query or which are
+within x tokens before (controlled by the parameter `pre`) or y tokens
+after (controled by the parameter `post`) another SpanQuery. The span not
 query maps to Lucene `SpanNotQuery`. Here is an example:
 
 [source,js]
@@ -39,7 +41,7 @@ In the above example all documents with the term hoya are filtered except the on
 Other top level options:
 
 [horizontal]
-`pre`::     If set the amount of tokens before the include span can't have overlap with the exclude span.
-`post`::    If set the amount of tokens after the include span can't have overlap with the exclude span.
+`pre`::     If set the amount of tokens before the include span can't have overlap with the exclude span. Defaults to 0.
+`post`::    If set the amount of tokens after the include span can't have overlap with the exclude span. Defaults to 0.
 `dist`::    If set the amount of tokens from within the include span can't have overlap with the exclude span. Equivalent
             of setting both `pre` and `post`.
diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc
@@ -5,6 +5,7 @@
 --
 This section summarizes the changes in each release.
 
+* <<release-notes-6.0.0-rc2>>
 * <<release-notes-6.0.0-rc1>>
 * <<release-notes-6.0.0-beta2>>
 * <<release-notes-6.0.0-beta1>>
@@ -13,6 +14,7 @@ This section summarizes the changes in each release.
 * <<release-notes-6.0.0-alpha1-5x>>
 
 --
+include::release-notes/6.0.0-rc2.asciidoc[]
 include::release-notes/6.0.0-rc1.asciidoc[]
 include::release-notes/6.0.0-beta2.asciidoc[]
 include::release-notes/6.0.0-beta1.asciidoc[]

diff --git a/docs/reference/release-notes/6.0.0-rc2.asciidoc b/docs/reference/release-notes/6.0.0-rc2.asciidoc
@@ -0,0 +1,118 @@
+[[release-notes-6.0.0-rc2]]
+== 6.0.0-rc2 Release Notes
+
+Also see <<breaking-changes-6.0>>.
+
+[[breaking-6.0.0-rc2]]
+[float]
+=== Breaking changes
+
+Inner Hits::
+* Return the _source of inner hit nested as is without wrapping it into its full path context {pull}26982[#26982] (issues: {issue}26102[#26102], {issue}26944[#26944])
+
+
+
+[[enhancement-6.0.0-rc2]]
+[float]
+=== Enhancements
+
+Core::
+* Ignore .DS_Store files on macOS {pull}27108[#27108] (issue: {issue}23982[#23982])
+
+Index Templates::
+* Fix error message for a put index template request without index_patterns {pull}27102[#27102] (issue: {issue}27100[#27100])
+
+Mapping::
+* Don't detect source's XContentType in DocumentParser.parseDocument() {pull}26880[#26880]
+
+Network::
+* Add additional low-level logging handler {pull}26887[#26887]
+* Unwrap causes when maybe dying {pull}26884[#26884]
+
+Plugins::
+* Adjust SHA-512 supported format on plugin install {pull}27093[#27093]
+
+REST::
+* Cat shards bytes {pull}26952[#26952]
+
+
+
+[[bug-6.0.0-rc2]]
+[float]
+=== Bug fixes
+
+Aggregations::
+* Create weights lazily in filter and filters aggregation {pull}26983[#26983]
+* Fix IndexOutOfBoundsException in histograms for NaN doubles (#26787) {pull}26856[#26856] (issue: {issue}26787[#26787])
+* Scripted_metric _agg parameter disappears if params are provided {pull}19863[#19863] (issue: {issue}19768[#19768])
+
+CAT API::
+* Fix NPE for /_cat/indices when no primary shard {pull}26953[#26953] (issue: {issue}26942[#26942])
+
+Cache::
+* Reduce the default number of cached queries. {pull}26949[#26949] (issue: {issue}26938[#26938])
+
+Core::
+* Timed runnable should delegate to abstract runnable {pull}27095[#27095] (issue: {issue}27069[#27069])
+* Stop invoking non-existent syscall {pull}27016[#27016] (issue: {issue}20179[#20179])
+* MetaData Builder doesn't properly prevent an alias with the same name as an index {pull}26804[#26804]
+
+Ingest::
+* date processor should not fail if timestamp is specified as json number {pull}26986[#26986] (issue: {issue}26967[#26967])
+* date_index_name processor should not fail if timestamp is specified as json number {pull}26910[#26910] (issue: {issue}26890[#26890])
+
+Internal::
+* Upgrade Lucene to version 7.0.1 {pull}26926[#26926]
+
+Java High Level REST Client::
+* Make ShardSearchTarget optional when parsing ShardSearchFailure {pull}27078[#27078] (issue: {issue}27055[#27055])
+
+Java REST Client::
+* rest-client-sniffer: configurable threadfactory {pull}26897[#26897]
+
+Mapping::
+* wrong link target for datatype murmur3 {pull}27143[#27143]
+
+Network::
+* Check for closed connection while opening {pull}26932[#26932]
+
+Packaging::
+* Fix handling of Windows paths containing parentheses {pull}26916[#26916] (issue: {issue}26454[#26454])
+
+Percolator::
+* Also support query extraction for queries wrapped inside a ESToParentBlockJoinQuery {pull}26754[#26754]
+
+Plugin Analysis Phonetic::
+* Fix beidermorse phonetic token filter for unspecified `languageset` {pull}27112[#27112] (issue: {issue}26771[#26771])
+
+Plugin Repository Azure::
+* Use Azure upload method instead of our own implementation {pull}26751[#26751]
+
+REST::
+* Fix inconsistencies in the rest api specs for cat.snapshots {pull}26996[#26996] (issues: {issue}25737[#25737], {issue}26923[#26923])
+* Fix inconsistencies in the rest api specs for *_script {pull}26971[#26971] (issue: {issue}26923[#26923])
+* exists template needs a template name {pull}25988[#25988]
+
+Reindex API::
+* Fix update_by_query's default size parameter {pull}26784[#26784] (issue: {issue}26761[#26761])
+
+Search::
+* Avoid stack overflow on search phases {pull}27069[#27069] (issue: {issue}27042[#27042])
+* Fix search_after with geo distance sorting {pull}26891[#26891]
+* Fix serialization errors when cross cluster search goes to a single shard {pull}26881[#26881] (issue: {issue}26833[#26833])
+* Early termination with index sorting should not set terminated_early in the response {pull}26597[#26597] (issue: {issue}26408[#26408])
+* Format doc values fields. {pull}22146[#22146]
+
+Sequence IDs::
+* Fire global checkpoint sync under system context {pull}26984[#26984]
+
+Settings::
+* Emit settings deprecation logging on empty update {pull}27017[#27017] (issue: {issue}26419[#26419])
+* Fix filtering for ListSetting {pull}26914[#26914]
+
+Stats::
+* Keep cumulative elapsed scroll time in microseconds {pull}27068[#27068] (issue: {issue}27046[#27046])
+
+Suggesters::
+* Fix division by zero in phrase suggester that causes assertion to fail {pull}27149[#27149]
+
-Original file line number
+Diff line change
@@ Expand Up @@
                                     }
                                 },
                         null,
+                        null,
                         config);
             }
@@ Expand Down @@