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

fix: windows compile issue

This commit is contained in:
dapan1121 2024-12-10 09:15:15 +08:00
parent 20a8c92d3e
commit 7fd0d024fc
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmake.define
View File

@ -131,7 +131,7 @@ IF(TD_WINDOWS)
SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd") SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
ENDIF() ENDIF()
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /FORCE:MULTIPLE")
# IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900)) # IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
# SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18") # SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")

2
source/common/src/tglobal.c
View File

@ -56,7 +56,7 @@ int32_t tsShellActivityTimer = 3; // second
// memory pool // memory pool
int8_t tsMemPoolFullFunc = 0; int8_t tsMemPoolFullFunc = 0;
int8_t tsQueryUseMemoryPool = 0; int8_t tsQueryUseMemoryPool = 1;
int32_t tsQueryBufferPoolSize = 0; //MB int32_t tsQueryBufferPoolSize = 0; //MB
int32_t tsSingleQueryMaxMemorySize = 0; //MB int32_t tsSingleQueryMaxMemorySize = 0; //MB
int32_t tsMinReservedMemorySize = 0; //MB int32_t tsMinReservedMemorySize = 0; //MB

3
source/libs/executor/src/executorInt.c
View File

@ -988,8 +988,7 @@ int32_t getBufferPgSize(int32_t rowSize, uint32_t* defaultPgsz, int64_t* default
// The default buffer for each operator in query is 10MB. // The default buffer for each operator in query is 10MB.
// at least four pages need to be in buffer // at least four pages need to be in buffer
// TODO: make this variable to be configurable. // TODO: make this variable to be configurable.
// *defaultBufsz = 4096 * 2560; *defaultBufsz = 4096 * 2560;
*defaultBufsz = 4096UL * 2560000;
if ((*defaultBufsz) <= (*defaultPgsz)) { if ((*defaultBufsz) <= (*defaultPgsz)) {
(*defaultBufsz) = (*defaultPgsz) * 4; (*defaultBufsz) = (*defaultPgsz) * 4;
if (*defaultBufsz < ((int64_t)(*defaultPgsz)) * 4) { if (*defaultBufsz < ((int64_t)(*defaultPgsz)) * 4) {

4
source/libs/qworker/src/qwUtil.c
View File

@ -870,7 +870,7 @@ void qwChkDropTimeoutQuery(SQWorker *mgmt, int32_t currTs) {
void *pIter = taosHashIterate(mgmt->ctxHash, NULL); void *pIter = taosHashIterate(mgmt->ctxHash, NULL);
while (pIter) { while (pIter) {
SQWTaskCtx *ctx = (SQWTaskCtx *)pIter; SQWTaskCtx *ctx = (SQWTaskCtx *)pIter;
if (((ctx->lastAckTs <= 0) || (currTs - ctx->lastAckTs) < 60 /*tsQueryNoFetchTimeoutSec*/) && (!QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP))) { if (((ctx->lastAckTs <= 0) || (currTs - ctx->lastAckTs) < tsQueryNoFetchTimeoutSec) && (!QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP))) {
pIter = taosHashIterate(mgmt->ctxHash, pIter); pIter = taosHashIterate(mgmt->ctxHash, pIter);
continue; continue;
} }
@ -880,7 +880,7 @@ void qwChkDropTimeoutQuery(SQWorker *mgmt, int32_t currTs) {
sId = ctx->sId; sId = ctx->sId;
(void)qwStopTask(QW_FPARAMS(), ctx, true, TSDB_CODE_QRY_NO_FETCH_TIMEOUT); (void)qwStopTask(QW_FPARAMS(), ctx, true, (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) ? ctx->rspCode : TSDB_CODE_QRY_NO_FETCH_TIMEOUT);
pIter = taosHashIterate(mgmt->ctxHash, pIter); pIter = taosHashIterate(mgmt->ctxHash, pIter);
} }

2
tests/script/api/asyncQuery.c
View File

@ -96,6 +96,8 @@ int main(int argc, char* argv[]) {
printf("************ prepare data *************\n"); printf("************ prepare data *************\n");
//create table tbx (ts timestamp, f1 int); insert into tbx values('2024-11-11 00:00:00', 1);
for (int64_t i = 0; i < 1000000000; ++i) { for (int64_t i = 0; i < 1000000000; ++i) {
verifyQueryAsync(taos); verifyQueryAsync(taos);
printf("%llu queries launched, errTimes:%lld \n", i * 10, errTimes); printf("%llu queries launched, errTimes:%lld \n", i * 10, errTimes);