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

Merge branch 'develop' into feature/2.0tsdb

This commit is contained in:
Hongze Cheng 2020-06-23 11:41:56 +08:00
parent 89bfbfddb6 e2a05d3a3d
commit 8acc4b0bcc
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/src/tscParseInsert.c
View File

@ -46,8 +46,16 @@ static int32_t tscToInteger(SSQLToken *pToken, int64_t *value, char **endPtr) {
return TK_ILLEGAL; return TK_ILLEGAL;
} }
int32_t radix = 10;
if (pToken->type == TK_HEX) {
radix = 16;
} else if (pToken->type == TK_BIN) {
radix = 2;
}
errno = 0; errno = 0;
*value = strtoll(pToken->z, endPtr, 0); *value = strtoll(pToken->z, endPtr, radix);
if (**endPtr == 'e' || **endPtr == 'E' || **endPtr == '.') { if (**endPtr == 'e' || **endPtr == 'E' || **endPtr == '.') {
errno = 0; errno = 0;
double v = round(strtod(pToken->z, endPtr)); double v = round(strtod(pToken->z, endPtr));

11
src/util/src/tskiplist.c
View File

@ -194,13 +194,12 @@ void *tSkipListDestroy(SSkipList *pSkipList) {
pthread_rwlock_wrlock(pSkipList->lock); pthread_rwlock_wrlock(pSkipList->lock);
} }
SSkipListNode *pNode = SL_GET_FORWARD_POINTER(pSkipList->pHead, 0); if (pSkipList->keyInfo.freeNode) {
SSkipListNode *pNode = SL_GET_FORWARD_POINTER(pSkipList->pHead, 0);
while (pNode != pSkipList->pTail) { while (pNode != pSkipList->pTail) {
SSkipListNode *pTemp = pNode; SSkipListNode *pTemp = pNode;
pNode = SL_GET_FORWARD_POINTER(pNode, 0); pNode = SL_GET_FORWARD_POINTER(pNode, 0);
if (pSkipList->keyInfo.freeNode) {
tfree(pTemp); tfree(pTemp);
} }
} }