Commit Graph

10447 Commits

Author SHA1 Message Date
slguan c0f37c7261
Merge pull request #716 from taosdata/feature/liaohj
Feature/liaohj
2019-11-15 11:14:59 +08:00
hjxilinx 7a4bbc5c23 [tbase-1147] 2019-11-15 11:11:23 +08:00
hjxilinx 3313155271 [TBASE-814] 2019-11-15 11:00:37 +08:00
Hongze Cheng 7279c3dd90 extend memory 2019-11-15 10:33:02 +08:00
Jeff Tao 81ac233cdd
Merge pull request #720 from taosdata/hotfix/#719
Fix #719
2019-11-15 10:11:32 +08:00
Hongze Cheng 0bf6ef471a Fix #719 2019-11-15 09:45:04 +08:00
hjxilinx 69cdd4cd30 [tbase-686] 2019-11-14 16:34:13 +08:00
hjxilinx 891c12cdee [TBASE-686]add test case 2019-11-14 16:26:46 +08:00
xieyinglin 6206811f28
Merge pull request #715 from taosdata/dependabot/maven/tests/comparisonTest/opentsdb/opentsdbtest/com.fasterxml.jackson.core-jackson-databind-2.9.10.1
Bump jackson-databind from 2.9.10 to 2.9.10.1 in /tests/comparisonTest/opentsdb/opentsdbtest
2019-11-14 12:36:47 +08:00
hjxilinx cbb350b19d Merge branch 'develop' into feature/liaohj 2019-11-14 10:43:33 +08:00
dependabot[bot] 88abf75491
Bump jackson-databind in /tests/comparisonTest/opentsdb/opentsdbtest
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10 to 2.9.10.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-13 11:51:48 +00:00
plum-lihui 1aec55be65
Merge pull request #714 from taosdata/feature/slguan
[TBASE-1116]
2019-11-13 19:11:51 +08:00
slguan 32c5c18c3f [TBASE-1116] 2019-11-13 19:08:00 +08:00
hjxilinx ddfa301e14 refactor some codes 2019-11-13 18:08:50 +08:00
slguan adbf4c22c1
Merge pull request #713 from taosdata/feature/tbase-306
TBASE-306
2019-11-13 13:47:49 +08:00
slguan 4decb7b88d
Merge pull request #707 from robotspace/develop
Add support for continuous query in Lua connector.
2019-11-13 13:46:44 +08:00
hjxilinx cf1ae56ebb [TBASE-1112], and refactor some code. 2019-11-13 11:28:38 +08:00
localvar 21427af360 TBASE-306
enhance `taos_options` to support cocurrent calls.
note it still a problem if one thread is modifying a global configuration
while another thread is reading it.
2019-11-13 03:24:39 +00:00
slguan aaa694d7a9
Merge pull request #712 from taosdata/feature/atomic
add more atomic api
2019-11-13 11:01:15 +08:00
slguan 88e02c85ea
Merge pull request #706 from taosdata/feature/liaohj
remove illegal usage of configure file path
2019-11-13 10:59:49 +08:00
slguan 70493f751f
Merge pull request #702 from taosdata/fangpanpan-python-doc-1
Update connector-ch.md for python
2019-11-13 10:52:35 +08:00
hjxilinx ce863c00f6 [TBASE-1112] 2019-11-13 10:14:35 +08:00
xieyinglin e56fb50564 add tdengine monitor dashborad import 2019-11-13 10:10:51 +08:00
xieyinglin 43d247f8cc add grafana source code 2019-11-12 22:57:30 +08:00
hjxilinx 25d888f13b Merge branch 'develop' into feature/liaohj 2019-11-12 18:11:49 +08:00
hjxilinx 907fcfa09c issue #686 2019-11-12 18:05:47 +08:00
hjxilinx fa0f056f19 refactor some codes. fix bugs in selectivity+tags/ts query. 2019-11-12 17:21:36 +08:00
Hongze Cheng 1c82fe86bd Fix more bugs 2019-11-12 15:51:49 +08:00
Hongze Cheng 6e48ca27d3 Fix several bug 2019-11-12 15:11:36 +08:00
localvar 9b754d70f4 add more atomic api 2019-11-12 07:04:19 +00:00
hjxilinx b12e12f840 add some logs for release resource at vnode side 2019-11-12 11:47:47 +08:00
robot 79e1a7bcf8 Add support for continuous query in Lua connector.
Malloc memory to store Lua state and callback function from Lua. Connector can support multiple connection by this way.
Memory will be freed when connection isn't established successfully or connection is closed by lua call. Stream content
in Lua is not the same one with stream content in connector.

A loop in test code do the job for continuous query. record is inserted between query actions.
2019-11-12 10:40:44 +08:00
hjxilinx 8833fc69ae remove illegal usage of configure file path 2019-11-12 10:07:34 +08:00
slguan 317c98a2fa
Merge pull request #705 from taosdata/feature/mergecode
Feature/mergecode
2019-11-11 23:39:18 +08:00
slguan 30c38cbafe update some log format 2019-11-11 23:32:08 +08:00
slguan 652afa54ec Merge branch 'develop' into feature/mergecode 2019-11-11 23:19:41 +08:00
slguan be7a4259ef
Merge pull request #704 from taosdata/feature/liaohj
add update check command type
2019-11-11 22:45:30 +08:00
hjxilinx b2d01f72e0 add update check command type 2019-11-11 21:43:48 +08:00
slguan 4117607232 Merge remote-tracking branch 'origin/develop' into feature/mergecode
# Conflicts:
#	src/client/src/TSDBJNIConnector.c
2019-11-11 20:23:16 +08:00
slguan 1ca75c5a07 fix bugs in package script 2019-11-11 20:22:28 +08:00
Hongze Cheng 1b1b71dd24 Fix problem JIRA TBASE-1100 2019-11-11 16:50:35 +08:00
fangpanpan f5032bd579
Merge pull request #703 from taosdata/feature/lihui
[TBASE-816]
2019-11-11 16:45:42 +08:00
fangpanpan 1ebd80ea69
Update connector-ch.md 2019-11-11 16:38:32 +08:00
lihui f740e8bc1e [TBASE-816] 2019-11-11 16:30:21 +08:00
slguan 41c28f7a13
Merge pull request #701 from taosdata/feature/liaohj
[TBASE-1099] fix bug referred in issue #699, refactor some codes
2019-11-11 16:28:00 +08:00
hjxilinx acce71dbf3 [TBASE-1099] fix bug referred in issue #699, refactor some codes 2019-11-11 16:08:49 +08:00
fangpanpan cdfedd801b
Merge pull request #700 from taosdata/feature/lihui
Feature/lihui
2019-11-11 15:55:31 +08:00
lihui e521288582 [TBASE-816] 2019-11-11 15:43:25 +08:00
lihui e9c56255ef Merge branch 'develop' into feature/lihui 2019-11-11 15:09:06 +08:00
fangpanpan 6f553c571b
Merge pull request #698 from taosdata/feature/lihui
Feature/lihui
2019-11-11 15:08:59 +08:00