Enable the fixed query cases (#6108)

* Enable query test cases in tests/
Signed-off-by: Nzw <zw@milvus.io>

* update
Signed-off-by: Nzw <zw@milvus.io>

* enable the fixed query cases
Signed-off-by: Nzw <zw@milvus.io>
Co-authored-by: Nzw <zw@milvus.io>

tests/python_test/entity/test_query.py

@@ -91,7 +91,6 @@ class TestQueryBase:
         with pytest.raises(Exception):
             res = connect.query(collection, term_expr)
 
-    @pytest.mark.xfail(reason="#6070")
     def test_query_valid(self, connect, collection):
         """
         target: test query
@@ -104,9 +103,10 @@ class TestQueryBase:
         term_expr = f'{default_int_field_name} in {ids[:default_pos]}'
         res = connect.query(collection, term_expr)
         assert len(res) == default_pos
-        for i in range(default_pos):
-            assert res[i][default_int_field_name] == entities[0]["values"][i]
-            ut.assert_equal_vector(res[i][ut.default_float_vec_field_name], entities[-1]["values"][i])    
+        for _id, index in enumerate(ids[:default_pos]):
+            if res[index][default_int_field_name] == entities[0]["values"][index]:
+                assert res[index][default_float_field_name] == entities[1]["values"][index]
+                ut.assert_equal_vector(res[index][ut.default_float_vec_field_name], entities[2]["values"][index])
 
     def test_query_collection_not_existed(self, connect):
         """
@@ -158,7 +158,6 @@ class TestQueryBase:
             assert res[i][default_int_field_name] == entities[0]["values"][i]
             ut.assert_equal_vector(res[i][ut.default_float_vec_field_name], entities[-1]["values"][i])
 
-    @pytest.mark.xfail(reason="#6070")
     def test_query_after_search(self, connect, collection):
         """
         target: test query after search
@@ -178,9 +177,10 @@ class TestQueryBase:
         res = connect.query(collection, term_expr)
         logging.getLogger().info(res)
         assert len(res) == default_pos
-        for i in range(default_pos):
-            assert res[i][default_int_field_name] == entities[0]["values"][i]
-            ut.assert_equal_vector(res[i][ut.default_float_vec_field_name], entities[-1]["values"][i])
+        for _id, index in enumerate(ids[:default_pos]):
+            if res[index][default_int_field_name] == entities[0]["values"][index]:
+                assert res[index][default_float_field_name] == entities[1]["values"][index]
+                ut.assert_equal_vector(res[index][ut.default_float_vec_field_name], entities[2]["values"][index])
 
     @pytest.mark.xfail(reason="#6053")
     def test_query_empty_collection(self, connect, collection):
@@ -329,7 +329,6 @@ class TestQueryBase:
         assert res[2][ut.default_float_vec_field_name] == binary_entities[2]["values"][0]
 
     @pytest.mark.level(2)
-    @pytest.mark.xfail(reason="#6070")
     def test_query_expr_all_term_array(self, connect, collection):
         """
         target: test query with all array term expr
@@ -342,8 +341,10 @@ class TestQueryBase:
         term_expr = f'{default_int_field_name} in {ids}'
         res = connect.query(collection, term_expr)
         assert len(res) == ut.default_nb
-        for i in range(ut.default_nb):
-            assert res[i][default_int_field_name] == entities[0]["values"][i]
+        for _id, index in enumerate(ids):
+            if res[index][default_int_field_name] == entities[0]["values"][index]:
+                assert res[index][default_float_field_name] == entities[1]["values"][index]
+                ut.assert_equal_vector(res[index][ut.default_float_vec_field_name], entities[2]["values"][index])
 
     def test_query_expr_repeated_term_array(self, connect, collection):
         """
@@ -481,7 +482,6 @@ class TestQueryPartition:
     test Query interface
     query(collection_name, expr, output_fields=None, partition_names=None, timeout=None)
     """
-    @pytest.mark.xfail(reason="#6070")
     def test_query_partition(self, connect, collection):
         """
         target: test query on partition
@@ -493,9 +493,10 @@ class TestQueryPartition:
         assert len(ids) == ut.default_nb
         connect.load_partitions(collection, [ut.default_tag])
         res = connect.query(collection, default_term_expr, partition_names=[ut.default_tag])
-        for i in range(default_pos):
-            assert res[i][default_int_field_name] == entities[0]["values"][i]
-            ut.assert_equal_vector(res[i][ut.default_float_vec_field_name], entities[-1]["values"][i])
+        for _id, index in enumerate(ids[:default_pos]):
+            if res[index][default_int_field_name] == entities[0]["values"][index]:
+                assert res[index][default_float_field_name] == entities[1]["values"][index]
+                ut.assert_equal_vector(res[index][ut.default_float_vec_field_name], entities[2]["values"][index])
 
     def test_query_partition_without_loading(self, connect, collection):
         """
@@ -509,7 +510,6 @@ class TestQueryPartition:
         with pytest.raises(Exception):
             connect.query(collection, default_term_expr, partition_names=[ut.default_tag])
 
-    @pytest.mark.xfail(reason="#6070")
     def test_query_default_partition(self, connect, collection):
         """
         target: test query on default partition
@@ -520,9 +520,10 @@ class TestQueryPartition:
         assert len(ids) == ut.default_nb
         connect.load_collection(collection)
         res = connect.query(collection, default_term_expr, partition_names=[ut.default_partition_name])
-        for i in range(default_pos):
-            assert res[i][default_int_field_name] == entities[0]["values"][i]
-            ut.assert_equal_vector(res[i][ut.default_float_vec_field_name], entities[-1]["values"][i])
+        for _id, index in enumerate(ids[:default_pos]):
+            if res[index][default_int_field_name] == entities[0]["values"][index]:
+                assert res[index][default_float_field_name] == entities[1]["values"][index]
+                ut.assert_equal_vector(res[index][ut.default_float_vec_field_name], entities[2]["values"][index])
 
     @pytest.mark.xfail(reason="#6075")
     def test_query_empty_partition(self, connect, collection):
@@ -574,7 +575,6 @@ class TestQueryPartition:
         res = connect.query(collection, term_expr, partition_names=[ut.default_tag])
         assert len(res) == 0
 
-    @pytest.mark.xfail(reason="#6070")
     def test_query_multi_partitions_multi_results(self, connect, collection):
         """
         target: test query on multi partitions and get multi results
@@ -584,11 +584,14 @@ class TestQueryPartition:
         """
         entities, entities_2 = insert_entities_into_two_partitions_in_half(connect, collection)
         half = ut.default_nb // 2
-        term_expr = f'{default_int_field_name} in [{half - 1}, {half}]'
+        term_expr = f'{default_int_field_name} in [{half - 1}]'
         res = connect.query(collection, term_expr, partition_names=[ut.default_tag, ut.default_partition_name])
-        assert len(res) == 2
+        assert len(res) == 1
         assert res[0][default_int_field_name] == entities[0]["values"][-1]
-        assert res[1][default_int_field_name] == entities_2[0]["values"][0]
+        term_expr = f'{default_int_field_name} in [{half}]'
+        res = connect.query(collection, term_expr, partition_names=[ut.default_tag, ut.default_partition_name])
+        assert len(res) == 1
+        assert res[0][default_int_field_name] == entities_2[0]["values"][0]
 
     def test_query_multi_partitions_single_result(self, connect, collection):
         """