Bläddra i källkod

Docs: Added stub entries for pages deleted from 1.x

Clinton Gormley 10 år sedan
förälder
incheckning
6171ae6cc4

+ 3 - 0
docs/reference/index.asciidoc

@@ -40,5 +40,8 @@ include::testing.asciidoc[]
 
 
 include::glossary.asciidoc[]
 include::glossary.asciidoc[]
 
 
+include::redirects.asciidoc[]
+
+
 
 
 
 

+ 4 - 0
docs/reference/query-dsl/index.asciidoc

@@ -14,6 +14,8 @@ include::constant-score-query.asciidoc[]
 
 
 include::dis-max-query.asciidoc[]
 include::dis-max-query.asciidoc[]
 
 
+include::exists-query.asciidoc[]
+
 include::filtered-query.asciidoc[]
 include::filtered-query.asciidoc[]
 
 
 include::function-score-query.asciidoc[]
 include::function-score-query.asciidoc[]
@@ -44,6 +46,8 @@ include::limit-query.asciidoc[]
 
 
 include::match-all-query.asciidoc[]
 include::match-all-query.asciidoc[]
 
 
+include::missing-query.asciidoc[]
+
 include::mlt-query.asciidoc[]
 include::mlt-query.asciidoc[]
 
 
 include::nested-query.asciidoc[]
 include::nested-query.asciidoc[]

+ 24 - 12
docs/reference/query-dsl/match-query.asciidoc

@@ -17,10 +17,11 @@ Note, `message` is the name of a field, you can substitute the name of
 any field (including `_all`) instead.
 any field (including `_all`) instead.
 
 
 [float]
 [float]
-==== Types of Match Queries
+=== Types of Match Queries
 
 
 [float]
 [float]
-===== boolean
+[[query-dsl-match-query-boolean]]
+==== boolean
 
 
 The default `match` query is of type `boolean`. It means that the text
 The default `match` query is of type `boolean`. It means that the text
 provided is analyzed and the analysis process constructs a boolean query
 provided is analyzed and the analysis process constructs a boolean query
@@ -34,6 +35,14 @@ The `analyzer` can be set to control which analyzer will perform the
 analysis process on the text. It defaults to the field explicit mapping
 analysis process on the text. It defaults to the field explicit mapping
 definition, or the default search analyzer.
 definition, or the default search analyzer.
 
 
+The `lenient` parameter can be set to `true` to ignore exceptions caused by
+data-type mismatches,  such as trying to query a numeric field with a text
+query string. Defaults to `false`.
+
+[[query-dsl-match-query-fuzziness]]
+[float]
+===== Fuzziness
+
 `fuzziness` allows _fuzzy matching_ based on the type of field being queried.
 `fuzziness` allows _fuzzy matching_ based on the type of field being queried.
 See <<fuzziness>> for allowed settings.
 See <<fuzziness>> for allowed settings.
 
 
@@ -59,7 +68,9 @@ change in structure, `message` is the field name):
 }
 }
 --------------------------------------------------
 --------------------------------------------------
 
 
-.zero_terms_query
+[[query-dsl-match-query-zero]]
+[float]
+===== Zero terms query
 If the analyzer used removes all tokens in a query like a `stop` filter
 If the analyzer used removes all tokens in a query like a `stop` filter
 does, the default behavior is to match no documents at all. In order to
 does, the default behavior is to match no documents at all. In order to
 change that the `zero_terms_query` option can be used, which accepts
 change that the `zero_terms_query` option can be used, which accepts
@@ -78,7 +89,10 @@ change that the `zero_terms_query` option can be used, which accepts
 }
 }
 --------------------------------------------------
 --------------------------------------------------
 
 
-.cutoff_frequency
+[[query-dsl-match-query-cutoff]]
+[float]
+===== Cutoff frequency
+
 The match query supports a `cutoff_frequency` that allows
 The match query supports a `cutoff_frequency` that allows
 specifying an absolute or relative document frequency where high
 specifying an absolute or relative document frequency where high
 frequency terms are moved into an optional subquery and are only scored
 frequency terms are moved into an optional subquery and are only scored
@@ -117,8 +131,9 @@ IMPORTANT: The `cutoff_frequency` option operates on a per-shard-level. This mea
 that when trying it out on test indexes with low document numbers you
 that when trying it out on test indexes with low document numbers you
 should follow the advice in {defguide}/relevance-is-broken.html[Relevance is broken].
 should follow the advice in {defguide}/relevance-is-broken.html[Relevance is broken].
 
 
