Skip to content

Commit

Permalink
Merge branch 'main' into st_extent_optimize_geoshape
Browse files Browse the repository at this point in the history
  • Loading branch information
craigtaverner authored Jan 14, 2025
2 parents 44d0392 + 212e16b commit 7c3957c
Show file tree
Hide file tree
Showing 22 changed files with 895 additions and 1,309 deletions.
13 changes: 13 additions & 0 deletions docs/changelog/119227.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
pr: 119227
summary: Remove unfreeze REST endpoint
area: Indices APIs
type: breaking
issues: []
breaking:
title: Remove unfreeze REST endpoint
area: REST API
details: >-
The `/{index}/_unfreeze` REST endpoint is no longer supported. This API was deprecated, and the corresponding
`/{index}/_freeze` endpoint was removed in 8.0.
impact: None, since it is not possible to have a frozen index in a version which is readable by Elasticsearch 9.0
notable: false
12 changes: 12 additions & 0 deletions docs/changelog/119846.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
pr: 119846
summary: Drop support for brackets from METADATA syntax
area: ES|QL
type: deprecation
issues:
- 115401
deprecation:
title: Drop support for brackets from METADATA syntax
area: ES|QL
details: Please describe the details of this change for the release notes. You can
use asciidoc.
impact: Please describe the impact of this change to users
2 changes: 0 additions & 2 deletions docs/reference/indices.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ index settings, aliases, mappings, and index templates.
* <<indices-split-index>>
* <<indices-clone-index>>
* <<indices-rollover-index>>
* <<unfreeze-index-api>>
* <<indices-resolve-index-api>>
* <<indices-resolve-cluster-api>>
* <<indices-downsample-data-stream>>
Expand Down Expand Up @@ -143,6 +142,5 @@ include::indices/shrink-index.asciidoc[]
include::indices/simulate-index.asciidoc[]
include::indices/simulate-template.asciidoc[]
include::indices/split-index.asciidoc[]
include::indices/apis/unfreeze.asciidoc[]
include::indices/update-settings.asciidoc[]
include::indices/put-mapping.asciidoc[]
61 changes: 0 additions & 61 deletions docs/reference/indices/apis/unfreeze.asciidoc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/reference/indices/index-mgmt.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ For more information on managing indices, refer to <<indices, Index APIs>>.

* To filter the list of indices, use the search bar or click a badge.
Badges indicate if an index is a <<ccr-put-follow,follower index>>, a
<<rollup-get-rollup-index-caps,rollup index>>, or <<unfreeze-index-api,frozen>>.
<<rollup-get-rollup-index-caps,rollup index>>, or <<frozen-indices,frozen>>.

* To drill down into the index
<<mapping,mappings>>, <<index-modules-settings,settings>>, and statistics,
Expand Down
16 changes: 12 additions & 4 deletions docs/reference/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,16 @@ See <<restore-entire-cluster>>.
The freeze index API was removed in 8.0.
// tag::frozen-removal-explanation[]
Frozen indices are no longer useful due to
https://www.elastic.co/blog/significantly-decrease-your-elasticsearch-heap-memory-usage[recent
improvements in heap memory usage].
https://www.elastic.co/blog/significantly-decrease-your-elasticsearch-heap-memory-usage[improvements
in heap memory usage].
// end::frozen-removal-explanation[]

[role="exclude",id="unfreeze-index-api"]
=== Unfreeze index API

The unfreeze index API was removed in 9.0.
include::redirects.asciidoc[tag=frozen-removal-explanation]

[role="exclude",id="ilm-freeze"]
=== Freeze {ilm-init} action

Expand Down Expand Up @@ -1749,8 +1755,10 @@ See <<search-terms-enum>>.
=== Frozen indices

// tag::frozen-index-redirect[]

For API documentation, see <<unfreeze-index-api>>.
Older versions of {es} provided the option to reduce the amount of data kept in memory for an index, at the expense of
increasing search latency. This was known as 'freezing' the index.
include::redirects.asciidoc[tag=frozen-removal-explanation]
The freeze index API was removed in 8.0, and the unfreeze index API was removed in 9.0.
// end::frozen-index-redirect[]

[role="exclude",id="best_practices"]
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/sql/language/indices.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ requires the keyword `LIKE` for SQL `LIKE` pattern.
[[sql-index-frozen]]
=== Frozen Indices

By default, {es-sql} doesn't search <<unfreeze-index-api,frozen indices>>. To
By default, {es-sql} doesn't search <<frozen-indices,frozen indices>>. To
search frozen indices, use one of the following features:

dedicated configuration parameter::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;

import java.util.Locale;

@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
@ThreadLeakScope(ThreadLeakScope.Scope.NONE) // https://github.com/elastic/elasticsearch/issues/102482
public class RepositoryS3MinioBasicCredentialsRestIT extends AbstractRepositoryS3RestTestCase {

private static final String PREFIX = getIdentifierPrefix("RepositoryS3MinioBasicCredentialsRestIT");
private static final String PREFIX = getIdentifierPrefix("RepositoryS3MinioBasicCredentialsRestIT").toLowerCase(Locale.ROOT);
private static final String BUCKET = PREFIX + "bucket";
private static final String BASE_PATH = PREFIX + "base_path";
private static final String BASE_PATH = PREFIX + "base-path";
private static final String ACCESS_KEY = PREFIX + "access-key";
private static final String SECRET_KEY = PREFIX + "secret-key";
private static final String CLIENT = "minio_client";
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {

private static final int servicePort = 9000;
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2021-03-01T04-20-55Z";
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
private final boolean enabled;

public MinioTestContainer(boolean enabled, String accessKey, String secretKey, String bucketName) {
Expand Down
9 changes: 0 additions & 9 deletions x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,9 @@ indexString
;

metadata
: metadataOption
| deprecated_metadata
;

metadataOption
: METADATA UNQUOTED_SOURCE (COMMA UNQUOTED_SOURCE)*
;

deprecated_metadata
: OPENING_BRACKET metadataOption CLOSING_BRACKET
;

metricsCommand
: DEV_METRICS indexPattern (COMMA indexPattern)* aggregates=aggFields? (BY grouping=fields)?
;
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 7c3957c

Please sign in to comment.