Merge pull request #15340 from taosdata/fix/removeFilterUt

fix: remove filter ut temporarily

source/dnode/vnode/inc/vnode.h

@@ -89,6 +89,7 @@ void        metaReaderClear(SMetaReader *pReader);
 int32_t     metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid);
 int32_t     metaReadNext(SMetaReader *pReader);
 const void *metaGetTableTagVal(SMetaEntry *pEntry, int16_t type, STagVal *tagVal);
+int         metaGetTableNameByUid(void* meta, uint64_t uid, char* tbName);
 
 typedef struct SMetaFltParam {
   tb_uid_t suid;

source/dnode/vnode/src/meta/metaQuery.c

@@ -98,6 +98,17 @@ tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name) {
   return uid;
 }
 
+int metaGetTableNameByUid(void* meta, uint64_t uid, char* tbName) {
+  SMetaReader mr = {0};
+  metaReaderInit(&mr, (SMeta*)meta, 0);
+  metaGetTableEntryByUid(&mr, uid);
+
+  STR_TO_VARSTR(tbName, mr.me.name);
+  metaReaderClear(&mr);
+
+  return 0;
+}
+
 int metaReadNext(SMetaReader *pReader) {
   SMeta *pMeta = pReader->pMeta;
 

source/libs/scalar/CMakeLists.txt

@@ -13,4 +13,4 @@ target_link_libraries(scalar
 
 if(${BUILD_TEST})
     ADD_SUBDIRECTORY(test)
-endif(${BUILD_TEST})
\ No newline at end of file
+endif(${BUILD_TEST})

source/libs/scalar/src/sclfunc.c

@@ -5,6 +5,7 @@
 #include "tdatablock.h"
 #include "tjson.h"
 #include "ttime.h"
+#include "cJSON.h"
 #include "vnode.h"
 
 typedef float (*_float_fn)(float);
@@ -1722,15 +1723,10 @@ int32_t winEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p
 int32_t qTbnameFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
   ASSERT(inputNum == 1);
 
-  SMetaReader mr = {0};
-  metaReaderInit(&mr, pInput->param, 0);
-
   uint64_t uid = *(uint64_t *)colDataGetData(pInput->columnData, 0);
-  metaGetTableEntryByUid(&mr, uid);
 
   char str[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-  STR_TO_VARSTR(str, mr.me.name);
-  metaReaderClear(&mr);
+  metaGetTableNameByUid(pInput->param, uid, str);
 
   for(int32_t i = 0; i < pInput->numOfRows; ++i) {
     colDataAppend(pOutput->columnData, pOutput->numOfRows + i, str, false);

source/libs/scalar/test/CMakeLists.txt

 enable_testing()
 
-add_subdirectory(filter)
+#add_subdirectory(filter)
 add_subdirectory(scalar)

source/libs/scalar/test/filter/CMakeLists.txt

@@ -9,7 +9,7 @@ IF(NOT TD_DARWIN)
         ADD_EXECUTABLE(filterTest ${SOURCE_LIST})
         TARGET_LINK_LIBRARIES(
                 filterTest
-                PUBLIC os util common gtest qcom function nodes scalar
+                PUBLIC os util common gtest qcom function nodes scalar parser catalog transport
         )
 
         TARGET_INCLUDE_DIRECTORIES(
@@ -17,4 +17,4 @@ IF(NOT TD_DARWIN)
                 PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar/"
                 PRIVATE "${TD_SOURCE_DIR}/source/libs/scalar/inc"
         )
-ENDIF()
\ No newline at end of file
+ENDIF()

source/libs/scalar/test/filter/filterTests.cpp

@@ -44,7 +44,6 @@
 #include "scalar.h"
 #include "stub.h"
 #include "taos.h"
-#include "tdatablock.h"
 #include "tdef.h"
 #include "tlog.h"
 #include "tvariant.h"