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

4530 Commits

Author SHA1 Message Date
Shuaiqiang Chang b73ce7ba87 Merge branch 'develop' into hotfix/taos-tools 
* develop:
  [modify for not pSql in taos obj ]
  [TD-476]fixbug: show correct info when user has no permission to open db
  make test case print message one by one.
  fix crash caused by double free
 2020-06-04 18:18:19 +08:00
Shengliang Guan 94bbd38b29
Merge pull request #2135 from taosdata/hotfix/TD-476 
Hotfix/td-476
 2020-06-04 18:16:42 +08:00
Shengliang Guan fe5ebec94c
Merge branch 'develop' into hotfix/TD-476 2020-06-04 18:16:23 +08:00
Shengliang Guan 3c7b4637ff
Merge pull request #2132 from taosdata/hotfix/taos-tools 
Hotfix/taos tools
 2020-06-04 18:14:54 +08:00
Shengliang Guan 47fe15492d
Merge pull request #2134 from taosdata/hotfix/sangshuduo/increase-travis-wait-time-to-20min 
make test case print message one by one.
 2020-06-04 18:14:47 +08:00
Shengliang Guan cdb39a8920
Merge pull request #2136 from taosdata/hotfix/test 
[modify for not pSql in taos obj ]
 2020-06-04 18:14:19 +08:00
Hui Li 36d91237db [modify for not pSql in taos obj ] 2020-06-04 18:12:14 +08:00
Shengliang Guan 7a8ab98ff1 [TD-464] show connections 2020-06-04 10:01:11 +00:00
dengyihao 75b1980fc4 [TD-476]fixbug: show correct info when user has no permission to open db 2020-06-04 09:53:03 +00:00
Shuduo Sang 74e7f33f1c make test case print message one by one. 2020-06-04 17:47:35 +08:00
Shuaiqiang Chang 55b616ad88 mrege develop 2020-06-04 17:28:42 +08:00
Shuaiqiang Chang 925f2d4b9f Merge branch 'develop' into hotfix/taos-tools 
* develop: (41 commits)
  [TD-519] fix execute sql return
  fix crash caused by double free when fail to initQInfo
  fix: jdbc resultset
  [TD-314] modify python connector to adapt C API
  [td-225] add query cost statistics.
  [TD-314] modify python connector to adapt the taos API change
  test: importOneRow
  [td-225] update script
  [td-225] update script
  [td-225] update script
  [td-225] update the slow query buffer
  feat: taosdemo, taosdump
  [td-225] fix memory leaks.
  [td-225] add query cost summary right before the qinfo is destoried.
  [td-225] fix memory leaks
  [td-225] update the output log format
  [td-225] fix bugs found by script
  [td-225] handle super table missing error
  [td-225] fix invalid write
  [td-225] fix memory leaks
  ...
 2020-06-04 17:06:57 +08:00
Steven Li 0ab5ec4c74 Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-06-04 01:57:01 -07:00
Shengliang Guan 2add3b3ef9
Merge pull request #2131 from taosdata/yiBuf 
fix crash caused by double free when fail to initQInfo
 2020-06-04 16:48:14 +08:00
Shengliang Guan d2653a3d84
Merge pull request #2133 from taosdata/feature/query 
Feature/query
 2020-06-04 16:47:36 +08:00
Hongze Cheng 6632c4160f TD-521 2020-06-04 08:45:25 +00:00
Tao Liu 8fa42af9ea merge from develop 2020-06-04 08:35:57 +00:00
Tao Liu 2649d517f9 Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query 2020-06-04 08:06:51 +00:00
Tao Liu f9a9a7bc54 [TD-519] fix execute sql return 2020-06-04 08:05:45 +00:00
dengyihao 57b8617fa4 fix crash caused by double free when fail to initQInfo 2020-06-04 06:07:53 +00:00
Shuaiqiang Chang da856d0e8f Merge branch 'develop' into hotfix/taos-tools 
* develop: (43 commits)
  add 3 threads case.
  fix compile error
  [add sim case]
  fix variable issie.
  TD-90
  fix coverity scan bugs
  TD-90
  TD-90
  add multi-threading random test
  TD-90
  fix coverity scan bugs
  [add prepare demo file]
  TD-90
  remove a printf
  [td-90]
  TD-90
  [td-90]
  TD-90
  fix invalid write
  increase travis wait to 20 min
  ...
 2020-06-04 13:57:58 +08:00
