Commit Graph

6062 Commits

Author SHA1 Message Date
Hui Li f7e89d56b6 Merge branch 'develop' into hotfix/test 2020-07-15 11:21:45 +08:00
Hui Li c0b902cae3 [updata taos interface] 2020-07-15 10:44:17 +08:00
Shengliang Guan 894153dcb3 add fsync time 2020-07-15 10:35:42 +08:00
Shengliang Guan 455ed5a15a
Merge pull request #2664 from taosdata/hotfix/wal
Hotfix/wal
2020-07-15 10:34:02 +08:00
Shengliang Guan b03c73c9cc
Merge pull request #2665 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-07-15 10:33:44 +08:00
Hongze Cheng 849dd43e83 Merge branch 'develop' into feature/2.0tsdb 2020-07-15 10:07:31 +08:00
Hongze Cheng 3d4e8a70c4 Merge branch 'develop' into feature/2.0tsdb 2020-07-15 09:53:24 +08:00
Shengliang Guan 35bb7823f3 Merge branch 'develop' into hotfix/wal 2020-07-15 09:53:17 +08:00
Shengliang Guan 67a0474447 scripts 2020-07-15 09:52:55 +08:00
Shengliang Guan 9a94e626ab Checking the end flag of retrieve cause the grafana script failed 2020-07-15 09:50:11 +08:00
Hongze Cheng c16e252dc7 Merge branch 'develop' into feature/2.0tsdb 2020-07-14 22:51:47 +08:00
Jeff Tao 8b7ab163b6 Merge branch 'develop' into hotfix/wal 2020-07-14 14:38:52 +00:00
Shengliang Guan 3302f60e45 remove log in restful 2020-07-14 21:49:19 +08:00
Hongze Cheng ea60fa3335 Merge branch 'develop' into feature/2.0tsdb 2020-07-14 19:43:32 +08:00
Shengliang Guan fb3e5bae1d
Merge pull request #2658 from taosdata/feature/vnode
Feature/vnode
2020-07-14 19:36:58 +08:00
Shengliang Guan d78afdf2dd [TD-825] post semphore while kill query 2020-07-14 19:24:57 +08:00
Hui Li 32147fd87a [fix bug] 2020-07-14 19:18:37 +08:00
Shengliang Guan 869c19dc50 Merge remote-tracking branch 'origin/develop' into feature/vnode 2020-07-14 18:56:32 +08:00
Shengliang Guan 1d1cd322d4
Merge pull request #2662 from taosdata/hotfix/test
[modify sim cases]
2020-07-14 18:54:17 +08:00
Shengliang Guan 7ca488e3ac [TD-825] 2020-07-14 18:50:21 +08:00
Hui Li cbb06baea1 [modify sim cases] 2020-07-14 18:08:06 +08:00
Hongze Cheng de22b29388 use trace for massive log output 2020-07-14 18:05:50 +08:00
Hongze Cheng 701554ed5a fix typo 2020-07-14 17:51:01 +08:00
Hongze Cheng 18a33d1d3d fix add subblock commit error 2020-07-14 17:47:37 +08:00
Hongze Cheng 1ee08095c2 Merge branch 'develop' into feature/2.0tsdb 2020-07-14 15:51:53 +08:00
Shengliang Guan 627cdc0749 [TD-825] race condtion while free object in cache 2020-07-14 14:33:55 +08:00
Shengliang Guan 4b8428855f [TD-825] adjust callback sequence in async query 2020-07-14 14:10:40 +08:00
Hongze Cheng 5f04e54d3d fix null value commit coredump 2020-07-14 13:43:50 +08:00
Hongze Cheng 2e2286e2cd fix commit coredump 2020-07-14 12:07:41 +08:00
Shengliang Guan 045129ed01 Merge branch 'develop' into feature/vnode 2020-07-14 12:00:34 +08:00
Shengliang Guan fad8406810 change a log level 2020-07-14 11:59:20 +08:00
Hongze Cheng fb538e8860 fix a typo 2020-07-14 11:31:17 +08:00
Jeff Tao bd8a9769f8 change the option name to fsync from fsyncPeriod 2020-07-14 03:29:16 +00:00
Shengliang Guan 95c92802f8 [TD-825] change conditions of restful interface 2020-07-14 10:57:36 +08:00
Jeff Tao ee14fa074c add fsync option 2020-07-14 01:49:25 +00:00
Shengliang Guan d78ae3323a
Merge pull request #2656 from taosdata/hotfix/TD-816
adjust max tags number
2020-07-14 00:01:02 +08:00
Shengliang Guan 8fce74f07b
Merge pull request #2654 from taosdata/feature/query
Feature/query
2020-07-14 00:00:36 +08:00
Hongze Cheng 206f461b4a fix coredump 2020-07-13 23:06:40 +08:00
Hongze Cheng 489a8ca0f5 fix coredump 2020-07-13 22:51:54 +08:00
Jeff Tao e78ce3bbe3 sql.y 2020-07-13 13:24:04 +00:00
Jeff Tao 067e32d330 Merge branch 'develop' into hotfix/wal 2020-07-13 12:47:02 +00:00
Shengliang Guan 2436c9ff23
Merge pull request #2657 from taosdata/feature/vnode
[TD-918]
2020-07-13 20:29:54 +08:00
Shengliang Guan a1d992e321 [TD-918] 2020-07-13 20:24:10 +08:00
Hongze Cheng 76d2faeb25 fix load column data bug 2020-07-13 20:03:45 +08:00
Hongze Cheng 3d2cd1bce5 fix load column data bug 2020-07-13 19:54:15 +08:00
Haojun Liao 621f842c0f [td-225] fix bugs. 2020-07-13 19:27:07 +08:00
Shengliang Guan 4ba7f20504
Merge pull request #2653 from taosdata/bugfix/td-834
fix td-834
2020-07-13 18:51:06 +08:00
Hongze Cheng d782e229c6 finish more code 2020-07-13 18:46:37 +08:00
Jeff Tao c6dfcd2d39 add fsyncPeriod 2020-07-13 10:46:10 +00:00
yihaoDeng 4918aac1eb adjust max tags number 2020-07-13 10:41:12 +00:00