From c48c78e6ee47986a1b62b76339acb592c963ca29 Mon Sep 17 00:00:00 2001 From: fangpanpan Date: Fri, 17 Jan 2020 09:38:14 +0800 Subject: [PATCH 1/3] [update release info] --- src/util/src/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/src/version.c b/src/util/src/version.c index c85289fb8a..205b626656 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,5 +1,5 @@ -char version[64] = "1.6.4.4"; +char version[64] = "1.6.4.6"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "d62c5c30231d04a736d437cf428af6e12599bd9f"; -char gitinfoOfInternal[128] = "8094a32d78dc519bd883d01ac2ba6ec49ac57a80"; -char buildinfo[512] = "Built by ubuntu at 2019-12-16 21:40"; +char gitinfo[128] = "0d2351b4a7043f4e907734d7b1696d13574cb8e0"; +char gitinfoOfInternal[128] = "a898ecfc1f6b9f1c626ca98a0b9a77b8d5b52abe"; +char buildinfo[512] = "Built by root at 2020-01-14 11:05"; From ffe1cbcfbf3d93812ab0867146051f09c2afab76 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 21 Jan 2020 15:31:30 +0800 Subject: [PATCH 2/3] [#1165] --- src/system/detail/src/mgmtMeter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c index 76867a0d07..a2a6ed8a7d 100644 --- a/src/system/detail/src/mgmtMeter.c +++ b/src/system/detail/src/mgmtMeter.c @@ -1186,6 +1186,8 @@ int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pMetr int32_t * tagLen = calloc(1, sizeof(int32_t) * pMetricMetaMsg->numOfMeters); if (result == NULL || tagLen == NULL) { + tfree(result); + tfree(tagLen); return -1; } From 8828c9145c65dca21e743c99b66e4ab80cc82b1e Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 31 Jan 2020 12:12:01 +0800 Subject: [PATCH 3/3] fix some compile errors --- src/system/detail/inc/vnodeStatus.h | 2 +- src/system/detail/src/vnodeMeter.c | 2 +- src/system/detail/src/vnodeStore.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/detail/inc/vnodeStatus.h b/src/system/detail/inc/vnodeStatus.h index 4489710460..456304370d 100644 --- a/src/system/detail/inc/vnodeStatus.h +++ b/src/system/detail/inc/vnodeStatus.h @@ -26,7 +26,7 @@ enum _TSDB_VG_STATUS { TSDB_VG_STATUS_READY = TSDB_CODE_SUCCESS, TSDB_VG_STATUS_IN_PROGRESS = TSDB_CODE_ACTION_IN_PROGRESS, TSDB_VG_STATUS_NO_DISK_PERMISSIONS = TSDB_CODE_NO_DISK_PERMISSIONS, - TSDB_VG_STATUS_SERVER_NO_PACE = TSDB_CODE_SERVER_NO_SPACE, + TSDB_VG_STATUS_SERVER_NO_PACE = TSDB_CODE_SERV_NO_DISKSPACE, TSDB_VG_STATUS_SERV_OUT_OF_MEMORY = TSDB_CODE_SERV_OUT_OF_MEMORY, TSDB_VG_STATUS_INIT_FAILED = TSDB_CODE_VG_INIT_FAILED, TSDB_VG_STATUS_FULL = TSDB_CODE_NO_ENOUGH_DNODES, diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c index b2d87d3081..4dc6d78707 100644 --- a/src/system/detail/src/vnodeMeter.c +++ b/src/system/detail/src/vnodeMeter.c @@ -81,7 +81,7 @@ int vnodeCreateMeterObjFile(int vnode) { if (errno == EACCES) { return TSDB_CODE_NO_DISK_PERMISSIONS; } else if (errno == ENOSPC) { - return TSDB_CODE_SERVER_NO_SPACE; + return TSDB_CODE_SERV_NO_DISKSPACE; } else { return TSDB_CODE_VG_INIT_FAILED; } diff --git a/src/system/detail/src/vnodeStore.c b/src/system/detail/src/vnodeStore.c index 59d061e085..f184381d25 100644 --- a/src/system/detail/src/vnodeStore.c +++ b/src/system/detail/src/vnodeStore.c @@ -188,7 +188,7 @@ int vnodeCreateVnode(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc) { if (errno == EACCES) { return TSDB_CODE_NO_DISK_PERMISSIONS; } else if (errno == ENOSPC) { - return TSDB_CODE_SERVER_NO_SPACE; + return TSDB_CODE_SERV_NO_DISKSPACE; } else if (errno == EEXIST) { } else { return TSDB_CODE_VG_INIT_FAILED; @@ -201,7 +201,7 @@ int vnodeCreateVnode(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc) { if (errno == EACCES) { return TSDB_CODE_NO_DISK_PERMISSIONS; } else if (errno == ENOSPC) { - return TSDB_CODE_SERVER_NO_SPACE; + return TSDB_CODE_SERV_NO_DISKSPACE; } else if (errno == EEXIST) { } else { return TSDB_CODE_VG_INIT_FAILED;