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

feat:[TD-32642] add timezone logic

This commit is contained in:
wangmm0220 2024-11-26 00:02:17 +08:00
parent c7d0f69ca4
commit a9d73d7b05
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/scalar/src/sclvector.c
View File

@ -2128,7 +2128,9 @@ int32_t vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO
} }
int32_t vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { int32_t vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) {
pRight->tz = pLeft->tz; if (pRight != NULL) {
pRight->tz = pLeft->tz;
}
for (int32_t i = 0; i < pLeft->numOfRows; ++i) { for (int32_t i = 0; i < pLeft->numOfRows; ++i) {
int8_t v = IS_HELPER_NULL(pLeft->columnData, i) ? 0 : 1; int8_t v = IS_HELPER_NULL(pLeft->columnData, i) ? 0 : 1;
if (v) { if (v) {
@ -2142,7 +2144,9 @@ int32_t vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p
} }
int32_t vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { int32_t vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) {
pRight->tz = pLeft->tz; if (pRight != NULL) {
pRight->tz = pLeft->tz;
}
SCL_ERR_RET(vectorConvertSingleColImpl(pLeft, pOut, NULL, -1, -1)); SCL_ERR_RET(vectorConvertSingleColImpl(pLeft, pOut, NULL, -1, -1));
for (int32_t i = 0; i < pOut->numOfRows; ++i) { for (int32_t i = 0; i < pOut->numOfRows; ++i) {
if (colDataIsNull_s(pOut->columnData, i)) { if (colDataIsNull_s(pOut->columnData, i)) {

2
source/os/src/osTimezone.c
View File

@ -873,7 +873,7 @@ void getTimezoneStr(char *tz) {
break; break;
} }
zi += sizeof("zoneinfo"); zi += sizeof("zoneinfo");
memcpy(tz, zi, TD_TIMEZONE_LEN - (zi - tz)); memmove(tz, zi, TD_TIMEZONE_LEN - (zi - tz));
goto END; goto END;
} while (0); } while (0);