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

chore: restore codes

This commit is contained in:
kailixu 2024-04-01 14:01:09 +08:00
parent 6eaa99bb2d
commit 717c4b3d9c
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
View File

@ -299,11 +299,11 @@ int32_t vmProcessCreateVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
}
//if(req.encryptAlgorithm == DND_CA_SM4){
// if(strlen(tsEncryptKey) == 0){
// terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
// dError("vgId:%d, failed to create vnode since encrypt key is empty", req.vgId);
// return -1;
// }
if(strlen(tsEncryptKey) == 0){
terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
dError("vgId:%d, failed to create vnode since encrypt key is empty", req.vgId);
return -1;
}
//}
vmGenerateVnodeCfg(&req, &vnodeCfg);

20
source/dnode/mnode/impl/src/mndMain.c
View File

@ -477,16 +477,16 @@ static int32_t mndInitWal(SMnode *pMnode) {
};
#if defined(TD_ENTERPRISE)
// if(tsiEncryptAlgorithm == DND_CA_SM4 && (tsiEncryptScope & DND_CS_MNODE_WAL) == DND_CS_MNODE_WAL){
// cfg.encryptAlgorithm = (tsiEncryptScope & DND_CS_MNODE_WAL)? tsiEncryptAlgorithm : 0;
// if(tsEncryptKey[0] == '\0'){
// terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
// return -1;
// }
// else{
// strncpy(cfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
// }
// }
if(tsiEncryptAlgorithm == DND_CA_SM4 && (tsiEncryptScope & DND_CS_MNODE_WAL) == DND_CS_MNODE_WAL){
cfg.encryptAlgorithm = (tsiEncryptScope & DND_CS_MNODE_WAL)? tsiEncryptAlgorithm : 0;
if(tsEncryptKey[0] == '\0'){
terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
return -1;
}
else{
strncpy(cfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
}
}
#endif
pMnode->pWal = walOpen(path, &cfg);

54
source/dnode/vnode/src/vnd/vnodeCfg.c
View File

@ -246,15 +246,15 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
tjsonGetNumberValue(pJson, "tsdb.encryptAlgorithm", pCfg->tsdbCfg.encryptAlgorithm, code);
if (code < 0) return -1;
#if defined(TD_ENTERPRISE)
// if(pCfg->tsdbCfg.encryptAlgorithm == DND_CA_SM4){
// if(tsEncryptKey[0] == 0){
// terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
// return -1;
// }
// else{
// strncpy(pCfg->tsdbCfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
// }
// }
if(pCfg->tsdbCfg.encryptAlgorithm == DND_CA_SM4){
if(tsEncryptKey[0] == 0){
terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
return -1;
}
else{
strncpy(pCfg->tsdbCfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
}
}
#endif
tjsonGetNumberValue(pJson, "wal.vgId", pCfg->walCfg.vgId, code);
if (code < 0) return -1;
@ -273,28 +273,28 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
tjsonGetNumberValue(pJson, "wal.encryptAlgorithm", pCfg->walCfg.encryptAlgorithm, code);
if (code < 0) return -1;
#if defined(TD_ENTERPRISE)
// if(pCfg->walCfg.encryptAlgorithm == DND_CA_SM4){
// if(tsEncryptKey[0] == 0){
// terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
// return -1;
// }
// else{
// strncpy(pCfg->walCfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
// }
// }
if(pCfg->walCfg.encryptAlgorithm == DND_CA_SM4){
if(tsEncryptKey[0] == 0){
terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
return -1;
}
else{
strncpy(pCfg->walCfg.encryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
}
}
#endif
tjsonGetNumberValue(pJson, "tdbEncryptAlgorithm", pCfg->tdbEncryptAlgorithm, code);
if (code < 0) return -1;
#if defined(TD_ENTERPRISE)
// if(pCfg->tdbEncryptAlgorithm == DND_CA_SM4){
// if(tsEncryptKey[0] == 0){
// terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
// return -1;
// }
// else{
// strncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
// }
// }
if(pCfg->tdbEncryptAlgorithm == DND_CA_SM4){
if(tsEncryptKey[0] == 0){
terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
return -1;
}
else{
strncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN);
}
}
#endif
tjsonGetNumberValue(pJson, "sstTrigger", pCfg->sttTrigger, code);
if (code < 0) pCfg->sttTrigger = TSDB_DEFAULT_SST_TRIGGER;

12
tests/system-test/0-others/information_schema.py
View File

@ -338,13 +338,13 @@ class TDTestCase:
def run(self):
self.prepare_data()
# self.count_check()
# self.ins_columns_check()
self.count_check()
self.ins_columns_check()
# self.ins_col_check_4096()
# self.ins_stable_check()
# self.ins_stable_check2()
# self.ins_dnodes_check()
# self.ins_grants_check()
self.ins_stable_check()
self.ins_stable_check2()
self.ins_dnodes_check()
self.ins_grants_check()
self.ins_encryptions_check()