Skip to content

Commit 1d5d428

Browse files
Merge branch 'main' into poc_runtime_function_evaluators_code_only
2 parents c8d3424 + 6394d6a commit 1d5d428

File tree

141 files changed

+2171
-1790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+2171
-1790
lines changed

docs/changelog/142834.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
area: ES|QL
2+
issues: []
3+
pr: 142834
4+
summary: Remove snapshot protection from node reduce late materialization
5+
type: feature

docs/reference/query-languages/esql/_snippets/lists/processing-commands.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
* [`LOOKUP JOIN`](/reference/query-languages/esql/commands/lookup-join.md)
1313
* [`INLINE STATS`](/reference/query-languages/esql/commands/inlinestats-by.md)
1414
* [`MV_EXPAND`](/reference/query-languages/esql/commands/mv_expand.md) {applies_to}`stack: preview` {applies_to}`serverless: preview`
15-
* [`REGISTERED_DOMAIN`](/reference/query-languages/esql/commands/registered-domain.md) {applies_to}`stack: preview 9.4` {applies_to}`serverless: preview`
15+
% * [`REGISTERED_DOMAIN`](/reference/query-languages/esql/commands/registered-domain.md) {applies_to}`stack: preview 9.4` {applies_to}`serverless: preview`
1616
* [`RENAME`](/reference/query-languages/esql/commands/rename.md)
1717
* [`RERANK`](/reference/query-languages/esql/commands/rerank.md) {applies_to}`stack: preview` {applies_to}`serverless: preview`
1818
* [`SAMPLE`](/reference/query-languages/esql/commands/sample.md) {applies_to}`stack: preview` {applies_to}`serverless: preview`
1919
* [`SORT`](/reference/query-languages/esql/commands/sort.md)
2020
* [`STATS`](/reference/query-languages/esql/commands/stats-by.md)
21-
* [`URI_PARTS`](/reference/query-languages/esql/commands/uri-parts.md) {applies_to}`stack: preview 9.4` {applies_to}`serverless: preview`
21+
% * [`URI_PARTS`](/reference/query-languages/esql/commands/uri-parts.md) {applies_to}`stack: preview 9.4` {applies_to}`serverless: preview`
2222
* [`WHERE`](/reference/query-languages/esql/commands/where.md)

docs/reference/query-languages/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ toc:
124124
- file: esql/commands/limit.md
125125
- file: esql/commands/lookup-join.md
126126
- file: esql/commands/mv_expand.md
127-
- file: esql/commands/registered-domain.md
127+
- hidden: esql/commands/registered-domain.md
128128
- file: esql/commands/rename.md
129129
- file: esql/commands/rerank.md
130130
- file: esql/commands/sample.md
131131
- file: esql/commands/sort.md
132132
- file: esql/commands/stats-by.md
133-
- file: esql/commands/uri-parts.md
133+
- hidden: esql/commands/uri-parts.md
134134
- file: esql/commands/where.md
135135
- file: esql/esql-functions-operators.md
136136
children:

modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,25 @@ private static int getLevels(int treeLevels, double precisionInMeters, int defau
352352
return defaultLevels;
353353
}
354354

355+
@Override
356+
public String contentType() {
357+
return CONTENT_TYPE;
358+
}
359+
360+
@Override
361+
protected void throwMergeTypeConflict(FieldMapper.Builder incoming, String fullName) {
362+
if (CONTENT_TYPE.equals(incoming.contentType())) {
363+
throw new IllegalArgumentException(
364+
"mapper ["
365+
+ fullName
366+
+ "] of type [geo_shape] cannot change strategy from ["
367+
+ strategy.get().getStrategyName()
368+
+ "] to [BKD]"
369+
);
370+
}
371+
super.throwMergeTypeConflict(incoming, fullName);
372+
}
373+
355374
@Override
356375
public LegacyGeoShapeFieldMapper build(MapperBuilderContext context) {
357376
LegacyGeoShapeParser parser = new LegacyGeoShapeParser();

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,11 @@ private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context, Mult
210210
);
211211
}
212212

213+
@Override
214+
public String contentType() {
215+
return CONTENT_TYPE;
216+
}
217+
213218
@Override
214219
public MatchOnlyTextFieldMapper build(MapperBuilderContext context) {
215220
BuilderParams builderParams = builderParams(this, context);

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ protected Parameter<?>[] getParameters() {
8989
return new Parameter<?>[] { positiveScoreImpact, nullValue, meta };
9090
}
9191

92+
@Override
93+
public String contentType() {
94+
return CONTENT_TYPE;
95+
}
96+
9297
@Override
9398
public RankFeatureFieldMapper build(MapperBuilderContext context) {
9499
return new RankFeatureFieldMapper(

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ protected Parameter<?>[] getParameters() {
6363
return new Parameter<?>[] { positiveScoreImpact, meta };
6464
}
6565

66+
@Override
67+
public String contentType() {
68+
return CONTENT_TYPE;
69+
}
70+
6671
@Override
6772
public RankFeaturesFieldMapper build(MapperBuilderContext context) {
6873
return new RankFeaturesFieldMapper(

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ private IndexType indexType() {
206206
return IndexType.points(false, hasDocValues.getValue());
207207
}
208208

209+
@Override
210+
public String contentType() {
211+
return CONTENT_TYPE;
212+
}
213+
209214
@Override
210215
public ScaledFloatFieldMapper build(MapperBuilderContext context) {
211216
ScaledFloatFieldType type = new ScaledFloatFieldType(

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ protected Parameter<?>[] getParameters() {
174174
meta };
175175
}
176176

177+
@Override
178+
public String contentType() {
179+
return CONTENT_TYPE;
180+
}
181+
177182
@Override
178183
public SearchAsYouTypeFieldMapper build(MapperBuilderContext context) {
179184

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ protected Parameter<?>[] getParameters() {
7676
return new Parameter<?>[] { index, hasDocValues, store, analyzer, nullValue, enablePositionIncrements, meta };
7777
}
7878

79+
@Override
80+
public String contentType() {
81+
return CONTENT_TYPE;
82+
}
83+
7984
@Override
8085
public TokenCountFieldMapper build(MapperBuilderContext context) {
8186
if (analyzer.getValue() == null) {

0 commit comments

Comments
 (0)