Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr

documentation20/cn/08.connector/docs.md

@@ -805,7 +805,7 @@ C#连接器支持的系统有：Linux 64/Windows x64/Windows x86
 
 * 应用驱动安装请参考[安装连接器驱动步骤](https://www.taosdata.com/cn/documentation/connector#driver)。
 * .NET接口文件TDengineDrivercs.cs和参考程序示例TDengineTest.cs均位于Windows客户端install_directory/examples/C#目录下。
-* 在Windows系统上，C#应用程序可以使用TDengine的原生C接口来执行所有数据库操作，后续版本将提供ORM（dapper）框架驱动。
+* 在Windows系统上，C#应用程序可以使用TDengine的原生C接口来执行所有数据库操作，后续版本将提供ORM（Dapper）框架驱动。
 
 ### 安装验证
 

documentation20/cn/10.cluster/docs.md

@@ -85,7 +85,7 @@ taos>
 
 将后续的数据节点添加到现有集群，具体有以下几步：
 
-1. 按照[《立即开始》](https://www.taosdata.com/cn/documentation/getting-started/)一章的方法在每个物理节点启动taosd；
+1. 按照[《立即开始》](https://www.taosdata.com/cn/documentation/getting-started/)一章的方法在每个物理节点启动taosd；（注意：每个物理节点都需要在 taos.cfg 文件中将 firstEP 参数配置为新集群首个节点的 End Point——在本例中是 h1.taos.com:6030）
 
 2. 在第一个数据节点，使用CLI程序taos, 登录进TDengine系统, 执行命令:
 

documentation20/cn/11.administrator/docs.md

@@ -131,7 +131,7 @@ taosd -C
 - quorum：多副本环境下指令执行的确认数要求。取值范围：1、2，单位为个，默认值：1。（可通过 alter database 修改）
 - precision：时间戳精度标识。ms表示毫秒，us表示微秒，默认值：ms。（2.1.2.0 版本之前、2.0.20.7 版本之前在 taos.cfg 文件中不支持此参数。）
 - cacheLast：是否在内存中缓存子表的最近数据。0：关闭；1：缓存子表最近一行数据；2：缓存子表每一列的最近的非NULL值；3：同时打开缓存最近行和列功能。默认值：0。（可通过 alter database 修改）（从 2.1.2.0 版本开始此参数支持 0～3 的取值范围，在此之前取值只能是 [0, 1]；而 2.0.11.0 之前的版本在 SQL 指令中不支持此参数。）（2.1.2.0 版本之前、2.0.20.7 版本之前在 taos.cfg 文件中不支持此参数。）
-- update：是否允许更新。0：不允许；1：允许。默认值：0。（可通过 alter database 修改）
+- update：是否允许更新。0：不允许；1：允许。默认值：0。
 
 对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine允许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL：
 

documentation20/cn/12.taos-sql/docs.md

@@ -139,11 +139,6 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
     ```
     FSYNC 参数控制执行 fsync 操作的周期。缺省值为 3000，单位是毫秒，取值范围为 [0, 180000]。如果设置为 0，表示每次写入，立即执行 fsync。该设置项主要用于调节 WAL 参数设为 2 时的系统行为。
 
-    ```mysql
-    ALTER DATABASE db_name UPDATE 0;
-    ```
-    UPDATE 参数控制是否允许更新数据。缺省值为 0，取值范围为 [0, 1]。0 表示会直接丢弃后写入的相同时间戳的数据；1 表示会使用后写入的数据覆盖已有的相同时间戳的数据。
-
     **Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.3.0 版本开始，修改这些参数后无需重启服务器即可生效。
 
 - **显示系统所有数据库**

documentation20/en/02.getting-started/docs.md

@@ -2,7 +2,7 @@
 
 ## <a class="anchor" id="install"></a>Quick Install
 
-TDegnine software consists of 3 parts: server, client, and alarm module. At the moment, TDengine server only runs on Linux (Windows, mac OS and more OS supports will come soon), but client can run on either Windows or Linux. TDengine client can be installed and run on Windows or Linux. Applications based-on any OSes can all connect to server taosd via a RESTful interface. About CPU, TDegnine supports X64/ARM64/MIPS64/Alpha64, and ARM32、RISC-V, other more CPU architectures will be supported soon. You can set up and install TDengine server either from the [source code](https://www.taosdata.com/en/getting-started/#Install-from-Source) or the [packages](https://www.taosdata.com/en/getting-started/#Install-from-Package).
+TDengine software consists of 3 parts: server, client, and alarm module. At the moment, TDengine server only runs on Linux (Windows, mac OS and more OS supports will come soon), but client can run on either Windows or Linux. TDengine client can be installed and run on Windows or Linux. Applications based-on any OSes can all connect to server taosd via a RESTful interface. About CPU, TDengine supports X64/ARM64/MIPS64/Alpha64, and ARM32、RISC-V, other more CPU architectures will be supported soon. You can set up and install TDengine server either from the [source code](https://www.taosdata.com/en/getting-started/#Install-from-Source) or the [packages](https://www.taosdata.com/en/getting-started/#Install-from-Package).
 
 ### <a class="anchor" id="source-install"></a>Install from Source
 
@@ -14,7 +14,7 @@ Please visit our [TDengine Official Docker Image: Distribution, Downloading, and
 
 ### <a class="anchor" id="package-install"></a>Install from Package
 
-It’s extremely easy to install for TDegnine, which takes only a few seconds from downloaded to successful installed. The server installation package includes clients and connectors. We provide 3 installation packages, which you can choose according to actual needs:
+It’s extremely easy to install for TDengine, which takes only a few seconds from downloaded to successful installed. The server installation package includes clients and connectors. We provide 3 installation packages, which you can choose according to actual needs:
 
 Click [here](https://www.taosdata.com/cn/getting-started/#%E9%80%9A%E8%BF%87%E5%AE%89%E8%A3%85%E5%8C%85%E5%AE%89%E8%A3%85) to download the install package.
 
@@ -39,8 +39,8 @@ If the service is running successfully, you can play around through TDengine she
 **Note:**
 
 - The `systemctl` command needs the **root** privilege. Use **sudo** if you are not the **root** user.
-- To get better product feedback and improve our solution, TDegnine will collect basic usage information, but you can modify the configuration parameter **telemetryReporting** in the system configuration file taos.cfg, and set it to 0 to turn it off.
-- TDegnine uses FQDN (usually hostname) as the node ID. In order to ensure normal operation, you need to set hostname for the server running taosd, and configure DNS service or hosts file for the machine running client application, to ensure the FQDN can be resolved.
+- To get better product feedback and improve our solution, TDengine will collect basic usage information, but you can modify the configuration parameter **telemetryReporting** in the system configuration file taos.cfg, and set it to 0 to turn it off.
+- TDengine uses FQDN (usually hostname) as the node ID. In order to ensure normal operation, you need to set hostname for the server running taosd, and configure DNS service or hosts file for the machine running client application, to ensure the FQDN can be resolved.
 - TDengine supports installation on Linux systems with[ systemd ](https://en.wikipedia.org/wiki/Systemd)as the process service management, and uses `which systemctl` command to detect whether `systemd` packages exist in the system:
   
   ```bash

documentation20/en/08.connector/docs.md

@@ -6,7 +6,7 @@ TDengine provides many connectors for development, including C/C++, JAVA, Python
 
 At present, TDengine connectors support a wide range of platforms, including hardware platforms such as X64/X86/ARM64/ARM32/MIPS/Alpha, and development environments such as Linux/Win64/Win32. The comparison matrix is as follows:
 
-| **CPU**     | **X64 64bit** | **X64 64bit** | **X64 64bit** | **X86 32bit** | **ARM64** | **ARM32** | **MIPS Godson** | **Alpha Whenwei** | **X64 TimecomTech** |
+| **CPU**     | **X64 64bit** | **X64 64bit** | **X64 64bit** | **X86 32bit** | **ARM64** | **ARM32** | **MIPS Godson** | **Alpha Sunway** | **X64 TimecomTech** |
 | ----------- | ------------- | ------------- | ------------- | ------------- | --------- | --------- | --------------- | ----------------- | ------------------- |
 | **OS**      | **Linux**     | **Win64**     | **Win32**     | **Win32**     | **Linux** | **Linux** | **Linux**       | **Linux**         | **Linux**           |
 | **C/C++**   | ●             | ●             | ●             | ○             | ●         | ●         | ○               | ○                 | ○                   |
@@ -75,9 +75,9 @@ Edit the taos.cfg file (default path/etc/taos/taos.cfg) and change firstEP to En
 * X64 hardware environment: TDengine-client-2.X.X.X-Windows-x64.exe
 * X86 hardware environment: TDengine-client-2.X.X.X-Windows-x86.exe
 
-**2. Execute installation, select default vales as prompted to complete**
+**2. Execute installation, select default values as prompted to complete**
 
-**3. Installatino path**
+**3. Installation path**
 
 Default installation path is: C:\TDengine, with following files(directories):
 
@@ -327,7 +327,7 @@ typedef struct TAOS_BIND {
 } TAOS_BIND;
 ```
 
-Add the curren bound parameters to the batch. After calling this function, you can call `taos_stmt_bind_param` again to bind the new parameters. It should be noted that this function only supports insert/import statements, and if it is other SQL statements such as select, it will return errors.
+Add the current bound parameters to the batch. After calling this function, you can call `taos_stmt_bind_param` again to bind the new parameters. It should be noted that this function only supports insert/import statements, and if it is other SQL statements such as select, it will return errors.
 
 - `int taos_stmt_execute(TAOS_STMT *stmt)`
 
@@ -523,7 +523,7 @@ Users can directly view the usage information of the module through Python's hel
 
 Refer to help (taos.TDEngineConnection) in python. This class corresponds to a connection between the client and TDengine. In the scenario of client multithreading, it is recommended that each thread apply for an independent connection instance, but not recommended that multiple threads share a connection.
 
-- *TDegnineCursor* class
+- *TDengineCursor* class
 
 Refer to help (taos.TDengineCursor) in python. This class corresponds to the write and query operations performed by the client. In the scenario of client multithreading, this cursor instance must be kept exclusive to threads and cannot be used by threads, otherwise errors will occur in the returned results.
 
@@ -685,7 +685,7 @@ Return value:
 }
 ```
 
-- Craete a database demo:
+- Create a database demo:
 
 ```bash
 curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6041/rest/sql
@@ -771,7 +771,7 @@ The C # connector supports: Linux 64/Windows x64/Windows x86.
 
 - For application driver installation, please refer to the[ steps of installing connector driver](https://www.taosdata.com/en/documentation/connector#driver).
 - . NET interface file TDengineDrivercs.cs and reference sample TDengineTest.cs are both located in the Windows client install_directory/examples/C# directory.
-- On Windows, C # applications can use the native C interface of TDengine to perform all database operations, and future versions will provide the ORM (dapper) framework driver.
+- On Windows, C # applications can use the native C interface of TDengine to perform all database operations, and future versions will provide the ORM (Dapper) framework driver.
 
 ### Installation verification
 
@@ -908,7 +908,7 @@ Use Microsoft [windows-build-tools](https://github.com/felixrieseberg/windows-bu
 
 #### Solution 2
 
-Mannually install the following tools:
+Manually install the following tools:
 
 - Install Visual Studio related tools: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community)
 - Install [Python](https://www.python.org/downloads/) 2.7 (not supported in v3.x.x) and execute npm config set python python2.7

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BadLocaleSettingTest.java

+package com.taosdata.jdbc.cases;
+
+
+import com.taosdata.jdbc.TSDBDriver;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import java.io.IOException;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class BadLocaleSettingTest {
+
+    private static final String host = "127.0.0.1";
+    private static final String dbName = "bad_locale_test";
+    private static Connection conn;
+
+    @Test
+    public void canSetLocale() {
+        try {
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+
+            String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+            conn = DriverManager.getConnection(url, properties);
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists " + dbName);
+            stmt.execute("create database if not exists " + dbName);
+            stmt.execute("use " + dbName);
+            stmt.execute("drop table if exists weather");
+            stmt.execute("create table weather(ts timestamp, temperature float, humidity int)");
+            stmt.executeUpdate("insert into weather values(1624071506435, 12.3, 4)");
+            stmt.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        System.setProperty("sun.jnu.encoding", "ANSI_X3.4-1968");
+        System.setProperty("file.encoding", "ANSI_X3.4-1968");
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file

tests/comparisonTest/tdengine/tdengineTest.c

@@ -181,8 +181,8 @@ void writeDataImp(void *param) {
 
       if (lastMachineid != machineid) {
         lastMachineid = machineid;
-        sqlLen += sprintf(sql + sqlLen, " dev%d using devices tags(%d,'%s',%d) values",
-                          machineid, machineid, machinename, machinegroup);
+        sqlLen += sprintf(sql + sqlLen, " dev%d values",
+                          machineid);
       }
 
       sqlLen += sprintf(sql + sqlLen, "(%" PRId64 ",%d,%f)", timestamp, temperature, humidity);
@@ -192,7 +192,8 @@ void writeDataImp(void *param) {
         result = taos_query(taos, sql);
         code = taos_errno(result);
         if (code != 0) {
-          printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
+          printf("insert into dev%d values (%" PRId64 ",%d,%f)\n",machineid, timestamp, temperature, humidity);
+          printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(result));
         }
         taos_free_result(result);
 
@@ -210,6 +211,7 @@ void writeDataImp(void *param) {
     result = taos_query(taos, sql);
     code = taos_errno(result);
     if (code != 0) {
+      // printf("insert into dev%d using devices tags(%d,'%s',%d) values (%" PRId64 ",%d,%f)",machineid, machineid, machinename, machinegroup, timestamp, temperature, humidity);
       printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
     }
     taos_free_result(result);
@@ -246,7 +248,7 @@ void writeData() {
   taos_free_result(result);
 
   result = taos_query(taos,
-                      "create table if not exists db.devices(ts timestamp, temperature int, humidity float) "
+                      "create stable if not exists db.devices(ts timestamp, temperature int, humidity float) "
                       "tags(devid int, devname binary(16), devgroup int)");
   code = taos_errno(result);
   if (code != 0) {
@@ -254,6 +256,77 @@ void writeData() {
   }
   taos_free_result(result);
 
+  //create tables before insert the data
+  result = taos_query(taos, "use db");
+  code = taos_errno(result);
+  if (code != 0) {
+    taos_error(result, taos);
+  }
+  taos_free_result(result);
+  
+  char *sql = calloc(1, 8*1024*1024);
+  int sqlLen = 0;
+  int lastMachineid = 0;
+  int counter = 0;
+  int totalRecords = 0;
+  for (int i = 0; i < arguments.filesNum; i++) {
+    char fileName[300];
+    sprintf(fileName, "%s/testdata%d.csv", arguments.dataDir, i);
+
+    FILE *fp = fopen(fileName, "r");
+    if (fp == NULL) {
+      printf("failed to open file %s\n", fileName);
+      exit(1);
+    }
+    printf("open file %s success\n", fileName);
+
+    char *line = NULL;
+    size_t len = 0;
+    while (!feof(fp)) {
+      free(line);
+      line = NULL;
+      len = 0;
+
+      getline(&line, &len, fp);
+      if (line == NULL) break;
+
+      if (strlen(line) < 10) continue;
+      
+      int machineid;
+      char machinename[16];
+      int machinegroup;
+      int64_t timestamp;
+      int temperature;
+      float humidity;
+      sscanf(line, "%d%s%d%" PRId64 "%d%f", &machineid, machinename, &machinegroup, &timestamp, &temperature, &humidity);
+
+      if (counter == 0) {
+        sqlLen = sprintf(sql, "create table if not exists");
+      }
+
+      if (lastMachineid != machineid) {
+        lastMachineid = machineid;
+        sqlLen += sprintf(sql + sqlLen, " dev%d using devices tags(%d,'%s',%d)", machineid, machineid, machinename, machinegroup);
+      }
+      counter++;
+
+      if (counter >= arguments.rowsPerRequest) {
+        result = taos_query(taos, sql);
+        code = taos_errno(result);
+        if (code != 0) {
+          printf("create table error:%d reason:%s\n", code, taos_errstr(result));
+        }
+        taos_free_result(result);
+
+        totalRecords += counter;
+        counter = 0;
+        lastMachineid = -1;
+        sqlLen = 0;
+      }
+    }
+    fclose(fp);    
+  }
+
   int64_t st = getTimeStampMs();
 
   int a = arguments.filesNum / arguments.clients;
@@ -380,4 +453,3 @@ void readData() {
 
   free(threads);
 }
\ No newline at end of file
-