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

Merge pull request #2358 from taosdata/hotfix/crash 

fix compile error in arm64
This commit is contained in:
Shengliang Guan 2020-06-19 11:03:00 +08:00 committed by GitHub
parent c9860ac555 fe9094258a
commit ae360ecbe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/inc/tutil.h
View File

@ -117,7 +117,7 @@ extern "C" {
#define POW2(x) ((x) * (x)) #define POW2(x) ((x) * (x))
int taosRand(void); uint32_t taosRand(void);
int32_t strdequote(char *src); int32_t strdequote(char *src);

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

@ -445,10 +445,11 @@ static void *tdDecodeKVRecord(void *buf, SKVRecord *pRecord) {
} }
static int tdRestoreKVStore(SKVStore *pStore) { static int tdRestoreKVStore(SKVStore *pStore) {
char tbuf[128] = "\0"; char tbuf[128] = "\0";
void * buf = NULL; void * buf = NULL;
int maxBufSize = 0; int maxBufSize = 0;
SKVRecord rInfo = {0}; SKVRecord rInfo = {0};
SHashMutableIterator *pIter = NULL;
ASSERT(TD_KVSTORE_HEADER_SIZE == lseek(pStore->fd, 0, SEEK_CUR)); ASSERT(TD_KVSTORE_HEADER_SIZE == lseek(pStore->fd, 0, SEEK_CUR));
@ -497,7 +498,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
goto _err; goto _err;
} }
SHashMutableIterator *pIter = taosHashCreateIter(pStore->map); pIter = taosHashCreateIter(pStore->map);
if (pIter == NULL) { if (pIter == NULL) {
uError("failed to create hash iter while opening KV store %s", pStore->fname); uError("failed to create hash iter while opening KV store %s", pStore->fname);
terrno = TSDB_CODE_COM_OUT_OF_MEMORY; terrno = TSDB_CODE_COM_OUT_OF_MEMORY;

12
src/util/src/tutil.c
View File

@ -29,12 +29,12 @@
#ifdef WINDOWS #ifdef WINDOWS
int taosRand(void) uint32_t taosRand(void)
{ {
return rand(); return rand();
} }
#else #else
int taosRand(void) uint32_t taosRand(void)
{ {
int fd; int fd;
int seed; int seed;
@ -50,7 +50,7 @@ int taosRand(void)
close(fd); close(fd);
} }
return seed; return (uint32_t)seed;
} }
#endif #endif
@ -474,9 +474,9 @@ void getTmpfilePath(const char *fileNamePrefix, char *dstPath) {
void taosRandStr(char* str, int32_t size) { void taosRandStr(char* str, int32_t size) {
const char* set = "abcdefghijklmnopqrstuvwxyz0123456789-_."; const char* set = "abcdefghijklmnopqrstuvwxyz0123456789-_.";
int32_t len = 39; int32_t len = 39;
for(int32_t i = 0; i < size; ++i) { for (int32_t i = 0; i < size; ++i) {
str[i] = set[taosRand()%len]; str[i] = set[taosRand() % len];
} }
} }