xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
25,708 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

563 Commits

Author SHA1 Message Date
Haojun Liao 6af7e1810f Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-09 11:56:45 +08:00
Haojun Liao 2523445452 <fix>[query]: refactor. 2022-04-09 11:55:59 +08:00
wangmm0220 388ab2f50d <fix>:fix compile error 2022-04-09 10:31:15 +08:00
WANG MINGMING 41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
Haojun Liao 94e19cc32a <fix>[query]: fix scalar function calculate bug in scalar module. td-14576 2022-04-09 10:10:56 +08:00
Haojun Liao 8a62f5fa73 <fix>[query]: fix filter caused taosd crash.td-14566. 2022-04-08 19:41:55 +08:00
Haojun Liao 126658bf80
Merge pull request #11313 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-04-08 19:33:58 +08:00
Haojun Liao cf9e0be1c9 [td-14493] support slimit/soffset 2022-04-08 17:37:57 +08:00
WANG MINGMING bcbba6d0ae
Merge branch '3.0' into feature/TD-14422 2022-04-08 17:28:03 +08:00
dapan1121 519b6ca0f3
Merge pull request #11305 from taosdata/feature/qnode 
Feature/qnode
 2022-04-08 17:21:33 +08:00
wangmm0220 bd3a7838c0 Merge branch '3.0' into feature/TD-14422 2022-04-08 16:53:56 +08:00
wangmm0220 460d43f22c <fix>: fix index map error from table scan to sort output 2022-04-08 16:53:09 +08:00
Haojun Liao e77ecba753 [td-14493] fix bug in partition by. 2022-04-08 15:31:03 +08:00
wangmm0220 65a2131493 <fix>: fix index map error from table scan to sort output 2022-04-08 14:40:02 +08:00
wangmm0220 1f8d2ea446 <fix>: fix index map error from table scan to sort output 2022-04-08 14:17:32 +08:00
Hongze Cheng 6faaafb7a2 remove tsdb.h and meta.h 2022-04-08 06:09:15 +00:00
Haojun Liao 28456a034c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-08 13:13:38 +08:00
Haojun Liao f700e4746c [td-14393] fix bug. 2022-04-08 13:09:44 +08:00
wangmm0220 8df8c60f60 merge from 3.0 2022-04-08 10:58:39 +08:00
dapan1121 b0184c201f feature/qnode 2022-04-08 10:27:27 +08:00
Haojun Liao b984e12e4c [td-14493] support partition by 2022-04-08 10:24:35 +08:00
Ganlin Zhao aa2396acca
Merge pull request #11295 from taosdata/fix/TD-14572 
[TD-14572]<fix>: fix char_length result when nchar column has chinese characters
 2022-04-07 19:45:08 +08:00
Ganlin Zhao f22574262a [TD-14572]<fix>: fix char_length result when nchar column has chinese characters 2022-04-07 18:53:34 +08:00
Ganlin Zhao bb847e87bd [TD-14572]<fix>: fix char_length result when nchar column has chinese characters 2022-04-07 18:49:33 +08:00
wangmm0220 bb18e3c485 fix error in sort logic 2022-04-07 17:50:06 +08:00
Cary Xu c3b5f435b0 tsma integration with stream computing 2022-04-07 17:13:55 +08:00
Ganlin Zhao c0b2e2caa0 fix taosd crash issue 2022-04-07 16:13:34 +08:00
Haojun Liao 628096b3dd
Merge pull request #11285 from taosdata/feature/3.0_liaohj 
[td-14493] add new api.
 2022-04-07 15:24:59 +08:00
Haojun Liao 945de54b68 [td-14493] add new api. 2022-04-07 14:51:52 +08:00
Haojun Liao 52ada128d8
Merge pull request #11280 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-04-07 14:41:23 +08:00
Haojun Liao c84afedce0 [td-14493] refactor. 2022-04-07 13:57:47 +08:00
wangmm0220 225cf61845 merge from 3.0 2022-04-07 11:31:50 +08:00
Ganlin Zhao 264ebbd495
Merge pull request #11274 from taosdata/fix/TD-14525 
[TD-14525]<fix>: fix taosd crash if scalar function has constant param
 2022-04-07 10:50:12 +08:00