+[[query-dsl-match-query-phrase]]
 [float]
 [float]
-===== phrase
+==== phrase
 
 
 The `match_phrase` query analyzes the text and creates a `phrase` query
 The `match_phrase` query analyzes the text and creates a `phrase` query
 out of the analyzed text. For example:
 out of the analyzed text. For example:
@@ -167,6 +182,7 @@ definition, or the default search analyzer, for example:
 --------------------------------------------------
 --------------------------------------------------
 
 
 [float]
 [float]
+[[query-dsl-match-query-phrase-prefix]]
 ===== match_phrase_prefix
 ===== match_phrase_prefix
 
 
 The `match_phrase_prefix` is the same as `match_phrase`, except that it
 The `match_phrase_prefix` is the same as `match_phrase`, except that it
@@ -213,8 +229,8 @@ For example:
 }
 }
 --------------------------------------------------
 --------------------------------------------------
 
 
-[float]
-==== Comparison to query_string / field
+.Comparison to query_string / field
+**************************************************
 
 
 The match family of queries does not go through a "query parsing"
 The match family of queries does not go through a "query parsing"
 process. It does not support field name prefixes, wildcard characters,
 process. It does not support field name prefixes, wildcard characters,
@@ -225,8 +241,4 @@ usually what a text search box does). Also, the `phrase_prefix` type can
 provide a great "as you type" behavior to automatically load search
 provide a great "as you type" behavior to automatically load search
 results.
 results.
 
 
-[float]
-==== Other options
-
-* `lenient` - If set to true will cause format based failures (like
-providing text to a numeric field) to be ignored. Defaults to false.
+**************************************************

+ 368 - 0
docs/reference/redirects.asciidoc

