enhance test case for score sorting

fix backward logic
zuliaio · Nov 20, 2019 · 501249b · 501249b
1 parent 51bfeb4
commit 501249b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
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
@@ -175,6 +175,7 @@ public ZuliaQuery.ShardQueryResponse queryShard(Query query, Map<String, ZuliaBa
 		TopDocsCollector<?> collector;
 
 		boolean sorting = (sortRequest != null) && !sortRequest.getFieldSortList().isEmpty();
+
 		if (sorting) {
 			collector = getSortingCollector(sortRequest, hasMoreAmount, after);
 		}
@@ -427,7 +428,7 @@ private TopDocsCollector<?> getSortingCollector(ZuliaQuery.SortRequest sortReque
 			ZuliaIndex.FieldConfig.FieldType sortFieldType = indexConfig.getFieldTypeForSortField(sortField);
 
 			if (ZuliaConstants.SCORE_FIELD.equals(sortField)) {
-				sortFields.add(new SortField(null, SortField.Type.SCORE, reverse));
+				sortFields.add(new SortField(null, SortField.Type.SCORE, !reverse));
 			}
 			else if (FieldTypeUtil.isNumericOrDateFieldType(sortFieldType)) {
 

diff --git a/zulia-server/src/test/java/io/zulia/server/test/node/StartStopTest.java b/zulia-server/src/test/java/io/zulia/server/test/node/StartStopTest.java
@@ -125,21 +125,31 @@ else if (half) { // 2/5 of input
 
 	@Test(dependsOnMethods = "index")
 	public void sortScore() throws Exception {
-		Query q = new Query(FACET_TEST_INDEX, "issn:1234*", 10);
+		Query q = new Query(FACET_TEST_INDEX, "issn:\"1234-1234\" OR country:US", 10);
 		q.addFieldSort(ZuliaConstants.SCORE_FIELD, ASCENDING);
 		QueryResult queryResult = zuliaWorkPool.query(q);
 
+		double lowScore = -1;
+		double highScore = -1;
 		for (ZuliaQuery.ScoredResult result : queryResult.getResults()) {
 			Assert.assertTrue(result.getScore() > 0);
+			if (lowScore < 0) {
+				lowScore = result.getScore();
+			}
 		}
 
-		q = new Query(FACET_TEST_INDEX, "issn:1234*", 10);
+		q = new Query(FACET_TEST_INDEX, "issn:\"1234-1234\" OR country:US", 10);
 		q.addFieldSort(ZuliaConstants.SCORE_FIELD, DESCENDING);
 		queryResult = zuliaWorkPool.query(q);
 
 		for (ZuliaQuery.ScoredResult result : queryResult.getResults()) {
 			Assert.assertTrue(result.getScore() > 0);
+			if (highScore < 0) {
+				highScore = result.getScore();
+			}
 		}
+
+		Assert.assertTrue(highScore > lowScore);
 	}
 
 	@Test(dependsOnMethods = "sortScore")