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

Merge pull request #26183 from taosdata/fix/TD-30228-3.0 

fix: double covert ulong warning
This commit is contained in:
Alex Duan 2024-06-19 14:10:00 +08:00 committed by GitHub
parent b38ad97a86 c130b0e04c
commit 7a7aed42f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/client/taos.h
View File

@ -366,7 +366,7 @@ typedef enum {
} TSDB_SERVER_STATUS; } TSDB_SERVER_STATUS;
DLL_EXPORT TSDB_SERVER_STATUS taos_check_server_status(const char *fqdn, int port, char *details, int maxlen); DLL_EXPORT TSDB_SERVER_STATUS taos_check_server_status(const char *fqdn, int port, char *details, int maxlen);
DLL_EXPORT char* getBuildInfo();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
source/util/src/version.c.in
View File

@ -5,3 +5,6 @@ char gitinfoOfInternal[48] = "${TD_VER_GIT_INTERNAL}";
char buildinfo[64] = "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}"; 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}() {}; void libtaos_${TD_LIB_VER_NUMBER}_${TD_VER_OSTYPE}_${TD_VER_CPUTYPE}_${TD_VER_VERTYPE}() {};
char* getBuildInfo(){
return buildinfo;
}

4
utils/TSZ/sz/src/sz_double.c
View File

@ -385,11 +385,11 @@ unsigned int optimize_intervals_double_1D_opt(double *oriData, size_t dataLength
totalSampleSize++; totalSampleSize++;
pred_value = data_pos[-1]; pred_value = data_pos[-1];
pred_err = fabs(pred_value - *data_pos); 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) if(dbri >= (double)confparams_cpr->maxRangeRadius)
radiusIndex = confparams_cpr->maxRangeRadius - 1; radiusIndex = confparams_cpr->maxRangeRadius - 1;
else else
radiusIndex = dbri; radiusIndex = (size_t)dbri;
intervals[radiusIndex]++; intervals[radiusIndex]++;
data_pos += confparams_cpr->sampleDistance; data_pos += confparams_cpr->sampleDistance;

18
utils/TSZ/sz/src/sz_float.c
View File

@ -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 = 2*oriData[i-1] - oriData[i-2];
pred_value = oriData[i-1]; pred_value = oriData[i-1];
pred_err = fabs(pred_value - oriData[i]); pred_err = fabs(pred_value - oriData[i]);
radiusIndex = (unsigned long)((pred_err/realPrecision+1)/2); double dbri = (pred_err/realPrecision+1)/2;
if(radiusIndex>=confparams_cpr->maxRangeRadius) if(dbri >= confparams_cpr->maxRangeRadius) {
radiusIndex = confparams_cpr->maxRangeRadius - 1; radiusIndex = confparams_cpr->maxRangeRadius - 1;
} else {
radiusIndex = (size_t)dbri;
}
intervals[radiusIndex]++; intervals[radiusIndex]++;
} }
} }
@ -404,9 +407,12 @@ unsigned int optimize_intervals_float_1D_opt(float *oriData, size_t dataLength,
totalSampleSize++; totalSampleSize++;
pred_value = data_pos[-1]; pred_value = data_pos[-1];
pred_err = fabs(pred_value - *data_pos); pred_err = fabs(pred_value - *data_pos);
radiusIndex = (unsigned long)((pred_err/realPrecision+1)/2); double dbri = (pred_err/realPrecision+1)/2;
if(radiusIndex>=confparams_cpr->maxRangeRadius) if(dbri >= confparams_cpr->maxRangeRadius) {
radiusIndex = confparams_cpr->maxRangeRadius - 1; radiusIndex = confparams_cpr->maxRangeRadius - 1;
} else {
radiusIndex = (size_t)dbri;
}
intervals[radiusIndex]++; intervals[radiusIndex]++;
data_pos += confparams_cpr->sampleDistance; data_pos += confparams_cpr->sampleDistance;