Commit Graph

13924 Commits

Author SHA1 Message Date
dapan1121 9394afec68
Merge pull request #21144 from taosdata/feat/TD-19801
feat(query): support interp with super table
2023-05-12 11:37:20 +08:00
Ganlin Zhao 83e049812c fix asan error 2023-05-12 10:21:01 +08:00
yihaoDeng cfc6bd9f9f factor code 2023-05-12 02:10:40 +00:00
yihaoDeng eb3ab4fcea factor code 2023-05-11 13:34:17 +00:00
yihaoDeng 6cf1adf1b1 factor code 2023-05-11 13:01:45 +00:00
kailixu f4d90fb9bb fix: column length check when update/add column 2023-05-11 20:59:07 +08:00
liuyao 8b7b804606 opt partition by tbname 2023-05-11 18:47:27 +08:00
yihaoDeng 4e8f5f5d32 factor code 2023-05-11 09:58:53 +00:00
Ganlin Zhao 092ed0ddae Merge branch 'main' into fix/TD-24008 2023-05-11 17:58:47 +08:00
yihaoDeng afaee9c386 factor code 2023-05-11 09:51:01 +00:00
yihaoDeng 4715aacd41 factor code 2023-05-11 09:44:40 +00:00
yihaoDeng 59ff6bd301 factor code 2023-05-11 09:32:44 +00:00
Ganlin Zhao 3bf9cb2d78 fix 2023-05-11 17:28:46 +08:00
Ganlin Zhao 788b521592 Revert "fix"
This reverts commit 9ce1e8ccf4.
2023-05-11 17:20:58 +08:00
yihaoDeng 04c7c99a67 factor code 2023-05-11 09:17:05 +00:00
yihaoDeng 0710fc39af factor code 2023-05-11 09:04:14 +00:00
Haojun Liao 8277d608f4 other: update logs. 2023-05-11 16:53:19 +08:00
yihaoDeng e6474caddf factor code 2023-05-11 08:51:41 +00:00
yihaoDeng a6fc4f9cc2 Merge branch 'enh/main' into enh/rocksdbSstateMerge 2023-05-11 08:21:13 +00:00
slzhou e8c1745d17 Merge branch 'main' of github.com:taosdata/TDengine into szhou/fix-td24084 2023-05-11 16:04:46 +08:00
slzhou e58fda2bdd fix: bypass projection pruning if union set op and subquery 2023-05-11 16:04:06 +08:00
Haojun Liao b2d141fe40 fix(stream): limit the batch size. 2023-05-11 15:07:07 +08:00
yihaoDeng f652f71d68 factor code 2023-05-11 06:37:57 +00:00
Haojun Liao a76e47ef54 refactor: add some logs. 2023-05-11 14:19:27 +08:00
Haojun Liao f0f90888ab refactor: update some logs. 2023-05-11 13:48:50 +08:00
Ganlin Zhao 9ce1e8ccf4 fix 2023-05-11 13:23:40 +08:00
Haojun Liao 2b736ffd60 fix(stream): avoid duplicated task id in task id list. 2023-05-11 11:47:57 +08:00
Haojun Liao 28c43f0151 fix(stream): add null check. 2023-05-11 11:36:27 +08:00
Haojun Liao 8a1b0ed052 refactor: do some internal refactor. 2023-05-11 10:35:09 +08:00
Haojun Liao b02b3117b5 refactor: do some internal refactor. 2023-05-11 10:14:29 +08:00
Ganlin Zhao 121564de2f add threshold for group result 2023-05-11 10:04:25 +08:00
Benguang Zhao b8933389bb enh: keep the trailing empty wal file in walCheckAdnRepairMeta 2023-05-11 09:42:46 +08:00
yihaoDeng d473fcf6b0 refactor code 2023-05-11 01:19:54 +00:00
yihaoDeng c7602a4c1a refactor code 2023-05-11 01:19:40 +00:00
Benguang Zhao 7433bad888 enh: tidy up walEndSnapshot 2023-05-11 09:14:37 +08:00
wangjiaming0909 db318a40c2 fix: func ctgHandleGetTbMetasRsp invalid read SName 2023-05-11 00:55:02 +08:00
Haojun Liao dbd79cc80c refactor: do some internal refactor. 2023-05-10 22:22:01 +08:00
Benguang Zhao 2a558323be fix: set absent closeTs with mtime of log files during walCheckAndRepairMeta 2023-05-10 20:35:08 +08:00
Ganlin Zhao 37d607c820 enh: remove group_key from subsidiaries if multiple select function
presents
2023-05-10 18:51:21 +08:00
yihaoDeng b4bd6a4f1c refactor code 2023-05-10 10:49:10 +00:00
dapan1121 daedb3618b Merge remote-tracking branch 'origin/3.0' into feat/TD-22746 2023-05-10 17:47:11 +08:00
dapan1121 79d4403377 feat: add client meta limitation 2023-05-10 17:44:53 +08:00
dapan1121 cacbc7d3d3 fix: query stop issue 2023-05-10 16:20:44 +08:00
yihaoDeng 5708fcb5cb Merge branch 'enh/3.0' into enh/rocksdbSstateMerge 2023-05-10 08:02:16 +00:00
Ganlin Zhao 523f08fe4b return result after finish processing of each group 2023-05-10 11:18:42 +08:00
Hui Li b1b85c3d95
Merge pull request #21227 from taosdata/fix/TD-24058
fix:[TD-24058]send poll result to client if no data 5 times to avoid …
2023-05-10 11:12:20 +08:00
Yihao Deng c6e5879f44
Merge branch 'main' into enh/rocksdbSstate 2023-05-10 10:04:28 +08:00
liuyao 62ccd4bf16 avoid delete data 2023-05-10 09:11:04 +08:00
dapan1121 7ab11c42f4 fix: vnode key word issue 2023-05-10 09:07:52 +08:00
dapan1121 7d1a6e0e40
Merge pull request #21221 from taosdata/szhou/fix-ts3374
fix: check varchar/nchar column length for alter normal table
2023-05-10 08:59:12 +08:00
yihaoDeng 8356533eb1 Merge branch 'enh/standVer' into enh/rocksdbSstateMerge 2023-05-09 12:13:16 +00:00
dapan1121 2c403266e3 feat: support restore dnode clause 2023-05-09 19:29:57 +08:00
dapan1121 a8c65cd25a feat: support restore dnode clause 2023-05-09 19:19:14 +08:00
dapan1121 d0e26d2efc
Merge pull request #21216 from taosdata/fix/TS-3358
fix:after restarting taosd, stream does not work.
2023-05-09 19:01:43 +08:00
dapan1121 653f7f02f3
Merge pull request #21218 from wangjiaming0909/fix/3.0/TS-3319
fix: show table distributed  t; set the unit of Size to KB
2023-05-09 18:57:55 +08:00
yihaoDeng 711c475693 fix invalid free 2023-05-09 10:34:14 +00:00
wangmm0220 587f750c94 fix:[TD-24058]send poll result to client if no data 5 times to avoid lost data 2023-05-09 17:42:11 +08:00
liuyao 8224d49702 fix:after restarting taosd, stream does not work. 2023-05-09 17:24:11 +08:00
cadem 843d606058 feat/restore dnode 2023-05-09 17:15:37 +08:00
dapan1121 52fd6a84ac enh: support db cfg cache update 2023-05-09 17:04:20 +08:00
yihaoDeng 55014aa003 Merge branch 'enh/rocksdbSstate' into enh/rocksdbSstateMerge 2023-05-09 08:58:51 +00:00
wangjiaming0909 479bb157e0 fix: select _block_dist() from t; set the unit of Size to KB 2023-05-09 15:19:21 +08:00
Ganlin Zhao e1140d4c15 optimize duplicate timestamp check 2023-05-09 15:05:41 +08:00
yihaoDeng b5fdaa327d avoid deadlock 2023-05-09 07:00:29 +00:00
shenglian zhou 50feb64748 fix: add check nchar/varchar column length for normal table 2023-05-09 14:29:09 +08:00
Ganlin Zhao 4693c22970 optimize group key storage 2023-05-09 14:06:09 +08:00
wade zhang ebdc1a3234
Merge pull request #20996 from taosdata/fix/TD-23623
enh(cache/rocks): base for rocks put/get
2023-05-09 13:27:33 +08:00
dapan1121 a1eefd25ea fix: count wrong group number issue 2023-05-09 11:33:47 +08:00
Ganlin Zhao 3b10ac29ce use functionType instead of functionName 2023-05-09 11:09:29 +08:00
dapan1121 f4f3b886fc
Merge pull request #21213 from wangjiaming0909/fix/TS-3350
fix: data compare of signed and unsigned integers
2023-05-09 08:58:55 +08:00
Hui Li a68a5b73b8
Merge pull request #21212 from taosdata/fix/TD-24030
fix: fix invalid read
2023-05-08 20:30:44 +08:00
dapan1121 95b228a050
Merge pull request #21194 from taosdata/fix/TD-24010
fix:[TD-24010] subscribeStb.py failed in windows CI
2023-05-08 20:29:47 +08:00
wangjiaming0909 e22c62ffba fix: data compare of signed and unsigned integers 2023-05-08 18:13:37 +08:00
yihaoDeng c3e0de0bfc fix invalid read 2023-05-08 09:21:20 +00:00
Benguang Zhao bd5372c378 fix: protect against nullptr in syncRespCleanRsp 2023-05-08 17:08:24 +08:00
wangmm0220 f9142c0ddb fix:[TD24010] lost data if apply ver is small than commit ver 2023-05-08 16:49:56 +08:00
dapan1121 5d4830956a
Merge pull request #21187 from taosdata/szhou/fix-ts23905-ts23865
fix: forbid some stream computing
2023-05-08 16:24:00 +08:00
slzhou 2f45a3dfdb fix: change variable name 2023-05-08 14:42:31 +08:00
dapan1121 1526eb2923 fix: projection group merge issue 2023-05-08 10:28:07 +08:00
liuyao eb52e73305 Merge branch 'enh/rocksdbSstate' of https://github.com/taosdata/TDengine into enh/rocksdbSstate 2023-05-08 09:54:00 +08:00
liuyao fc8cab6fe1 recover setSelectValueColumnInfo 2023-05-08 09:53:27 +08:00
Yihao Deng cb223acf82
Merge branch 'main' into enh/rocksdbSstate 2023-05-08 09:45:27 +08:00
Minglei Jin bb7f050b37 Merge branch '3.0' into fix/TD-23623 2023-05-08 08:13:00 +08:00
Haojun Liao 31ac1e3eaa fix(stream): revise the input queue capacity. 2023-05-08 00:00:55 +08:00
Haojun Liao d026e7ef16 refactor: update some logs. 2023-05-07 22:55:49 +08:00
yihaoDeng 163a862f5f fix mem leak 2023-05-06 13:57:33 +00:00
yihaoDeng 08c3a63341 Merge branch 'enh/standVer' into enh/rocksdbSstateMerge 2023-05-06 12:37:54 +00:00
Haojun Liao c141abfbb8 fix(stream): set correct msg size; 2023-05-06 20:03:07 +08:00
dapan1121 c83367e455 enh: add table group cache 2023-05-06 19:24:47 +08:00
wangmm0220 261f2736f7 fix:[TD-24010] subscribeStb.py failed in windows CI 2023-05-06 19:17:36 +08:00
Haojun Liao c6007d53e8
Merge pull request #21190 from taosdata/fix/TS-3347
fix:[TS-3347]set ver to first version if version stored is smaller th…
2023-05-06 18:51:49 +08:00
Haojun Liao 13f3ca4226 fix(stream): add input queue size limitation. 2023-05-06 18:47:29 +08:00
yihaoDeng 8be29dc98e failed to open rocksdb cf 2023-05-06 10:35:23 +00:00
dapan1121 1de5f84536
Merge pull request #21184 from taosdata/fix/TD-23898-a
fix: fix taosd not exit when press ctrl+c
2023-05-06 17:46:38 +08:00
liuyao 6ceda68365 opt selectivity function 2023-05-06 17:42:38 +08:00
slzhou 04e9648d8e enhance: change variable name 2023-05-06 17:16:27 +08:00
slzhou 276e5daa8c fix: pseudo column function are treated as variable 2023-05-06 17:13:14 +08:00
dapan1121 1f25cc57cd fix: projection merge issue 2023-05-06 16:39:40 +08:00
wangmm0220 ee32620808 fix:[TS-3347]set ver to first version if version stored is smaller than first version in wal when subscribe db 2023-05-06 16:22:30 +08:00
shenglian zhou 83c857a017 fix: fix compilation error 2023-05-06 16:17:34 +08:00
Minglei Jin 596bee8028 Merge branch '3.0' into fix/TD-23623 2023-05-06 16:07:26 +08:00
shenglian zhou c8ac3a581e fix: forbid some stream computing 2023-05-06 15:50:38 +08:00
Ganlin Zhao 33d4e0cc67 fix: fix taosd not exit when press ctrl+c 2023-05-06 15:03:17 +08:00
dapan1121 e798ef8645
Merge pull request #21168 from taosdata/fix/TD-23985
fix: having clause issues
2023-05-06 13:40:42 +08:00
Haojun Liao 6b305bf745 refactor: do some internal refactor. 2023-05-06 13:35:18 +08:00
Haojun Liao aca5760ceb fix(query): fix syntax error. 2023-05-06 13:17:31 +08:00
Haojun Liao da6212bab0 other: merge main. 2023-05-06 12:51:38 +08:00
Shengliang Guan af81f91c0f
Merge pull request #21162 from taosdata/FIX/TD-22103-3.0
enh: unify error msg for disk space checking in doInitAggInfoSup
2023-05-06 11:15:57 +08:00
dapan1121 47791dfe2f fix: group by validation issue 2023-05-06 11:02:20 +08:00
Haojun Liao 1fa4327f6c Merge branch 'main' into fix/liaohj_main 2023-05-06 10:15:23 +08:00
liuyao 76bf0aea56 opt stream input queue 2023-05-06 10:14:27 +08:00
Haojun Liao 3afc5bdfcf refactor: add some logs. 2023-05-06 10:09:51 +08:00
Haojun Liao 29fcd1b83a refactor: do some internal refactor. 2023-05-06 10:08:05 +08:00
Haojun Liao 5d4a3116d5
Merge pull request #21139 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-05-06 09:49:26 +08:00
wade zhang 2025aa5650
Merge pull request #21167 from taosdata/fix/TD-23953
fix(tdb/decoder): free decoder's value if not needed by user
2023-05-06 08:32:29 +08:00
yihaoDeng d7e86aca05 fix case failure 2023-05-05 15:14:16 +00:00
Haojun Liao cbf0cd41ec
Merge pull request #21169 from taosdata/fix/stop_tsdb_read
fix(stream): opt task scan performance.
2023-05-05 22:08:11 +08:00
kailixu 0c3dc0867f chore: sync fix from main 2023-05-05 20:33:41 +08:00
Haojun Liao 8958aabe4b fix(stream): opt task scan performance. 2023-05-05 19:33:30 +08:00
Haojun Liao 4be94940e1
Merge pull request #21164 from taosdata/fix/stop_tsdb_read
fix(stream): secure the delete task operation. TD-1198
2023-05-05 18:40:23 +08:00
Haojun Liao 08ce790cda fix(query): fix memory leak. 2023-05-05 18:20:27 +08:00
dapan1121 997be0a3ed fix: having clause issues 2023-05-05 17:04:36 +08:00
yihaoDeng f7a7743af7 fix case failure 2023-05-05 08:32:33 +00:00
Minglei Jin 8286c145b6 fix(tdb/decoder): free decoder's value if not needed by user 2023-05-05 16:15:15 +08:00
Ganlin Zhao 5a1681d91d fix data block not properly saved 2023-05-05 15:24:15 +08:00
Haojun Liao 8b12d4d3da fix(stream): secure the delete task operation. TD-1198 2023-05-05 15:02:03 +08:00
Benguang Zhao 0e6de09353 enh: unify error msg for disk space checking in doInitAggInfoSup 2023-05-05 14:53:32 +08:00
dapan1121 e889249c54 fix: grant no table specifed issue 2023-05-05 14:33:09 +08:00
dapan1121 3976504b47 fix: subtable grant is not allowed 2023-05-05 14:01:15 +08:00
Haojun Liao 9b5c205498 fix(stream): set correct ssdatablock for tqRetrieveDataBlock 2023-05-05 13:41:25 +08:00
yihaoDeng a1b9dcf595 fix mem leak 2023-05-05 02:20:11 +00:00
liuyao 74ab689719 opt batch num 2023-05-05 08:59:07 +08:00
yihaoDeng f20b28bc9f fix mem leak 2023-05-04 14:29:56 +00:00
yihaoDeng 6b0bda6708 fix mem leak 2023-05-04 13:38:19 +00:00
yihaoDeng c2de8c91dd fix mem leak 2023-05-04 11:52:29 +00:00
yihaoDeng f9c49f4938 add compile opt on windows 2023-05-04 10:22:13 +00:00
Haojun Liao 2b7a816b86 fix(tmq): fix syntax error. 2023-05-04 16:59:26 +08:00
Haojun Liao 23c49594b7 other: merge main. 2023-05-04 16:41:53 +08:00
yihaoDeng c27d01a510 Merge branch 'enh/addTtlToStream' into enh/rocksdbSstateMerge 2023-05-04 08:22:31 +00:00
Haojun Liao 09a04052ec refactor: do some internal refactor. 2023-05-04 16:15:14 +08:00
Haojun Liao 11dccf12de
Merge pull request #21131 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-05-04 11:26:00 +08:00
Haojun Liao 851193a033
Merge pull request #21060 from taosdata/fix/TS-3222
opti:change push mgr to consume msg for subscribe
2023-05-04 10:16:41 +08:00
liuyao d8a1f15d10 fix resum bug 2023-05-04 09:28:06 +08:00
dapan1121 4bc30ff2cf
Merge pull request #21126 from taosdata/fix/TD-23864
enh: optimize tbname condition
2023-05-04 08:54:04 +08:00
Haojun Liao 3b814f2478 fix(stream): do some internal refactor. 2023-05-01 23:21:29 +08:00
Haojun Liao a1263b8b04 fix(query):fix syntax error. 2023-05-01 19:40:26 +08:00
Haojun Liao 3c61932ecc refactor: do some internal refactor. 2023-05-01 19:28:54 +08:00
Haojun Liao 6c86847b12 refactor: do some internal refactor. 2023-05-01 14:58:59 +08:00
Haojun Liao ace193ca9b fix(stream): set the seek version if the reader's version is earlier than the first version in wal. 2023-04-29 23:34:49 +08:00
Haojun Liao 777ed1761f refactor: update logs. 2023-04-29 18:24:46 +08:00
Haojun Liao 39cac9d308 refactor: remove log ; 2023-04-29 14:06:26 +08:00
Haojun Liao bbb8aaa0dc refactor: add some logs. 2023-04-29 02:37:10 +08:00
Haojun Liao 8b57184a9a
Merge pull request #21123 from taosdata/fix/liaohj_main
refactor: remove assert.
2023-04-29 00:44:24 +08:00
Haojun Liao b69137df44 refactor(log): add some logs. 2023-04-29 00:00:25 +08:00
Haojun Liao 05d416f3b9 fix(stream): fix invalid access when handling error, not start stream if tsDisablestream is set. 2023-04-28 23:53:53 +08:00
Haojun Liao c647ded0da fix(stream): add some logs. 2023-04-28 19:47:49 +08:00
dapan1121 70761fd959 enh: optimize tbname condition 2023-04-28 17:56:52 +08:00
yihaoDeng dda1c8803c Merge branch 'enh/rocksdbSstate' into enh/rocksdbSstateMerge 2023-04-28 09:17:22 +00:00
Ganlin Zhao 42df9f587f fix group_key not set properly 2023-04-28 16:41:36 +08:00
Haojun Liao a0d08b7fe4 fix(query): add null ptr check. 2023-04-28 16:29:09 +08:00
Ganlin Zhao 76eea9f7c4 fix group_key check 2023-04-28 14:59:35 +08:00
Haojun Liao b3da6cb224 fix(query): fix syntax error. 2023-04-28 14:56:50 +08:00
yihaoDeng afc6023a8a merge rocksdb inst 2023-04-28 06:32:33 +00:00
Haojun Liao 03b1de017a refactor: remove assert. 2023-04-28 14:12:17 +08:00
Haojun Liao ad059db91b
Merge pull request #21120 from taosdata/fix/liaohj_main
other: add some logs.
2023-04-28 14:12:04 +08:00
Haojun Liao b7c8346b44 other: merge other branch. 2023-04-28 13:06:47 +08:00
Haojun Liao f9a64cbcd6 other: add some logs. 2023-04-28 12:58:03 +08:00
Haojun Liao a0c2b34788
Merge pull request #21119 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-04-28 12:53:31 +08:00
Haojun Liao da0d9c78ef refactor: do some internal refactor. 2023-04-28 11:42:34 +08:00
Haojun Liao f850388ed9
Merge pull request #21116 from taosdata/fix/liaohj_main
fix(query): stop tsdbreade ASAP, and do some internal refactor. TD-23249
2023-04-28 11:42:05 +08:00
liuyao 2984c5a758 merge main 2023-04-28 10:34:46 +08:00
Haojun Liao 3ac1ce69b6 fix(query): set correct scan flag. 2023-04-28 10:02:37 +08:00
yihaoDeng c4f36d32ae merge rocksdb inst 2023-04-28 01:31:37 +00:00
Haojun Liao 6482ef9ad1 refactor: do some internal refactor. 2023-04-28 09:19:53 +08:00
Haojun Liao 8205168428 fix(query): fix memory leak. 2023-04-28 09:16:11 +08:00
Haojun Liao 7adc21028a refactor: do some internal refactor. 2023-04-28 00:23:38 +08:00
yihaoDeng 984a69671e merge rocksdb inst 2023-04-27 14:46:33 +00:00
yihaoDeng 36a4413bf1 merge rocksdb inst 2023-04-27 14:38:33 +00:00
Haojun Liao 25010cb11e fix(query): stop tsdbreade ASAP, and do some internal refactor. 2023-04-27 22:21:18 +08:00
kailixu fa822ff286 Merge branch '3.0' into enh/TD-21161-3.0 2023-04-27 19:11:16 +08:00
jiajingbin ebf9a13fe7 inc batch num 2023-04-27 18:15:17 +08:00
Haojun Liao ad7c3218f7
Merge pull request #21111 from taosdata/fix/liaohj_main
enh(query): stop tsdb reader ASAP.  TD-23249
2023-04-27 17:45:38 +08:00
Haojun Liao 91f9b58f9a refactor: do some internal refactor. 2023-04-27 16:06:06 +08:00
Haojun Liao 17a5691afb refactor: remove assert. 2023-04-27 15:37:33 +08:00
Haojun Liao d83f29dc23 refactor: remove assert. 2023-04-27 15:33:04 +08:00
Haojun Liao 6780833cd2 Merge remote-tracking branch 'origin/enh/rocksdbSstate' into enh/rocksdbSstate 2023-04-27 15:08:17 +08:00
Haojun Liao b7040ed15e enh(stream): support resume from the latest data, and do some internal refactor. 2023-04-27 15:07:54 +08:00
liuyao 8b5251004f inc queue cap 2023-04-27 14:04:46 +08:00
Haojun Liao e1bd65ec0a
Merge pull request #21105 from taosdata/fix/liaohj_main
fix(query): check the init status for pReader->status.merger  TD-23903
2023-04-27 12:40:13 +08:00
Ganlin Zhao 54d82fce8a add reset when switching groups 2023-04-27 11:28:20 +08:00
liuyao dbdc31539c inc queue cap 2023-04-27 10:46:08 +08:00
wangmm0220 6a889ae80e Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-27 09:48:04 +08:00
Haojun Liao db1d75bb48 refactor: do some internal refactor. 2023-04-27 09:28:20 +08:00
liuyao 4c4a4775de opt stream 2023-04-26 19:13:58 +08:00
liuyao 863d30e5a9 opt tq read 2023-04-26 18:58:19 +08:00
Ganlin Zhao c64788ad71 fix group restore 2023-04-26 18:37:23 +08:00
Ganlin Zhao 75f76a62ab fix process next group bug 2023-04-26 18:07:19 +08:00
dapan1121 51a1e07dbf
Merge pull request #21029 from taosdata/fix/TD-23797
fix: fix crash caused by deleting from system table
2023-04-26 17:48:58 +08:00
Minglei Jin a1fba2df65 Merge branch '3.0' into fix/TD-23623 2023-04-26 17:38:47 +08:00
liuyao 2533b5c5c2 op stream 2023-04-26 17:00:33 +08:00