make sure to remove the _FIELD_TYPE style suffixes from the fieldname…

… in get fields and add a test case
zuliaio · May 8, 2023 · 6c222a1 · 6c222a1
1 parent 96e26d9
commit 6c222a1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/zulia-common/src/main/java/io/zulia/ZuliaFieldConstants.java b/zulia-common/src/main/java/io/zulia/ZuliaFieldConstants.java
@@ -1,5 +1,7 @@
 package io.zulia;
 
+import io.zulia.message.ZuliaIndex;
+
 public interface ZuliaFieldConstants {
 
 	String TIMESTAMP_FIELD = "_ztsf_";
@@ -27,4 +29,13 @@ public interface ZuliaFieldConstants {
 	String LIST_LENGTH_BARS = "|||";
 	String CHAR_LENGTH_BAR = "|";
 
+	String NUMERIC_INT_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.NUMERIC_INT;
+	String NUMERIC_LONG_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.NUMERIC_LONG;
+	String NUMERIC_FLOAT_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.NUMERIC_FLOAT;
+	String NUMERIC_DOUBLE_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.NUMERIC_DOUBLE;
+
+	String DATE_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.DATE;
+
+	String BOOL_SUFFIX = "_" + ZuliaIndex.FieldConfig.FieldType.BOOL;
+
 }
diff --git a/zulia-server/src/main/java/io/zulia/server/index/ShardReader.java b/zulia-server/src/main/java/io/zulia/server/index/ShardReader.java
@@ -95,7 +95,34 @@ public ZuliaServiceOuterClass.GetFieldNamesResponse getFields() {
 		for (LeafReaderContext subReaderContext : indexReader.leaves()) {
 			FieldInfos fieldInfos = subReaderContext.reader().getFieldInfos();
 			for (FieldInfo fi : fieldInfos) {
-				builder.addFieldName(fi.name);
+
+				if (fi.getPointDimensionCount() > 0) {
+
+					int matchedLength = 0;
+					if (fi.name.endsWith(ZuliaFieldConstants.NUMERIC_INT_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.NUMERIC_INT_SUFFIX.length();
+					}
+					else if (fi.name.endsWith(ZuliaFieldConstants.NUMERIC_LONG_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.NUMERIC_LONG_SUFFIX.length();
+					}
+					else if (fi.name.endsWith(ZuliaFieldConstants.NUMERIC_FLOAT_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.NUMERIC_FLOAT_SUFFIX.length();
+					}
+					else if (fi.name.endsWith(ZuliaFieldConstants.NUMERIC_DOUBLE_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.NUMERIC_DOUBLE_SUFFIX.length();
+					}
+					else if (fi.name.endsWith(ZuliaFieldConstants.BOOL_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.BOOL_SUFFIX.length();
+					}
+					else if (fi.name.endsWith(ZuliaFieldConstants.DATE_SUFFIX)) {
+						matchedLength = ZuliaFieldConstants.DATE_SUFFIX.length();
+					}
+					builder.addFieldName(fi.name.substring(0, fi.name.length() - matchedLength));
+
+				}
+				else {
+					builder.addFieldName(fi.name);
+				}
 			}
 		}
 

diff --git a/zulia-server/src/test/java/io/zulia/server/test/node/AliasTest.java b/zulia-server/src/test/java/io/zulia/server/test/node/AliasTest.java
@@ -130,6 +130,9 @@ public void aliasSearchTest() throws Exception {
 
 		GetFieldsResult getFields = zuliaWorkPool.getFields("someAlias");
 		Assertions.assertEquals(3, getFields.getFieldNames().size());
+		Assertions.assertTrue(getFields.getFieldNames().contains("id"));
+		Assertions.assertTrue(getFields.getFieldNames().contains("title"));
+		Assertions.assertTrue(getFields.getFieldNames().contains("rating"));
 
 		GetTermsResult getTermsResult = zuliaWorkPool.execute(new GetTerms("someAlias", "title"));
 		Assertions.assertEquals(6, getTermsResult.getTerms().size());