Commit Graph

27626 Commits

Author SHA1 Message Date
hjxilinx d3c5320b1f Merge branch 'develop' into feature/liaohj 2019-11-10 22:50:40 +08:00
Hongze Cheng c012704a5b Submit the first version of merge import 2019-11-10 19:54:05 +08:00
hjxilinx c0d6cb743f refactor the header file format in client module 2019-11-09 22:38:22 +08:00
hjxilinx 4918783d5a refactor the header file format in client module 2019-11-09 22:30:27 +08:00
slguan 6e14f9dc8b Client and server versions may not match 2019-11-09 14:37:44 +08:00
fangpanpan d3941fe95b
Merge pull request #689 from taosdata/feature/mergecode
Unable to establish connection when IP address is NULL
2019-11-09 13:52:16 +08:00
root 3c3edeb241 Unable to establish connection when IP address is NULL 2019-11-09 13:39:30 +08:00
xieyinglin 6da3459841
Merge pull request #688 from taosdata/feature/grafana_plugin
fix grafana bugs
2019-11-09 11:14:43 +08:00
slguan b6204c9c41 fix grafana bugs 2019-11-08 15:58:12 +08:00
slguan 4a3e086c4d
Merge pull request #685 from taosdata/feature/prepare
documentation of statement preparation API
2019-11-08 14:27:35 +08:00
slguan 51943b6f0e
Merge pull request #684 from taosdata/feature/newtimer
new timer implementation
2019-11-08 14:26:52 +08:00
localvar 5365b56ab4 TBASE-794: update documentation 2019-11-08 05:26:00 +00:00
localvar 82ce093aff TBASE-870: fix link error in windows 2019-11-08 05:10:03 +00:00
localvar 128a49fc2d TBASE-870 2019-11-08 02:48:43 +00:00
slguan 1c3fcabe04 Merge branch 'develop' into feature/mergecode 2019-11-07 22:34:39 +08:00
slguan ec63e58813 fix package script error 2019-11-07 22:34:08 +08:00
slguan b57c527f93
Merge pull request #683 from taosdata/feature/mergecode
fix some compile errors
2019-11-07 20:27:46 +08:00
slguan 3f4da1949f fix some compile errors 2019-11-07 20:25:42 +08:00
slguan 869171d233 refactor the allocation buffer for load data block into memory 2019-11-07 19:15:30 +08:00
slguan c2e91fcb75 Adjust code structure 2019-11-07 18:12:26 +08:00
lihui 20d340f520 [issue-676] 2019-11-07 14:31:42 +08:00
slguan 1734f38ada
Merge pull request #680 from taosdata/feature/windows64_client
Fix some compilation and packaging problems under windows
2019-11-07 13:42:21 +08:00
slguan a447b14792 Fix some compilation and packaging problems under windows 2019-11-07 12:24:28 +08:00
lihui c2f65ef028 Merge branch 'master' of https://github.com/taosdata/TDengine 2019-11-06 16:01:47 +08:00
lihui a58e4f342f [issue-676] 2019-11-06 16:01:12 +08:00
fangpanpan 4c6e028a51
Update pom.xml
for a vulnerability notification
2019-11-06 14:16:08 +08:00
Jeff Tao 77b20bf138 fix issue 677 2019-11-06 08:49:40 +08:00
hjxilinx e124a54d50 The length of submit message used to insert data to server is incorrect #673 2019-11-04 21:39:01 +08:00
hjxilinx afb33efc6a configure the connection option through taos_options #671 2019-11-04 17:59:57 +08:00
hjxilinx 5d1b173528 Restore the state of the meter in case of failing to launch the update procedure. 2019-11-04 13:47:29 +08:00
hjxilinx f5cd00282c Restore the state of the meter in case of failing to launch the update procedure. 2019-11-04 13:45:45 +08:00
hjxilinx 654a5061ff configure the socket type(TCP/UDP) in config file.#671 2019-11-04 13:16:31 +08:00
haojun Liao ba197c2d39
Update TAOS SQL-ch.md 2019-11-01 16:29:59 +08:00
xieyinglin 53412e4d28
Merge pull request #664 from xieyinglin/master
fix the tag is placeholder for issue #661
2019-11-01 13:13:57 +08:00
xieyinglin afcd5a060e fix the tag is placeholder when tableName is static 2019-11-01 12:59:02 +08:00
Jeff Tao a2ba535760 idle timer in shell shall be set a little bit longer 2019-10-31 19:06:50 +08:00
Jeff Tao 4afd80c508 Merge branch 'master' of https://github.com/taosdata/TDengine 2019-10-31 16:05:29 +08:00
Jeff Tao a54e96fc05 fix issue #662 2019-10-31 13:43:51 +08:00
hjxilinx d0f62cfff1 fix bug issue #643. 2019-10-30 22:16:03 +08:00
hjxilinx 09e347045a Merge branch 'master' of http://www.github.com/taosdata/tdengine 2019-10-30 10:39:01 +08:00
hjxilinx 0a0852ad46 fix bug #660 2019-10-30 10:30:57 +08:00
Jeff Tao dea69ae5d2 fix issue #659 2019-10-29 19:20:51 +08:00
hjxilinx d4bcce0d8f Merge remote-tracking branch 'origin/master' 2019-10-29 17:53:40 +08:00
hjxilinx 6fec7de230 fix bug #657. RPC module frees the msg body while other threads still access that struct to cause the SIGSEGV error. 2019-10-29 17:53:19 +08:00
haojun Liao bd2b9f0647
Merge pull request #651 from xieyinglin/master
print the java.library.path variable for debug
2019-10-29 17:32:33 +08:00
hjxilinx 9c468129d2 fix the bug that the setLocale function return wrong value to cause both the TDengine and Shell fail to launch.#494 #478 2019-10-29 17:26:59 +08:00
xieyinglin 15cae30667 Merge remote-tracking branch 'upstream/master' 2019-10-29 14:22:55 +08:00
xieyinglin 0fcdb5ae39 print the java.library.path variable for debug
format the code
2019-10-26 11:46:23 +08:00
hjxilinx 93371c71c9 add some log for close connection 2019-10-25 15:42:33 +08:00
slguan 5683cb5ba6
Merge pull request #646 from xieyinglin/master
fix issue #642 to add  druid pool support
2019-10-25 15:18:24 +08:00