Match _id working: search value wasn't being encoded

Author: parkertimmins

server/src/main/java/org/elasticsearch/index/mapper/LogsdbIdFieldMapper.java

@@ -1,3 +1,4 @@
+
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the "Elastic License
@@ -16,16 +17,12 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * A mapper for the _id field.
  */
 public class LogsdbIdFieldMapper extends IdFieldMapper {
-    // here
-    public static final String NAME = "_id";
-
-    public static final String CONTENT_TYPE = "_id";
-
     public static final LogsdbIdFieldMapper INSTANCE = new LogsdbIdFieldMapper();
 
     public LogsdbIdFieldMapper() {
@@ -39,7 +36,7 @@ public void preParse(DocumentParserContext context) {
         }
         context.id(context.sourceToParse().id());
         BytesRef uidEncoded = Uid.encodeId(context.id());
-        context.doc().add(new SortedDocValuesField(fieldType().name(), uidEncoded));
+        context.doc().add(SortedDocValuesField.indexedField(fieldType().name(), uidEncoded));
     }
 
     @Override
@@ -60,12 +57,12 @@ public String reindexId(String id) {
     protected static class LogsdbIdFieldType extends TermBasedFieldType {
 
         public LogsdbIdFieldType() {
-            super(NAME, false, false, true, TextSearchInfo.SIMPLE_MATCH_ONLY, Collections.emptyMap());
+            super(IdFieldMapper.NAME, false, false, true, TextSearchInfo.SIMPLE_MATCH_ONLY, Collections.emptyMap());
         }
 
         @Override
         public String typeName() {
-            return CONTENT_TYPE;
+            return IdFieldMapper.CONTENT_TYPE;
         }
 
         @Override
@@ -76,24 +73,33 @@ public boolean isSearchable() {
 
         @Override
         public Query termsQuery(Collection<?> values, SearchExecutionContext context) {
-            var bytesRefs = values.stream().map(this::indexedValueForSearch).toList();
+            var bytesRefs = values.stream()
+                .map(LogsdbIdFieldType::encode)
+                .map(this::indexedValueForSearch).toList();
             return SortedDocValuesField.newSlowSetQuery(name(), bytesRefs);
         }
 
         @Override
         public Query termQuery(Object value, SearchExecutionContext context) {
-            return SortedDocValuesField.newSlowExactQuery(name(), indexedValueForSearch(value));
+            return SortedDocValuesField.newSlowExactQuery(name(), indexedValueForSearch(encode(value)));
         }
 
         @Override
         public BlockLoader blockLoader(BlockLoaderContext blContext) {
-            return new BlockDocValuesReader.BytesRefsFromOrdsBlockLoader(NAME);
+            return new BlockDocValuesReader.BytesRefsFromOrdsBlockLoader(IdFieldMapper.NAME);
         }
 
         @Override
         public ValueFetcher valueFetcher(SearchExecutionContext context, String format) {
             // TODO can this be done somehow?
             throw new UnsupportedOperationException("logsdb id cannot be fetched by values since only using doc values");
         }
+
+        private static BytesRef encode(Object idObject) {
+            if (idObject instanceof BytesRef) {
+                idObject = ((BytesRef) idObject).utf8ToString();
+            }
+            return Uid.encodeId(idObject.toString());
+        }
     }
 }

server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java

@@ -153,7 +153,7 @@ protected void setNextReader(LeafReaderContext ctx, int[] docsInLeaf) throws IOE
                 this.leafNestedDocuments = nestedDocuments.getLeafNestedDocuments(ctx);
                 this.leafStoredFieldLoader = storedFieldLoader.getLoader(ctx, docsInLeaf);
                 this.leafSourceLoader = sourceLoader.leaf(ctx.reader(), docsInLeaf);
-                this.leafIdLoader = idLoader.leaf(leafStoredFieldLoader, ctx.reader(), docsInLeaf);
+                this.leafIdLoader = idLoader.leaf(leafSourceLoader, leafStoredFieldLoader, ctx.reader(), docsInLeaf);
                 fieldLookupProvider.setNextReader(ctx);
                 for (FetchSubPhaseProcessor processor : processors) {
                     processor.setNextReader(ctx);

x-pack/plugin/logsdb/src/internalClusterTest/java/org/elasticsearch/xpack/logsdb/LogsIdIT.java

@@ -30,15 +30,19 @@
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.license.LicenseSettings;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.XPackPlugin;
 
 import java.io.IOException;
 import java.time.Instant;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -106,13 +110,6 @@ protected Settings nodeSettings() {
             .build();
     }
 
-    public void testStandard() throws Exception {
-        String dataStreamName = "k8s";
-        createTemplate(dataStreamName);
-        checkIndexSearchAndRetrieval(dataStreamName, false);
-    }
-
-
     public void testGetByGeneratedId() throws Exception {
         String dataStreamName = "k8s";
         createTemplate(dataStreamName);
@@ -125,7 +122,7 @@ public void testGetByGeneratedId() throws Exception {
             indexRequest.source(
                 DOC.replace("$time", formatInstant(time))
                     .replace("$uuid", UUID.randomUUID().toString())
-                    .replace("$pod", "pod-" + randomIntBetween(0, 10)),
+                    .replace("$pod", "pod-" + j),
                 XContentType.JSON
             );
             bulkRequest.add(indexRequest);
@@ -143,11 +140,13 @@ public void testGetByGeneratedId() throws Exception {
             assertThat(searchResponse.getHits().getTotalHits().value(), equalTo((long) numDocs));
 
             for (int i = 0; i < searchResponse.getHits().getHits().length; i++) {
-                String id = searchResponse.getHits().getHits()[i].getId();
+                SearchHit hit = searchResponse.getHits().getHits()[i];
+                String id = hit.getId();
                 assertThat(id, notNullValue());
 
                 // Check that the _id is gettable:
-                var getResponse = client().get(new GetRequest(indexName).id(id)).actionGet();
+                var getRequest = new GetRequest(indexName).id(id);
+                var getResponse = client().get(getRequest).actionGet();
                 assertThat(getResponse.isExists(), is(true));
                 assertThat(getResponse.getId(), equalTo(id));
             }
@@ -163,11 +162,11 @@ public void testGetByProvidedID() throws Exception {
         for (int j = 0; j < numDocs; j++) {
             var indexRequest = new IndexRequest(indexName)
                 .opType(DocWriteRequest.OpType.INDEX)
-                .id("some-id-" + j);
+                .id("id-" + j);
             indexRequest.source(
                 DOC.replace("$time", formatInstant(time))
                     .replace("$uuid", UUID.randomUUID().toString())
-                    .replace("$pod", "pod-" + randomIntBetween(0, 10)),
+                    .replace("$pod", "pod-" + j),
                 XContentType.JSON
             );
             bulkRequest.add(indexRequest);
@@ -188,22 +187,24 @@ public void testGetByProvidedID() throws Exception {
             assertThat(searchResponse.getHits().getTotalHits().value(), equalTo((long) numDocs));
 
             for (int i = 0; i < searchResponse.getHits().getHits().length; i++) {
-                String id = searchResponse.getHits().getHits()[i].getId();
+                SearchHit hit = searchResponse.getHits().getHits()[i];
+                String id = hit.getId();
+                String numPart = id.split("-")[1];
                 assertThat(id, notNullValue());
-
-                // test get with the IDs from search response
-                var getResponse = client().get(new GetRequest(indexName).id(id)).actionGet();
-                assertThat(getResponse.isExists(), is(true));
-                assertThat(getResponse.getId(), equalTo(id));
+                // check got correct doc in search response
+                var pod = (String) hit.getSourceAsMap().get("message");
+                assertThat(pod, equalTo("pod-" + numPart));
             }
         });
 
         // test get with the provided IDs
         for (int i = 0; i < numDocs; i++) {
-            String id = "some-id-" + i;
-            var getResponse = client().get(new GetRequest(indexName).id(id)).actionGet();
+            String id = "id-" + i;
+            var getRequest = new GetRequest(indexName).id(id).fetchSourceContext(FetchSourceContext.FETCH_SOURCE);
+            var getResponse = client().get(getRequest).actionGet();
             assertThat(getResponse.isExists(), is(true));
             assertThat(getResponse.getId(), equalTo(id));
+            assertThat(getResponse.getSourceAsMap().get("message"), equalTo("pod-" + i));
         }
     }
 
@@ -216,7 +217,7 @@ public void testMatchByProvidedID() throws Exception {
         for (int j = 0; j < numDocs; j++) {
             var indexRequest = new IndexRequest(indexName)
                 .opType(DocWriteRequest.OpType.INDEX)
-                .id("some-id-" + j);
+                .id("id-" + j);
             indexRequest.source(
                 DOC.replace("$time", formatInstant(time))
                     .replace("$uuid", UUID.randomUUID().toString())
@@ -231,12 +232,12 @@ public void testMatchByProvidedID() throws Exception {
         client().admin().indices().refresh(new RefreshRequest(indexName)).actionGet();
 
         for (int i = 0; i < numDocs; i++) {
-            String id = "some-id-" + i;
+            String id = "id-" + i;
             var searchRequest = new SearchRequest(indexName);
             searchRequest.source(new SearchSourceBuilder().query(new TermQueryBuilder("_id", id)).size(10));
             var searchResponse = client().search(searchRequest).actionGet();
             assertThat(searchResponse.getHits().getTotalHits().value(), equalTo((long) 1));
-            assertThat(searchResponse.getHits().getAt(0).field("message"), equalTo("pod-" + i));
+            assertThat(searchResponse.getHits().getHits()[0].getSourceAsMap().get("message"), equalTo("pod-" + i));
         }
     }