Commit Graph

27626 Commits

Author SHA1 Message Date
haojun Liao c48db46a80
Update tscUtil.c 2020-01-03 11:19:57 +08:00
slguan e7add9a561
Merge pull request #1055 from taosdata/hjxilinx-patch-1
fix invalid release operatons
2020-01-03 11:14:47 +08:00
haojun Liao 9b5e23b104
fix invalid
fix the invalid release operations when the database is dropped and the metermeta cache is cleaned up at the client side. #1053  [tbase-1435]
2020-01-03 11:13:13 +08:00
tanxuefeng 3febe2ac0f CGO DLL 2020-01-03 10:58:53 +08:00
slguan e0d2bbe6d2
Merge pull request #1052 from taosdata/jtao1735-patch-1
Update connector-ch.md
2020-01-03 09:35:16 +08:00
Jeff Tao 42f1e7c93e
Update connector-ch.md 2020-01-02 23:16:03 +08:00
hjxilinx f20169933b add the union support in sql parser: fix some bugs. #1032. [TBASE-1140] 2020-01-02 19:16:02 +08:00
slguan b7953cc492
Merge pull request #1049 from taosdata/hjxilinx-patch-3
Update tscStream.c
2020-01-02 14:16:39 +08:00
haojun Liao 7496234056
Update tscStream.c 2020-01-02 14:15:35 +08:00
slguan d1a595f4ce
Merge pull request #1048 from taosdata/hjxilinx-patch-3
fix bugs in #1047. [tbase-1434]
2020-01-02 14:06:33 +08:00
haojun Liao f0f427abe1
fix bugs in #1047. [tbase-1434] 2020-01-02 13:20:43 +08:00
hjxilinx c982714173 add the union support in sql parser. refactor some codes. fix bug in join query caused by feature update #1032. [TBASE-1140] 2020-01-01 23:00:23 +08:00
hjxilinx e15aa9b1f9 add the union support in sql parser. #1032. [TBASE-1140] 2019-12-31 23:33:48 +08:00
slguan 805e23a676 Merge branch 'master' into develop 2019-12-31 23:26:45 +08:00
hzcheng 9149d091fd
Merge pull request #1043 from taosdata/hotfix/slguan
#1041
2019-12-31 18:37:47 +08:00
fangpanpan 6bb4bbbd22
Merge pull request #1044 from taosdata/feature/importSampleData
add dashboard json
2019-12-31 18:36:16 +08:00
xieyinglin 848ad48282 add dashboard json 2019-12-31 18:23:37 +08:00
haojun Liao da954f2ad0
Merge pull request #1038 from taosdata/feature/lihui
[TBASE-816]
2019-12-31 17:20:53 +08:00
slguan fbda0edb24
Merge pull request #1042 from taosdata/feature/grafana_plugin
Feature/grafana plugin
2019-12-31 17:15:59 +08:00
haojun Liao 669f228beb
Merge pull request #1040 from taosdata/master-lihui
[#1039 TBASE-816]
2019-12-31 17:12:07 +08:00
xieyinglin d4f82fa3c8 edit grafana doc 2019-12-31 17:11:28 +08:00
slguan ea33f64fc1 #1041 2019-12-31 17:02:11 +08:00
lihui 5187b700aa [#1039 TBASE-816] 2019-12-31 16:55:20 +08:00
slguan 568ac53462
Merge pull request #1037 from taosdata/hjxilinx-patch-2
add the null-terminated char for binary data
2019-12-31 16:52:08 +08:00
slguan 40cff228fb
Merge pull request #1035 from taosdata/feature/fangdoc
correct typos in node.js connector chinese user guide
2019-12-31 16:51:56 +08:00
slguan 6ea3ff8d9d
Merge pull request #1036 from taosdata/hjxilinx-patch-1
Update vnodeQueryImpl.c
2019-12-31 16:51:13 +08:00
lihui ceb92c8cbe [TBASE-816] 2019-12-31 16:39:08 +08:00
haojun Liao 212aae5316
add the null-terminated char for binary data
add the null-terminated char for the binary data, if the space if available.
2019-12-31 12:19:24 +08:00
haojun Liao 99e758f2f1
Update vnodeQueryImpl.c 2019-12-31 12:09:47 +08:00
fang f299efcb41 correct typos in node.js connector chinese user guide 2019-12-31 11:28:29 +08:00
fangpanpan bcc3261776
Merge pull request #1033 from taosdata/feature/importSampleData
add statistic and save option
2019-12-30 20:46:17 +08:00
xieyinglin 6210f4ecce add statistic and save option 2019-12-30 19:14:51 +08:00
hjxilinx c18b6b1ba4 add the union support in sql parser. #1032. [TBASE-1140] 2019-12-30 11:18:16 +08:00
fangpanpan 41e6b06180
Merge pull request #1031 from taosdata/feature/lihui
Feature/lihui
2019-12-28 17:17:17 +08:00
lihui a90b00aabd [TBASE-1420] 2019-12-28 17:07:51 +08:00
fangpanpan 39adfbff06
Merge pull request #1030 from taosdata/feature/lihui
Feature/lihui
2019-12-28 16:49:52 +08:00
lihui 9b429f3c13 Merge branch 'develop' into feature/lihui 2019-12-28 16:35:58 +08:00
lihui 3700552ed2 [TBASE-1420] 2019-12-28 16:34:46 +08:00
lihui b0c839de54 [#1029 TBASE-1431] 2019-12-28 16:33:28 +08:00
hjxilinx 25fae2a1c4 refactor some codes, add a safety check 2019-12-27 23:42:57 +08:00
fangpanpan ce8ab3c104
Merge pull request #1028 from taosdata/feature/importSampleData
edit readme
2019-12-27 16:34:00 +08:00
xieyinglin 432ed39486 edit readme 2019-12-27 16:30:55 +08:00
fangpanpan 753b8bd29e
Merge pull request #1027 from taosdata/feature/importSampleData
add importSampleData tool
2019-12-27 16:22:38 +08:00
xieyinglin f96c019556 add importSampleData tool 2019-12-27 16:07:18 +08:00
Bomin Zhang e7baca3651
Merge pull request #1026 from taosdata/feature/lihui
[TBASE-1360]
2019-12-27 14:32:59 +08:00
lihui 65e556e7c3 [TBASE-1360] 2019-12-27 14:30:59 +08:00
hzcheng a5507631b2
Merge pull request #1024 from taosdata/feature/lihui
[TBASE-816]
2019-12-26 18:00:10 +08:00
lihui b73de8c116 [TBASE-816] 2019-12-26 17:57:50 +08:00
hjxilinx 117e1f8b3d [TBASE-1396] 2019-12-26 17:55:52 +08:00
plum-lihui faf46dc460
Merge pull request #1023 from taosdata/feature/slguan
#1022
2019-12-26 17:16:12 +08:00