Haojun Liao ba29bc21f4
Merge pull request #11268 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-04-07 10:48:45 +08:00
Ganlin Zhao 772a5d114a [TD-14525]<fix>: fix taosd crash if scalar function has constant param 2022-04-07 10:30:41 +08:00
Ganlin Zhao cd972fdb00 [TD-14525]<fix>: fix taosd crash if scalar function has constant param 2022-04-07 10:26:18 +08:00
Haojun Liao 94b7081e97 [td-14493] fix bug found by regression test. 2022-04-07 10:24:22 +08:00
Haojun Liao 50f0ab05ff [td-14493] support distinct. 2022-04-06 23:00:32 +08:00
Hongze Cheng f739e7c32a
Merge pull request #11258 from taosdata/feature/meta 
Feature/meta
 2022-04-06 20:02:48 +08:00
wangmm0220 288b50aef2 fix error in sort logic 2022-04-06 19:53:17 +08:00
wangmm0220 4cc93f9984 fix error in sort logic 2022-04-06 19:51:28 +08:00
wangmm0220 c9de8b3b15 fix error in sort logic 2022-04-06 19:50:24 +08:00
Haojun Liao d4d210af5b [td-14493] support distinct. 2022-04-06 19:46:38 +08:00
wangmm0220 83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
wangmm0220 aced34c438 fix error in sort operation 2022-04-06 18:30:25 +08:00
Haojun Liao 6f26d1771c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-06 18:30:12 +08:00
Haojun Liao 21b94f4caf [td-14393] refactor. 2022-04-06 18:29:08 +08:00
Haojun Liao 09824c4934 [td-14493] set correct primary timestamp column index. 2022-04-06 18:26:35 +08:00
Haojun Liao af32cfcaef
Merge pull request #11262 from taosdata/feature/3.0_liaohj 
[td-14493] support having in group by
 2022-04-06 18:25:52 +08:00
Haojun Liao 6863999ec5 [td-14493] support having in group by 2022-04-06 17:59:08 +08:00
wangmm0220 4bc0e507da modify test case 2022-04-06 17:10:51 +08:00
wangmm0220 f72c983792 modify test case 2022-04-06 16:56:13 +08:00
wangmm0220 865a13c1c2 fix error in sort logic 2022-04-06 16:46:26 +08:00
Hongze Cheng 0cfbca6284 Merge branch 'feature/tdb' of https://github.com/taosdata/TDengine into feature/meta 2022-04-06 08:44:38 +00:00
Hongze Cheng cf727c9db3 fix show tables problem 2022-04-06 07:54:52 +00:00
wangmm0220 78acaed84e fix error in sort logic 2022-04-06 15:44:14 +08:00
dapan1121 2b5c4788d1 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-06 15:28:36 +08:00
dapan1121 398a41d09b feature/qnode 2022-04-06 15:20:38 +08:00
wangmm0220 9b66bb1682 optimize sort logic & fix memory leak 2022-04-06 14:32:07 +08:00
wangmm0220 ff21ecd364 optimize sort logic & fix memory leak 2022-04-06 11:43:17 +08:00
dapan1121 21542194c6 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-06 11:32:46 +08:00
dapan1121 2c6dec89d2 feature/qnode 2022-04-06 11:32:21 +08:00
Haojun Liao a4c7e78d5f [td-14393] refactor. 2022-04-06 11:01:09 +08:00
Haojun Liao 78b1bf27b6 [td-14393] refactor. 2022-04-06 10:09:14 +08:00
Haojun Liao ddc63b9f27 [td-14393] fix error. 2022-04-04 15:45:32 +08:00
Haojun Liao f7ba0c31d8 [td-14393] refactor. 2022-04-04 14:54:39 +08:00
wangmm0220 411086c811 fix error in sort operation 2022-04-03 10:42:55 +08:00
Haojun Liao e7e5fd4345 [td-14393] support percentile function. 2022-04-02 23:42:00 +08:00
Xiaoyu Wang aaf35118f6
Merge pull request #11222 from taosdata/feature/3.0_wxy 
integrate constant calculate
 2022-04-02 20:35:10 +08:00
