reset version

This commit is contained in:
yihaoDeng 2023-03-30 03:56:01 +00:00
parent 009d5099b4
commit c3a8ecd9c2
1 changed files with 66 additions and 24 deletions

View File

@ -319,8 +319,8 @@ int streamInitBackend(SStreamState* pState, char* path) {
rocksdb_options_set_block_based_table_factory((rocksdb_options_t*)cfOpt[i], tableOpt); rocksdb_options_set_block_based_table_factory((rocksdb_options_t*)cfOpt[i], tableOpt);
rocksdb_slicetransform_t* trans = rocksdb_slicetransform_create_fixed_prefix(8); // rocksdb_slicetransform_t* trans = rocksdb_slicetransform_create_fixed_prefix(8);
rocksdb_options_set_prefix_extractor((rocksdb_options_t*)cfOpt[i], trans); // rocksdb_options_set_prefix_extractor((rocksdb_options_t*)cfOpt[i], trans);
}; };
rocksdb_comparator_t** pCompare = taosMemoryCalloc(cfLen, sizeof(rocksdb_comparator_t**)); rocksdb_comparator_t** pCompare = taosMemoryCalloc(cfLen, sizeof(rocksdb_comparator_t**));
@ -401,9 +401,12 @@ int streamGetInit(const char* funcName) {
return -1; return -1;
} }
bool streamStateIterSeekAndValid(rocksdb_iterator_t* iter, char* buf, size_t len) { bool streamStateIterSeekAndValid(rocksdb_iterator_t* iter, char* buf, size_t len) {
rocksdb_iter_seek_for_prev(iter, buf, len); rocksdb_iter_seek(iter, buf, len);
if (!rocksdb_iter_valid(iter)) { if (!rocksdb_iter_valid(iter)) {
return false; rocksdb_iter_seek_for_prev(iter, buf, len);
if (!rocksdb_iter_valid(iter)) {
return false;
}
} }
return true; return true;
} }
@ -412,8 +415,9 @@ rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfNa
int idx = streamGetInit(cfName); int idx = streamGetInit(cfName);
//*snapshot = (rocksdb_snapshot_t*)rocksdb_create_snapshot(pState->pTdbState->rocksdb); //*snapshot = (rocksdb_snapshot_t*)rocksdb_create_snapshot(pState->pTdbState->rocksdb);
if (snapshot != NULL) {
*snapshot = NULL; *snapshot = NULL;
}
rocksdb_readoptions_t* rOpt = rocksdb_readoptions_create(); rocksdb_readoptions_t* rOpt = rocksdb_readoptions_create();
*readOpt = rOpt; *readOpt = rOpt;
@ -572,29 +576,67 @@ int32_t streamStateFillDel_rocksdb(SStreamState* pState, const SWinKey* key) {
int32_t streamStateClear_rocksdb(SStreamState* pState) { int32_t streamStateClear_rocksdb(SStreamState* pState) {
qDebug("streamStateClear_rocksdb"); qDebug("streamStateClear_rocksdb");
SStateKey sKey = {.key = {.ts = 0, .groupId = 0}, .opNum = pState->number}; // SStateKey sKey = {.key = {.ts = 0, .groupId = 0}, .opNum = pState->number};
SStateKey eKey = {.key = {.ts = INT64_MAX, .groupId = UINT64_MAX}, .opNum = pState->number}; // SStateKey eKey = {.key = {.ts = INT64_MAX, .groupId = UINT64_MAX}, .opNum = pState->number};
char sKeyStr[128] = {0}; // char sKeyStr[128] = {0};
char eKeyStr[128] = {0}; // char eKeyStr[128] = {0};
int sLen = stateKeyEncode(&sKey, sKeyStr); // int sLen = stateKeyEncode(&sKey, sKeyStr);
int eLen = stateKeyEncode(&eKey, eKeyStr); // int eLen = stateKeyEncode(&eKey, eKeyStr);
char toStringStart[128] = {0}; // char toStringStart[128] = {0};
char toStringEnd[128] = {0}; // char toStringEnd[128] = {0};
if (qDebugFlag & DEBUG_TRACE) { // if (qDebugFlag & DEBUG_TRACE) {
stateKeyToString(&sKey, toStringStart); // stateKeyToString(&sKey, toStringStart);
stateKeyToString(&eKey, toStringEnd); // stateKeyToString(&eKey, toStringEnd);
} // }
// char* err = NULL;
// rocksdb_delete_range_cf(pState->pTdbState->rocksdb, pState->pTdbState->writeOpts, pState->pTdbState->pHandle[0],
// sKeyStr, sLen, eKeyStr, eLen, &err);
// // rocksdb_compact_range_cf(pState->pTdbState->rocksdb, pState->pTdbState->pHandle[0], sKeyStr, sLen, eKeyStr,
// eLen); if (err != NULL) {
// qWarn("failed to delete range cf(default) err: %s, start: %s, end:%s", err, toStringStart, toStringEnd);
// taosMemoryFree(err);
// }
// del one by one
char buf[128] = {0};
char* s = "null";
SWinKey key = {.ts = 0, .groupId = 0};
SStateKey skey = {.key = key, .opNum = pState->number};
int sLen = stateKeyEncode(&skey, buf);
streamStatePut_rocksdb(pState, &key, s, strlen(s));
rocksdb_readoptions_t* opt = NULL;
rocksdb_iterator_t* iter = streamStateIterCreate(pState, "default", NULL, &opt);
rocksdb_iter_seek(iter, buf, sLen);
// int32_t limit = 128;
// krocksdb_writebatch_t* batch = rocksdb_writebatch_create();
char* err = NULL; char* err = NULL;
rocksdb_delete_range_cf(pState->pTdbState->rocksdb, pState->pTdbState->writeOpts, pState->pTdbState->pHandle[0], while (rocksdb_iter_valid(iter)) {
sKeyStr, sLen, eKeyStr, eLen, &err); int kLen = 0;
// rocksdb_compact_range_cf(pState->pTdbState->rocksdb, pState->pTdbState->pHandle[0], sKeyStr, sLen, eKeyStr, eLen); char* key = (char*)rocksdb_iter_key(iter, (size_t*)&kLen);
if (err != NULL) {
qWarn("failed to delete range cf(default) err: %s, start: %s, end:%s", err, toStringStart, toStringEnd); SStateKey sskey = {0};
taosMemoryFree(err); stateKeyDecode((void*)&sskey, key);
if (sskey.opNum != pState->number) {
rocksdb_iter_next(iter);
continue;
}
rocksdb_delete_cf(pState->pTdbState->rocksdb, pState->pTdbState->writeOpts, pState->pTdbState->pHandle[0], key,
kLen, &err);
if (err != NULL) {
taosMemoryFree(err);
}
if (rocksdb_iter_valid(iter)) rocksdb_iter_next(iter);
} }
rocksdb_iter_destroy(iter);
return 0; return 0;
} }