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

long fields

This commit is contained in:
dmchen 2023-08-30 16:03:57 +08:00
parent 63e2926a60
commit 04a89b4a49
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libs/audit/audit.h
View File

@ -29,6 +29,8 @@
extern "C" { extern "C" {
#endif #endif
#define AUDIT_DETAIL_MAX 16000
typedef struct { typedef struct {
const char *server; const char *server;
uint16_t port; uint16_t port;

39
source/dnode/mnode/impl/src/mndStb.c
View File

@ -1117,6 +1117,26 @@ static char* mndAuditFieldTypeStr(int32_t type){
} }
} }
static void mndAuditFieldStr(char* detail, SArray *arr, int32_t len, int32_t max){
for (int32_t i = 0; i < len; ++i) {
SField *pField = taosArrayGet(arr, i);
char field[200] = {0};
if(strlen(detail) > 0 && strlen(detail)< max-3) {
strcat(detail, ", ");
}
else{
break;
}
sprintf(field, "%s:%s", pField->name, mndAuditFieldTypeStr(pField->type));
if(strlen(detail)< max-strlen(field)) {
strcat(detail, field);
}
else{
break;
}
}
}
static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) { static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
SMnode *pMnode = pReq->info.node; SMnode *pMnode = pReq->info.node;
int32_t code = -1; int32_t code = -1;
@ -1225,7 +1245,7 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
} }
if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS;
char detail[4000] = {0}; char detail[AUDIT_DETAIL_MAX] = {0};
sprintf(detail, "colVer:%d, delay1:%" PRId64 ", delay2:%" PRId64 ", deleteMark1:%" PRId64 ", " sprintf(detail, "colVer:%d, delay1:%" PRId64 ", delay2:%" PRId64 ", deleteMark1:%" PRId64 ", "
"deleteMark2:%" PRId64 ", igExists:%d, numOfColumns:%d, numOfFuncs:%d, numOfTags:%d, " "deleteMark2:%" PRId64 ", igExists:%d, numOfColumns:%d, numOfFuncs:%d, numOfTags:%d, "
"source:%d, suid:%" PRId64 ", tagVer:%d, ttl:%d, " "source:%d, suid:%" PRId64 ", tagVer:%d, ttl:%d, "
@ -1235,21 +1255,8 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
createReq.source, createReq.suid, createReq.tagVer, createReq.ttl, createReq.source, createReq.suid, createReq.tagVer, createReq.ttl,
createReq.watermark1, createReq.watermark2); createReq.watermark1, createReq.watermark2);
for (int32_t i = 0; i < createReq.numOfColumns; ++i) { mndAuditFieldStr(detail, createReq.pColumns, createReq.numOfColumns, AUDIT_DETAIL_MAX);
SField *pField = taosArrayGet(createReq.pColumns, i); mndAuditFieldStr(detail, createReq.pTags, createReq.numOfTags, AUDIT_DETAIL_MAX);
char field[200] = {0};
if(strlen(detail) > 0) strcat(detail, ", ");
sprintf(field, "%s:%s", pField->name, mndAuditFieldTypeStr(pField->type));
strcat(detail, field);
}
for (int32_t i = 0; i < createReq.numOfTags; ++i) {
SField *pField = taosArrayGet(createReq.pTags, i);
char field[200] = {0};
if(strlen(detail) > 0) strcat(detail, ", ");
sprintf(field, "%s:%s", pField->name, mndAuditFieldTypeStr(pField->type));
strcat(detail, field);
}
SName name = {0}; SName name = {0};
tNameFromString(&name, createReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE); tNameFromString(&name, createReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);