vagrant 441bddce34 fix crash caused by double free 2020-06-04 05:57:51 +00:00
Shuaiqiang Chang b2017d9fc4 Merge branch 'feature/query' of github.com:taosdata/TDengine into feature/query 
* 'feature/query' of github.com:taosdata/TDengine:
  [TD-314] modify python connector to adapt C API
  [td-225] add query cost statistics.
  [TD-314] modify python connector to adapt the taos API change
 2020-06-04 13:56:59 +08:00
Shuaiqiang Chang 123d432772 fix: jdbc resultset 2020-06-04 13:56:24 +08:00
Shengliang Guan 4913ce5897
Merge pull request #2127 from taosdata/feature/2.0tsdb 
Feature/2.0tsdb
 2020-06-04 13:34:34 +08:00
Shengliang Guan 5e226cd01b
Merge pull request #2128 from taosdata/feature/sangshuduo/multi-thread-random-test 
fix variable issie.
 2020-06-04 13:33:33 +08:00
Shuduo Sang 51965cdf34 add 3 threads case. 2020-06-04 11:55:48 +08:00
Hongze Cheng 851c531371 fix compile error 2020-06-04 03:36:02 +00:00
Shengliang Guan 25cb101aa6
Merge pull request #2129 from taosdata/hotfix/test 
[add sim case]
 2020-06-04 11:26:16 +08:00
Hui Li d27ebba527 [add sim case] 2020-06-04 11:22:49 +08:00
Shuduo Sang bc7e518708 fix variable issie. 2020-06-04 11:15:27 +08:00
Hongze Cheng 9db2c4bb5e Merge branch 'develop' into feature/2.0tsdb 2020-06-04 02:39:34 +00:00
Hongze Cheng 32922be19e TD-90 2020-06-04 02:17:45 +00:00
Steven Li feb87b3598 Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-06-03 17:06:29 -07:00
Jeff Tao 344c0655e9 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-06-03 23:27:27 +00:00
Jeff Tao aff5a70eb6 fix coverity scan bugs 2020-06-03 23:26:38 +00:00
Hongze Cheng 4c3b3c81a6 TD-90 2020-06-03 14:45:31 +00:00
Hongze Cheng 98fc3df8a0 TD-90 2020-06-03 14:37:29 +00:00
Shengliang Guan 06d878d3ef
Merge pull request #2125 from taosdata/feature/sangshuduo/multi-thread-random-test 
add multi-threading random test
 2020-06-03 19:49:58 +08:00
Shuduo Sang 240d7381bc add multi-threading random test 
[TD-517]
 2020-06-03 18:59:57 +08:00
Shengliang Guan a96d41146f
Merge pull request #2119 from taosdata/hotfix/test 
[TD-489]
 2020-06-03 18:59:17 +08:00
Hongze Cheng b3a0c4291e TD-90 2020-06-03 10:59:05 +00:00
huili 3b57d7398c
Merge pull request #2124 from taosdata/hotfix/fileinfo 
Hotfix/fileinfo
 2020-06-03 18:45:24 +08:00
Hongze Cheng c5e7da740c Merge branch 'develop' into hotfix/fileinfo 2020-06-03 10:36:12 +00:00
Jeff Tao cdbfe6b825 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-06-03 10:24:25 +00:00
Jeff Tao 8da1ff0274 fix coverity scan bugs 2020-06-03 10:18:25 +00:00
Hui Li b886311a1b [add prepare demo file] 2020-06-03 18:11:53 +08:00
Shengliang Guan f84f7fd8bb
Merge pull request #2120 from taosdata/hotfix/sangshuduo/increase-travis-wait-time-to-20min 
increase travis wait to 20 min
 2020-06-03 17:45:05 +08:00
Shengliang Guan 750dc959ef
Merge pull request #2123 from taosdata/hjxilinx-patch-1 
remove a printf
 2020-06-03 17:44:39 +08:00
Tao Liu 6084f5a78f [TD-314] modify python connector to adapt C API 2020-06-03 08:44:45 +00:00