diff --git a/include/client/taos.h b/include/client/taos.h index a22c8e5138..1d2b3a913c 100644 --- a/include/client/taos.h +++ b/include/client/taos.h @@ -366,7 +366,7 @@ typedef enum { } TSDB_SERVER_STATUS; DLL_EXPORT TSDB_SERVER_STATUS taos_check_server_status(const char *fqdn, int port, char *details, int maxlen); - +DLL_EXPORT char* getBuildInfo(); #ifdef __cplusplus } #endif diff --git a/source/util/src/version.c.in b/source/util/src/version.c.in index 2446bf9278..07bb1d42f8 100644 --- a/source/util/src/version.c.in +++ b/source/util/src/version.c.in @@ -5,3 +5,6 @@ char gitinfoOfInternal[48] = "${TD_VER_GIT_INTERNAL}"; char buildinfo[64] = "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}"; void libtaos_${TD_LIB_VER_NUMBER}_${TD_VER_OSTYPE}_${TD_VER_CPUTYPE}_${TD_VER_VERTYPE}() {}; +char* getBuildInfo(){ + return buildinfo; +} diff --git a/utils/TSZ/sz/src/sz_double.c b/utils/TSZ/sz/src/sz_double.c index 0510fc612d..7fe5a07843 100644 --- a/utils/TSZ/sz/src/sz_double.c +++ b/utils/TSZ/sz/src/sz_double.c @@ -385,11 +385,11 @@ unsigned int optimize_intervals_double_1D_opt(double *oriData, size_t dataLength totalSampleSize++; pred_value = data_pos[-1]; pred_err = fabs(pred_value - *data_pos); - double dbri = (unsigned long)((pred_err/realPrecision+1)/2); + double dbri = (pred_err/realPrecision+1)/2; if(dbri >= (double)confparams_cpr->maxRangeRadius) radiusIndex = confparams_cpr->maxRangeRadius - 1; else - radiusIndex = dbri; + radiusIndex = (size_t)dbri; intervals[radiusIndex]++; data_pos += confparams_cpr->sampleDistance; diff --git a/utils/TSZ/sz/src/sz_float.c b/utils/TSZ/sz/src/sz_float.c index 4b18eb6ee8..e5dc40f003 100644 --- a/utils/TSZ/sz/src/sz_float.c +++ b/utils/TSZ/sz/src/sz_float.c @@ -53,9 +53,12 @@ unsigned int optimize_intervals_float_1D(float *oriData, size_t dataLength, doub //pred_value = 2*oriData[i-1] - oriData[i-2]; pred_value = oriData[i-1]; pred_err = fabs(pred_value - oriData[i]); - radiusIndex = (unsigned long)((pred_err/realPrecision+1)/2); - if(radiusIndex>=confparams_cpr->maxRangeRadius) - radiusIndex = confparams_cpr->maxRangeRadius - 1; + double dbri = (pred_err/realPrecision+1)/2; + if(dbri >= confparams_cpr->maxRangeRadius) { + radiusIndex = confparams_cpr->maxRangeRadius - 1; + } else { + radiusIndex = (size_t)dbri; + } intervals[radiusIndex]++; } } @@ -404,9 +407,12 @@ unsigned int optimize_intervals_float_1D_opt(float *oriData, size_t dataLength, totalSampleSize++; pred_value = data_pos[-1]; pred_err = fabs(pred_value - *data_pos); - radiusIndex = (unsigned long)((pred_err/realPrecision+1)/2); - if(radiusIndex>=confparams_cpr->maxRangeRadius) - radiusIndex = confparams_cpr->maxRangeRadius - 1; + double dbri = (pred_err/realPrecision+1)/2; + if(dbri >= confparams_cpr->maxRangeRadius) { + radiusIndex = confparams_cpr->maxRangeRadius - 1; + } else { + radiusIndex = (size_t)dbri; + } intervals[radiusIndex]++; data_pos += confparams_cpr->sampleDistance;