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

Merge pull request #15198 from taosdata/fix/ZhiqiangWang/TD-13063-fix-win-timestamp-convert-error 

os: fix win timestamp convert error
This commit is contained in:
Zhiqiang Wang 2022-07-20 19:31:27 +08:00 committed by GitHub
parent e6febe45dd 946aef2181
commit 35b4673a58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/os/src/osTime.c
View File

@ -371,7 +371,7 @@ time_t taosMktime(struct tm *timep) {
localtime_s(&tm1, &tt); localtime_s(&tm1, &tt);
ss.wYear = tm1.tm_year + 1900; ss.wYear = tm1.tm_year + 1900;
ss.wMonth = tm1.tm_mon + 1; ss.wMonth = tm1.tm_mon + 1;
ss.wDay = tm1.tm_wday; ss.wDay = tm1.tm_mday;
ss.wHour = tm1.tm_hour; ss.wHour = tm1.tm_hour;
ss.wMinute = tm1.tm_min; ss.wMinute = tm1.tm_min;
ss.wSecond = tm1.tm_sec; ss.wSecond = tm1.tm_sec;
@ -383,7 +383,7 @@ time_t taosMktime(struct tm *timep) {
s.wYear = timep->tm_year + 1900; s.wYear = timep->tm_year + 1900;
s.wMonth = timep->tm_mon + 1; s.wMonth = timep->tm_mon + 1;
s.wDay = timep->tm_wday; s.wDay = timep->tm_mday;
s.wHour = timep->tm_hour; s.wHour = timep->tm_hour;
s.wMinute = timep->tm_min; s.wMinute = timep->tm_min;
s.wSecond = timep->tm_sec; s.wSecond = timep->tm_sec;

1
tests/script/test-all.bat
View File

@ -63,4 +63,5 @@ goto :eof
:CheckSkipCase :CheckSkipCase
set skipCase=false set skipCase=false
@REM if "%*" == "./test.sh -f tsim/query/scalarFunction.sim" ( set skipCase=true ) @REM if "%*" == "./test.sh -f tsim/query/scalarFunction.sim" ( set skipCase=true )
echo %* | grep valgrind && set skipCase=true
:goto eof :goto eof

4
tests/system-test/fulltest.sh
View File

@ -191,8 +191,8 @@ python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb-snapshot0.py
python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb-snapshot1.py python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb-snapshot1.py
#python3 ./test.py -f 7-tmq/tmqDelete-1ctb.py #python3 ./test.py -f 7-tmq/tmqDelete-1ctb.py
python3 ./test.py -f 7-tmq/tmqUdf.py python3 ./test.py -f 7-tmq/tmqUdf.py
python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py
python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py
python3 ./test.py -f 7-tmq/stbTagFilter-1ctb.py python3 ./test.py -f 7-tmq/stbTagFilter-1ctb.py
python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py