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

refact

This commit is contained in:
Hongze Cheng 2021-01-28 15:16:57 +08:00
parent 7f5eaf9eec
commit 895607f0cb
10 changed files with 9 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tsdb/inc/tsdbBuffer.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_BUFFER_H_
#define _TD_TSDB_BUFFER_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
int64_t blockId;
int offset;
@ -44,8 +40,4 @@ int tsdbOpenBufPool(STsdbRepo* pRepo);
void tsdbCloseBufPool(STsdbRepo* pRepo);
SListNode* tsdbAllocBufBlockFromPool(STsdbRepo* pRepo);
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_BUFFER_H_ */

8
src/tsdb/inc/tsdbCommit.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_COMMIT_H_
#define _TD_TSDB_COMMIT_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
int minFid;
int midFid;
@ -50,8 +46,4 @@ static FORCE_INLINE int tsdbGetFidLevel(int fid, SRtn *pRtn) {
}
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_COMMIT_H_ */

8
src/tsdb/inc/tsdbCommitQueue.h
View File

@ -16,14 +16,6 @@
#ifndef _TD_TSDB_COMMIT_QUEUE_H_
#define _TD_TSDB_COMMIT_QUEUE_H_
#ifdef __cplusplus
extern "C" {
#endif
int tsdbScheduleCommit(STsdbRepo *pRepo);
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_COMMIT_QUEUE_H_ */

8
src/tsdb/inc/tsdbFS.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_FS_H_
#define _TD_TSDB_FS_H_
#ifdef __cplusplus
extern "C" {
#endif
#define TSDB_FS_VERSION 0
// ================== CURRENT file header info
@ -112,8 +108,4 @@ static FORCE_INLINE int tsdbUnLockFS(STsdbFS* pFs) {
return 0;
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_FS_H_ */

8
src/tsdb/inc/tsdbFile.h
View File

@ -16,10 +16,6 @@
#ifndef _TS_TSDB_FILE_H_
#define _TS_TSDB_FILE_H_
#ifdef __cplusplus
extern "C" {
#endif
#define TSDB_FILE_HEAD_SIZE 512
#define TSDB_FILE_DELIMITER 0xF00AFA0F
#define TSDB_FILE_INIT_MAGIC 0xFFFFFFFF
@ -350,8 +346,4 @@ static FORCE_INLINE void tsdbGetFidKeyRange(int days, int8_t precision, int fid,
*maxKey = *minKey + days * tsMsPerDay[precision] - 1;
}
#ifdef __cplusplus
}
#endif
#endif /* _TS_TSDB_FILE_H_ */

8
src/tsdb/inc/tsdbLog.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_LOG_H_
#define _TD_TSDB_LOG_H_
#ifdef __cplusplus
extern "C" {
#endif
extern int32_t tsdbDebugFlag;
#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }} while(0)
@ -29,8 +25,4 @@ extern int32_t tsdbDebugFlag;
#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_LOG_H_ */

9
src/tsdb/inc/tsdbMemTable.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_MEMTABLE_H_
#define _TD_TSDB_MEMTABLE_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
int rowsInserted;
int rowsUpdated;
@ -111,9 +107,4 @@ static FORCE_INLINE TKEY tsdbNextIterTKey(SSkipListIterator* pIter) {
return dataRowTKey(row);
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_MEMTABLE_H_ */

8
src/tsdb/inc/tsdbMeta.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_META_H_
#define _TD_TSDB_META_H_
#ifdef __cplusplus
extern "C" {
#endif
#define TSDB_MAX_TABLE_SCHEMAS 16
typedef struct STable {
@ -145,8 +141,4 @@ static FORCE_INLINE TSKEY tsdbGetTableLastKeyImpl(STable* pTable) {
return pTable->lastKey;
}
#ifdef __cplusplus
}
#endif
#endif /* _TD_TSDB_META_H_ */

8
src/tsdb/inc/tsdbReadImpl.h
View File

@ -16,10 +16,6 @@
#ifndef _TD_TSDB_READ_IMPL_H_
#define _TD_TSDB_READ_IMPL_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef struct SReadH SReadH;
typedef struct {
@ -134,8 +130,4 @@ static FORCE_INLINE int tsdbMakeRoom(void **ppBuf, size_t size) {
return 0;
}
#ifdef __cplusplus
}
#endif
#endif /*_TD_TSDB_READ_IMPL_H_*/

18
src/tsdb/inc/tsdbint.h
View File

@ -16,15 +16,15 @@
#ifndef _TD_TSDB_INT_H_
#define _TD_TSDB_INT_H_
// TODO: remove the include
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <inttypes.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <semaphore.h>
#include <dirent.h>
// // TODO: remove the include
// #include <errno.h>
// #include <fcntl.h>
// #include <limits.h>
// #include <inttypes.h>
// #include <sys/stat.h>
// #include <sys/types.h>
// #include <semaphore.h>
// #include <dirent.h>
#include "os.h"
#include "tlog.h"