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

add test case

This commit is contained in:
yihaoDeng 2024-12-25 11:11:09 +08:00
parent 80e5716d20
commit aeb8067595
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/index/inc/indexFstRegex.h
View File

@ -28,7 +28,7 @@
extern "C" { extern "C" {
#endif #endif
typedef enum { MATCH, JUMP, SPLIT, RANGE } InstType; typedef enum { INS_MATCH, INS_JUMP, INS_SPLIT, INS_RANGE } InstType;
typedef struct MatchValue { typedef struct MatchValue {
#ifdef WINDOWS #ifdef WINDOWS

18
source/libs/index/src/indexFstDfa.c
View File

@ -159,14 +159,14 @@ bool dfaBuilderCacheState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *r
if (false == sparSetGet(set, i, &ip)) continue; if (false == sparSetGet(set, i, &ip)) continue;
Inst *inst = taosArrayGet(builder->dfa->insts, ip); Inst *inst = taosArrayGet(builder->dfa->insts, ip);
if (inst->ty == JUMP || inst->ty == SPLIT) { if (inst->ty == INS_JUMP || inst->ty == INS_SPLIT) {
continue; continue;
} else if (inst->ty == RANGE) { } else if (inst->ty == INS_RANGE) {
if (taosArrayPush(tinsts, &ip) == NULL) { if (taosArrayPush(tinsts, &ip) == NULL) {
code = terrno; code = terrno;
goto _exception; goto _exception;
} }
} else if (inst->ty == MATCH) { } else if (inst->ty == INS_MATCH) {
isMatch = true; isMatch = true;
if (taosArrayPush(tinsts, &ip) == NULL) { if (taosArrayPush(tinsts, &ip) == NULL) {
code = terrno; code = terrno;
@ -234,11 +234,11 @@ void dfaAdd(FstDfa *dfa, FstSparseSet *set, uint32_t ip) {
} }
bool succ = sparSetAdd(set, ip, NULL); bool succ = sparSetAdd(set, ip, NULL);
Inst *inst = taosArrayGet(dfa->insts, ip); Inst *inst = taosArrayGet(dfa->insts, ip);
if (inst->ty == MATCH || inst->ty == RANGE) { if (inst->ty == INS_MATCH || inst->ty == INS_RANGE) {
// do nothing // do nothing
} else if (inst->ty == JUMP) { } else if (inst->ty == INS_JUMP) {
dfaAdd(dfa, set, inst->jv.step); dfaAdd(dfa, set, inst->jv.step);
} else if (inst->ty == SPLIT) { } else if (inst->ty == INS_SPLIT) {
dfaAdd(dfa, set, inst->sv.len1); dfaAdd(dfa, set, inst->sv.len1);
dfaAdd(dfa, set, inst->sv.len2); dfaAdd(dfa, set, inst->sv.len2);
} }
@ -253,11 +253,11 @@ bool dfaRun(FstDfa *dfa, FstSparseSet *from, FstSparseSet *to, uint8_t byte) {
if (false == sparSetGet(from, i, &ip)) continue; if (false == sparSetGet(from, i, &ip)) continue;
Inst *inst = taosArrayGet(dfa->insts, ip); Inst *inst = taosArrayGet(dfa->insts, ip);
if (inst->ty == JUMP || inst->ty == SPLIT) { if (inst->ty == INS_JUMP || inst->ty == INS_SPLIT) {
continue; continue;
} else if (inst->ty == MATCH) { } else if (inst->ty == INS_MATCH) {
isMatch = true; isMatch = true;
} else if (inst->ty == RANGE) { } else if (inst->ty == INS_RANGE) {
if (inst->rv.start <= byte && byte <= inst->rv.end) { if (inst->rv.start <= byte && byte <= inst->rv.end) {
dfaAdd(dfa, to, ip + 1); dfaAdd(dfa, to, ip + 1);
} }

18
source/libs/index/test/utilUT.cc
View File

@ -17,6 +17,7 @@
#include "tglobal.h" #include "tglobal.h"
#include "tskiplist.h" #include "tskiplist.h"
#include "tutil.h" #include "tutil.h"
#include "indexFstDfa.h"
class UtilEnv : public ::testing::Test { class UtilEnv : public ::testing::Test {
protected: protected:
@ -404,6 +405,23 @@ TEST_F(UtilComm, testCompress) {
} }
} }
} }
TEST_F(UtilComm, testfstDfa) {
{
FstDfaBuilder *builder = dfaBuilderCreate(NULL);
ASSERT_TRUE(builder != NULL);
dfaBuilderDestroy(builder);
}
{
SArray *pInst = taosArrayInit(32, sizeof(uint8_t));
for (int32_t i = 0; i < 26; i++) {
uint8_t v = 'a' + i;
taosArrayPush(pInst, &v);
}
FstDfaBuilder *builder = dfaBuilderCreate(pInst);
FstDfa *dfa = dfaBuilderBuild(builder);
dfaBuilderDestroy(builder);
}
}