haojun Liao
|
0ad471e3ff
|
Merge pull request #1079 from taosdata/feature/lihui
[1078]
|
2020-01-04 18:45:24 +08:00 |
lihui
|
501d005098
|
[1078]
|
2020-01-04 18:41:21 +08:00 |
hjxilinx
|
9382e4d85b
|
merge with develop
|
2020-01-04 18:37:02 +08:00 |
slguan
|
a5752e911d
|
Merge pull request #1077 from taosdata/hotfix-liaohj
prepare all subqueries object before launch subqueries. and add some …
|
2020-01-04 17:47:57 +08:00 |
|
hjxilinx
|
dcc175edac
|
prepare all subqueries object before launch subqueries. and add some check for global status object during super table query.
|
2020-01-04 17:44:25 +08:00 |
|
slguan
|
d1c3128237
|
Merge branch 'master' into develop
# Conflicts:
# src/client/src/tscFunctionImpl.c
# src/client/src/tscServer.c
|
2020-01-04 17:19:21 +08:00 |
plum-lihui
|
ded3a2c142
|
Merge pull request #1075 from taosdata/hotfix/slguan
TBASE-1398 #1073
|
2020-01-04 16:58:54 +08:00 |
|
slguan
|
cbd77262b0
|
TBASE-1398 #1073
|
2020-01-04 16:50:19 +08:00 |
|
slguan
|
cbb0dd728b
|
Merge pull request #1072 from taosdata/feature/fangdoc
return if fail to open file, otherwise coredump
|
2020-01-04 16:35:21 +08:00 |
fang
|
947f2a4ede
|
return if fail to open file, otherwise coredump
|
2020-01-04 16:16:10 +08:00 |
|
plum-lihui
|
9dd6cd0162
|
Merge pull request #1069 from taosdata/feature/fangdoc
#1065 add quotes to binary values
|
2020-01-04 16:05:09 +08:00 |
fangpanpan
|
d8bdd226d2
|
Merge pull request #1071 from taosdata/master-lihui
[#909]
|
2020-01-04 16:04:59 +08:00 |
|
lihui
|
acd8b5dfa2
|
[#909]
|
2020-01-04 16:03:18 +08:00 |
|
fangpanpan
|
0cede1664e
|
Merge pull request #1070 from taosdata/feature/lihui
[#909]
|
2020-01-04 16:01:30 +08:00 |
|
lihui
|
01c396fff1
|
[#909]
|
2020-01-04 15:59:06 +08:00 |
|
fang
|
8eeb950083
|
#1065 add quotes to binary values
|
2020-01-04 15:35:01 +08:00 |
|
fangpanpan
|
975c2147db
|
Merge pull request #1068 from taosdata/feature/cgodll
[#1054]
|
2020-01-04 15:02:15 +08:00 |
|
lihui
|
89d74d83a4
|
[#1054]
|
2020-01-04 14:59:26 +08:00 |
|
fangpanpan
|
b5fd541663
|
Merge pull request #1066 from taosdata/feature/cgodll
[#1054]
|
2020-01-04 14:26:03 +08:00 |
|
lihui
|
01dab17fc1
|
[#1054]
|
2020-01-04 14:20:46 +08:00 |
|
fangpanpan
|
1828eec852
|
Merge pull request #1064 from taosdata/feature/cgodll
Feature/cgodll
|
2020-01-04 13:52:19 +08:00 |
|
lihui
|
5e047028be
|
[#1054]
|
2020-01-04 13:44:33 +08:00 |
|
lihui
|
d9a3b9daef
|
[#1054]
|
2020-01-04 13:43:43 +08:00 |
|
plum-lihui
|
2aae18dd80
|
Merge pull request #1054 from huskar-t/feature/cgodll
CGO DLL
|
2020-01-04 11:29:04 +08:00 |
|
slguan
|
9838b2fa6c
|
Merge pull request #1063 from taosdata/hjxilinx-update-doc-1
Update TAOS SQL-ch.md
|
2020-01-03 23:09:30 +08:00 |
|
haojun Liao
|
81da07d268
|
Update TAOS SQL-ch.md
update the taos sql document.
|
2020-01-03 22:57:45 +08:00 |
|
fangpanpan
|
f85955b110
|
Merge pull request #1062 from taosdata/feature/importSampleData
replace grafana subscribe sql
|
2020-01-03 18:37:26 +08:00 |
xieyinglin
|
0c22f9d871
|
replace grafana subscribe sql
|
2020-01-03 18:36:04 +08:00 |
|
hjxilinx
|
35a534ec9a
|
add the union support in sql parser: fix some bugs. #1032. [TBASE-1140]
|
2020-01-03 18:30:24 +08:00 |
|
fangpanpan
|
755ef98349
|
Merge pull request #1061 from taosdata/feature/lihui
[#1059 TBASE-1436]
|
2020-01-03 17:56:50 +08:00 |
|
lihui
|
bdd8292eb2
|
[#1059 TBASE-1436]
|
2020-01-03 17:09:01 +08:00 |
|
hjxilinx
|
6287be5a59
|
add the union support in sql parser: fix memory leaks and refactor some functions, improve the performance of some functions. #1032. [TBASE-1140]
|
2020-01-03 15:16:20 +08:00 |
|
fangpanpan
|
ef44bf60e4
|
Merge pull request #1058 from taosdata/feature/lihui
[#issue-1057 TBASE-1433]
|
2020-01-03 13:23:13 +08:00 |
|
lihui
|
7629406d32
|
[modify cmake parameter]
|
2020-01-03 13:06:38 +08:00 |
|
lihui
|
63bfb3a21a
|
[#issue-1057 TBASE-1433]
|
2020-01-03 12:18:46 +08:00 |
|
slguan
|
1fecbbfab9
|
Merge pull request #1056 from taosdata/hjxilinx-patch-1
Update tscUtil.c
|
2020-01-03 11:40:28 +08:00 |
|
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 |