Address milvus-io#1721 by putting filteredPKStr used for paging in QueryIterator first in the query, allowing any RANDOM_SAMPLE clause to come last (milvus-io#1722)

gehnaphore · George Hoffman · yhmo · yhmo · commit 7150c72b6cc1 · 2025-12-17T12:12:53.000+08:00
Co-authored-by: George Hoffman &lt;george@patientcase.com&gt;
Co-authored-by: groot &lt;yihua.mo@zilliz.com&gt;
diff --git a/sdk-core/src/main/java/io/milvus/orm/iterator/QueryIterator.java b/sdk-core/src/main/java/io/milvus/orm/iterator/QueryIterator.java
@@ -201,7 +201,7 @@ private String setupNextExpr() {
         if (StringUtils.isEmpty(currentExpr)) {
             return filteredPKStr;
         }
-        return " ( " + currentExpr + " ) " + " and " + filteredPKStr;
+        return filteredPKStr + " and ( " + currentExpr + " )";
     }
 
     private boolean isResSufficient(List<QueryResultsWrapper.RowRecord> ret) {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private String setupNextExpr() {`
`201`	`201`	`if (StringUtils.isEmpty(currentExpr)) {`
`202`	`202`	`return filteredPKStr;`
`203`	`203`	`}`
`204`		`- return " ( " + currentExpr + " ) " + " and " + filteredPKStr;`
	`204`	`+ return filteredPKStr + " and ( " + currentExpr + " )";`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`private boolean isResSufficient(List<QueryResultsWrapper.RowRecord> ret) {`