finish up sort by score pipeline

zuliaio · Nov 12, 2019 · 5f2f39c · 5f2f39c
1 parent 4c315e4
commit 5f2f39c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/zulia-common/src/main/java/io/zulia/ZuliaConstants.java b/zulia-common/src/main/java/io/zulia/ZuliaConstants.java
@@ -84,4 +84,5 @@ public interface ZuliaConstants {
 	String BATCH_SIZE = "batchSize";
 	String CURSOR = "cursor";
 
+	String SCORE_FIELD = "zuliaScore";
 }
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
@@ -575,6 +575,11 @@ private void handleSortValues(ZuliaQuery.SortRequest sortRequest, ScoreDoc score
 			ZuliaQuery.FieldSort fieldSort = sortRequest.getFieldSort(c);
 			String sortField = fieldSort.getSortField();
 
+			if (ZuliaConstants.SCORE_FIELD.equals(sortField)) {
+				sortValues.addSortValue(ZuliaQuery.SortValue.newBuilder().setExists(false));
+				continue;
+			}
+
 			ZuliaIndex.FieldConfig.FieldType fieldTypeForSortField = indexConfig.getFieldTypeForSortField(sortField);
 
 			ZuliaQuery.SortValue.Builder sortValueBuilder = ZuliaQuery.SortValue.newBuilder().setExists(true);

diff --git a/zulia-server/src/main/java/io/zulia/server/search/QueryCombiner.java b/zulia-server/src/main/java/io/zulia/server/search/QueryCombiner.java
@@ -1,5 +1,6 @@
 package io.zulia.server.search;
 
+import io.zulia.ZuliaConstants;
 import io.zulia.message.ZuliaBase.Term;
 import io.zulia.message.ZuliaIndex.FieldConfig;
 import io.zulia.message.ZuliaQuery.AnalysisRequest;
@@ -393,7 +394,10 @@ public QueryResponse getQueryResponse() throws Exception {
 
 					FieldConfig.FieldType sortType = sortTypeMap.get(sortField);
 
-					if (FieldConfig.FieldType.NUMERIC_INT.equals(sortType)) {
+					if (ZuliaConstants.SCORE_FIELD.equals(sortField)) {
+						compare = scoreCompare.compare(o1, o2);
+					}
+					else if (FieldConfig.FieldType.NUMERIC_INT.equals(sortType)) {
 						Integer a = sortValues1.getSortValue(sortValueIndex).getIntegerValue();
 						Integer b = sortValues2.getSortValue(sortValueIndex).getIntegerValue();