Skip to content

Commit ece13d9

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 0ef36a1 + b5d5229 commit ece13d9

File tree

66 files changed

+1770
-676
lines changed

Some content is hidden

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

66 files changed

+1770
-676
lines changed

docs/changelog/128399.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128399
2+
summary: Allow missing shard stats for restarted nodes for `_snapshot/_status`
3+
area: Snapshot/Restore
4+
type: enhancement
5+
issues: []

docs/changelog/128531.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/128925.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128925
2+
summary: ES|QL - Add `match_phrase` full text function (tech preview)
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/reference/query-languages/esql/_snippets/functions/description/match_phrase.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/match_phrase.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
* [preview] [`KQL`](../../functions-operators/search-functions.md#esql-kql)
22
* [preview] [`MATCH`](../../functions-operators/search-functions.md#esql-match)
3-
% * [preview] [
4-
`MATCH_PHRASE`](../../functions-operators/search-functions.md#esql-match-phrase)
3+
* [preview] [`MATCH_PHRASE`](../../functions-operators/search-functions.md#esql-match_phrase)
54
* [preview] [`QSTR`](../../functions-operators/search-functions.md#esql-qstr)
65
% * [preview] [
76
`TERM`](../../functions-operators/search-functions.md#esql-term)

docs/reference/query-languages/esql/functions-operators/search-functions.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ for information on the limitations of full text search.
3636
:::{include} ../_snippets/functions/layout/match.md
3737
:::
3838

39-
% MATCH_PHRASE is currently hidden
40-
% :::{include} ../_snippets/functions/layout/match_phrase.md
41-
% :::
39+
:::{include} ../_snippets/functions/layout/match_phrase.md
40+
:::
4241

4342
:::{include} ../_snippets/functions/layout/qstr.md
4443
:::

docs/reference/query-languages/esql/kibana/definition/functions/match_phrase.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/docs/functions/match_phrase.md

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libs/entitlement/asm-provider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@
3737
import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES;
3838
import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
3939
import static org.objectweb.asm.Opcodes.ACC_STATIC;
40+
import static org.objectweb.asm.Opcodes.CHECKCAST;
4041
import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
4142
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
4243

43-
public class InstrumenterImpl implements Instrumenter {
44+
public final class InstrumenterImpl implements Instrumenter {
4445
private static final Logger logger = LogManager.getLogger(InstrumenterImpl.class);
4546

4647
private final String getCheckerClassMethodDescriptor;
@@ -271,7 +272,8 @@ public void visitCode() {
271272
}
272273

273274
private void pushEntitlementChecker() {
274-
InstrumenterImpl.this.pushEntitlementChecker(mv);
275+
mv.visitMethodInsn(INVOKESTATIC, handleClass, "instance", getCheckerClassMethodDescriptor, false);
276+
mv.visitTypeInsn(CHECKCAST, checkMethod.className());
275277
}
276278

277279
private void pushCallerClass() {
@@ -319,10 +321,7 @@ private void invokeInstrumentationMethod() {
319321
true
320322
);
321323
}
322-
}
323324

324-
protected void pushEntitlementChecker(MethodVisitor mv) {
325-
mv.visitMethodInsn(INVOKESTATIC, handleClass, "instance", getCheckerClassMethodDescriptor, false);
326325
}
327326

328327
record ClassFileInfo(String fileName, byte[] bytecodes) {}

0 commit comments

Comments
 (0)