Merge pull request #9187 from taosdata/feature/index_cache
adjust index interface
This commit is contained in:
commit
e0e9eca753
|
@ -37,6 +37,7 @@ option(
|
||||||
off
|
off
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
option(
|
option(
|
||||||
BUILD_WITH_NURAFT
|
BUILD_WITH_NURAFT
|
||||||
"If build with NuRaft"
|
"If build with NuRaft"
|
||||||
|
@ -54,3 +55,9 @@ option(
|
||||||
"If use doxygen build documents"
|
"If use doxygen build documents"
|
||||||
OFF
|
OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
|
option(
|
||||||
|
BUILD_WITH_INVERTEDINDEX
|
||||||
|
"If use invertedIndex"
|
||||||
|
ON
|
||||||
|
)
|
||||||
|
|
|
@ -24,6 +24,7 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct SIndex SIndex;
|
typedef struct SIndex SIndex;
|
||||||
|
typedef struct SIndexTerm SIndexTerm;
|
||||||
typedef struct SIndexOpts SIndexOpts;
|
typedef struct SIndexOpts SIndexOpts;
|
||||||
typedef struct SIndexMultiTermQuery SIndexMultiTermQuery;
|
typedef struct SIndexMultiTermQuery SIndexMultiTermQuery;
|
||||||
typedef struct SArray SIndexMultiTerm;
|
typedef struct SArray SIndexMultiTerm;
|
||||||
|
@ -35,7 +36,7 @@ typedef enum {
|
||||||
ADD_INDEX, // add index on specify column
|
ADD_INDEX, // add index on specify column
|
||||||
DROP_INDEX, // drop existed index
|
DROP_INDEX, // drop existed index
|
||||||
DROP_SATBLE // drop stable
|
DROP_SATBLE // drop stable
|
||||||
} SIndexColumnType;
|
} SIndexOperOnColumn;
|
||||||
|
|
||||||
typedef enum { MUST = 0, SHOULD = 1, NOT = 2 } EIndexOperatorType;
|
typedef enum { MUST = 0, SHOULD = 1, NOT = 2 } EIndexOperatorType;
|
||||||
typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2,QUERY_REGEX = 3} EIndexQueryType;
|
typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2,QUERY_REGEX = 3} EIndexQueryType;
|
||||||
|
@ -45,12 +46,12 @@ typedef enum { QUERY_TERM = 0, QUERY_PREFIX = 1, QUERY_SUFFIX = 2,QUERY_REGEX =
|
||||||
*/
|
*/
|
||||||
SIndexMultiTermQuery *indexMultiTermQueryCreate(EIndexOperatorType oper);
|
SIndexMultiTermQuery *indexMultiTermQueryCreate(EIndexOperatorType oper);
|
||||||
void indexMultiTermQueryDestroy(SIndexMultiTermQuery *pQuery);
|
void indexMultiTermQueryDestroy(SIndexMultiTermQuery *pQuery);
|
||||||
int indexMultiTermQueryAdd(SIndexMultiTermQuery *pQuery, const char *field, int32_t nFields, const char *value, int32_t nValue, EIndexQueryType type);
|
int indexMultiTermQueryAdd(SIndexMultiTermQuery *pQuery, SIndexTerm *term, EIndexQueryType type);
|
||||||
/*
|
/*
|
||||||
* @param:
|
* @param:
|
||||||
* @param:
|
* @param:
|
||||||
*/
|
*/
|
||||||
SIndex* indexOpen(SIndexOpts *opt, const char *path);
|
int indexOpen(SIndexOpts *opt, const char *path, SIndex **index);
|
||||||
void indexClose(SIndex *index);
|
void indexClose(SIndex *index);
|
||||||
int indexPut(SIndex *index, SIndexMultiTerm *terms, int uid);
|
int indexPut(SIndex *index, SIndexMultiTerm *terms, int uid);
|
||||||
int indexDelete(SIndex *index, SIndexMultiTermQuery *query);
|
int indexDelete(SIndex *index, SIndexMultiTermQuery *query);
|
||||||
|
@ -61,8 +62,8 @@ int indexRebuild(SIndex *index, SIndexOpts *opt);
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
SIndexMultiTerm *indexMultiTermCreate();
|
SIndexMultiTerm *indexMultiTermCreate();
|
||||||
int indexMultiTermAdd(SIndexMultiTerm *terms, const char *field, int32_t nFields, const char *value, int32_t nValue);
|
int indexMultiTermAdd(SIndexMultiTerm *terms, SIndexTerm *term);
|
||||||
void indexMultiTermDestroy(SIndexMultiTerm *terms);
|
void indexMultiTermDestroy(SIndexMultiTerm *terms);
|
||||||
/*
|
/*
|
||||||
* @param:
|
* @param:
|
||||||
* @param:
|
* @param:
|
||||||
|
@ -70,6 +71,17 @@ void indexMultiTermDestroy(SIndexMultiTerm *terms);
|
||||||
SIndexOpts *indexOptsCreate();
|
SIndexOpts *indexOptsCreate();
|
||||||
void indexOptsDestroy(SIndexOpts *opts);
|
void indexOptsDestroy(SIndexOpts *opts);
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @param:
|
||||||
|
* @param:
|
||||||
|
*/
|
||||||
|
|
||||||
|
SIndexTerm *indexTermCreate(int64_t suid, SIndexOperOnColumn operType, uint8_t colType,
|
||||||
|
const char *colName, int32_t nColName, const char *colVal, int32_t nColVal);
|
||||||
|
void indexTermDestroy(SIndexTerm *p);
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -22,9 +22,13 @@ if (${BUILD_WITH_LUCENE})
|
||||||
index
|
index
|
||||||
PUBLIC lucene++
|
PUBLIC lucene++
|
||||||
)
|
)
|
||||||
|
|
||||||
endif(${BUILD_WITH_LUCENE})
|
endif(${BUILD_WITH_LUCENE})
|
||||||
|
|
||||||
|
if (${BUILD_WITH_INVERTEDINDEX})
|
||||||
|
add_definitions(-DUSE_INVERTED_INDEX)
|
||||||
|
endif(${BUILD_WITH_INVERTEDINDEX})
|
||||||
|
|
||||||
|
|
||||||
if (${BUILD_TEST})
|
if (${BUILD_TEST})
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
endif(${BUILD_TEST})
|
endif(${BUILD_TEST})
|
||||||
|
|
|
@ -37,10 +37,10 @@ struct SIndex {
|
||||||
#endif
|
#endif
|
||||||
void *cache;
|
void *cache;
|
||||||
void *tindex;
|
void *tindex;
|
||||||
SHashObj *fieldObj;// < field name, field id>
|
SHashObj *colObj;// < field name, field id>
|
||||||
|
|
||||||
int64_t suid; // current super table id, -1 is normal table
|
int64_t suid; // current super table id, -1 is normal table
|
||||||
int fieldId; // field id allocated to cache
|
int colId; // field id allocated to cache
|
||||||
int32_t cVersion; // current version allocated to cache
|
int32_t cVersion; // current version allocated to cache
|
||||||
pthread_mutex_t mtx;
|
pthread_mutex_t mtx;
|
||||||
};
|
};
|
||||||
|
@ -60,22 +60,21 @@ struct SIndexMultiTermQuery {
|
||||||
|
|
||||||
// field and key;
|
// field and key;
|
||||||
typedef struct SIndexTerm {
|
typedef struct SIndexTerm {
|
||||||
uint8_t type; // term data type, str/interger/json
|
int64_t suid;
|
||||||
char *key;
|
SIndexOperOnColumn operType; // oper type, add/del/update
|
||||||
int32_t nKey;
|
uint8_t colType; // term data type, str/interger/json
|
||||||
char *val;
|
char *colName;
|
||||||
int32_t nVal;
|
int32_t nColName;
|
||||||
|
char *colVal;
|
||||||
|
int32_t nColVal;
|
||||||
} SIndexTerm;
|
} SIndexTerm;
|
||||||
|
|
||||||
typedef struct SIndexTermQuery {
|
typedef struct SIndexTermQuery {
|
||||||
SIndexTerm* field_value;
|
SIndexTerm* term;
|
||||||
EIndexQueryType type;
|
EIndexQueryType qType;
|
||||||
} SIndexTermQuery;
|
} SIndexTermQuery;
|
||||||
|
|
||||||
|
|
||||||
SIndexTerm *indexTermCreate(const char *key, int32_t nKey, const char *val, int32_t nVal);
|
|
||||||
void indexTermDestroy(SIndexTerm *p);
|
|
||||||
|
|
||||||
|
|
||||||
#define indexFatal(...) do { if (sDebugFlag & DEBUG_FATAL) { taosPrintLog("index FATAL ", 255, __VA_ARGS__); }} while(0)
|
#define indexFatal(...) do { if (sDebugFlag & DEBUG_FATAL) { taosPrintLog("index FATAL ", 255, __VA_ARGS__); }} while(0)
|
||||||
#define indexError(...) do { if (sDebugFlag & DEBUG_ERROR) { taosPrintLog("index ERROR ", 255, __VA_ARGS__); }} while(0)
|
#define indexError(...) do { if (sDebugFlag & DEBUG_ERROR) { taosPrintLog("index ERROR ", 255, __VA_ARGS__); }} while(0)
|
||||||
|
|
|
@ -38,13 +38,13 @@ typedef struct IndexCache {
|
||||||
//
|
//
|
||||||
IndexCache *indexCacheCreate();
|
IndexCache *indexCacheCreate();
|
||||||
|
|
||||||
void indexCacheDestroy(IndexCache *cache);
|
void indexCacheDestroy(void *cache);
|
||||||
|
|
||||||
int indexCachePut(IndexCache *cache, int16_t fieldId, int16_t fieldType, const char *fieldValue, int32_t fvLen,
|
int indexCachePut(void *cache, int16_t fieldId, int16_t fieldType, const char *fieldValue, int32_t fvLen,
|
||||||
uint32_t version, uint64_t uid, int8_t operType);
|
uint32_t version, uint64_t uid, int8_t operType);
|
||||||
|
|
||||||
int indexCacheGet(IndexCache *cache, uint64_t *rst);
|
int indexCacheGet(void *cache, uint64_t *rst);
|
||||||
int indexCacheSearch(IndexCache *cache, SIndexMultiTermQuery *query, SArray *result);
|
int indexCacheSearch(void *cache, SIndexMultiTermQuery *query, SArray *result);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,11 +22,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
typedef struct SIdxFieldInfo {
|
typedef struct SIdxColInfo {
|
||||||
int fieldId; // generated by index internal
|
int colId; // generated by index internal
|
||||||
int cVersion;
|
int cVersion;
|
||||||
int type; // field type
|
} SIdxColInfo;
|
||||||
} SIdxFieldInfo;
|
|
||||||
|
|
||||||
static pthread_once_t isInit = PTHREAD_ONCE_INIT;
|
static pthread_once_t isInit = PTHREAD_ONCE_INIT;
|
||||||
static void indexInit();
|
static void indexInit();
|
||||||
|
@ -38,22 +37,25 @@ static int indexMergeCacheIntoTindex(struct SIndex *sIdx) {
|
||||||
indexWarn("suid %" PRIu64 " merge cache into tindex", sIdx->suid);
|
indexWarn("suid %" PRIu64 " merge cache into tindex", sIdx->suid);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SIndex *indexOpen(SIndexOpts *opts, const char *path) {
|
int indexOpen(SIndexOpts *opts, const char *path, SIndex **index) {
|
||||||
pthread_once(&isInit, indexInit);
|
pthread_once(&isInit, indexInit);
|
||||||
SIndex *sIdx = calloc(1, sizeof(SIndex));
|
SIndex *sIdx = calloc(1, sizeof(SIndex));
|
||||||
|
if (sIdx == NULL) { return -1; }
|
||||||
|
|
||||||
#ifdef USE_LUCENE
|
#ifdef USE_LUCENE
|
||||||
index_t *index = index_open(path);
|
index_t *index = index_open(path);
|
||||||
sIdx->index = index;
|
sIdx->index = index;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sIdx->cache = (void*)indexCacheCreate();
|
sIdx->cache = (void*)indexCacheCreate();
|
||||||
sIdx->tindex = NULL;
|
sIdx->tindex = NULL;
|
||||||
sIdx->fieldObj = taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
|
sIdx->colObj = taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
|
||||||
sIdx->fieldId = 1;
|
sIdx->colId = 1;
|
||||||
sIdx->cVersion = 1;
|
sIdx->cVersion = 1;
|
||||||
pthread_mutex_init(&sIdx->mtx, NULL);
|
pthread_mutex_init(&sIdx->mtx, NULL);
|
||||||
return sIdx;
|
|
||||||
|
*index = sIdx;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void indexClose(SIndex *sIdx) {
|
void indexClose(SIndex *sIdx) {
|
||||||
|
@ -61,14 +63,17 @@ void indexClose(SIndex *sIdx) {
|
||||||
index_close(sIdex->index);
|
index_close(sIdex->index);
|
||||||
sIdx->index = NULL;
|
sIdx->index = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INVERTED_INDEX
|
||||||
indexCacheDestroy(sIdx->cache);
|
indexCacheDestroy(sIdx->cache);
|
||||||
taosHashCleanup(sIdx->fieldObj);
|
taosHashCleanup(sIdx->colObj);
|
||||||
pthread_mutex_destroy(&sIdx->mtx);
|
pthread_mutex_destroy(&sIdx->mtx);
|
||||||
|
#endif
|
||||||
free(sIdx);
|
free(sIdx);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int indexPut(SIndex *index, SArray* fVals, int uid) {
|
int indexPut(SIndex *index, SIndexMultiTerm * fVals, int uid) {
|
||||||
|
|
||||||
#ifdef USE_LUCENE
|
#ifdef USE_LUCENE
|
||||||
index_document_t *doc = index_document_create();
|
index_document_t *doc = index_document_create();
|
||||||
|
@ -86,32 +91,38 @@ int indexPut(SIndex *index, SArray* fVals, int uid) {
|
||||||
index_document_destroy(doc);
|
index_document_destroy(doc);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INVERTED_INDEX
|
||||||
|
|
||||||
//TODO(yihao): reduce the lock range
|
//TODO(yihao): reduce the lock range
|
||||||
pthread_mutex_lock(&index->mtx);
|
pthread_mutex_lock(&index->mtx);
|
||||||
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
|
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
|
||||||
SIndexTerm *p = taosArrayGetP(fVals, i);
|
SIndexTerm *p = taosArrayGetP(fVals, i);
|
||||||
SIdxFieldInfo *fi = taosHashGet(index->fieldObj, p->key, p->nKey);
|
SIdxColInfo *fi = taosHashGet(index->colObj, p->colName, p->nColName);
|
||||||
if (fi == NULL) {
|
if (fi == NULL) {
|
||||||
SIdxFieldInfo tfi = {.fieldId = index->fieldId, .type = p->type};
|
SIdxColInfo tfi = {.colId = index->colId};
|
||||||
index->cVersion++;
|
index->cVersion++;
|
||||||
index->fieldId++;
|
index->colId++;
|
||||||
taosHashPut(index->fieldObj, p->key, p->nKey, &tfi, sizeof(tfi));
|
taosHashPut(index->colObj, p->colName, p->nColName, &tfi, sizeof(tfi));
|
||||||
} else {
|
} else {
|
||||||
//TODO, del
|
//TODO, del
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pthread_mutex_unlock(&index->mtx);
|
||||||
|
|
||||||
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
|
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
|
||||||
SIndexTerm *p = taosArrayGetP(fVals, i);
|
SIndexTerm *p = taosArrayGetP(fVals, i);
|
||||||
SIdxFieldInfo *fi = taosHashGet(index->fieldObj, p->key, p->nKey);
|
SIdxColInfo *fi = taosHashGet(index->colObj, p->colName, p->nColName);
|
||||||
assert(fi != NULL);
|
assert(fi != NULL);
|
||||||
int32_t fieldId = fi->fieldId;
|
int32_t colId = fi->colId;
|
||||||
int32_t colType = fi->type;
|
|
||||||
int32_t version = index->cVersion;
|
int32_t version = index->cVersion;
|
||||||
|
int ret = indexCachePut(index->cache, colId, p->colType, p->colVal, p->nColVal, version, uid, p->operType);
|
||||||
|
if (ret != 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&index->mtx);
|
#endif
|
||||||
return 1;
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
int indexSearch(SIndex *index, SIndexMultiTermQuery *multiQuerys, SArray *result) {
|
int indexSearch(SIndex *index, SIndexMultiTermQuery *multiQuerys, SArray *result) {
|
||||||
#ifdef USE_LUCENE
|
#ifdef USE_LUCENE
|
||||||
|
@ -148,16 +159,26 @@ int indexSearch(SIndex *index, SIndexMultiTermQuery *multiQuerys, SArray *result
|
||||||
free(fields);
|
free(fields);
|
||||||
free(keys);
|
free(keys);
|
||||||
free(types);
|
free(types);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INVERTED_INDEX
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int indexDelete(SIndex *index, SIndexMultiTermQuery *query) {
|
int indexDelete(SIndex *index, SIndexMultiTermQuery *query) {
|
||||||
|
#ifdef USE_INVERTED_INDEX
|
||||||
|
#endif
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
int indexRebuild(SIndex *index, SIndexOpts *opts);
|
int indexRebuild(SIndex *index, SIndexOpts *opts) {
|
||||||
|
#ifdef USE_INVERTED_INDEX
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
SIndexOpts *indexOptsCreate() {
|
SIndexOpts *indexOptsCreate() {
|
||||||
|
@ -184,53 +205,55 @@ SIndexMultiTermQuery *indexMultiTermQueryCreate(EIndexOperatorType opera) {
|
||||||
void indexMultiTermQueryDestroy(SIndexMultiTermQuery *pQuery) {
|
void indexMultiTermQueryDestroy(SIndexMultiTermQuery *pQuery) {
|
||||||
for (int i = 0; i < taosArrayGetSize(pQuery->query); i++) {
|
for (int i = 0; i < taosArrayGetSize(pQuery->query); i++) {
|
||||||
SIndexTermQuery *p = (SIndexTermQuery *)taosArrayGet(pQuery->query, i);
|
SIndexTermQuery *p = (SIndexTermQuery *)taosArrayGet(pQuery->query, i);
|
||||||
indexTermDestroy(p->field_value);
|
indexTermDestroy(p->term);
|
||||||
}
|
}
|
||||||
taosArrayDestroy(pQuery->query);
|
taosArrayDestroy(pQuery->query);
|
||||||
free(pQuery);
|
free(pQuery);
|
||||||
};
|
};
|
||||||
int indexMultiTermQueryAdd(SIndexMultiTermQuery *pQuery, const char *field, int32_t nFields, const char *value, int32_t nValue, EIndexQueryType type){
|
int indexMultiTermQueryAdd(SIndexMultiTermQuery *pQuery, SIndexTerm *term, EIndexQueryType qType){
|
||||||
SIndexTerm *t = indexTermCreate(field, nFields, value, nValue);
|
SIndexTermQuery q = {.qType = qType, .term = term};
|
||||||
if (t == NULL) {return -1;}
|
|
||||||
SIndexTermQuery q = {.type = type, .field_value = t};
|
|
||||||
taosArrayPush(pQuery->query, &q);
|
taosArrayPush(pQuery->query, &q);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SIndexTerm *indexTermCreate(const char *key, int32_t nKey, const char *val, int32_t nVal) {
|
SIndexTerm *indexTermCreate(int64_t suid, SIndexOperOnColumn oper, uint8_t colType, const char *colName, int32_t nColName, const char *colVal, int32_t nColVal) {
|
||||||
SIndexTerm *t = (SIndexTerm *)malloc(sizeof(SIndexTerm));
|
SIndexTerm *t = (SIndexTerm *)calloc(1, (sizeof(SIndexTerm)));
|
||||||
t->key = (char *)calloc(nKey + 1, 1);
|
if (t == NULL) { return NULL; }
|
||||||
memcpy(t->key, key, nKey);
|
|
||||||
t->nKey = nKey;
|
|
||||||
|
|
||||||
t->val = (char *)calloc(nVal + 1, 1);
|
t->suid = suid;
|
||||||
memcpy(t->val, val, nVal);
|
t->operType= oper;
|
||||||
t->nVal = nVal;
|
t->colType = colType;
|
||||||
|
|
||||||
|
t->colName = (char *)calloc(1, nColName + 1);
|
||||||
|
memcpy(t->colName, colName, nColName);
|
||||||
|
t->nColName = nColName;
|
||||||
|
|
||||||
|
t->colVal = (char *)calloc(1, nColVal + 1);
|
||||||
|
memcpy(t->colVal, colVal, nColVal);
|
||||||
|
t->nColVal = nColVal;
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
void indexTermDestroy(SIndexTerm *p) {
|
void indexTermDestroy(SIndexTerm *p) {
|
||||||
free(p->key);
|
free(p->colName);
|
||||||
free(p->val);
|
free(p->colVal);
|
||||||
free(p);
|
free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
SArray *indexMultiTermCreate() {
|
SIndexMultiTerm *indexMultiTermCreate() {
|
||||||
return taosArrayInit(4, sizeof(SIndexTerm *));
|
return taosArrayInit(4, sizeof(SIndexTerm *));
|
||||||
}
|
}
|
||||||
|
|
||||||
int indexMultiTermAdd(SArray *array, const char *field, int32_t nField, const char *val, int32_t nVal) {
|
int indexMultiTermAdd(SIndexMultiTerm *terms, SIndexTerm *term) {
|
||||||
SIndexTerm *term = indexTermCreate(field, nField, val, nVal);
|
taosArrayPush(terms, &term);
|
||||||
if (term == NULL) { return -1; }
|
|
||||||
taosArrayPush(array, &term);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
void indexMultiTermDestroy(SArray *array) {
|
void indexMultiTermDestroy(SIndexMultiTerm *terms) {
|
||||||
for (int32_t i = 0; i < taosArrayGetSize(array); i++) {
|
for (int32_t i = 0; i < taosArrayGetSize(terms); i++) {
|
||||||
SIndexTerm *p = taosArrayGetP(array, i);
|
SIndexTerm *p = taosArrayGetP(terms, i);
|
||||||
indexTermDestroy(p);
|
indexTermDestroy(p);
|
||||||
}
|
}
|
||||||
taosArrayDestroy(array);
|
taosArrayDestroy(terms);
|
||||||
}
|
}
|
||||||
|
|
||||||
void indexInit() {
|
void indexInit() {
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include "index_cache.h"
|
#include "index_cache.h"
|
||||||
#include "tcompare.h"
|
#include "tcompare.h"
|
||||||
|
|
||||||
#define MAX_INDEX_KEY_LEN 128 // test only, change later
|
#define MAX_INDEX_KEY_LEN 256// test only, change later
|
||||||
|
|
||||||
static char* getIndexKey(const void *pData) {
|
static char* getIndexKey(const void *pData) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -96,16 +96,19 @@ IndexCache *indexCacheCreate() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void indexCacheDestroy(IndexCache *cache) {
|
void indexCacheDestroy(void *cache) {
|
||||||
if (cache == NULL) { return; }
|
IndexCache *pCache = cache;
|
||||||
tSkipListDestroy(cache->skiplist);
|
if (pCache == NULL) { return; }
|
||||||
free(cache);
|
tSkipListDestroy(pCache->skiplist);
|
||||||
|
free(pCache);
|
||||||
}
|
}
|
||||||
|
|
||||||
int indexCachePut(IndexCache *cache, int16_t fieldId, int16_t fieldType, const char *fieldValue, int32_t fvLen,
|
int indexCachePut(void *cache, int16_t fieldId, int16_t fieldType, const char *fieldValue, int32_t fvLen,
|
||||||
uint32_t version, uint64_t uid, int8_t operType) {
|
uint32_t version, uint64_t uid, int8_t operType) {
|
||||||
if (cache == NULL) { return -1;}
|
if (cache == NULL) { return -1;}
|
||||||
|
|
||||||
|
IndexCache *pCache = cache;
|
||||||
|
|
||||||
// encode data
|
// encode data
|
||||||
int32_t total = sizeof(int32_t) + sizeof(fieldId) + sizeof(fieldType) + sizeof(fvLen) + fvLen + sizeof(version) + sizeof(uid) + sizeof(operType);
|
int32_t total = sizeof(int32_t) + sizeof(fieldId) + sizeof(fieldType) + sizeof(fvLen) + fvLen + sizeof(version) + sizeof(uid) + sizeof(operType);
|
||||||
|
|
||||||
|
@ -135,20 +138,15 @@ int indexCachePut(IndexCache *cache, int16_t fieldId, int16_t fieldType, const c
|
||||||
memcpy(p, &operType, sizeof(operType));
|
memcpy(p, &operType, sizeof(operType));
|
||||||
p += sizeof(operType);
|
p += sizeof(operType);
|
||||||
|
|
||||||
tSkipListPut(cache->skiplist, (void *)buf);
|
tSkipListPut(pCache->skiplist, (void *)buf);
|
||||||
// encode end
|
// encode end
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
int indexCacheDel(IndexCache *cache, int32_t fieldId, const char *fieldValue, int32_t fvlen, uint64_t uid, int8_t operType) {
|
int indexCacheDel(void *cache, int32_t fieldId, const char *fieldValue, int32_t fvlen, uint64_t uid, int8_t operType) {
|
||||||
|
IndexCache *pCache = cache;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
int indexCacheSearch(IndexCache *cache, SIndexMultiTermQuery *query, SArray *result) {
|
int indexCacheSearch(void *cache, SIndexMultiTermQuery *query, SArray *result) {
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
add_executable(indexTest "")
|
add_executable(indexTest "")
|
||||||
target_sources(indexTest
|
target_sources(indexTest
|
||||||
PRIVATE
|
PRIVATE
|
||||||
"indexTests.cpp"
|
"indexTests.cc"
|
||||||
)
|
)
|
||||||
target_include_directories ( indexTest
|
target_include_directories ( indexTest
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
|
|
@ -1,3 +1,17 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -61,7 +75,7 @@ class FstReadMemory {
|
||||||
// add later
|
// add later
|
||||||
bool Search(AutomationCtx *ctx, std::vector<uint64_t> &result) {
|
bool Search(AutomationCtx *ctx, std::vector<uint64_t> &result) {
|
||||||
FstStreamBuilder *sb = fstSearch(_fst, ctx);
|
FstStreamBuilder *sb = fstSearch(_fst, ctx);
|
||||||
StreamWithState *st = streamBuilderIntoStream(sb);
|
StreamWithState *st = streamBuilderIntoStream(sb);
|
||||||
StreamWithStateResult *rt = NULL;
|
StreamWithStateResult *rt = NULL;
|
||||||
|
|
||||||
while ((rt = streamWithStateNextWith(st, NULL)) != NULL) {
|
while ((rt = streamWithStateNextWith(st, NULL)) != NULL) {
|
||||||
|
@ -279,15 +293,71 @@ void validateFst() {
|
||||||
delete m;
|
delete m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class IndexEnv : public ::testing::Test {
|
||||||
|
protected:
|
||||||
|
virtual void SetUp() {
|
||||||
|
taosRemoveDir(path);
|
||||||
|
opts = indexOptsCreate();
|
||||||
|
int ret = indexOpen(opts, path, &index);
|
||||||
|
assert(ret == 0);
|
||||||
|
}
|
||||||
|
virtual void TearDown() {
|
||||||
|
indexClose(index);
|
||||||
|
indexOptsDestroy(opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *path = "/tmp/tindex";
|
||||||
|
SIndexOpts *opts;
|
||||||
|
SIndex *index;
|
||||||
|
};
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
TEST_F(IndexEnv, testPut) {
|
||||||
checkFstPerf();
|
|
||||||
//checkFstPrefixSearch();
|
// single index column
|
||||||
return 1;
|
{
|
||||||
|
|
||||||
|
std::string colName("tag1"), colVal("Hello world");
|
||||||
|
SIndexTerm *term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
|
||||||
|
SIndexMultiTerm *terms = indexMultiTermCreate();
|
||||||
|
indexMultiTermAdd(terms, term);
|
||||||
|
|
||||||
|
for (size_t i = 0; i < 100; i++) {
|
||||||
|
int tableId = i;
|
||||||
|
int ret = indexPut(index, terms, tableId);
|
||||||
|
assert(ret == 0);
|
||||||
|
}
|
||||||
|
indexMultiTermDestroy(terms);
|
||||||
|
}
|
||||||
|
// multi index column
|
||||||
|
{
|
||||||
|
|
||||||
|
SIndexMultiTerm *terms = indexMultiTermCreate();
|
||||||
|
{
|
||||||
|
std::string colName("tag1"), colVal("Hello world");
|
||||||
|
SIndexTerm *term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
|
||||||
|
indexMultiTermAdd(terms, term);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
std::string colName("tag2"), colVal("Hello world");
|
||||||
|
SIndexTerm *term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
|
||||||
|
indexMultiTermAdd(terms, term);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 100; i++) {
|
||||||
|
int tableId = i;
|
||||||
|
int ret = indexPut(index, terms, tableId);
|
||||||
|
assert(ret == 0);
|
||||||
|
}
|
||||||
|
indexMultiTermDestroy(terms);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(IndexEnv, testDel) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//TEST(IndexFstBuilder, IndexFstInput) {
|
|
||||||
//
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue