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

make compile and run test

This commit is contained in:
Hongze Cheng 2021-10-12 15:11:44 +08:00
parent b45884c151
commit 87dcc7fd92
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/server/vnode/meta/meta.h
View File

@ -57,7 +57,7 @@ SMetaQueryOpts *metaQueryOptionsCreate();
void metaQueryOptionsDestroy(SMetaQueryOpts *); void metaQueryOptionsDestroy(SMetaQueryOpts *);
// STableOpts // STableOpts
void metaTableOptsInit(int8_t type, const char *name, const STSchema *pSchema); void metaTableOptsInit(STableOpts *, int8_t type, const char *name, const STSchema *pSchema);
/* -------------------------------- Hided implementations -------------------------------- */ /* -------------------------------- Hided implementations -------------------------------- */
struct STableOpts { struct STableOpts {

19
source/server/vnode/meta/src/meta.c
View File

@ -146,10 +146,19 @@ int metaCreateTable(SMeta *pMeta, STableOpts *pTableOpts) {
wopt = rocksdb_writeoptions_create(); wopt = rocksdb_writeoptions_create();
// Add to tbname db
rocksdb_put(pMeta->tbnameDb, wopt, pTableOpts->name, strlen(pTableOpts->name), &pTableObj->pTable->uid, rocksdb_put(pMeta->tbnameDb, wopt, pTableOpts->name, strlen(pTableOpts->name), &pTableObj->pTable->uid,
sizeof(tb_uid_t), &err); sizeof(tb_uid_t), &err);
rocksdb_put(pMeta->schemaDb, wopt, pTableOpts->name, strlen(pTableOpts->name), &pTableObj->pTable->uid,
sizeof(tb_uid_t), &err); // Add to schema db
char id[12];
char buf[256];
void *pBuf = buf;
*(tb_uid_t *)id = pTableObj->pTable->uid;
*(int32_t *)(id + sizeof(tb_uid_t)) = schemaVersion(pTableOpts->pSchema);
int size = tdEncodeSchema(&pBuf, pTableOpts->pSchema);
rocksdb_put(pMeta->schemaDb, wopt, id, 12, buf, size, &err);
rocksdb_writeoptions_destroy(wopt); rocksdb_writeoptions_destroy(wopt);
@ -162,6 +171,12 @@ void metaDestroy(const char *path) { taosRemoveDir(path); }
int metaCommit(SMeta *meta) { return 0; } int metaCommit(SMeta *meta) { return 0; }
void metaTableOptsInit(STableOpts *pTableOpts, int8_t type, const char *name, const STSchema *pSchema) {
pTableOpts->type = type;
pTableOpts->name = strdup(name);
pTableOpts->pSchema = tdDupSchema(pSchema);
}
/* -------------------- Static Methods -------------------- */ /* -------------------- Static Methods -------------------- */
static STable *metaTableNew(tb_uid_t uid, const char *name, int32_t sver) { static STable *metaTableNew(tb_uid_t uid, const char *name, int32_t sver) {

26
source/server/vnode/meta/test/metaTests.cpp
View File

@ -1,15 +1,37 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <string.h>
#include <iostream> #include <iostream>
#include "meta.h" #include "meta.h"
TEST(MetaTest, meta_open_test) { TEST(MetaTest, meta_open_test) {
// Open Meta
SMeta *meta = metaOpen(NULL); SMeta *meta = metaOpen(NULL);
std::cout << "Meta is opened!" << std::endl; std::cout << "Meta is opened!" << std::endl;
// Create tables
STableOpts tbOpts;
char tbname[128];
STSchema * pSchema;
STSchemaBuilder sb;
tdInitTSchemaBuilder(&sb, 0);
for (size_t i = 0; i < 10; i++) {
tdAddColToSchema(&sb, TSDB_DATA_TYPE_TIMESTAMP, i, 8);
}
pSchema = tdGetSchemaFromBuilder(&sb);
tdDestroyTSchemaBuilder(&sb);
for (size_t i = 0; i < 1000000; i++) {
sprintf(tbname, "tb%ld", i);
metaTableOptsInit(&tbOpts, 0, tbname, pSchema);
metaCreateTable(meta, &tbOpts);
}
// Close Meta
metaClose(meta); metaClose(meta);
std::cout << "Meta is closed!" << std::endl; std::cout << "Meta is closed!" << std::endl;
metaDestroy("meta"); // // Destroy Meta
std::cout << "Meta is destroyed!" << std::endl; // metaDestroy("meta");
// std::cout << "Meta is destroyed!" << std::endl;
} }