Merge branch 'main' into entitlements/fix-multiple-version-checker-initialization-2

Author: ldematte

docs/changelog/121193.yaml

@@ -0,0 +1,18 @@
+pr: 121193
+summary: Enable LOOKUP JOIN in non-snapshot builds
+area: ES|QL
+type: enhancement
+issues:
+ - 121185
+highlight:
+  title: Enable LOOKUP JOIN in non-snapshot builds
+  body: |-
+    This effectively releases LOOKUP JOIN into tech preview. Docs will
+    follow in a separate PR.
+
+    - Enable the lexing/grammar for LOOKUP JOIN in non-snapshot builds.
+    - Remove the grammar for the unsupported `| JOIN ...` command (without `LOOKUP` as first keyword). The way the lexer modes work, otherwise we'd also have to enable `| JOIN ...` syntax on non-snapshot builds and would have to add additional validation to provide appropriate error messages.
+    - Remove grammar for `LOOKUP JOIN index AS ...` because qualifiers are not yet supported. Otherwise we'd have to put in additional validation as well to prevent such queries.
+
+    Also fix https://github.com/elastic/elasticsearch/issues/121185
+  notable: true

docs/changelog/121283.yaml

@@ -0,0 +1,5 @@
+pr: 121283
+summary: Cheaper snapshot-related `toString()` impls
+area: Snapshot/Restore
+type: bug
+issues: []

muted-tests.yml

@@ -314,8 +314,6 @@ tests:
 - class: org.elasticsearch.xpack.security.profile.ProfileIntegTests
   method: testSetEnabled
   issue: https://github.com/elastic/elasticsearch/issues/121183
-- class: org.elasticsearch.xpack.esql.optimizer.LogicalPlanOptimizerTests
-  issue: https://github.com/elastic/elasticsearch/issues/121185
 - class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
   method: test {yaml=cat.aliases/10_basic/Simple alias}
   issue: https://github.com/elastic/elasticsearch/issues/121186
@@ -372,6 +370,9 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/121293
 - class: org.elasticsearch.xpack.inference.common.InferenceServiceNodeLocalRateLimitCalculatorTests
   issue: https://github.com/elastic/elasticsearch/issues/121294
+- class: org.elasticsearch.entitlement.runtime.policy.PolicyManagerTests
+  method: testDuplicateFlagEntitlements
+  issue: https://github.com/elastic/elasticsearch/issues/121300
 
 # Examples:
 #

server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotsServiceIT.java

@@ -17,10 +17,12 @@
 import org.elasticsearch.cluster.SnapshotDeletionsInProgress;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.cluster.service.MasterService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.snapshots.mockstore.MockRepository;
 import org.elasticsearch.test.ClusterServiceUtils;
 import org.elasticsearch.test.MockLog;
+import org.elasticsearch.test.junit.annotations.TestLogging;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -223,4 +225,30 @@ public void testRerouteWhenShardSnapshotsCompleted() throws Exception {
         safeAwait(shardMovedListener);
         ensureGreen(indexName);
     }
+
+    @TestLogging(reason = "testing task description, logged at DEBUG", value = "org.elasticsearch.cluster.service.MasterService:DEBUG")
+    public void testCreateSnapshotTaskDescription() {
+        createIndexWithRandomDocs(randomIdentifier(), randomIntBetween(1, 5));
+        final var repositoryName = randomIdentifier();
+        createRepository(repositoryName, "mock");
+
+        final var snapshotName = randomIdentifier();
+        MockLog.assertThatLogger(
+            () -> createFullSnapshot(repositoryName, snapshotName),
+            MasterService.class,
+            new MockLog.SeenEventExpectation(
+                "executing cluster state update debug message",
+                MasterService.class.getCanonicalName(),
+                Level.DEBUG,
+                "executing cluster state update for [create_snapshot ["
+                    + snapshotName
+                    + "][CreateSnapshotTask{repository="
+                    + repositoryName
+                    + ", snapshot=*"
+                    + snapshotName
+                    + "*}]]"
+            )
+        );
+    }
+
 }

server/src/main/java/org/elasticsearch/repositories/RepositoryData.java

@@ -605,6 +605,11 @@ public int hashCode() {
         return Objects.hash(snapshotIds, snapshotsDetails, indices, indexSnapshots, shardGenerations, indexMetaDataGenerations);
     }
 
