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

correct some error

This commit is contained in:
hzcheng 2020-03-04 06:20:26 +00:00
parent 576f77031d
commit 9fa0685bbf
6 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -4,11 +4,11 @@ PROJECT(TDengine)
ADD_SUBDIRECTORY(os) ADD_SUBDIRECTORY(os)
ADD_SUBDIRECTORY(util) ADD_SUBDIRECTORY(util)
ADD_SUBDIRECTORY(rpc) ADD_SUBDIRECTORY(rpc)
ADD_SUBDIRECTORY(client) # ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(kit) # ADD_SUBDIRECTORY(kit)
ADD_SUBDIRECTORY(plugins) # ADD_SUBDIRECTORY(plugins)
ADD_SUBDIRECTORY(sdb) # ADD_SUBDIRECTORY(sdb)
ADD_SUBDIRECTORY(mnode) # ADD_SUBDIRECTORY(mnode)
ADD_SUBDIRECTORY(vnode) ADD_SUBDIRECTORY(vnode)
ADD_SUBDIRECTORY(dnode) # ADD_SUBDIRECTORY(dnode)
#ADD_SUBDIRECTORY(connector/jdbc) #ADD_SUBDIRECTORY(connector/jdbc)

1
src/vnode/tests/tsdb/tsdbTests.cpp
View File

@ -10,6 +10,7 @@ TEST(TsdbTest, createTsdbRepo) {
config.tsdbId = 0; config.tsdbId = 0;
config.maxTables = 100; config.maxTables = 100;
config.daysPerFile = 10; config.daysPerFile = 10;
config.keep = 3650;
config.minRowsPerFileBlock = 100; config.minRowsPerFileBlock = 100;
config.maxRowsPerFileBlock = 4096; config.maxRowsPerFileBlock = 4096;
config.maxCacheSize = 4 * 1024 * 1024; config.maxCacheSize = 4 * 1024 * 1024;

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

@ -32,12 +32,6 @@ typedef enum {
} TSDB_FILE_TYPE; } TSDB_FILE_TYPE;
extern const char *tsdbFileSuffix[]; extern const char *tsdbFileSuffix[];
// const char *tsdbFileSuffix[] = {
// ".head", // TSDB_FILE_TYPE_HEAD
// ".data", // TSDB_FILE_TYPE_DATA
// ".last", // TSDB_FILE_TYPE_LAST
// ".meta" // TSDB_FILE_TYPE_META
// };
typedef struct { typedef struct {
int64_t fileSize; int64_t fileSize;
@ -55,6 +49,8 @@ typedef struct {
// int16_t numOfBlocks; // int16_t numOfBlocks;
// } SDataBlock; // } SDataBlock;
#define IS_VALID_TSDB_FILE_TYPE(type) ((type) >= TSDB_FILE_TYPE_HEAD && (type) <= TSDB_FILE_TYPE_META)
char *tsdbGetFileName(char *dirName, char *fname, TSDB_FILE_TYPE type); char *tsdbGetFileName(char *dirName, char *fname, TSDB_FILE_TYPE type);
#ifdef __cplusplus #ifdef __cplusplus

18
src/vnode/tsdb/src/tsdbFileStore.c
View File

@ -1,8 +1,22 @@
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "tsdbFile.h" #include "tsdbFile.h"
const char *tsdbFileSuffix[] = {
".head", // TSDB_FILE_TYPE_HEAD
".data", // TSDB_FILE_TYPE_DATA
".last", // TSDB_FILE_TYPE_LAST
".meta" // TSDB_FILE_TYPE_META
};
char *tsdbGetFileName(char *dirName, char *fname, TSDB_FILE_TYPE type) { char *tsdbGetFileName(char *dirName, char *fname, TSDB_FILE_TYPE type) {
// TODO if (!IS_VALID_TSDB_FILE_TYPE(type)) return NULL;
return NULL;
char *fileName = (char *)malloc(strlen(dirName) + strlen(fname) + strlen(tsdbFileSuffix[type]) + 5);
if (fileName == NULL) return NULL;
sprintf(fileName, "%s/%s%s", dirName, fname, tsdbFileSuffix[type]);
return fileName;
} }

2
src/vnode/tsdb/src/tsdbMain.c
View File

@ -241,7 +241,7 @@ static int32_t tsdbSetRepoEnv(STsdbRepo *pRepo) {
return -1; return -1;
} }
sprintf(dirName, "%s/%s", pRepo->rootDir, dirName); sprintf(dirName, "%s/%s", pRepo->rootDir, "tsdb");
if (mkdir(dirName, 0755) < 0) { if (mkdir(dirName, 0755) < 0) {
free(dirName); free(dirName);
return -1; return -1;

4
src/vnode/tsdb/src/tsdbMeta.c
View File

@ -90,7 +90,7 @@ int32_t tsdbCreateTableImpl(STsdbMeta *pMeta, STableCfg *pCfg) {
pSTable->stableUid = -1; pSTable->stableUid = -1;
pSTable->numOfCols = pCfg->numOfCols; pSTable->numOfCols = pCfg->numOfCols;
pSTable->pSchema = tdDupSchema(pCfg->schema); pSTable->pSchema = tdDupSchema(pCfg->schema);
pSTable->content.pIndex = tSkipListCreate(5, 0, 10); // TODO: change here // pSTable->content.pIndex = tSkipListCreate(5, 0, 10); // TODO: change here
tsdbAddTable(pMeta, pSTable); tsdbAddTable(pMeta, pSTable);
} else { } else {
if (pSTable->type != TSDB_SUPER_TABLE) return NULL; if (pSTable->type != TSDB_SUPER_TABLE) return NULL;
@ -113,7 +113,7 @@ int32_t tsdbCreateTableImpl(STsdbMeta *pMeta, STableCfg *pCfg) {
pTable->stableUid = -1; pTable->stableUid = -1;
pTable->pSchema = tdDupSchema(pCfg->schema); pTable->pSchema = tdDupSchema(pCfg->schema);
} }
pTable->content.pData = tSkipListCreate(5, 0, 10); // TODO: change here // pTable->content.pData = tSkipListCreate(5, 0, 10); // TODO: change here
tsdbAddTable(pMeta, pTable); tsdbAddTable(pMeta, pTable);