Haojun Liao b0310c90eb [td-14393] support percentile. 2022-04-02 20:13:48 +08:00
Xiaoyu Wang 469cd23f43 integrate constant calculate 2022-04-02 07:57:44 -04:00
dapan1121 27a3a1d782 feature/qnode 2022-04-02 19:31:52 +08:00
wangmm0220 5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
wangmm0220 9f959e17f8 fix error in order by logic 2022-04-02 18:53:13 +08:00
wangmm0220 e7585db216 fix error in order by logic 2022-04-02 18:52:41 +08:00
wangmm0220 eba69fdb91 fix error in order by logic 2022-04-02 16:03:48 +08:00
Haojun Liao 29fd5ec11e [td-14393] fix bug. 2022-04-02 15:42:45 +08:00
Haojun Liao cf25aca809 [td-13039] refactor. 2022-04-02 15:08:48 +08:00
wangmm0220 12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +08:00
Haojun Liao 9a5123c64f [td-13039] add times for session window 2022-04-02 13:32:26 +08:00
Haojun Liao 55f93d2179 [td-14393] refactor and support filter condition in where clause. 2022-04-02 10:43:28 +08:00
Haojun Liao 751cad9c2a [td-14393] fix bug. 2022-04-01 20:19:40 +08:00
dapan1121 7602f91612 feature/qnode 2022-04-01 19:45:45 +08:00
Haojun Liao 9d16e86277 [td-13039] refactor. 2022-04-01 19:11:14 +08:00
Haojun Liao 7b3e488173 [td-13039] fix bug. 2022-04-01 18:08:36 +08:00
Haojun Liao 60c472df19 [td-13039] refactor. 2022-04-01 17:22:34 +08:00
Haojun Liao 7b0dfc6c4e [td-13039] support limit/offset 2022-04-01 17:21:24 +08:00
Haojun Liao 3846250454 [td-13039] fix query crash. 2022-04-01 16:09:00 +08:00
Haojun Liao 14d8c5f7f1 [td-14440] fix bug. 2022-04-01 10:44:34 +08:00
wangmm0220 69a5e55a24 [TD-14422]<fix> fix error in sort logic & add test case 2022-04-01 10:05:16 +08:00
wangmm0220 878e54f143 fix test error 2022-03-31 22:23:12 +08:00
Haojun Liao 869b0b99a9 [td-13039] fix bug. 2022-03-31 17:59:41 +08:00
Haojun Liao 02e097dc5c [td-14426] fix bug. 2022-03-31 17:36:51 +08:00
Haojun Liao 810cfefddc [td-13039] fix bug found by compiling. 2022-03-31 16:28:59 +08:00
Haojun Liao 847775c48d [td-13039] refactor. 2022-03-31 16:10:32 +08:00
wangmm0220 7d4775ddd3 merge from 3.0 2022-03-31 11:48:58 +08:00
Haojun Liao 387cfe8d45 [td-13039] fix bug in stream interval query. 2022-03-30 19:38:30 +08:00
Haojun Liao c39595639c [td-14392] fix show bug. 2022-03-30 17:09:06 +08:00
Haojun Liao 416952ddf8 [td-13039] fix error found by the compiler. 2022-03-30 15:31:20 +08:00
Haojun Liao e8f0d4df0b [td-13039] support stream execution interval query. 2022-03-30 14:54:00 +08:00
Haojun Liao 39036ea512 [td-13039] support pseudo column in interval query. 2022-03-30 13:41:15 +08:00
wangmm0220 5b2d664dbf fix conflicts 2022-03-30 10:09:17 +08:00
wangmm0220 bceb557809 rm useless code 2022-03-30 10:05:20 +08:00
Haojun Liao dba4a72dac [td-13039] support stream execution interval query. 2022-03-29 20:07:38 +08:00
Haojun Liao dd66affd0a [td-13039] merge 3.0. 2022-03-29 20:05:04 +08:00
Haojun Liao f659130551 [td-13039] merge 3.0. 2022-03-29 19:12:34 +08:00
Ganlin Zhao 370218220a [TD-14388]<feature>: Support value type parameter processing in scalar function 2022-03-29 18:58:36 +08:00
wangmm0220 c941a2c710 add test for encode/decode ResultRow in group by and interval 2022-03-29 18:16:40 +08:00
Ganlin Zhao ab831ee814 Merge branch 'feature/3.0_liaohj' of github.com:taosdata/TDengine into feature/3.0_liaohj 2022-03-29 17:31:37 +08:00
Ganlin Zhao 0c243e658e math functions working with shell 2022-03-29 17:30:44 +08:00
Liu Jicong 58352b76e3
Merge pull request #11091 from taosdata/feature/tq 
stream set multi input
 2022-03-29 16:55:25 +08:00
