xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
606 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

606 Commits

Author SHA1 Message Date
hjxilinx c302d338e7 refactor code, reorganize the header files 2019-11-16 15:30:28 +08:00
hjxilinx 4156af7c0d Merge branch 'develop' into feature/liaohj 2019-11-16 10:43:47 +08:00
hjxilinx 4e7e75b7ad 4] 2019-11-16 10:39:47 +08:00
hjxilinx de2ef67b06 [TBASE-1165] 2019-11-16 10:35:12 +08:00
plum-lihui ac94df49f1
Merge pull request #728 from taosdata/feature/slguan 
[TBASE-1155]
 2019-11-15 19:04:40 +08:00
slguan 95955cb474 [TBASE-1155] 2019-11-15 19:01:01 +08:00
slguan 601ae0551c
Merge pull request #722 from malongcn/develop 
按时间周期聚合查询 中 WHERE后面的name 改为 location
 2019-11-15 18:02:22 +08:00
slguan 2ed9150616
Merge pull request #726 from taosdata/feature/liaohj 
[tbase-1147]
 2019-11-15 18:01:58 +08:00
slguan b3525504b5
Merge pull request #721 from taosdata/feature/tbase1020 
[TBASE1020]
 2019-11-15 18:01:40 +08:00
slguan 21c44ead65
Merge pull request #724 from taosdata/feature/tbase-814 
[tbase-814]
 2019-11-15 18:00:05 +08:00
hjxilinx 6246ec6add Merge branch 'develop' into feature/liaohj 2019-11-15 16:41:30 +08:00
hjxilinx ad3c52a806 [tbase-1147] 2019-11-15 16:29:18 +08:00
fangpanpan 29a98bbe61 [tbase-814] 2019-11-15 16:03:04 +08:00
malong 48c470e21c “超级表管理”的说明“2.TAGS列的数据类型不能是timestamp和nchar类型；描述错误，实际tags是支持nchar类型的 2019-11-15 15:47:34 +08:00
malong e42fff8bb7 此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表 多了个‘里’字 2019-11-15 15:38:55 +08:00
malong a52ea6e614 使用类SQL语言用插入或查询数据 改为： 使用类SQL语言插入或查询数据 2019-11-15 15:22:39 +08:00
malong 5a09ffebb9 按时间周期聚合查询 中 WHERE后面的name 改为 location 2019-11-15 15:06:01 +08:00
slguan 683baa2899 [TBASE1020] 2019-11-15 11:59:36 +08:00
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
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
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
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