Browse Source

fix query not respect conssitency level setting

Signed-off-by: ruiyi.jiang <ruiyi.jiang@zilliz.com>
ruiyi.jiang 1 year ago
parent
commit
26ce4db274
1 changed files with 3 additions and 23 deletions
  1. 3 23
      client/src/hooks/Query.ts

+ 3 - 23
client/src/hooks/Query.ts

@@ -18,7 +18,7 @@ export const useQuery = (params: {
     onQueryStart,
     onQueryStart,
     onQueryEnd,
     onQueryEnd,
     onQueryFinally,
     onQueryFinally,
-    consistencyLevel
+    consistencyLevel,
   } = params;
   } = params;
 
 
   // states
   // states
@@ -27,7 +27,6 @@ export const useQuery = (params: {
   const [total, setTotal] = useState<number>(0);
   const [total, setTotal] = useState<number>(0);
   const [expr, setExpr] = useState<string>('');
   const [expr, setExpr] = useState<string>('');
   const [queryResult, setQueryResult] = useState<any>({ data: [], latency: 0 });
   const [queryResult, setQueryResult] = useState<any>({ data: [], latency: 0 });
-  const lastQuery = useRef<any>();
 
 
   // build local cache for pk ids
   // build local cache for pk ids
   const pageCache = useRef(new Map());
   const pageCache = useRef(new Map());
@@ -70,7 +69,7 @@ export const useQuery = (params: {
     consistency_level = consistencyLevel
     consistency_level = consistencyLevel
   ) => {
   ) => {
     const _expr = getPageExpr(page);
     const _expr = getPageExpr(page);
-    // console.log('query expr', _expr);
+
     onQueryStart(_expr);
     onQueryStart(_expr);
 
 
     try {
     try {
@@ -82,8 +81,6 @@ export const useQuery = (params: {
         // travel_timestamp: timeTravelInfo.timestamp,
         // travel_timestamp: timeTravelInfo.timestamp,
       };
       };
 
 
-      // cache last query
-      lastQuery.current = queryParams;
       // execute query
       // execute query
       const res = await CollectionService.queryData(
       const res = await CollectionService.queryData(
         collection.collection_name,
         collection.collection_name,
@@ -128,7 +125,6 @@ export const useQuery = (params: {
       expr: expr,
       expr: expr,
       output_fields: [count],
       output_fields: [count],
       consistency_level,
       consistency_level,
-      // travel_timestamp: timeTravelInfo.timestamp,
     });
     });
     setTotal(Number(res.data[0][count]));
     setTotal(Number(res.data[0][count]));
   };
   };
@@ -151,23 +147,7 @@ export const useQuery = (params: {
     count();
     count();
     // do the query
     // do the query
     query();
     query();
-  }, [expr, pageSize]);
-
-  // query if collection is changed
-  useEffect(() => {
-    if (!collection || !collection.loaded) {
-      // console.info('[skip running query]: no key yet');
-      return;
-    }
-
-    // reset
-    reset();
-
-    // get count;
-    count();
-    // do the query
-    query();
-  }, [collection]);
+  }, [expr, pageSize, collection]);
 
 
   return {
   return {
     // total query count
     // total query count