diff options
7 files changed, 19 insertions, 23 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java index 6c2d62f37cb..fa663fbec96 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java @@ -42,6 +42,16 @@ public class AdjustPositionSummaryFields extends Processor { } } + static String getPositionSummaryFieldName(String fieldName) { + // Only used in v7 legacy mode, remove in Vespa 9 + return fieldName + ".position"; + } + + static String getDistanceSummaryFieldName(String fieldName) { + // Only used in v7 legacy mode, remove in Vespa 9 + return fieldName + ".distance"; + } + private void scanSummary(DocumentSummary summary) { for (SummaryField summaryField : summary.getSummaryFields().values()) { if ( ! GeoPos.isAnyPos(summaryField.getDataType())) continue; @@ -75,12 +85,12 @@ public class AdjustPositionSummaryFields extends Processor { summaryField.getSources().clear(); summaryField.addSource(source); ensureSummaryField(summary, - PositionDataType.getPositionSummaryFieldName(summaryField.getName()), + getPositionSummaryFieldName(summaryField.getName()), DataType.getArray(DataType.STRING), source, SummaryTransform.POSITIONS); ensureSummaryField(summary, - PositionDataType.getDistanceSummaryFieldName(summaryField.getName()), + getDistanceSummaryFieldName(summaryField.getName()), DataType.INT, source, SummaryTransform.DISTANCE); diff --git a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java index 5bb5079fab6..e39b78d0d9f 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java @@ -78,11 +78,11 @@ public class CreatePositionZCurve extends Processor { Collection<String> summaryTo = removeSummaryTo(field); if (! useV8GeoPositions) { ensureCompatibleSummary(field, zName, - PositionDataType.getPositionSummaryFieldName(fieldName), + AdjustPositionSummaryFields.getPositionSummaryFieldName(fieldName), DataType.getArray(DataType.STRING), // will become "xmlstring" SummaryTransform.POSITIONS, summaryTo, validate); ensureCompatibleSummary(field, zName, - PositionDataType.getDistanceSummaryFieldName(fieldName), + AdjustPositionSummaryFields.getDistanceSummaryFieldName(fieldName), DataType.INT, SummaryTransform.DISTANCE, summaryTo, validate); } diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java index 7b4bc00230a..cb28e74b4b1 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java @@ -92,12 +92,12 @@ public class ImplicitSummaries extends Processor { if (field.doesSummarying()) { for (Attribute attribute : field.getAttributes().values()) { if ( ! attribute.isPosition()) continue; - var distField = field.getSummaryField(PositionDataType.getDistanceSummaryFieldName(fieldName)); + var distField = field.getSummaryField(AdjustPositionSummaryFields.getDistanceSummaryFieldName(fieldName)); if (distField != null) { DocumentSummary attributePrefetchSummary = getOrCreateAttributePrefetchSummary(schema); attributePrefetchSummary.add(distField); } - var posField = field.getSummaryField(PositionDataType.getPositionSummaryFieldName(fieldName)); + var posField = field.getSummaryField(AdjustPositionSummaryFields.getPositionSummaryFieldName(fieldName)); if (posField != null) { DocumentSummary attributePrefetchSummary = getOrCreateAttributePrefetchSummary(schema); attributePrefetchSummary.add(posField); diff --git a/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java index 6f0facf9541..e4f32fff41d 100644 --- a/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java @@ -113,8 +113,8 @@ public class PositionTestCase { PositionDataType.getZCurveFieldName(fieldName), (isArray ? DataType.getArray(PositionDataType.INSTANCE) : PositionDataType.INSTANCE), SummaryTransform.GEOPOS); - assertNull(schema.getSummaryField(PositionDataType.getDistanceSummaryFieldName(fieldName))); - assertNull(schema.getSummaryField(PositionDataType.getPositionSummaryFieldName(fieldName))); + assertNull(schema.getSummaryField(AdjustPositionSummaryFields.getDistanceSummaryFieldName(fieldName))); + assertNull(schema.getSummaryField(AdjustPositionSummaryFields.getPositionSummaryFieldName(fieldName))); } private static void assertSummaryField(Schema schema, String fieldName, String sourceName, DataType dataType, diff --git a/document/abi-spec.json b/document/abi-spec.json index 15d22ed1f64..dcf89da32e4 100644 --- a/document/abi-spec.json +++ b/document/abi-spec.json @@ -877,9 +877,7 @@ "public static com.yahoo.document.datatypes.Struct fromString(java.lang.String)", "public static com.yahoo.document.datatypes.IntegerFieldValue getXValue(com.yahoo.document.datatypes.FieldValue)", "public static com.yahoo.document.datatypes.IntegerFieldValue getYValue(com.yahoo.document.datatypes.FieldValue)", - "public static java.lang.String getZCurveFieldName(java.lang.String)", - "public static java.lang.String getPositionSummaryFieldName(java.lang.String)", - "public static java.lang.String getDistanceSummaryFieldName(java.lang.String)" + "public static java.lang.String getZCurveFieldName(java.lang.String)" ], "fields": [ "public static final com.yahoo.document.StructDataType INSTANCE", diff --git a/document/src/main/java/com/yahoo/document/PositionDataType.java b/document/src/main/java/com/yahoo/document/PositionDataType.java index 80c33b4f475..d4160fc58c7 100644 --- a/document/src/main/java/com/yahoo/document/PositionDataType.java +++ b/document/src/main/java/com/yahoo/document/PositionDataType.java @@ -99,16 +99,6 @@ public final class PositionDataType { return fieldName + "_zcurve"; } - public static String getPositionSummaryFieldName(String fieldName) { - // Only used in v7 legacy mode, remove in Vespa 9 - return fieldName + ".position"; - } - - public static String getDistanceSummaryFieldName(String fieldName) { - // Only used in v7 legacy mode, remove in Vespa 9 - return fieldName + ".distance"; - } - private static StructDataType newInstance() { StructDataType ret = new StructDataType(STRUCT_NAME); ret.addField(new Field(FIELD_X, DataType.INT)); diff --git a/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java b/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java index 159b016d6ef..af01075adc9 100644 --- a/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/PositionTypeTestCase.java @@ -38,8 +38,6 @@ public class PositionTypeTestCase { assertEquals("x", PositionDataType.FIELD_X); assertEquals("y", PositionDataType.FIELD_Y); assertEquals("foo_zcurve", PositionDataType.getZCurveFieldName("foo")); - assertEquals("foo.position", PositionDataType.getPositionSummaryFieldName("foo")); - assertEquals("foo.distance", PositionDataType.getDistanceSummaryFieldName("foo")); } @Test |