Commit Graph

27626 Commits

Author SHA1 Message Date
haojun Liao 9e7f670376
fix bugs avoiding two super table join crash
fix bugs avoiding two super table join crashed.
2020-01-09 14:11:26 +08:00
fangpanpan 2afef97fe3
Merge pull request #1107 from taosdata/feature/lihui
[#1096]
2020-01-09 10:44:38 +08:00
lihui 4217bacf54 [#1096] 2020-01-09 10:41:21 +08:00
lihui 82317294ba [#1102] 2020-01-09 10:35:47 +08:00
hjxilinx 475c03a3c2 add more security check for async union processing. 2020-01-09 10:20:25 +08:00
hzcheng 217168780e
Merge pull request #1105 from taosdata/hotfix/slguan
TBASE-1398 #1073
2020-01-08 19:11:19 +08:00
slguan b83ad01397
Merge pull request #1106 from taosdata/feature/fangdoc
edit english user guide for java connector
2020-01-08 18:58:45 +08:00
slguan ff40a0cb5f
Merge pull request #1104 from taosdata/feature/lihui
[#1102]
2020-01-08 18:58:25 +08:00
slguan fe582f9156 TBASE-1442 #1025 2020-01-08 18:35:34 +08:00
fang 112c9f63a1 edit english user guide for java connector 2020-01-08 18:31:35 +08:00
lihui 821b3cbc12 [#1102] 2020-01-08 06:16:05 -04:00
fangpanpan 913050a4d0
Merge pull request #1103 from taosdata/feature/jdbc_doc
edity jdbc connector doc
2020-01-08 18:07:11 +08:00
xieyinglin 6e05c6a230 edity jdbc connector doc 2020-01-08 18:03:00 +08:00
slguan 9362bfe502 TBASE-1398 #1073 2020-01-08 18:01:06 +08:00
hjxilinx c0c5754b7a help to prevent current data in file from causing TDengine crashed while min/max function is invoked. 2020-01-08 17:35:07 +08:00
hjxilinx d6828370a5 add more default int hash function. 2020-01-08 17:20:08 +08:00
haojun Liao e505a6b4fb
Merge pull request #1101 from taosdata/hotfix/slguan
TBASE-1442 #1025
2020-01-08 17:13:04 +08:00
haojun Liao 672c7d59d9
Merge pull request #1097 from taosdata/feature/lihui
[#1096 TBASE-1389]
2020-01-08 17:08:56 +08:00
hjxilinx b058e4e85b add the union support in sql parser: refactor some codes. #1032. [TBASE-1140] 2020-01-08 17:04:00 +08:00
lihui ff254b72e5 [#1098] 2020-01-08 16:20:12 +08:00
lihui b5f11cc88b Merge branch 'develop' into feature/lihui 2020-01-08 16:12:29 +08:00
slguan 4bde87f6a2
Merge pull request #1095 from taosdata/beta/v1.6.5.3
fix bugs in #1094
2020-01-08 14:33:20 +08:00
slguan dfb29f75e8
Merge branch 'develop' into beta/v1.6.5.3 2020-01-08 14:33:10 +08:00
hjxilinx 3cc8eb0917 add the union support in sql parser: refactor some codes. #1032. [TBASE-1140] 2020-01-08 13:12:59 +08:00
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