Commit Graph

7123 Commits

Author SHA1 Message Date
Shengliang Guan fe834cc75d only drop one vnode each time 2020-08-11 04:43:57 +00:00
Shengliang Guan 88171545f8 TD-1081 change cache key 2020-08-11 03:58:41 +00:00
Shengliang Guan 618c64192c Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-11 11:09:20 +08:00
Shengliang Guan 5d5137adac
Merge pull request #2984 from taosdata/hotfix/test
Hotfix/test
2020-08-11 11:02:02 +08:00
Shengliang Guan 916c8246ad
Merge pull request #3009 from taosdata/feature/query
[td-255]fix bugs in table alias name.
2020-08-11 10:56:18 +08:00
Hui Li f1e19aae4c [fix bug] 2020-08-11 10:33:17 +08:00
Shengliang Guan 6702061f68 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-11 09:51:48 +08:00
Shengliang Guan 49944faf7d TD-1081 change httpContext keep time 2020-08-11 09:47:23 +08:00
Shengliang Guan fe6f96b1ce
Merge pull request #3002 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-08-11 09:42:37 +08:00
Shengliang Guan 3484f25153
Merge pull request #3005 from taosdata/feature/os
Feature/os
2020-08-11 09:36:32 +08:00
Shengliang Guan 72252e0a2e
Merge pull request #3004 from eurake/patch-3
Update CMakeLists.txt
2020-08-11 09:36:18 +08:00
Hui Li 99753ae08e Merge branch 'develop' into hotfix/test 2020-08-11 09:24:48 +08:00
Haojun Liao 36c43566da [td-255]fix bugs in table alias name. 2020-08-11 00:50:09 +08:00
Shengliang Guan 0ac540218a TD-1057 minor changes 2020-08-10 23:57:14 +08:00
Shengliang Guan 2dfcac405a TD-1057 change pthread_t to int64 2020-08-10 23:51:53 +08:00
eurake d7ed734e9f
Update CMakeLists.txt 2020-08-10 23:44:09 +08:00
Shengliang Guan d4f3954891 TD-1057 change compile errors 2020-08-10 23:22:01 +08:00
Shengliang Guan 6608e13c8b
Merge pull request #3003 from taosdata/feature/os
Feature/os
2020-08-10 23:08:43 +08:00
Shengliang Guan d79cad4b64 TD-1057 2020-08-10 14:34:50 +00:00
Shengliang Guan d776f10dae TD-1057 2020-08-10 14:02:14 +00:00
Shengliang Guan e57965f64a TD-1057 2020-08-10 13:48:59 +00:00
Shengliang Guan 5da10761ef
Merge pull request #3000 from taosdata/feature/query
Feature/query
2020-08-10 19:55:05 +08:00
Shengliang Guan e27a71aa01
Merge pull request #3001 from taosdata/update_taos-jdbcdriver_version
udpate taos-jdbcdriver version for jdbc demos
2020-08-10 19:54:37 +08:00
Haojun Liao 7e4cf6511a [td-255]remove unused functions. 2020-08-10 19:05:00 +08:00
Hongze Cheng eb9e42eece Merge branch 'develop' into feature/2.0tsdb 2020-08-10 19:01:03 +08:00
Hongze Cheng 9eafba461f TD-1102 2020-08-10 18:58:25 +08:00
Ping Xiao bc73587498 udpate taos-jdbcdriver version for jdbc demos 2020-08-10 18:52:05 +08:00
Shengliang Guan 5aae4b9078 TD-1057 first compile version of windows 64 client 2020-08-10 18:46:20 +08:00
Haojun Liao f6712d984a [td-255]remove unused functions. 2020-08-10 18:43:16 +08:00
Haojun Liao 98cec99dc1 [td-255] fix counting value error bug. 2020-08-10 18:30:16 +08:00
Shengliang Guan 4bd41a0fbf TD-1057 2020-08-10 18:17:14 +08:00
Haojun Liao dcfab65c6a [td-255] fix errors. 2020-08-10 18:10:06 +08:00
Haojun Liao 40318cc50e [td-255] merge develop 2020-08-10 17:58:09 +08:00
Shengliang Guan bc492a3f99
Merge pull request #2999 from taosdata/master
Master
2020-08-10 17:42:18 +08:00
Shengliang Guan 03a29a618f
Merge branch 'develop' into master 2020-08-10 17:42:06 +08:00
Shengliang Guan cd8e71f880
Merge pull request #2998 from taosdata/hotfix/blockiter
Hotfix/blockiter
2020-08-10 17:40:14 +08:00
Shengliang Guan 16ca0b9549
Merge pull request #2997 from eurake/patch-2
Update cluster-ch.md
2020-08-10 17:39:46 +08:00
Haojun Liao e00d072887 [td-1101] add time range check, fix bugs for projection query. 2020-08-10 17:38:09 +08:00
eurake 8aad94d7eb
Update cluster-ch.md
删除多余英文字符
2020-08-10 17:31:12 +08:00
Shengliang Guan 22cbd9627c
Merge pull request #2995 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-08-10 17:05:51 +08:00
Haojun Liao 2cee0797b4 [td-1101]add some logs 2020-08-10 15:56:41 +08:00
Hongze Cheng d7cc7d9ec2 Merge branch 'develop' into feature/2.0tsdb 2020-08-10 11:25:19 +08:00
Hongze Cheng 1f66342c4b remove part of assert 2020-08-10 11:12:16 +08:00
Shengliang Guan 5c73b49b83
Merge pull request #2989 from taosdata/feature/platform
TD-1102
2020-08-10 10:10:44 +08:00
Hongze Cheng 77cfb02ea0 add file size statistics 2020-08-10 09:59:15 +08:00
Hongze Cheng 30d98e1aeb Merge branch 'develop' into feature/2.0tsdb 2020-08-10 09:50:12 +08:00
Shengliang Guan 863d6567b5
Merge pull request #2994 from taosdata/fix_taos_sql_typo
fix typo in taos sql md file
2020-08-09 23:49:42 +08:00
Ping Xiao 9ccdaec95d fix typo in taos sql md file 2020-08-09 23:25:43 +08:00
Shengliang Guan 41d97eeea7 TD-1057 2020-08-09 15:21:03 +00:00
Shengliang Guan a9cabb54fa TD-1057 2020-08-09 22:59:42 +08:00