From df31192c18ba7bc12b4a0915bdfcf9acc11f9739 Mon Sep 17 00:00:00 2001 From: Michael Froh Date: Wed, 18 Dec 2024 17:03:54 -0800 Subject: [PATCH] Fix IpFieldMapperTests I broke these tests as a side-effect for my fix to DerivedFieldMapperQueryTests. Signed-off-by: Michael Froh --- .../index/mapper/IpFieldMapperTests.java | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java index 0f30e93f0622a..333f151997814 100644 --- a/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java +++ b/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java @@ -84,16 +84,13 @@ public void testDefaults() throws Exception { ParsedDocument doc = mapper.parse(source(b -> b.field("field", "::1"))); IndexableField[] fields = doc.rootDoc().getFields("field"); - assertEquals(2, fields.length); - IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); - assertEquals(16, pointField.fieldType().pointNumBytes()); - assertFalse(pointField.fieldType().stored()); - assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue()); - IndexableField dvField = fields[1]; - assertEquals(DocValuesType.SORTED_SET, dvField.fieldType().docValuesType()); - assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), dvField.binaryValue()); - assertFalse(dvField.fieldType().stored()); + assertEquals(1, fields.length); + IndexableField pointFieldAndDVField = fields[0]; + assertEquals(1, pointFieldAndDVField.fieldType().pointIndexDimensionCount()); + assertEquals(16, pointFieldAndDVField.fieldType().pointNumBytes()); + assertFalse(pointFieldAndDVField.fieldType().stored()); + assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointFieldAndDVField.binaryValue()); + assertEquals(DocValuesType.SORTED_SET, pointFieldAndDVField.fieldType().docValuesType()); } public void testNotIndexed() throws Exception { @@ -145,12 +142,11 @@ public void testStore() throws Exception { ParsedDocument doc = mapper.parse(source(b -> b.field("field", "::1"))); IndexableField[] fields = doc.rootDoc().getFields("field"); - assertEquals(3, fields.length); - IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); - IndexableField dvField = fields[1]; - assertEquals(DocValuesType.SORTED_SET, dvField.fieldType().docValuesType()); - IndexableField storedField = fields[2]; + assertEquals(2, fields.length); + IndexableField pointFieldAndDVField = fields[0]; + assertEquals(1, pointFieldAndDVField.fieldType().pointIndexDimensionCount()); + assertEquals(DocValuesType.SORTED_SET, pointFieldAndDVField.fieldType().docValuesType()); + IndexableField storedField = fields[1]; assertTrue(storedField.fieldType().stored()); assertEquals(new BytesRef(InetAddressPoint.encode(InetAddress.getByName("::1"))), storedField.binaryValue()); } @@ -190,16 +186,13 @@ public void testNullValue() throws IOException { doc = mapper.parse(source(b -> b.nullField("field"))); IndexableField[] fields = doc.rootDoc().getFields("field"); - assertEquals(2, fields.length); - IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); - assertEquals(16, pointField.fieldType().pointNumBytes()); - assertFalse(pointField.fieldType().stored()); - assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue()); - IndexableField dvField = fields[1]; - assertEquals(DocValuesType.SORTED_SET, dvField.fieldType().docValuesType()); - assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), dvField.binaryValue()); - assertFalse(dvField.fieldType().stored()); + assertEquals(1, fields.length); + IndexableField pointFieldAndDVField = fields[0]; + assertEquals(1, pointFieldAndDVField.fieldType().pointIndexDimensionCount()); + assertEquals(16, pointFieldAndDVField.fieldType().pointNumBytes()); + assertFalse(pointFieldAndDVField.fieldType().stored()); + assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointFieldAndDVField.binaryValue()); + assertEquals(DocValuesType.SORTED_SET, pointFieldAndDVField.fieldType().docValuesType()); mapper = createDocumentMapper(fieldMapping(b -> { b.field("type", "ip");