wangmm0220 226743967a fix conflict 2022-03-29 16:04:14 +08:00
Liu Jicong 4fd6f59092 stream set multi input 2022-03-29 15:24:25 +08:00
Xiaoyu Wang 58149dc47e merge 3.0 2022-03-29 02:56:24 -04:00
Xiaoyu Wang 0f60e644e9 TD-14383 limit/slimit plan implement, and sort plan bugfix 2022-03-29 02:52:40 -04:00
Haojun Liao 14e690348a [td-13039] fix bug in session window agg. 2022-03-29 14:36:08 +08:00
Haojun Liao 0ae4bab0ab [td-13039] refactor. 2022-03-29 13:37:14 +08:00
Haojun Liao bdbb984894 [td-13039] add new api. 2022-03-29 13:31:17 +08:00
Haojun Liao b771748eb2 [td-13039] fix bug in sort. 2022-03-29 10:08:21 +08:00
Haojun Liao 6c332af1ae [td-13039] support sort. 2022-03-28 20:11:02 +08:00
Haojun Liao 4b041a8bd4 [td-13039] support order by. 2022-03-28 19:08:07 +08:00
wangmm0220 6a28b750e7 Merge branch '3.0' into feature/TD-14222-new 2022-03-28 11:15:48 +08:00
wangmm0220 b9471b8115 [TD-14222]<feature> add test for encode/decode ResultRow 2022-03-28 11:13:59 +08:00
Haojun Liao 0daa0de073 [td-13039] support scalar function. 2022-03-27 22:43:07 +08:00
Haojun Liao b9c33dade2 [td-13039] merge 3.0. 2022-03-27 15:30:46 +08:00
Xiaoyu Wang bef5d75dac bugfix 2022-03-26 21:31:27 -04:00
Haojun Liao df7c801ef7 [td-13039] refactor. 2022-03-26 22:17:26 +08:00
Haojun Liao 23db83f5f4 [td-13039] support arithmetic query. 2022-03-26 22:13:14 +08:00
Xiaoyu Wang 6c6295bdae merge 3.0 2022-03-26 05:55:01 -04:00
dapan1121 96eee80063 feature/qnode 2022-03-26 15:03:22 +08:00
Haojun Liao 1d52dd9d43 [td-13039] fix bug. 2022-03-26 15:02:29 +08:00
Xiaoyu Wang f6bcae1913 sort scan cols 2022-03-26 01:39:10 -04:00
dapan1121 9484d25a59 Merge remote-tracking branch 'origin/feature/scheduler' into feature/qnode 2022-03-26 09:17:05 +08:00
dapan1121 4188934040 feature/qnode 2022-03-26 09:12:47 +08:00
afwerar 222db126bc [TD-13758]<fix>: redefine memory api. 2022-03-26 00:29:53 +08:00
Xiaoyu Wang 75d77eb126 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-25 05:15:52 -04:00
Xiaoyu Wang 4e5df8e3c3 bugfix 2022-03-25 05:15:45 -04:00
Xiaoyu Wang cc0dfeb19a bugfix 2022-03-25 05:00:06 -04:00
Haojun Liao 21a0ee9284 [td-13039] fix bug. 2022-03-25 15:25:09 +08:00
Haojun Liao 693e8784cb
Merge pull request #10992 from taosdata/feature/3.0_liaohj 
[td-14285] fix the taosd crash when both interval and sliding exist.
 2022-03-25 14:54:57 +08:00
Haojun Liao 67dde1620f [td-14285] fix the taosd crash when both interval and sliding exist. 2022-03-25 14:28:01 +08:00
Haojun Liao bf124afb7a
Merge pull request #10990 from taosdata/feature/3.0_liaohj 
[td-13039]add api for stream computing.
 2022-03-25 14:08:59 +08:00
Haojun Liao b5d011901e [td-14288] fix bug in first query. 2022-03-25 13:45:57 +08:00
Xiaoyu Wang 9765678e75 scan cols sort 2022-03-25 01:41:28 -04:00
Haojun Liao e4d3f1ad26
Merge pull request #10982 from taosdata/feature/3.0_liaohj 
[td-14266] fix interval bug.
 2022-03-24 20:07:40 +08:00
Haojun Liao fb94d2da92 [td-14266] fix bug. 2022-03-24 19:50:54 +08:00
Haojun Liao afe99b1fdf
Merge pull request #10980 from taosdata/feature/TD-14222-new 
add encode/decode resultRow function
 2022-03-24 18:16:59 +08:00
Haojun Liao ba1dd2ca45 [td-13039] merge 3.0. 2022-03-24 17:31:22 +08:00
Haojun Liao 45fec96567 [td-13039] support nchar data type. 2022-03-24 17:26:04 +08:00
wangmm0220 0649e662d3 add encode/decode resultRow function 2022-03-24 17:24:01 +08:00