fix: use MD5 hash to fix aliasname not enough to hold dbname.tbname #22540
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dapan1121
reviewed
Aug 30, 2023
| @@ -391,8 +391,10 @@ static int32_t createPartialFunction(const SFunctionNode* pSrcFunc, SFunctionNod | |||
| nodesDestroyList(pParameterList); | |||
| return TSDB_CODE_OUT_OF_MEMORY; | |||
| } | |||
| snprintf((*pPartialFunc)->node.aliasName, sizeof((*pPartialFunc)->node.aliasName), "%s.%p", | |||
| (*pPartialFunc)->functionName, pSrcFunc); | |||
| char name[TSDB_FUNC_NAME_LEN + TSDB_NAME_DELIMITER_LEN + sizeof(pSrcFunc) + 1] = {0}; | |||
There was a problem hiding this comment.
sizeof(pSrcFunc)这个大小不对，%p可能会超过的
There was a problem hiding this comment.
使用TSDB_POINTER_PRINT_BYTES 18, 包含16个字符表示最大8个地址字节，加上0x的两个字符。
| @@ -2132,7 +2136,10 @@ static SNode* rewriteUniqueOptCreateFirstFunc(SFunctionNode* pSelectValue, SNode | |||
| strcpy(pFunc->node.aliasName, pSelectValue->node.aliasName); | |||
| } else { | |||
| int64_t pointer = (int64_t)pFunc; | |||
| snprintf(pFunc->node.aliasName, sizeof(pFunc->node.aliasName), "%s.%" PRId64 "", pFunc->functionName, pointer); | |||
| char name[TSDB_FUNC_NAME_LEN + sizeof(pointer) + TSDB_NAME_DELIMITER_LEN + 1] = {0}; | |||
| @@ -388,7 +388,11 @@ static int32_t stbSplAppendWStart(SNodeList* pFuncs, int32_t* pIndex) { | |||
| } | |||
| strcpy(pWStart->functionName, "_wstart"); | |||
| int64_t pointer = (int64_t)pWStart; | |||
| snprintf(pWStart->node.aliasName, sizeof(pWStart->node.aliasName), "%s.%" PRId64 "", pWStart->functionName, pointer); | |||
| char name[TSDB_COL_NAME_LEN + sizeof(pointer) + TSDB_NAME_DELIMITER_LEN + 1] = {0}; | |||
| @@ -414,7 +418,11 @@ static int32_t stbSplAppendWEnd(SWindowLogicNode* pWin, int32_t* pIndex) { | |||
| } | |||
| strcpy(pWEnd->functionName, "_wend"); | |||
| int64_t pointer = (int64_t)pWEnd; | |||
| snprintf(pWEnd->node.aliasName, sizeof(pWEnd->node.aliasName), "%s.%" PRId64 "", pWEnd->functionName, pointer); | |||
| char name[TSDB_COL_NAME_LEN + sizeof(pointer) + TSDB_NAME_DELIMITER_LEN + 1] = {0}; | |||
dapan1121
approved these changes
Aug 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.