diff --git a/dbcon/mysql/ha_mcs_impl.cpp b/dbcon/mysql/ha_mcs_impl.cpp index c920c86..127abb0 100644 --- a/dbcon/mysql/ha_mcs_impl.cpp +++ b/dbcon/mysql/ha_mcs_impl.cpp @@ -337,7 +337,7 @@ void storeNumericField(Field** f, int64_t value, CalpontSystemCatalog::ColType& if (ct.colDataType == CalpontSystemCatalog::DECIMAL) dataconvert::DataConvert::decimalToString(value, (unsigned)ct.scale, tmp, 25, ct.colDataType); else - snprintf(tmp, 25, "%ld", value); + snprintf(tmp, 25, "%lld", (long long)value); f2->store(tmp, strlen(tmp), f2->charset()); break; diff --git a/dbcon/mysql/ha_window_function.cpp b/dbcon/mysql/ha_window_function.cpp index f707151..7c039cc 100644 --- a/dbcon/mysql/ha_window_function.cpp +++ b/dbcon/mysql/ha_window_function.cpp @@ -442,7 +442,7 @@ ReturnedColumn* buildWindowFunctionColumn(Item* item, gp_walk_info& gwi, bool& n { case Item_sum::UDF_SUM_FUNC: { - uint64_t bRespectNulls = (ac->getUDAFContext().getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS)) ? 0 : 1; + unsigned long bRespectNulls = (ac->getUDAFContext().getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS)) ? 0 : 1; char sRespectNulls[18]; sprintf(sRespectNulls, "%lu", bRespectNulls); srcp.reset(new ConstantColumn(sRespectNulls, (uint64_t)bRespectNulls, ConstantColumn::NUM)); // IGNORE/RESPECT NULLS. 1 => RESPECT diff --git a/storage-manager/src/AppendTask.cpp b/storage-manager/src/AppendTask.cpp index f6d5f35..25a2da9 100644 --- a/storage-manager/src/AppendTask.cpp +++ b/storage-manager/src/AppendTask.cpp @@ -74,7 +74,7 @@ bool AppendTask::run() while (readCount < cmd->count) { - uint toRead = min(cmd->count - readCount, bufsize); + uint toRead = min(static_cast(cmd->count - readCount), bufsize); success = read(&databuf[0], toRead); check_error("AppendTask read data", false); if (success==0) diff --git a/storage-manager/src/Config.cpp b/storage-manager/src/Config.cpp index 2ba96e3..2238e0a 100644 --- a/storage-manager/src/Config.cpp +++ b/storage-manager/src/Config.cpp @@ -174,7 +174,7 @@ string use_envvar(const boost::smatch &envvar) string expand_numbers(const boost::smatch &match) { - long num = stol(match[1].str()); + long long num = stol(match[1].str()); char suffix = (char) ::tolower(match[2].str()[0]); if (suffix == 't') diff --git a/storage-manager/src/MetadataFile.cpp b/storage-manager/src/MetadataFile.cpp index 028b1d2..cde0492 100644 --- a/storage-manager/src/MetadataFile.cpp +++ b/storage-manager/src/MetadataFile.cpp @@ -461,8 +461,8 @@ void MetadataFile::printObjects() const { BOOST_FOREACH(const boost::property_tree::ptree::value_type &v, jsontree->get_child("objects")) { - printf("Name: %s Length: %lu Offset: %lu\n", v.second.get("key").c_str(), - v.second.get("length"), v.second.get("offset")); + printf("Name: %s Length: %zu Offset: %lld\n", v.second.get("key").c_str(), + v.second.get("length"), (long long)v.second.get("offset")); } } diff --git a/storage-manager/src/WriteTask.cpp b/storage-manager/src/WriteTask.cpp index fc7c3fc..70cc7d7 100644 --- a/storage-manager/src/WriteTask.cpp +++ b/storage-manager/src/WriteTask.cpp @@ -74,7 +74,7 @@ bool WriteTask::run() while (readCount < cmd->count) { - uint toRead = min(cmd->count - readCount, bufsize); + uint toRead = min(static_cast(cmd->count - readCount), bufsize); success = read(&databuf[0], toRead); check_error("WriteTask read data", false); if (success==0) diff --git a/storage-manager/src/unit_tests.cpp b/storage-manager/src/unit_tests.cpp index c77f37d..b3460f4 100644 --- a/storage-manager/src/unit_tests.cpp +++ b/storage-manager/src/unit_tests.cpp @@ -433,7 +433,7 @@ bool writetask() WriteTask w(clientSock, hdr->payloadLen); ssize_t result = ::write(sessionSock, cmd, hdr->payloadLen); - assert(result==(hdr->payloadLen)); + assert(result == static_cast(hdr->payloadLen)); w.run(); @@ -1065,7 +1065,7 @@ bool copytask(bool connectionTest=false) len -= 2; ssize_t result = ::write(sessionSock, buf, len); - assert(result==len); + assert(result==static_cast(len)); int err=0; @@ -1805,7 +1805,7 @@ void shortMsg() WriteTask w(clientSock, hdrWrite->payloadLen); ssize_t result = ::write(sessionSock, cmdWrite, hdrWrite->payloadLen); - assert(result==(hdrWrite->payloadLen)); + assert(result==static_cast(hdrWrite->payloadLen)); w.run(); diff --git a/utils/funcexp/func_conv.cpp b/utils/funcexp/func_conv.cpp index 4e80eed..3afc137 100644 --- a/utils/funcexp/func_conv.cpp +++ b/utils/funcexp/func_conv.cpp @@ -132,35 +132,18 @@ namespace helpers const char* convNumToStr(int64_t val, char* dst, int radix) { if (radix == 16 || radix == -16) -#ifdef _MSC_VER - sprintf(dst, "%llX", val); + sprintf(dst, "%llX", (long long)val); -#else - sprintf(dst, "%lX", val); -#endif else if (radix == 8 || radix == -8) -#ifdef _MSC_VER - sprintf(dst, "%llo", val); + sprintf(dst, "%llo", (long long)val); -#else - sprintf(dst, "%lo", val); -#endif else if (radix == 10) { - uint64_t uval = static_cast(val); -#ifdef _MSC_VER - sprintf(dst, "%llu", uval); -#else - sprintf(dst, "%lu", uval); -#endif + sprintf(dst, "%llu", (unsigned long long)val); } else if (radix == -10) -#ifdef _MSC_VER - sprintf(dst, "%lld", val); + sprintf(dst, "%lld", (long long)val); -#else - sprintf(dst, "%ld", val); -#endif else if (radix == 2 || radix == -2) { char tmp[65]; diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h index 2144c44..aa17fde 100644 --- a/utils/funcexp/functor_str.h +++ b/utils/funcexp/functor_str.h @@ -122,7 +122,7 @@ protected: // [ the default format in treenode.h is fixed-point notation ] char buf[20]; long double floatVal; - int64_t exponent; + int exponent; long double base; switch (fp->data()->resultType().colDataType) @@ -157,7 +157,7 @@ protected: { snprintf(buf, 20, "%.5Lf", base); fFloatStr = execplan::removeTrailing0(buf, 20); - snprintf(buf, 20, "e%02ld", exponent); + snprintf(buf, 20, "e%02d", exponent); fFloatStr += buf; }