Commit Graph

515 Commits

Author SHA1 Message Date
zyyang b6b3ee45cf change 2021-01-28 16:08:41 +08:00
zyyang b7a3581cc0 change 2021-01-28 15:55:04 +08:00
zyyang 71543cf085 change 2021-01-28 15:52:31 +08:00
zyyang 152b7f00ce change 2021-01-28 15:44:57 +08:00
zyyang e728058416 change 2021-01-28 15:43:04 +08:00
zyyang 20b1ea71e2 change 2021-01-28 15:41:08 +08:00
zyyang b11a514280 change 2021-01-28 15:39:19 +08:00
zyyang 81d66d8995 change 2021-01-28 15:32:19 +08:00
zyyang 0605028372 change 2021-01-28 15:24:42 +08:00
zyyang cf72ddb16d change 2021-01-28 15:19:43 +08:00
Shuduo Sang c244f389ff [TD-2873] <fix>: fix JdbcRestfulDemo.java compile issue. 2021-01-28 11:43:48 +08:00
zyyang 0bcb46afb2 change 2021-01-27 22:42:01 +08:00
zyyang 6a73886ed2 change 2021-01-27 19:35:51 +08:00
zyyang 6fecb25da8 change 2021-01-27 19:25:59 +08:00
zyyang c076d6aeb2 change 2021-01-27 18:57:04 +08:00
zyyang a792e6c3d0 change 2021-01-27 18:51:58 +08:00
zyyang 40f4534f2a change 2021-01-27 17:55:54 +08:00
zyyang ee85996beb change 2021-01-27 17:51:38 +08:00
zyyang b346f51889 change 2021-01-27 17:10:08 +08:00
zyyang a763cb48fe change 2021-01-27 16:20:43 +08:00
zyyang 3e588cffd0 change 2021-01-27 16:17:23 +08:00
zyyang 70bed13745 change 2021-01-27 16:07:55 +08:00
zyyang 2839d49757 change 2021-01-27 15:27:12 +08:00
zyyang 9b67864f56 change 2021-01-27 15:21:29 +08:00
zyyang 224b850b62 change 2021-01-27 15:20:35 +08:00
zyyang 61a1563864 change 2021-01-27 15:17:10 +08:00
zyyang 99ef14af98 change 2021-01-27 15:12:48 +08:00
zyyang 3ef5dea4a4 change 2021-01-27 14:29:13 +08:00
zyyang e76038cd0f change 2021-01-27 14:02:18 +08:00
zyyang 9ed2f88bbc change 2021-01-27 13:54:39 +08:00
zyyang 45a0bf5c15 change 2021-01-27 13:46:26 +08:00
zyyang df6bc52856 change 2021-01-27 13:42:46 +08:00
zyyang ee236c2088 change 2021-01-27 12:41:56 +08:00
zyyang 1ceacaafa8 [TD-2541]<fix>: optimized the connection pool demo codes 2021-01-27 11:52:03 +08:00
zyyang c5b69e7109 [TD-2597]<fix>: fix Druid and HikariCP configurations 2021-01-26 17:34:34 +08:00
huili cee64b0c16
Merge pull request #5029 from taosdata/hotfix/TD-2827
[TD-2827]<fix>: fix JDBC-RESTful resultSet and restSetMetaData bugs
2021-01-26 16:00:41 +08:00
freemine 4a669b9b31 how to do a pressure-test upon eok: refer to comments in tests/examples/c/epoll.c 2021-01-26 10:58:10 +08:00
zyyang bc5fc8cc8b Merge branch 'develop' into hotfix/TD-2827 2021-01-26 10:46:24 +08:00
zyyang 33f099b57c [TD-2827]<fix>: fix JDBC-RESTful resultSet and restSetMetaData bugs 2021-01-26 10:19:34 +08:00
freemine 0765b2363c Merge remote-tracking branch 'upstream/develop' into mac 2021-01-23 08:47:00 +08:00
freemine 94eb0e1e71 1. __APPLE__
2. tsem_xxx for mac
2021-01-23 08:44:32 +08:00
huili 52b135c1be
Merge pull request #4988 from taosdata/feature/TD-2271
Feature/td 2271
2021-01-22 09:19:04 +08:00
zyyang c8b6ff8689 change 2021-01-21 18:19:10 +08:00
haojun Liao 2f34cf62fe
Merge pull request #4960 from taosdata/feature/query
Feature/query
2021-01-21 13:34:57 +08:00
zyyang bbcdd5dbf8 change 2021-01-20 15:59:51 +08:00
huili ee5d9b2498
Merge pull request #4947 from taosdata/hotfix/sangshuduo/TD-2769-nodejs-12+-adapt
Hotfix/sangshuduo/td 2769 nodejs 12+ adapt
2021-01-20 11:06:55 +08:00
huili 2b7e6d975f
Merge pull request #4955 from taosdata/feature/TD-2776
Feature/td 2776
2021-01-20 11:06:23 +08:00
Haojun Liao 986aff05d4 [TD-225]merge develop 2021-01-20 11:01:46 +08:00
freemine 6485afb69d Merge remote-tracking branch 'upstream/develop' into mac 2021-01-20 10:30:02 +08:00
Shuduo Sang 99b31035a6 [TD-2769] <fix>: make nodejs connector use napi to support v10 and v12. 2021-01-18 19:47:23 +08:00
Shuduo Sang c3cd63218c Merge branch 'develop' into hotfix/sangshuduo/TD-2769-nodejs-12+-adapt 2021-01-18 14:50:36 +08:00
zyyang 4509e2c368 change 2021-01-18 10:34:51 +08:00
freemine 0ef43ca365 literal big integer 2021-01-17 21:53:02 +08:00
freemine 0c96f7653e 1. bugfix: eok.c: array of pointers rather than POD buffer
2. initial port of taosd for MacOSX
2021-01-17 21:40:39 +08:00
zyyang 10b1d91070 [TD-2776]<feature>: add stable infos in getTables method 2021-01-17 16:43:30 +08:00
haojun Liao 7d4287eccf
Merge pull request #4917 from taosdata/feature/query
Feature/query
2021-01-17 13:12:10 +08:00
freemine 60a9725d03 replace array initializer with memset 2021-01-17 02:07:25 +08:00
freemine 54af96b6f0 adding TAOS license header 2021-01-17 01:37:58 +08:00
freemine 0759bbb2a6 Merge remote-tracking branch 'upstream/develop' into mac 2021-01-17 00:51:26 +08:00
Haojun Liao e1b1b3141f [TD-225]fix bug in prepare stmt 2021-01-16 15:17:42 +08:00
huili 20d0279971
Merge pull request #4919 from taosdata/test/TD-2695
Test/td 2695
2021-01-16 15:08:05 +08:00
freemine 1e7037e8e1 epoll and kqueue 2021-01-16 13:11:33 +08:00
freemine 499644d5a7 epoll.c test in CMakeLists.txt 2021-01-15 23:11:24 +08:00
freemine c46f6ac022 add epoll.c tests 2021-01-15 22:39:56 +08:00
freemine a649f55195 eok 2021-01-15 22:34:48 +08:00
Shuduo Sang 3bfbbc8c10 [TD-2769] <fix>:nodejs 12+ adapt 2021-01-15 19:26:31 +08:00
Haojun Liao b15eb99494 [TD-225]refactor codes. 2021-01-15 11:23:21 +08:00
Shuduo Sang 686b90998d [TD-2598] feature: C# taosdemo, hide config print. 2021-01-12 23:34:43 +08:00
Shuduo Sang 4acd2069e6 [TD-2598] feature: C# taosdemo, use return value. 2021-01-12 19:24:33 +08:00
Shuduo Sang 68a9a2ae44 [TD-2598] feature: C# taosdemo, CI integration. 2021-01-12 19:14:01 +08:00
Shuduo Sang 7b476ef75f [TD-2598] feature: C# taosdemo, support query command. 2021-01-12 18:52:35 +08:00
Shuduo Sang 2f027acdd5 [TD-2598] feature: C# taosdemo, cleanup and minor fix. 2021-01-12 15:47:50 +08:00
zyyang 5806683eb7 change 2021-01-12 14:03:44 +08:00
zyyang cfe4422580 [TD-2695]<test>: change jdbc unit test cases 2021-01-11 18:12:30 +08:00
huili 204f50d6c7
Merge pull request #4841 from taosdata/feature/sangshuduo/TD-2598
[TD-2598] feature: C# taosdemo, remove .dll to support both Linux and Windows.
2021-01-07 15:06:25 +08:00
zyyang 251f9d0836 change 2021-01-07 10:53:24 +08:00
zyyang 3fad85e3a9 [TD-2286]<fix>: fix wrong error info when use unexisted database 2021-01-07 10:50:11 +08:00
Shuduo Sang 54e479015c [TD-2598] feature: C# taosdemo, update README.md 2021-01-07 00:07:53 +08:00
Shuduo Sang 1037822a57 [TD-2598] feature: C# taosdemo. add TDengineDriver.cs 2021-01-06 23:46:27 +08:00
Shuduo Sang 221877050f [TD-2598] feature: C# taosdemo, remove .dll to support both Linux and Windows. 2021-01-06 23:33:41 +08:00
Shuduo Sang fc166e9c98 [TD-2598] feature: C# taosdemo support normal table, and insert only. 2021-01-06 23:30:20 +08:00
zyyang efe299f09d change 2021-01-06 10:09:41 +08:00
zyyang 4fee1be84a merge from develop 2021-01-06 10:05:07 +08:00
zyyang 4c18fcd557 Merge branch 'develop' into feature/TD-2191 2021-01-05 17:12:02 +08:00
zyyang d9705c08ba change 2021-01-05 15:12:08 +08:00
zyyang ec85a24cea change 2021-01-05 15:10:47 +08:00
zyyang fa6bf4d3e7 change 2021-01-05 15:03:55 +08:00
zyyang 92a7bd4601 change 2021-01-05 14:58:11 +08:00
zyyang 2406b9d609 change 2021-01-05 14:39:49 +08:00
zyyang af9e38b522 change 2021-01-05 14:33:11 +08:00
zyyang bcc8dabd03 change 2021-01-05 14:11:20 +08:00
zyyang b1862fef52 change 2021-01-05 13:33:04 +08:00
zyyang 243d58d1fa change 2021-01-05 13:29:59 +08:00
zyyang f1896f54e9 [TD-2297]<test>: check local taos-jdbcdriver-2.0.x.jar 2021-01-05 11:40:45 +08:00
zyyang 3d80c54c94 change 2021-01-04 17:40:34 +08:00
zyyang a96e1229f0 change 2021-01-04 16:27:35 +08:00
zyyang 18812217d3 change 2021-01-04 10:53:25 +08:00
zyyang 27e6937570 change 2021-01-04 10:46:15 +08:00
Shuduo Sang 2cef0333df [TD-2598] feature: C# taosdemo
update README.md
2021-01-03 22:48:56 +08:00
Shuduo Sang 05a12b6357 [TD-2598] feature: C# taosdemo
support multithread create table and insertion.
2021-01-03 22:46:02 +08:00
Shuduo Sang 980f5862c0 add simple README.md 2020-12-31 19:41:45 +08:00
Shuduo Sang b913caacd3 first version C# taosdemo. 2020-12-31 19:39:46 +08:00
zyyang d5c2782fb7 change 2020-12-30 10:41:24 +08:00
zyyang 05cf7afc0d change 2020-12-30 10:09:31 +08:00
zyyang b5c1f0029f change 2020-12-23 10:39:01 +08:00
zyyang 1e578c399c change 2020-12-22 15:21:49 +08:00
zyyang 118f1ac138 change 2020-12-22 11:39:47 +08:00
zyyang eac79edcc8 change 2020-12-22 11:38:01 +08:00
zyyang 6075751d04 change 2020-12-22 11:34:31 +08:00
zyyang fd8fa36dd7 change 2020-12-22 11:32:50 +08:00
zyyang 6b538b4afb change 2020-12-22 11:16:43 +08:00
zyyang 48a8a2db08 change 2020-12-22 11:15:52 +08:00
zyyang a91d886b77 change 2020-12-22 10:58:10 +08:00
zyyang dbb866e374 change 2020-12-22 10:41:26 +08:00
zyyang b01f13bbd9 change 2020-12-22 10:36:43 +08:00
zyyang e6154984e6 change 2020-12-22 09:23:21 +08:00
zyyang 702af6e3cb change 2020-12-21 17:26:39 +08:00
zyyang 85f438db23 change 2020-12-21 17:26:19 +08:00
zyyang 7f147e0550 change 2020-12-21 17:17:40 +08:00
zyyang 3ce01a27b5 change 2020-12-21 17:15:13 +08:00
zyyang 305cbd8c51 change 2020-12-21 17:13:11 +08:00
zyyang 8877907e70 change 2020-12-21 15:34:47 +08:00
zyyang efa1709fdf change 2020-12-21 11:42:52 +08:00
zyyang 16b35ba58c change 2020-12-21 11:42:35 +08:00
zyyang c623b4da7b change 2020-12-18 10:40:22 +08:00
zyyang c5b53e9700 change 2020-12-18 10:04:48 +08:00
zyyang acd270836c change 2020-12-17 10:11:46 +08:00
zyyang 22f38e54a7 change 2020-12-16 15:52:07 +08:00
zyyang 1bdcc0f186 change 2020-12-16 15:47:01 +08:00
zyyang 057d90b4b9 change 2020-12-16 15:31:12 +08:00
zyyang 199782da5a change 2020-12-16 09:25:15 +08:00
zyyang cb75a3e2d3 change 2020-12-16 09:24:54 +08:00
zyyang 503b420ed1 change 2020-12-15 00:04:05 +08:00
zyyang 4c50d1d9c6 change 2020-12-14 23:15:44 +08:00
zyyang 0d47e4a31c change 2020-12-14 22:43:19 +08:00
zyyang 5d3544e79a change 2020-12-14 22:40:43 +08:00
zyyang 56c9770244 change 2020-12-14 22:38:52 +08:00
zyyang 01e13d7d56 change 2020-12-14 22:36:30 +08:00
zyyang 4f301f3bfc change 2020-12-14 22:35:21 +08:00
zyyang 95a4a6603b change 2020-12-14 22:32:13 +08:00
zyyang be5b4659de change 2020-12-14 22:29:05 +08:00
zyyang ed4ff8c208 change 2020-12-14 22:25:12 +08:00
zyyang a3183dff36 change 2020-12-14 22:06:12 +08:00
zyyang a4fe566cf6 change 2020-12-14 21:41:50 +08:00
zyyang 995284cc0d change 2020-12-14 21:37:27 +08:00
zyyang 33e14d6d64 change 2020-12-14 21:21:41 +08:00
zyyang d304641011 change 2020-12-14 21:16:50 +08:00
zyyang a150b2b660 change 2020-12-14 21:11:25 +08:00
zyyang 0cab1f289e change 2020-12-14 18:52:32 +08:00
huili e14ec01c33
Merge pull request #4472 from robotspace/develop
Set connection parameter with table as conventional style.
2020-12-14 15:36:07 +08:00
zyyang 078ed83e90 change 2020-12-14 15:21:10 +08:00
zyyang 7583c66e73 change 2020-12-14 13:39:37 +08:00
zyyang e3f2788327 change 2020-12-14 13:26:35 +08:00
zyyang 97a2838324 change 2020-12-14 13:10:14 +08:00
zyyang c8cceb68d3 change 2020-12-14 13:05:43 +08:00
robot 057415a0ec Modify ignore list for subdirectory logs in OpenResty work directory. 2020-12-11 19:05:33 +08:00
robot b8809670d6 Add logs directory in OpenResty work dir and keep subdirectory logs empty. 2020-12-11 18:54:36 +08:00
robot f1dfe5138d Remove compile warnings and add comments for trial. 2020-12-11 18:04:31 +08:00
zyyang cf453e39f3 change 2020-12-11 15:49:49 +08:00
zyyang d73c69b60e change 2020-12-11 15:40:08 +08:00
zyyang 94c2721e97 change 2020-12-11 15:38:10 +08:00
zyyang 63ff87309e change 2020-12-11 15:25:12 +08:00
zyyang 013d6693db change 2020-12-11 15:19:45 +08:00
zyyang ad41116841 change 2020-12-11 15:13:44 +08:00
zyyang 70f716a6ad change 2020-12-11 15:02:20 +08:00
zyyang b35fd1a0a2 change 2020-12-11 14:59:29 +08:00
zyyang 230e848679 [TD-2191]<feature>: taosdemo tool for java developers 2020-12-11 14:30:12 +08:00
huili 6c24bbaee1
Merge pull request #4476 from taosdata/bugfix/TD-2336
use only one taos_connect and taos_close
2020-12-10 10:20:19 +08:00
robot e8260ed869 Implement connector for OpenResty based on lua51.
Connector is implemented by lua51 but luajit and ffi are not included. Connection pool is not implemented yet. It is a raw demonstration at present and not verified on production environment.
2020-12-08 14:11:22 +08:00
dapan1121 b980a53353 use only one taos_connect and taos_close 2020-12-07 10:22:00 +00:00
zyyang 5b28a59a97 change 2020-12-07 15:10:40 +08:00
robot 1919d0aa38 Set connection parameter with table as conventional style. Output result for test case. 2020-12-07 15:04:10 +08:00
zyyang 9083dc986d [TD-2364]<fix>: mybatis-plus pagenation with druid datasource 2020-12-07 13:13:53 +08:00
huili f09b69a0c4
Merge pull request #4421 from taosdata/hotfix/TD-2301
change
2020-12-03 15:34:44 +08:00
zyyang b6d30543d8 change 2020-12-03 15:06:11 +08:00
huili 1df79f0a13
Merge pull request #4408 from taosdata/hotfix/TD-2301
[TD-2301]<hotfix>: change
2020-12-02 18:41:30 +08:00
zyyang 19a410f94b [TD-2301]<hotfix>: change 2020-12-02 11:36:56 +08:00
zyyang 28985c1fdb
Update readme.md 2020-12-01 17:26:00 +08:00
Hui Li 257af62edf [TD-2258]<fix> taos_fetch_block() resutl printf error 2020-11-27 15:29:12 +08:00
Haojun Liao 59c32df42e [TD-225] merge develop 2020-11-18 21:46:05 +08:00
huili 06d4dd737e
Merge pull request #4258 from taosdata/zyyang-taosdata-patch-3-2
Update README-jdbc-windows.md
2020-11-17 14:26:24 +08:00
huili ba584bd1f4
Merge pull request #4019 from songtianyi/master
feat:  see #4016
2020-11-17 14:23:56 +08:00
zyyang 9a76935d79
Update README-jdbc-windows.md 2020-11-17 10:41:01 +08:00
huili 69fe86bccd
Merge pull request #4173 from taosdata/hotfix/TD-2026
[TD-2026]<fix>: 'show create table' return unexpected column len
2020-11-16 19:58:58 +08:00
huili 924c4de433
Merge pull request #4248 from taosdata/feature/TD-1869
Feature/td 1869
2020-11-16 18:57:08 +08:00
zyyang 85bbf1a47e change and test 2020-11-16 17:19:46 +08:00
zyyang 4e461ac23e change 2020-11-16 15:38:12 +08:00
zyyang 80ee8c1d7c change 2020-11-16 15:35:47 +08:00
zyyang f111f76b74 change 2020-11-16 15:15:18 +08:00
zyyang 3ec1adf762 change 2020-11-16 15:14:41 +08:00
zyyang 5454f092bf change 2020-11-16 14:57:35 +08:00
zyyang c6c7ab3bdd change 2020-11-16 14:46:38 +08:00
zyyang 5349141dca change 2020-11-16 10:11:28 +08:00
zyyang ae95667bff change 2020-11-14 16:32:49 +08:00
zyyang 6d673ecd26 change 2020-11-14 14:25:48 +08:00
zyyang 3ae555de41 change 2020-11-14 14:00:37 +08:00
zyyang ee814ac85b change 2020-11-14 12:35:59 +08:00
zyyang deb6cd23f9 change 2020-11-14 10:51:02 +08:00
dependabot[bot] e3d3c2d18d
Bump c3p0 in /tests/examples/JDBC/connectionPools
Bumps [c3p0](https://github.com/swaldman/c3p0) from 0.9.5.2 to 0.9.5.4.
- [Release notes](https://github.com/swaldman/c3p0/releases)
- [Commits](https://github.com/swaldman/c3p0/compare/c3p0-0.9.5.2...c3p0-0.9.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-13 06:56:51 +00:00
yihaoDeng ee4adca353 add demo.c 2020-11-13 06:50:37 +00:00