Fix FieldSubsetReaderTests

jordan-powers · jordan-powers · commit 6f75669ebb2b · 2025-07-30T10:38:55.000-07:00
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java
@@ -419,7 +419,9 @@ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
                     filteredNameValues.add(mappedNameValue.withMap(transformedField));
                 }
                 if (didFilter) {
-                    visitor.binaryField(fieldInfo, IgnoredSourceFieldMapper.encodeFromMapMulti(filteredNameValues));
+                    if (filteredNameValues.isEmpty() == false) {
+                        visitor.binaryField(fieldInfo, IgnoredSourceFieldMapper.encodeFromMapMulti(filteredNameValues));
+                    }
                 } else {
                     visitor.binaryField(fieldInfo, value);
                 }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java
@@ -709,7 +709,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {
             iw.close();
 
             {
-                Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", IgnoredSourceFieldMapper.NAME));
+                Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", IgnoredSourceFieldMapper.ignoredFieldName("*")));
                 try (
                     DirectoryReader indexReader = FieldSubsetReader.wrap(
                         wrapInMockESDirectoryReader(DirectoryReader.open(directory)),
@@ -740,7 +740,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {
             }
 
             {
-                Automaton automaton = Automatons.patterns(Arrays.asList("obj.fieldC", IgnoredSourceFieldMapper.NAME));
+                Automaton automaton = Automatons.patterns(Arrays.asList("obj.fieldC", IgnoredSourceFieldMapper.ignoredFieldName("*")));
                 try (
                     DirectoryReader indexReader = FieldSubsetReader.wrap(
                         wrapInMockESDirectoryReader(DirectoryReader.open(directory)),
@@ -772,7 +772,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {
             }
 
             {
-                Automaton automaton = Automatons.patterns(Arrays.asList("arr.fieldD", IgnoredSourceFieldMapper.NAME));
+                Automaton automaton = Automatons.patterns(Arrays.asList("arr.fieldD", IgnoredSourceFieldMapper.ignoredFieldName("*")));
                 try (
                     DirectoryReader indexReader = FieldSubsetReader.wrap(
                         wrapInMockESDirectoryReader(DirectoryReader.open(directory)),

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,9 @@ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {`
`419`	`419`	`filteredNameValues.add(mappedNameValue.withMap(transformedField));`
`420`	`420`	`}`
`421`	`421`	`if (didFilter) {`
`422`		`- visitor.binaryField(fieldInfo, IgnoredSourceFieldMapper.encodeFromMapMulti(filteredNameValues));`
	`422`	`+ if (filteredNameValues.isEmpty() == false) {`
	`423`	`+ visitor.binaryField(fieldInfo, IgnoredSourceFieldMapper.encodeFromMapMulti(filteredNameValues));`
	`424`	`+ }`
`423`	`425`	`} else {`
`424`	`426`	`visitor.binaryField(fieldInfo, value);`
`425`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {`
`709`	`709`	`iw.close();`
`710`	`710`
`711`	`711`	`{`
`712`		`- Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", IgnoredSourceFieldMapper.NAME));`
	`712`	`+ Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", IgnoredSourceFieldMapper.ignoredFieldName("*")));`
`713`	`713`	`try (`
`714`	`714`	`DirectoryReader indexReader = FieldSubsetReader.wrap(`
`715`	`715`	`wrapInMockESDirectoryReader(DirectoryReader.open(directory)),`
`@@ -740,7 +740,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {`
`740`	`740`	`}`
`741`	`741`
`742`	`742`	`{`
`743`		`- Automaton automaton = Automatons.patterns(Arrays.asList("obj.fieldC", IgnoredSourceFieldMapper.NAME));`
	`743`	`+ Automaton automaton = Automatons.patterns(Arrays.asList("obj.fieldC", IgnoredSourceFieldMapper.ignoredFieldName("*")));`
`744`	`744`	`try (`
`745`	`745`	`DirectoryReader indexReader = FieldSubsetReader.wrap(`
`746`	`746`	`wrapInMockESDirectoryReader(DirectoryReader.open(directory)),`
`@@ -772,7 +772,7 @@ public void testIgnoredSourceFilteringIntegration() throws Exception {`
`772`	`772`	`}`
`773`	`773`
`774`	`774`	`{`
`775`		`- Automaton automaton = Automatons.patterns(Arrays.asList("arr.fieldD", IgnoredSourceFieldMapper.NAME));`
	`775`	`+ Automaton automaton = Automatons.patterns(Arrays.asList("arr.fieldD", IgnoredSourceFieldMapper.ignoredFieldName("*")));`
`776`	`776`	`try (`
`777`	`777`	`DirectoryReader indexReader = FieldSubsetReader.wrap(`
`778`	`778`	`wrapInMockESDirectoryReader(DirectoryReader.open(directory)),`