@@ -0,0 +1,368 @@
+["appendix",role="exclude",id="redirects"]
+= Deleted pages
+
+The following pages have moved or been deleted.
+
+[role="exclude",id="cluster-nodes-shutdown"]
+=== Nodes shutdown
+
+The `_shutdown` API has been removed.  Instead, setup Elasticsearch to run as
+a service (see <<setup-service>> or <<setup-service-win>>) or use the `-p`
+command line option to <<setup-installation-pid,write the PID to a file>>.
+
+[role="exclude",id="docs-bulk-udp"]
+=== Bulk UDP API
+
+The Bulk UDP services has been removed.  Use the standard <<docs-bulk>> instead.
+
+[role="exclude",id="indices-delete-mapping"]
+=== Delete Mapping
+
+It is no longer possible to delete the mapping for a type. Instead you should
+<<indices-delete-index,delete the index>> and recreate it with the new mappings.
+
+[role="exclude",id="indices-status"]
+=== Index Status
+
+The  index `_status` API has been replaced with the <<indices-stats>> and
+<<indices-recovery>> APIs.
+
+[role="exclude",id="mapping-analyzer-field"]
+=== `_analyzer`
+
+The `_analyzer` field in type mappings is no longer supported and will be
+automatically removed from mappings when upgrading to 2.x.
+
+[role="exclude",id="mapping-boost-field"]
+=== `_boost`
+
+The `_boost` field in type mappings is no longer supported and will be
+automatically removed from mappings when upgrading to 2.x.
+
+[role="exclude",id="mapping-conf-mappings"]
+=== Config mappings
+
+It is no longer possible to specify mappings in files in the `config`
+directory.  Instead, mappings should be created using the API with:
+
+* <<indices-create-index>>
+* <<indices-put-mapping>>
+* <<indices-templates>>
+
+[role="exclude",id="modules-memcached"]
+=== memcached
+
+The `memcached` transport is no longer supported.  Instead use the REST
+interface over <<modules-http,HTTP>> or the
+https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/index.html[Java API].
+
+[role="exclude",id="modules-thrift"]
+=== Thrift
+
+The `thrift` transport is no longer supported.  Instead use the REST
+interface over <<modules-http,HTTP>> or the
+https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/index.html[Java API].
+
+// QUERY DSL
+
+[role="exclude",id="query-dsl-queries"]
+=== Queries
+
+Queries and filters have been merged.  Any query clause can now be used as a query
+in ``query context'' and as a filter in ``filter context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-filters"]
+=== Filters
+
+Queries and filters have been merged.  Any query clause can now be used as a query
+in ``query context'' and as a filter in ``filter context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-and-filter"]
+=== And Filter
+
+The `and` filter has been replaced by the <<query-dsl-and-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-or-filter"]
+=== Or Filter
+
+The `or` filter has been replaced by the <<query-dsl-or-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-not-filter"]
+=== Not Filter
+
+The `not` filter has been replaced by the <<query-dsl-not-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-bool-filter"]
+=== Bool Filter
+
+The `bool` filter has been replaced by the <<query-dsl-bool-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-exists-filter"]
+=== Exists Filter
+
+The `exists` filter has been replaced by the <<query-dsl-exists-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-missing-filter"]
+=== Missing Filter
+
+The `missing` filter has been replaced by the <<query-dsl-missing-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+
+[role="exclude",id="query-dsl-geo-bounding-box-filter"]
+=== Geo Bounding Box Filter
+
+The `geo_bounding_box` filter has been replaced by the <<query-dsl-geo-bounding-box-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-geo-distance-filter"]
+=== Geo Distance Filter
+
+The `geo_distance` filter has been replaced by the <<query-dsl-geo-distance-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-geo-distance-range-filter"]
+=== Geo Distance Range Filter
+
+The `geo_distance_range` filter has been replaced by the <<query-dsl-geo-distance-range-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-geo-polygon-filter"]
+=== Geo Polygon Filter
+
+The `geo_polygon` filter has been replaced by the <<query-dsl-geo-polygon-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-geo-shape-filter"]
+=== Geo Shape Filter
+
+The `geo_shape` filter has been replaced by the <<query-dsl-geo-shape-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-geohash-cell-filter"]
+=== Geohash Cell Filter
+
+The `geohash_cell` filter has been replaced by the <<query-dsl-geohash-cell-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-has-child-filter"]
+=== Has Child Filter
+
+The `has_child` filter has been replaced by the <<query-dsl-has-child-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-has-parent-filter"]
+=== Has Parent Filter
+
+The `has_parent` filter has been replaced by the <<query-dsl-has-parent-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-top-children-query"]
+=== Top Children Query
+
+The `top_children` query has been removed. Use the <<query-dsl-has-child-query>> instead.
+
+[role="exclude",id="query-dsl-ids-filter"]
+=== IDs Filter
+
+The `ids` filter has been replaced by the <<query-dsl-ids-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-indices-filter"]
+=== Indices Filter
+
+The `indices` filter has been replaced by the <<query-dsl-indices-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-limit-filter"]
+=== Limit Filter
+
+The `limit` filter has been replaced by the <<query-dsl-limit-query>>.
+It behaves as a query in ``query context'' and as a filter in ``filter
+context'' (see <<query-dsl>>).
+
+[role="exclude",id="query-dsl-match-all-filter"]
+=== Match All Filter
+
+The `match_all` filter has been replaced by the <<query-dsl-match-all-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-nested-filter"]
+=== Nested Filter
+
+The `nested` filter has been replaced by the <<query-dsl-nested-query>>.  It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-prefix-filter"]
+=== Prefix Filter
+
+The `prefix` filter has been replaced by the <<query-dsl-prefix-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-query-filter"]
+=== Query Filter
+
+The `query` filter has been removed as queries and filters have been merged (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-range-filter"]
+=== Range Filter
+
+The `range` filter has been replaced by the <<query-dsl-range-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-regexp-filter"]
+=== Regexp Filter
+
+The `regexp` filter has been replaced by the <<query-dsl-regexp-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-script-filter"]
+=== Script Filter
+
+The `script` filter has been replaced by the <<query-dsl-script-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-term-filter"]
+=== Term Filter
+
+The `term` filter has been replaced by the <<query-dsl-term-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-terms-filter"]
+=== Terms Filter
+
+The `terms` filter has been replaced by the <<query-dsl-terms-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-type-filter"]
+=== Type Filter
+
+The `type` filter has been replaced by the <<query-dsl-type-query>>. It behaves
+as a query in ``query context'' and as a filter in ``filter context'' (see
+<<query-dsl>>).
+
+[role="exclude",id="query-dsl-flt-query"]
+=== Fuzzy Like This Query
+
+The `fuzzy_like_this` or `flt` query has been removed.  Instead use
+the <<query-dsl-match-query-fuzziness,`fuzziness`>> parameter with the
+<<query-dsl-match-query,`match` query>> or the <<query-dsl-mlt-query>>.
+
+
+[role="exclude",id="query-dsl-flt-field-query"]
+=== Fuzzy Like This Field Query
+
+The `fuzzy_like_this_field` or `flt_field` query has been removed.  Instead use
+the <<query-dsl-match-query-fuzziness,`fuzziness`>> parameter with the
+<<query-dsl-match-query,`match` query>> or the <<query-dsl-mlt-query>>.
+
+[role="exclude",id="search-more-like-this"]
+=== More Like This API
+
+The More Like This API has been removed. Instead, use the <<query-dsl-mlt-query>>.
+
+// FACETS
+
+[role="exclude",id="search-facets-filter-facet"]
+=== Filter Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-filter-aggregation,`filter` aggregation>> or
+<<search-aggregations-bucket-filters-aggregation,`filters` aggregation>> instead.
+
+[role="exclude",id="search-facets-query-facet"]
+=== Query Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-filter-aggregation,`filter` aggregation>> or
+<<search-aggregations-bucket-filters-aggregation,`filters` aggregation>> instead.
+
+[role="exclude",id="search-facets-geo-distance-facet"]
+=== Geo Distance Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-geodistance-aggregation,`geo_distance` aggregation>> instead.
+
+[role="exclude",id="search-facets-histogram-facet"]
+=== Histogram Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-histogram-aggregation,`histogram` aggregation>> instead.
+
+[role="exclude",id="search-facets-date-histogram-facet"]
+=== Date Histogram Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-datehistogram-aggregation,`date_histogram` aggregation>> instead.
+
+[role="exclude",id="search-facets-range-facet"]
+=== Range Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-range-aggregation,`range` aggregation>> instead.
+
+[role="exclude",id="search-facets-terms-facet"]
+=== Terms Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-terms-aggregation,`terms` aggregation>> instead.
+
+[role="exclude",id="search-facets-terms-statistical-facet"]
+=== Terms Stats Facet
+
+Facets have been removed. Use the
+<<search-aggregations-bucket-terms-aggregation,`terms` aggregation>>
+with the <<search-aggregations-metrics-stats-aggregation,`stats` aggregation>>
+or the <<search-aggregations-metrics-extendedstats-aggregation,`extended_stats` aggregation>>
+instead.
+
+[role="exclude",id="search-facets-statistical-facet"]
+=== Statistical Facet
+
+Facets have been removed. Use the
+<<search-aggregations-metrics-stats-aggregation,`stats` aggregation>>
+or the <<search-aggregations-metrics-extendedstats-aggregation,`extended_stats` aggregation>>  instead.
+
+[role="exclude",id="search-facets-migrating-to-aggs"]
+=== Migrating from facets to aggregations
+
+Facets have been removed. Use <<search-aggregations>> instead.
+
+
+
+
+
+
+
+
+

+ 25 - 2
docs/reference/setup.asciidoc

@@ -14,7 +14,7 @@ See <<setup-repositories>>.
 [float]
 [float]
 == Installation
 == Installation
 
 
-After link:/download[downloading] the latest release and extracting it,
+After link:/downloads/elasticsearch[downloading] the latest release and extracting it,
 *elasticsearch* can be started using:
 *elasticsearch* can be started using:
 
 
 [source,sh]
 [source,sh]
@@ -22,7 +22,12 @@ After link:/download[downloading] the latest release and extracting it,
 $ bin/elasticsearch
 $ bin/elasticsearch
 --------------------------------------------------
 --------------------------------------------------
 
 
-Under *nix system, the command will start the process in the foreground.
+On *nix systems, the command will start the process in the foreground.
+
+[[setup-installation-daemon]]
+[float]
+=== Running as a daemon
+
 To run it in the background, add the `-d` switch to it:
 To run it in the background, add the `-d` switch to it:
 
 
 [source,sh]
 [source,sh]
@@ -30,6 +35,24 @@ To run it in the background, add the `-d` switch to it:
 $ bin/elasticsearch -d
 $ bin/elasticsearch -d
 --------------------------------------------------
 --------------------------------------------------
 
 
+[[setup-installation-pid]]
+[float]
+=== PID
+
+The Elasticsearch process can write its PID to a specified file on startup,
+making it easy to shut down the process later on:
+
+[source,sh]
+--------------------------------------------------
+$ bin/elasticsearch -d -p pid <1>
+$ kill `cat pid` <2>
+--------------------------------------------------
+<1> The PID is written to a file called `pid`.
+<2> The `kill` command sends a `TERM` signal to the PID stored in the `pid` file.
+
+NOTE: The startup scripts provided for <<setup-service,Linux>> and <<setup-service-win,Windows>>
+take care of starting and stopping the Elasticsearch process for you.
+
 .*NIX
 .*NIX
 *************************************************************************
 *************************************************************************
 There are added features when using the `elasticsearch` shell script.
 There are added features when using the `elasticsearch` shell script.