Skip to content

Commit 717da47

Browse files
martijnvgmartijnvg
committed
Merge remote-tracking branch 'es/main' into DocumentParserContext_cleanup
2 parents b629d77 + 6dfb5dc commit 717da47

File tree

13 files changed

+93
-14
lines changed

13 files changed

+93
-14
lines changed

‎docs/reference/search-connectors/release-notes.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,33 @@ If you are an Enterprise Search user and want to upgrade to Elastic 9.0, refer t
1313
It includes detailed steps, tooling, and resources to help you transition to supported alternatives in 9.x, such as Elasticsearch, the Open Web Crawler, and self-managed connectors.
1414
:::
1515

16+
## 9.1.2 [connectors-9.1.2-release-notes]
17+
There are no new features, enhancements, fixes, known issues, or deprecations associated with this release.
18+
19+
## 9.1.1 [connectors-9.1.1-release-notes]
20+
21+
### Fixes [connectors-9.1.1-fixes]
22+
23+
:::{dropdown} Resolves missing access control for “Everyone Except External Users” in SharePoint connector
24+
25+
Permissions granted to the `Everyone Except External Users` group were previously ignored, causing incomplete access control metadata in documents. This occurred because the connector did not recognize the group’s login name format.
26+
[#3577](https://github.com/elastic/connectors/pull/3577) resolves this issue by recognizing the group’s login format and correctly applying its permissions to document access control metadata.
27+
:::
28+
29+
## 9.1.0 [connectors-9.1.0-release-notes]
30+
There are no new features, enhancements, fixes, known issues, or deprecations associated with this release.
31+
32+
## 9.0.5 [connectors-9.0.5-release-notes]
33+
34+
### Fixes [connectors-9.0.5-fixes]
35+
36+
:::{dropdown} Resolves missing access control for `Everyone Except External Users` in SharePoint connector
37+
Permissions granted to the `Everyone Except External Users` group were previously ignored, causing incomplete access control metadata in documents. This occurred because the connector did not recognize the group’s login name format. [#3577](https://github.com/elastic/connectors/pull/3577) resolves this issue by recognizing the group’s login format and correctly applying its permissions to document access control metadata.
38+
:::
39+
40+
## 9.0.4 [connectors-9.0.4-release-notes]
41+
No changes since 9.0.3
42+
1643
## 9.0.3 [connectors-9.0.3-release-notes]
1744

1845
### Features and enhancements [connectors-9.0.3-features-enhancements]

‎muted-tests.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,21 @@ tests:
558558
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
559559
method: test {p0=search/510_range_query_out_of_bounds/Test range query for float field with out of bounds lower limit}
560560
issue: https://github.com/elastic/elasticsearch/issues/133012
561+
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
562+
method: test {p0=field_caps/10_basic/Field caps for boolean field with only doc values}
563+
issue: https://github.com/elastic/elasticsearch/issues/133019
564+
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
565+
method: test {p0=search/160_exists_query/Test exists query on unmapped boolean field}
566+
issue: https://github.com/elastic/elasticsearch/issues/133029
567+
- class: org.elasticsearch.xpack.remotecluster.RemoteClusterSecurityEsqlIT
568+
method: testCrossClusterEnrichWithOnlyRemotePrivs
569+
issue: https://github.com/elastic/elasticsearch/issues/133031
570+
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
571+
method: test {p0=search.vectors/45_knn_search_bit/Vector similarity with filter only}
572+
issue: https://github.com/elastic/elasticsearch/issues/133037
573+
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
574+
method: test {p0=search.vectors/45_knn_search_bit/Vector rescoring has no effect for non-quantized vectors and provides same results as non-rescored knn}
575+
issue: https://github.com/elastic/elasticsearch/issues/133039
561576

562577
# Examples:
563578
#

‎server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,10 +1276,10 @@ public long longValue() throws IOException {
12761276
valuesData.seek(indexReader.get(blockIndex));
12771277
}
12781278
currentBlockIndex = blockIndex;
1279-
if (maxOrd >= 0) {
1280-
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
1281-
} else {
1279+
if (bitsPerOrd == -1) {
12821280
decoder.decode(valuesData, currentBlock);
1281+
} else {
1282+
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
12831283
}
12841284
return currentBlock[blockInIndex];
12851285
}
@@ -1347,7 +1347,7 @@ long lookAheadValueAt(int targetDoc) throws IOException {
13471347
if (lookaheadBlockIndex + 1 != blockIndex) {
13481348
lookaheadData.seek(indexReader.get(blockIndex));
13491349
}
1350-
if (maxOrd == -1L) {
1350+
if (bitsPerOrd == -1) {
13511351
decoder.decode(lookaheadData, lookaheadBlock);
13521352
} else {
13531353
decoder.decodeOrdinals(lookaheadData, lookaheadBlock, bitsPerOrd);
@@ -1417,10 +1417,10 @@ public long longValue() throws IOException {
14171417
valuesData.seek(indexReader.get(blockIndex));
14181418
}
14191419
currentBlockIndex = blockIndex;
1420-
if (maxOrd >= 0) {
1421-
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
1422-
} else {
1420+
if (bitsPerOrd == -1) {
14231421
decoder.decode(valuesData, currentBlock);
1422+
} else {
1423+
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
14241424
}
14251425
}
14261426
return currentBlock[blockInIndex];
@@ -1452,10 +1452,10 @@ long advance(long index) throws IOException {
14521452
valuesData.seek(indexReader.get(blockIndex));
14531453
}
14541454
currentBlockIndex = blockIndex;
1455-
if (bitsPerOrd >= 0) {
1456-
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
1457-
} else {
1455+
if (bitsPerOrd == -1) {
14581456
decoder.decode(valuesData, currentBlock);
1457+
} else {
1458+
decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
14591459
}
14601460
}
14611461
return currentBlock[blockInIndex];

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/DataPartitioning.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77

88
package org.elasticsearch.compute.lucene;
99

10+
import org.apache.lucene.search.Query;
1011
import org.elasticsearch.compute.operator.Driver;
1112

1213
import java.util.List;
14+
import java.util.function.Function;
1315

1416
/**
1517
* How we partition the data across {@link Driver}s. Each request forks into
@@ -54,5 +56,19 @@ public enum DataPartitioning {
5456
* their own tasks. See {@link LuceneSliceQueue#nextSlice(LuceneSlice)}.</li>
5557
* </ol>
5658
*/
57-
DOC
59+
DOC;
60+
61+
@FunctionalInterface
62+
public interface AutoStrategy {
63+
Function<Query, LuceneSliceQueue.PartitioningStrategy> pickStrategy(int limit);
64+
65+
AutoStrategy DEFAULT = LuceneSourceOperator.Factory::autoStrategy;
66+
AutoStrategy DEFAULT_TIME_SERIES = limit -> {
67+
if (limit == LuceneOperator.NO_LIMIT) {
68+
return q -> LuceneSliceQueue.PartitioningStrategy.DOC;
69+
} else {
70+
return DEFAULT.pickStrategy(limit);
71+
}
72+
};
73+
}
5874
}

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSourceOperator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public Factory(
6868
List<? extends ShardContext> contexts,
6969
Function<ShardContext, List<LuceneSliceQueue.QueryAndTags>> queryFunction,
7070
DataPartitioning dataPartitioning,
71+
DataPartitioning.AutoStrategy autoStrategy,
7172
int taskConcurrency,
7273
int maxPageSize,
7374
int limit,
@@ -77,7 +78,7 @@ public Factory(
7778
contexts,
7879
queryFunction,
7980
dataPartitioning,
80-
autoStrategy(limit),
81+
autoStrategy.pickStrategy(limit),
8182
taskConcurrency,
8283
limit,
8384
needsScore,

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/OperatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ static LuceneOperator.Factory luceneOperatorFactory(IndexReader reader, List<Luc
381381
List.of(searchContext),
382382
ctx -> queryAndTags,
383383
randomFrom(DataPartitioning.values()),
384+
DataPartitioning.AutoStrategy.DEFAULT,
384385
randomIntBetween(1, 10),
385386
randomPageSize(),
386387
limit,

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneQueryEvaluatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ private static LuceneOperator.Factory luceneOperatorFactory(IndexReader reader,
279279
List.of(searchContext),
280280
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(query, List.of())),
281281
randomFrom(DataPartitioning.values()),
282+
DataPartitioning.AutoStrategy.DEFAULT,
282283
randomIntBetween(1, 10),
283284
randomPageSize(),
284285
LuceneOperator.NO_LIMIT,

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneSourceOperatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ private LuceneSourceOperator.Factory simple(DataPartitioning dataPartitioning, i
224224
List.of(ctx),
225225
queryFunction,
226226
dataPartitioning,
227+
DataPartitioning.AutoStrategy.DEFAULT,
227228
taskConcurrency,
228229
maxPageSize,
229230
limit,

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValueSourceReaderTypeConversionTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ private SourceOperator simpleInput(DriverContext context, int size, int commitEv
277277
shardContexts,
278278
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
279279
DataPartitioning.SHARD,
280+
DataPartitioning.AutoStrategy.DEFAULT,
280281
1,// randomIntBetween(1, 10),
281282
pageSize,
282283
LuceneOperator.NO_LIMIT,
@@ -1312,6 +1313,7 @@ public void testWithNulls() throws IOException {
13121313
List.of(shardContext),
13131314
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
13141315
randomFrom(DataPartitioning.values()),
1316+
DataPartitioning.AutoStrategy.DEFAULT,
13151317
randomIntBetween(1, 10),
13161318
randomPageSize(),
13171319
LuceneOperator.NO_LIMIT,
@@ -1473,6 +1475,7 @@ public void testManyShards() throws IOException {
14731475
contexts,
14741476
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
14751477
DataPartitioning.SHARD,
1478+
DataPartitioning.AutoStrategy.DEFAULT,
14761479
randomIntBetween(1, 10),
14771480
1000,
14781481
LuceneOperator.NO_LIMIT,

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ private SourceOperator sourceOperator(DriverContext context, int pageSize) {
195195
List.of(new LuceneSourceOperatorTests.MockShardContext(reader, 0)),
196196
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
197197
DataPartitioning.SHARD,
198+
DataPartitioning.AutoStrategy.DEFAULT,
198199
randomIntBetween(1, 10),
199200
pageSize,
200201
LuceneOperator.NO_LIMIT,
@@ -1506,6 +1507,7 @@ public void testWithNulls() throws IOException {
15061507
List.of(new LuceneSourceOperatorTests.MockShardContext(reader, 0)),
15071508
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
15081509
randomFrom(DataPartitioning.values()),
1510+
DataPartitioning.AutoStrategy.DEFAULT,
15091511
randomIntBetween(1, 10),
15101512
randomPageSize(),
15111513
LuceneOperator.NO_LIMIT,
@@ -1755,6 +1757,7 @@ public void testManyShards() throws IOException {
17551757
contexts,
17561758
ctx -> List.of(new LuceneSliceQueue.QueryAndTags(new MatchAllDocsQuery(), List.of())),
17571759
DataPartitioning.SHARD,
1760+
DataPartitioning.AutoStrategy.DEFAULT,
17581761
randomIntBetween(1, 10),
17591762
1000,
17601763
LuceneOperator.NO_LIMIT,

0 commit comments

Comments
 (0)