iter

martijnvg · Dec 19, 2024 · 9631133 · 9631133
1 parent aff65ec
commit 9631133
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java
@@ -279,7 +279,11 @@ private Mode resolveSourceMode() {
             }
 
             if (sourceModeIsNoop) {
-                return indexMode.defaultSourceMode();
+                if (indexMode == null || indexMode == IndexMode.STANDARD) {
+                    return null;
+                } else {
+                    return indexMode.defaultSourceMode();
+                }
             }
 
             // If `_source.mode` is not set we need to apply a default according to index mode.

diff --git a/...db/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java b/...db/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java
@@ -405,7 +405,7 @@ public void testNewIndexHasSyntheticSourceUsage() throws IOException {
                 }
                 """;
             boolean result = provider.newIndexHasSyntheticSourceUsage(indexName, null, settings, List.of(new CompressedXContent(mapping)));
-            assertTrue(result);
+            assertFalse("_source.mode is a noop", result);
             assertThat(newMapperServiceCounter.get(), equalTo(1));
             assertWarnings(SourceFieldMapper.DEPRECATION_WARNING);
         }