hjxilinx
|
82706e1b41
|
add the union support in sql parser: fix bugs and refactor some codes. #1032. [TBASE-1140]
|
2020-01-08 13:03:48 +08:00 |
lihui
|
5a0cafa44b
|
[#1096 TBASE-1389]
|
2020-01-08 11:27:22 +08:00 |
haojun Liao
|
cb7d3e8136
|
fix bugs in #1094
fix the bug in #1094. [tbase-1450]
|
2020-01-08 10:56:56 +08:00 |
localvar
|
76ade60994
|
tbase-916
|
2020-01-08 10:22:40 +08:00 |
fangpanpan
|
1960898861
|
Merge pull request #1093 from taosdata/feature/importSampleData
add savetb option
|
2020-01-07 16:46:20 +08:00 |
xieyinglin
|
e694714221
|
add savetb option
|
2020-01-07 16:41:34 +08:00 |
|
hjxilinx
|
d99b94a582
|
fix bugs referred in issue #1091. [tbase-1448]
|
2020-01-07 15:40:14 +08:00 |
|
hjxilinx
|
ff3ad27800
|
add the union support in sql parser: fix bugs. #1032. [TBASE-1140]
|
2020-01-07 15:38:57 +08:00 |
slguan
|
3ca778d604
|
Merge pull request #1089 from taosdata/beta/v1.6.5.3
add the number of blocks in the SMeterDataInfo
|
2020-01-07 13:47:05 +08:00 |
|
haojun Liao
|
e2299ef22e
|
add the number of blocks in the SMeterDataInfo
fix bug that failed to add the number of blocks in the records (SMeterDataInfo) for each table
|
2020-01-07 12:26:11 +08:00 |
|
slguan
|
115d67e092
|
TBASE-1442 #1025
|
2020-01-06 18:28:06 +08:00 |
|
slguan
|
751fa0239b
|
Merge pull request #1088 from taosdata/beta/v1.6.5.3
fix release buffer failed bug
|
2020-01-06 18:00:50 +08:00 |
|
hjxilinx
|
ce9f1e5bae
|
fix release buffer failed bug
|
2020-01-06 17:57:23 +08:00 |
|
hjxilinx
|
7358e65db6
|
fix bugs during union all processing
|
2020-01-06 17:43:53 +08:00 |
|
slguan
|
7bcfa2f0ab
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# src/client/src/tscParseInsert.c
|
2020-01-06 17:09:14 +08:00 |
|
fangpanpan
|
ac5a9c9bb2
|
Merge pull request #1087 from taosdata/feature/lihui
[TBASE-1167]
|
2020-01-06 17:02:41 +08:00 |
|
lihui
|
5066571fc2
|
[TBASE-1167]
|
2020-01-06 16:56:05 +08:00 |
|
localvar
|
d7a8b0cb2d
|
tbase-915: documentation for subscription
|
2020-01-06 15:09:24 +08:00 |
|
fangpanpan
|
14111fbd6e
|
Merge pull request #1085 from taosdata/hotfix/slguan
examples
|
2020-01-06 14:37:40 +08:00 |
|
slguan
|
241c93b4bb
|
examples
|
2020-01-06 14:27:27 +08:00 |
|
fangpanpan
|
7dbd807af6
|
Merge pull request #1084 from taosdata/feature/lihui
[#1083]
|
2020-01-06 12:50:15 +08:00 |
|
fangpanpan
|
49b2ab19c6
|
Merge pull request #1082 from taosdata/hotfix/slguan
update log content
|
2020-01-06 12:49:36 +08:00 |
|
lihui
|
e30edca2bd
|
[#1083]
|
2020-01-06 12:15:06 +08:00 |
|
hjxilinx
|
dd41425f37
|
refactor some codes
|
2020-01-06 12:11:59 +08:00 |
|
slguan
|
1ca089de10
|
update log content
|
2020-01-06 12:05:56 +08:00 |
|
slguan
|
cfbcd4f438
|
Merge pull request #1081 from taosdata/beta/v1.6.5.2
increase the value range for pSql->numOfSubs
|
2020-01-06 11:59:16 +08:00 |
|
haojun Liao
|
d6f8f02eca
|
increase the value range for pSql->numOfSubs
increase the value range for pSql->numOfSubs from uint8_t to uint16_t
|
2020-01-06 11:38:26 +08:00 |
|
localvar
|
23527898e7
|
fix issue in single meter subscription.
|
2020-01-06 11:27:52 +08:00 |
|
localvar
|
592f210983
|
update java connector
|
2020-01-06 11:27:52 +08:00 |
|
localvar
|
051af216a5
|
tbase-1422: free resource
|
2020-01-06 11:27:23 +08:00 |
|
localvar
|
f2eac06a33
|
TBASE-1423: single meter subscription
|
2020-01-06 11:26:55 +08:00 |
|
localvar
|
4ba0819f58
|
TBASE-1424, TBASE-1425: save & load subscription progress.
|
2020-01-06 11:26:54 +08:00 |
|
localvar
|
44536fdcf7
|
TBASE-1427
|
2020-01-06 11:26:22 +08:00 |
|
localvar
|
3537de849a
|
update query process
|
2020-01-06 11:26:22 +08:00 |
|
localvar
|
804b581269
|
TBASE-917: update subscription example
|
2020-01-06 11:25:41 +08:00 |
|
localvar
|
192ad4df35
|
return last key of each meter to client
|
2020-01-06 11:25:41 +08:00 |
|
localvar
|
517fb88329
|
subscription (WIP)
|
2020-01-06 11:25:41 +08:00 |
|
hjxilinx
|
5295955b72
|
add the union support in sql parser: refactor some codes. #1032. [TBASE-1140]
|
2020-01-06 10:49:14 +08:00 |
|
fangpanpan
|
26974aae2b
|
Merge pull request #1080 from taosdata/master-lihui
[#1078]
|
2020-01-04 20:56:12 +08:00 |
|
lihui
|
8712b64101
|
[#1078]
|
2020-01-04 18:53:38 +08:00 |
|
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 |