+    @Override
+    public String toString() {
+        return Strings.format("RepositoryData[uuid=%s,gen=%s]", uuid, genId);
+    }
+
     /**
      * Resolve the index name to the index id specific to the repository,
      * throwing an exception if the index could not be resolved.

server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java

@@ -3885,6 +3885,11 @@ public void onFailure(Exception e) {
             logSnapshotFailure("create", snapshot, e);
             listener.onFailure(e);
         }
+
+        @Override
+        public String toString() {
+            return "CreateSnapshotTask{repository=" + repository.getMetadata().name() + ", snapshot=" + snapshot + '}';
+        }
     }
 
     private static void logSnapshotFailure(String operation, Snapshot snapshot, Exception e) {

server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java

@@ -40,9 +40,12 @@
 
 import static org.elasticsearch.repositories.RepositoryData.EMPTY_REPO_GEN;
 import static org.elasticsearch.repositories.RepositoryData.MISSING_UUID;
+import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.not;
 
 /**
  * Tests for the {@link RepositoryData} class.
@@ -430,6 +433,19 @@ public void testFailsIfMinVersionNotSatisfied() throws IOException {
         }
     }
 
+    public void testToString() {
+        final var repositoryData = generateRandomRepoData();
+        assertThat(
+            repositoryData.toString(),
+            allOf(
+                containsString("RepositoryData"),
+                containsString(repositoryData.getUuid()),
+                containsString(Long.toString(repositoryData.getGenId())),
+                not(containsString("@")) // not the default Object#toString which does a very expensive hashcode computation
+            )
+        );
+    }
+
     public static RepositoryData generateRandomRepoData() {
         final int numIndices = randomIntBetween(1, 30);
         final List<IndexId> indices = new ArrayList<>(numIndices);

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

@@ -232,7 +232,7 @@ protected boolean supportsIndexModeLookup() throws IOException {
     protected final void doTest() throws Throwable {
         RequestObjectBuilder builder = new RequestObjectBuilder(randomFrom(XContentType.values()));
 
-        if (testCase.query.toUpperCase(Locale.ROOT).contains("LOOKUP")) {
+        if (testCase.query.toUpperCase(Locale.ROOT).contains("LOOKUP_\uD83D\uDC14")) {
             builder.tables(tables());
         }
 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TelemetryIT.java

@@ -142,11 +142,9 @@ public static Iterable<Object[]> parameters() {
                         | EVAL y = to_str(host)
                         | LOOKUP JOIN lookup_idx ON host
                         """,
-                    Build.current().isSnapshot()
-                        ? Map.ofEntries(Map.entry("FROM", 1), Map.entry("EVAL", 1), Map.entry("LOOKUP JOIN", 1))
-                        : Collections.emptyMap(),
-                    Build.current().isSnapshot() ? Map.ofEntries(Map.entry("TO_STRING", 1)) : Collections.emptyMap(),
-                    Build.current().isSnapshot()
+                    Map.ofEntries(Map.entry("FROM", 1), Map.entry("EVAL", 1), Map.entry("LOOKUP JOIN", 1)),
+                    Map.ofEntries(Map.entry("TO_STRING", 1)),
+                    true
                 ) },
             new Object[] {
                 new Test(

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

@@ -73,6 +73,7 @@ SHOW : 'show'                 -> pushMode(SHOW_MODE);
 SORT : 'sort'                 -> pushMode(EXPRESSION_MODE);
 STATS : 'stats'               -> pushMode(EXPRESSION_MODE);
 WHERE : 'where'               -> pushMode(EXPRESSION_MODE);
+JOIN_LOOKUP : 'lookup'        -> pushMode(JOIN_MODE);
 //
 // in development
 //
@@ -88,11 +89,9 @@ DEV_INLINESTATS : {this.isDevVersion()}? 'inlinestats'   -> pushMode(EXPRESSION_
 DEV_LOOKUP :      {this.isDevVersion()}? 'lookup_🐔'      -> pushMode(LOOKUP_MODE);
 DEV_METRICS :     {this.isDevVersion()}? 'metrics'       -> pushMode(METRICS_MODE);
 // list of all JOIN commands
-DEV_JOIN :        {this.isDevVersion()}? 'join'          -> pushMode(JOIN_MODE);
 DEV_JOIN_FULL :   {this.isDevVersion()}? 'full'          -> pushMode(JOIN_MODE);
 DEV_JOIN_LEFT :   {this.isDevVersion()}? 'left'          -> pushMode(JOIN_MODE);
 DEV_JOIN_RIGHT :  {this.isDevVersion()}? 'right'         -> pushMode(JOIN_MODE);
-DEV_JOIN_LOOKUP : {this.isDevVersion()}? 'lookup'        -> pushMode(JOIN_MODE);
 
 
 //
@@ -556,7 +555,7 @@ LOOKUP_FIELD_WS
 //
 mode JOIN_MODE;
 JOIN_PIPE : PIPE -> type(PIPE), popMode;
-JOIN_JOIN : DEV_JOIN -> type(DEV_JOIN);
+JOIN : 'join';
 JOIN_AS : AS -> type(AS);
 JOIN_ON : ON -> type(ON), popMode, pushMode(EXPRESSION_MODE);
 USING : 'USING' -> popMode, pushMode(EXPRESSION_MODE);