xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: do some internal refactor.

This commit is contained in:
Haojun Liao 2023-05-23 18:42:52 +08:00
parent 3d084adf1f
commit c66c0c4dfd
6 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/libs/executor/storageapi.h
View File

@ -18,7 +18,6 @@
#include "tsimplehash.h" #include "tsimplehash.h"
#include "tscalablebf.h" #include "tscalablebf.h"
//#include "tdb.h"
#include "taosdef.h" #include "taosdef.h"
#include "tmsg.h" #include "tmsg.h"
#include "tcommon.h" #include "tcommon.h"
@ -35,8 +34,6 @@ extern "C" {
#define CACHESCAN_RETRIEVE_LAST_ROW 0x4 #define CACHESCAN_RETRIEVE_LAST_ROW 0x4
#define CACHESCAN_RETRIEVE_LAST 0x8 #define CACHESCAN_RETRIEVE_LAST 0x8
typedef struct SMeta SMeta;
typedef struct SMetaEntry { typedef struct SMetaEntry {
int64_t version; int64_t version;
int8_t type; int8_t type;
@ -138,8 +135,10 @@ typedef struct SMetaTableInfo {
char tbName[TSDB_TABLE_NAME_LEN]; char tbName[TSDB_TABLE_NAME_LEN];
} SMetaTableInfo; } SMetaTableInfo;
typedef struct SMeta SMeta;
typedef struct SSnapContext { typedef struct SSnapContext {
SMeta * pMeta; SMeta * pMeta; // todo remove it
int64_t snapVersion; int64_t snapVersion;
struct TBC *pCur; struct TBC *pCur;
int64_t suid; int64_t suid;

1
include/libs/index/index.h
View File

@ -21,7 +21,6 @@
#include "taoserror.h" #include "taoserror.h"
#include "tarray.h" #include "tarray.h"
#include "tglobal.h" #include "tglobal.h"
#include "tsdstorage.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

10
include/libs/scalar/filter.h
View File

@ -55,16 +55,6 @@ extern bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg **pColsAgg,
int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond, int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond,
SNode **pOtherCond); SNode **pOtherCond);
typedef struct SMetaFltParam {
tb_uid_t suid;
int16_t cid;
int16_t type;
void *val;
bool reverse;
bool equal;
int (*filterFunc)(void *a, void *b, int16_t type);
} SMetaFltParam;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
source/libs/executor/src/aggregateoperator.c
View File

@ -21,7 +21,6 @@
#include "tname.h" #include "tname.h"
#include "executorInt.h" #include "executorInt.h"
#include "tsdstorage.h"
#include "operator.h" #include "operator.h"
#include "query.h" #include "query.h"
#include "querytask.h" #include "querytask.h"

1
source/libs/executor/src/sysscanoperator.c
View File

@ -32,7 +32,6 @@
#include "tcompare.h" #include "tcompare.h"
#include "thash.h" #include "thash.h"
#include "ttypes.h" #include "ttypes.h"
#include "tsdstorage.h"
#include "index.h" #include "index.h"
typedef int (*__optSysFilter)(void* a, void* b, int16_t dtype); typedef int (*__optSysFilter)(void* a, void* b, int16_t dtype);

1
source/libs/index/src/indexFilter.c
View File

@ -21,7 +21,6 @@
#include "querynodes.h" #include "querynodes.h"
#include "scalar.h" #include "scalar.h"
#include "tdatablock.h" #include "tdatablock.h"
#include "tsdstorage.h"
// clang-format off // clang-format off
#define SIF_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0) #define SIF_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)