From 553b57f268aa34d1d813dae6de85da80f06a898e Mon Sep 17 00:00:00 2001
From: sheyanjie-qq <249478495@qq.com>
Date: Tue, 1 Oct 2024 10:33:00 +0800
Subject: [PATCH] mod java code comments
---
.../JDBC/SpringJdbcTemplate/readme.md | 16 ++---
.../src/main/resources/log4j.properties | 10 ++--
.../src/main/resources/proxool.xml | 21 +++----
.../src/main/java/com/taosdata/Worker.java | 9 +--
docs/examples/JDBC/mybatisplus-demo/readme | 8 +--
docs/examples/JDBC/springbootdemo/readme.md | 14 ++---
docs/examples/JDBC/taosdemo/readme.md | 7 ++-
.../taosdemo/TaosDemoApplication.java | 15 +++--
.../taosdata/taosdemo/dao/SubTableMapper.java | 15 ++---
.../taosdemo/dao/SuperTableMapper.java | 22 +++----
.../taosdata/taosdemo/dao/TableMapper.java | 13 ++--
.../taosdemo/service/DatabaseService.java | 4 +-
.../taosdemo/service/SubTableService.java | 60 ++++++++++---------
.../taosdemo/service/SuperTableService.java | 2 +-
.../taosdemo/service/TableService.java | 5 +-
.../service/data/FieldValueGenerator.java | 10 +++-
.../service/data/SubTableMetaGenerator.java | 2 +-
.../service/data/SuperTableMetaGenerator.java | 13 ++--
.../service/data/TagValueGenerator.java | 2 +-
.../taosdemo/utils/TimeStampUtil.java | 6 +-
.../src/main/resources/log4j.properties | 10 ++--
21 files changed, 142 insertions(+), 122 deletions(-)
diff --git a/docs/examples/JDBC/SpringJdbcTemplate/readme.md b/docs/examples/JDBC/SpringJdbcTemplate/readme.md
index f59bcdbeb5..0e9812385a 100644
--- a/docs/examples/JDBC/SpringJdbcTemplate/readme.md
+++ b/docs/examples/JDBC/SpringJdbcTemplate/readme.md
@@ -1,11 +1,11 @@
## TDengine Spring JDBC Template Demo
-`Spring JDBC Template` 简化了原生 JDBC Connection 获取释放等操作，使得操作数据库更加方便。
+`Spring JDBC Template` simplifies the operations of acquiring and releasing native JDBC Connections, making database operations more convenient.
-### 配置
+### Configuration
-修改 `src/main/resources/applicationContext.xml` 文件中 TDengine 的配置信息：
+Modify the TDengine configuration in the `src/main/resources/applicationContext.xml` file:
```xml
@@ -20,13 +20,15 @@
```
-### 打包运行
+### Package and run
+
+Navigate to the `TDengine/tests/examples/JDBC/SpringJdbcTemplate` directory and execute the following commands to generate an executable jar file.
-进入 `TDengine/tests/examples/JDBC/SpringJdbcTemplate` 目录下，执行以下命令可以生成可执行 jar 包。
```shell
mvn clean package
```
-打包成功之后，进入 `target/` 目录下，执行以下命令就可运行测试：
+After successfully packaging, navigate to the `target/` directory and execute the following commands to run the tests:
+
```shell
java -jar target/SpringJdbcTemplate-1.0-SNAPSHOT-jar-with-dependencies.jar
-```
\ No newline at end of file
+```
diff --git a/docs/examples/JDBC/connectionPools/src/main/resources/log4j.properties b/docs/examples/JDBC/connectionPools/src/main/resources/log4j.properties
index 1299357be3..a7f4d3d492 100644
--- a/docs/examples/JDBC/connectionPools/src/main/resources/log4j.properties
+++ b/docs/examples/JDBC/connectionPools/src/main/resources/log4j.properties
@@ -1,21 +1,21 @@
-### 设置###
+### Settings###
log4j.rootLogger=debug,stdout,DebugLog,ErrorLog
-### 输出信息到控制抬 ###
+### Output information to the console ###
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
-### 输出DEBUG 级别以上的日志到=logs/debug.log
+### Output logs of DEBUG level and above to logs/debug.log
log4j.appender.DebugLog=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugLog.File=logs/debug.log
log4j.appender.DebugLog.Append=true
log4j.appender.DebugLog.Threshold=DEBUG
log4j.appender.DebugLog.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
-### 输出ERROR 级别以上的日志到=logs/error.log
+### Output logs of ERROR level and above to logs/error.log
log4j.appender.ErrorLog=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorLog.File=logs/error.log
log4j.appender.ErrorLog.Append=true
log4j.appender.ErrorLog.Threshold=ERROR
log4j.appender.ErrorLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.ErrorLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
\ No newline at end of file
+log4j.appender.ErrorLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
diff --git a/docs/examples/JDBC/connectionPools/src/main/resources/proxool.xml b/docs/examples/JDBC/connectionPools/src/main/resources/proxool.xml
index 0e2ac6368a..dcef51ffb5 100644
--- a/docs/examples/JDBC/connectionPools/src/main/resources/proxool.xml
+++ b/docs/examples/JDBC/connectionPools/src/main/resources/proxool.xml
@@ -1,27 +1,28 @@
+
ds
-
+
jdbc:TAOS-RS://127.0.0.1:6041/log
-
+
com.taosdata.jdbc.rs.RestfulDriver
-
+
-
+
100
-
+
100
-
+
1
-
+
5
-
+
30000
-
+
select server_version()
-
\ No newline at end of file
+
diff --git a/docs/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java b/docs/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
index f6e21cd729..6823ca5b4d 100644
--- a/docs/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
+++ b/docs/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
@@ -35,17 +35,18 @@ public class Worker implements Runnable {
public void run() {
while (!Thread.interrupted()) {
try {
- // 控制请求频率
+ // Control request rate
if (semaphore.tryAcquire()) {
ConsumerRecords records = consumer.poll(Duration.ofMillis(sleepTime));
pool.submit(() -> {
RateLimiter limiter = RateLimiter.create(rate);
try {
for (ConsumerRecord record : records) {
- // 流量控制
+ // Traffic control
limiter.acquire();
- // 业务处理数据
- System.out.println("[" + LocalDateTime.now() + "] Thread id:" + Thread.currentThread().getId() + " -> " + record.value());
+ // Business data processing
+ System.out.println("[" + LocalDateTime.now() + "] Thread id:"
+ + Thread.currentThread().getId() + " -> " + record.value());
}
} finally {
semaphore.release();
diff --git a/docs/examples/JDBC/mybatisplus-demo/readme b/docs/examples/JDBC/mybatisplus-demo/readme
index b31b6c34bf..a4816d7631 100644
--- a/docs/examples/JDBC/mybatisplus-demo/readme
+++ b/docs/examples/JDBC/mybatisplus-demo/readme
@@ -1,14 +1,14 @@
-# 使用说明
+# Instructions
-## 创建使用db
+## Create and use the database
```shell
$ taos
> create database mp_test
```
-## 执行测试用例
+## Execute test cases
```shell
$ mvn clean test
-```
\ No newline at end of file
+```
diff --git a/docs/examples/JDBC/springbootdemo/readme.md b/docs/examples/JDBC/springbootdemo/readme.md
index 625d43e4ed..d11bb33c83 100644
--- a/docs/examples/JDBC/springbootdemo/readme.md
+++ b/docs/examples/JDBC/springbootdemo/readme.md
@@ -1,6 +1,6 @@
## TDengine SpringBoot + Mybatis Demo
-## 需要提前创建 test 数据库
+## Need to create a test database in advance
```
$ taos -s 'create database if not exists test'
@@ -8,7 +8,7 @@ $ taos -s 'create database if not exists test'
$ curl http://localhost:8080/weather/init
```
-### 配置 application.properties
+### Configure application.properties
```properties
# datasource config
spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
@@ -38,9 +38,9 @@ mybatis.mapper-locations=classpath:mapper/*.xml
logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
```
-### 主要功能
+### Main functions
-* 创建数据库和表
+* Create databases and tables
```xml
@@ -52,14 +52,14 @@ logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
```
-* 插入单条记录
+* Insert a single record
```xml
insert into test.weather (ts, temperature, humidity) values (now, #{temperature,jdbcType=INTEGER}, #{humidity,jdbcType=FLOAT})
```
-* 插入多条记录
+* Insert multiple records
```xml
@@ -69,7 +69,7 @@ logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
```
-* 分页查询
+* Pagination query
```xml
diff --git a/docs/examples/JDBC/taosdemo/readme.md b/docs/examples/JDBC/taosdemo/readme.md
index 986eef8a05..141391d1f6 100644
--- a/docs/examples/JDBC/taosdemo/readme.md
+++ b/docs/examples/JDBC/taosdemo/readme.md
@@ -1,11 +1,14 @@
```
cd tests/examples/JDBC/taosdemo
mvn clean package -Dmaven.test.skip=true
-# 先建表，再插入的
+# Create tables first, then insert data
java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host -database -doCreateTable true -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
-# 不建表，直接插入的
+# Insert data directly without creating tables
java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host -database -doCreateTable false -superTableSQL "create table weather(ts timestamp, f1 int) tags(t1 nchar(4))" -numOfTables 1000 -numOfRowsPerTable 100000000 -numOfThreadsForInsert 10 -numOfTablesPerSQL 10 -numOfValuesPerSQL 100
```
如果发生错误 Exception in thread "main" java.lang.UnsatisfiedLinkError: no taos in java.library.path
请检查是否安装 TDengine 客户端安装包或编译 TDengine 安装。如果确定已经安装过还出现这个错误，可以在命令行 java 后加 -Djava.library.path=/usr/lib 来指定寻找共享库的路径。
+
+
+If you encounter the error Exception in thread "main" `java.lang.UnsatisfiedLinkError: no taos in java.library.path`, please check whether the TDengine client package is installed or TDengine is compiled and installed. If you are sure it is installed and still encounter this error, you can add `-Djava.library.path=/usr/lib` after the `java` command to specify the path to the shared library.
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
index 6854054703..40d44475b8 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
@@ -24,14 +24,14 @@ public class TaosDemoApplication {
private static final Logger logger = LogManager.getLogger(TaosDemoApplication.class);
public static void main(String[] args) throws IOException {
- // 读配置参数
+ // Read configuration parameters
JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args);
boolean isHelp = Arrays.asList(args).contains("--help");
if (isHelp || config.host == null || config.host.isEmpty()) {
JdbcTaosdemoConfig.printHelp();
System.exit(0);
}
- // 初始化
+ //
final DataSource dataSource = DataSourceFactory.getInstance(config.host, config.port, config.user,
config.password);
if (config.executeSql != null && !config.executeSql.isEmpty()
@@ -50,7 +50,7 @@ public class TaosDemoApplication {
final SuperTableService superTableService = new SuperTableService(dataSource);
final SubTableService subTableService = new SubTableService(dataSource);
- // 创建数据库
+ // create database
long start = System.currentTimeMillis();
Map databaseParam = new HashMap<>();
databaseParam.put("database", config.database);
@@ -81,13 +81,13 @@ public class TaosDemoApplication {
config.prefixOfFields, config.numOfTags, config.prefixOfTags);
}
/**********************************************************************************/
- // 建表
+ // create table
start = System.currentTimeMillis();
if (config.doCreateTable) {
superTableService.drop(superTableMeta.getDatabase(), superTableMeta.getName());
superTableService.create(superTableMeta);
if (!config.autoCreateTable) {
- // 批量建子表
+ // create sub tables in batch
subTableService.createSubTable(superTableMeta, config.numOfTables, config.prefixOfTable,
config.numOfThreadsForCreate);
}
@@ -95,7 +95,7 @@ public class TaosDemoApplication {
end = System.currentTimeMillis();
logger.info(">>> create table time cost : " + (end - start) + " ms.");
/**********************************************************************************/
- // 插入
+ // insert data
long tableSize = config.numOfTables;
int threadSize = config.numOfThreadsForInsert;
long startTime = getProperStartTime(config.startTime, config.days);
@@ -111,10 +111,9 @@ public class TaosDemoApplication {
end = System.currentTimeMillis();
logger.info("insert " + affectedRows + " rows, time cost: " + (end - start) + " ms");
/**********************************************************************************/
- // 查询
/**********************************************************************************/
- // 删除表
+ // drop table
if (config.dropTable) {
superTableService.drop(config.database, config.superTable);
}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SubTableMapper.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SubTableMapper.java
index e0ddd220c1..013d24eb87 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SubTableMapper.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SubTableMapper.java
@@ -9,21 +9,22 @@ import java.util.List;
@Repository
public interface SubTableMapper {
- // 创建：子表
+ // Create: SubTable
void createUsingSuperTable(SubTableMeta subTableMeta);
- // 插入：一张子表多个values
+ // Insert: Multiple records into one SubTable
int insertOneTableMultiValues(SubTableValue subTableValue);
- // 插入：一张子表多个values, 自动建表
+ // Insert: Multiple records into one SubTable, auto create SubTables
int insertOneTableMultiValuesUsingSuperTable(SubTableValue subTableValue);
- // 插入：多张表多个values
+ // Insert: Multiple records into multiple SubTable
int insertMultiTableMultiValues(List tables);
- // 插入：多张表多个values，自动建表
+ // Insert: Multiple records into multiple SubTable, auto create SubTables
int insertMultiTableMultiValuesUsingSuperTable(List tables);
- //
+ //
-}
\ No newline at end of file
+}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SuperTableMapper.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SuperTableMapper.java
index 9f8cec9e8f..15cafd04fb 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SuperTableMapper.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/SuperTableMapper.java
@@ -6,24 +6,26 @@ import org.springframework.stereotype.Repository;
@Repository
public interface SuperTableMapper {
- // 创建超级表 create table if not exists xxx.xxx (f1 type1, f2 type2, ... ) tags( t1 type1, t2 type2 ...)
+ // Create super table: create table if not exists xxx.xxx (f1 type1, f2 type2,
+ // ... ) tags( t1 type1, t2 type2 ...)
void createSuperTable(SuperTableMeta tableMetadata);
- // 删除超级表 drop table if exists xxx;
+ // Drop super table: drop table if exists xxx;
void dropSuperTable(String database, String name);
- //
+ //
- //
+ //
- //
+ //
- //
+ //
- //
+ //
- //
-
- //
+ //
+ //
}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/TableMapper.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/TableMapper.java
index 32d1875e4d..c0f75d2204 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/TableMapper.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/dao/TableMapper.java
@@ -9,19 +9,18 @@ import java.util.List;
@Repository
public interface TableMapper {
- // 创建：普通表
+ // Create: Normal table
void create(TableMeta tableMeta);
- // 插入：一张表多个value
+ // Insert: Multiple records into one table
int insertOneTableMultiValues(TableValue values);
- // 插入: 一张表多个value，指定的列
+ // Insert: Multiple records into one table, specified columns
int insertOneTableMultiValuesWithColumns(TableValue values);
- // 插入：多个表多个value
+ // Insert: Multiple records into multiple tables
int insertMultiTableMultiValues(List tables);
- // 插入：多个表多个value, 指定的列
+ // Insert: Multiple records into multiple tables, specified columns
int insertMultiTableMultiValuesWithColumns(List tables);
-
-}
\ No newline at end of file
+}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/DatabaseService.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/DatabaseService.java
index 3c8e962406..68ddd78323 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/DatabaseService.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/DatabaseService.java
@@ -14,12 +14,12 @@ public class DatabaseService {
this.databaseMapper = new DatabaseMapperImpl(dataSource);
}
- // 建库，指定 name
+ // Create database with specified name
public void createDatabase(String database) {
databaseMapper.createDatabase(database);
}
- // 建库，指定参数 keep,days,replica等
+ // Create database with specified parameters such as keep, days, replica, etc.
public void createDatabase(Map map) {
if (map.isEmpty())
return;
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java
index b0a79dea78..690b02f065 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java
@@ -27,7 +27,8 @@ public class SubTableService extends AbstractService {
this.mapper = new SubTableMapperImpl(datasource);
}
- public void createSubTable(SuperTableMeta superTableMeta, long numOfTables, String prefixOfTable, int numOfThreadsForCreate) {
+ public void createSubTable(SuperTableMeta superTableMeta, long numOfTables, String prefixOfTable,
+ int numOfThreadsForCreate) {
ExecutorService executor = Executors.newFixedThreadPool(numOfThreadsForCreate);
for (long i = 0; i < numOfTables; i++) {
long tableIndex = i;
@@ -35,54 +36,58 @@ public class SubTableService extends AbstractService {
}
executor.shutdown();
try {
- executor.awaitTermination(Long.MAX_VALUE,TimeUnit.NANOSECONDS);
+ executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
public void createSubTable(SuperTableMeta superTableMeta, String tableName) {
- // 构造数据
+ // Construct data
SubTableMeta meta = SubTableMetaGenerator.generate(superTableMeta, tableName);
createSubTable(meta);
}
- // 创建一张子表，可以指定database，supertable，tablename，tag值
+ // Create a sub-table, specifying database, super table, table name, and tag
+ // values
public void createSubTable(SubTableMeta subTableMeta) {
mapper.createUsingSuperTable(subTableMeta);
}
/*************************************************************************************************************************/
- // 插入：多线程，多表
+ // Insert: Multi-threaded, multiple tables
public int insert(List subTableValues, int threadSize, int frequency) {
ExecutorService executor = Executors.newFixedThreadPool(threadSize);
Future future = executor.submit(() -> insert(subTableValues));
executor.shutdown();
- //TODO：frequency
+ // TODO：frequency
return getAffectRows(future);
}
- // 插入：单表，insert into xxx values(),()...
+ // Insert: Single table, insert into xxx values(),()...
public int insert(SubTableValue subTableValue) {
return mapper.insertOneTableMultiValues(subTableValue);
}
- // 插入: 多表，insert into xxx values(),()... xxx values(),()...
+ // Insert: Multiple tables, insert into xxx values(),()... xxx values(),()...
public int insert(List subTableValues) {
return mapper.insertMultiTableMultiValues(subTableValues);
}
- // 插入：单表，自动建表, insert into xxx using xxx tags(...) values(),()...
+ // Insert: Single table, auto-create table, insert into xxx using xxx tags(...)
+ // values(),()...
public int insertAutoCreateTable(SubTableValue subTableValue) {
return mapper.insertOneTableMultiValuesUsingSuperTable(subTableValue);
}
- // 插入：多表，自动建表, insert into xxx using XXX tags(...) values(),()... xxx using XXX tags(...) values(),()...
+ // Insert: Multiple tables, auto-create tables, insert into xxx using XXX
+ // tags(...) values(),()... xxx using XXX tags(...) values(),()...
public int insertAutoCreateTable(List subTableValues) {
return mapper.insertMultiTableMultiValuesUsingSuperTable(subTableValues);
}
- public int insertMultiThreads(SuperTableMeta superTableMeta, int threadSize, long tableSize, long startTime, long gap, JdbcTaosdemoConfig config) {
+ public int insertMultiThreads(SuperTableMeta superTableMeta, int threadSize, long tableSize, long startTime,
+ long gap, JdbcTaosdemoConfig config) {
List taskList = new ArrayList<>();
List threads = IntStream.range(0, threadSize)
.mapToObj(i -> {
@@ -94,8 +99,7 @@ public class SubTableService extends AbstractService {
startTime, config.timeGap,
config.numOfRowsPerTable, config.numOfTablesPerSQL, config.numOfValuesPerSQL,
config.order, config.rate, config.range,
- config.prefixOfTable, config.autoCreateTable)
- );
+ config.prefixOfTable, config.autoCreateTable));
taskList.add(task);
return new Thread(task, "InsertThread-" + i);
}).collect(Collectors.toList());
@@ -126,7 +130,7 @@ public class SubTableService extends AbstractService {
private class InsertTask implements Callable {
private final long startTableInd; // included
- private final long endTableInd; // excluded
+ private final long endTableInd; // excluded
private final long startTime;
private final long timeGap;
private final long numOfRowsPerTable;
@@ -140,10 +144,10 @@ public class SubTableService extends AbstractService {
private final boolean autoCreateTable;
public InsertTask(SuperTableMeta superTableMeta, long startTableInd, long endTableInd,
- long startTime, long timeGap,
- long numOfRowsPerTable, long numOfTablesPerSQL, long numOfValuesPerSQL,
- int order, int rate, long range,
- String prefixOfTable, boolean autoCreateTable) {
+ long startTime, long timeGap,
+ long numOfRowsPerTable, long numOfTablesPerSQL, long numOfValuesPerSQL,
+ int order, int rate, long range,
+ String prefixOfTable, boolean autoCreateTable) {
this.superTableMeta = superTableMeta;
this.startTableInd = startTableInd;
this.endTableInd = endTableInd;
@@ -159,7 +163,6 @@ public class SubTableService extends AbstractService {
this.autoCreateTable = autoCreateTable;
}
-
@Override
public Integer call() {
@@ -171,23 +174,27 @@ public class SubTableService extends AbstractService {
int affectRows = 0;
// row
- for (long rowCnt = 0; rowCnt < numOfRowsPerTable; ) {
+ for (long rowCnt = 0; rowCnt < numOfRowsPerTable;) {
long rowSize = numOfValuesPerSQL;
if (rowCnt + rowSize > numOfRowsPerTable) {
rowSize = numOfRowsPerTable - rowCnt;
}
- //table
- for (long tableCnt = startTableInd; tableCnt < endTableInd; ) {
+ // table
+ for (long tableCnt = startTableInd; tableCnt < endTableInd;) {
long tableSize = numOfTablesPerSQL;
if (tableCnt + tableSize > endTableInd) {
tableSize = endTableInd - tableCnt;
}
long startTime = this.startTime + rowCnt * timeGap;
-// System.out.println(Thread.currentThread().getName() + " >>> " + "rowCnt: " + rowCnt + ", rowSize: " + rowSize + ", " + "tableCnt: " + tableCnt + ",tableSize: " + tableSize + ", " + "startTime: " + startTime + ",timeGap: " + timeGap + "");
+ // System.out.println(Thread.currentThread().getName() + " >>> " + "rowCnt: " +
+ // rowCnt + ", rowSize: " + rowSize + ", " + "tableCnt: " + tableCnt +
+ // ",tableSize: " + tableSize + ", " + "startTime: " + startTime + ",timeGap: "
+ // + timeGap + "");
/***********************************************/
- // 生成数据
- List data = SubTableValueGenerator.generate(superTableMeta, prefixOfTable, tableCnt, tableSize, rowSize, startTime, timeGap);
- // 乱序
+ // Construct data
+ List data = SubTableValueGenerator.generate(superTableMeta, prefixOfTable, tableCnt,
+ tableSize, rowSize, startTime, timeGap);
+ // disorder
if (order != 0)
SubTableValueGenerator.disrupt(data, rate, range);
// insert
@@ -205,5 +212,4 @@ public class SubTableService extends AbstractService {
}
}
-
}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SuperTableService.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SuperTableService.java
index b91348e2d0..47798e0c4e 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SuperTableService.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SuperTableService.java
@@ -14,7 +14,7 @@ public class SuperTableService {
this.superTableMapper = new SuperTableMapperImpl(dataSource);
}
- // 创建超级表，指定每个field的名称和类型，每个tag的名称和类型
+ // Create super table, specifying the name and type of each field and each tag
public void create(SuperTableMeta superTableMeta) {
superTableMapper.createSuperTable(superTableMeta);
}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/TableService.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/TableService.java
index 2504fdb0b4..2bfb963b4a 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/TableService.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/TableService.java
@@ -11,15 +11,14 @@ public class TableService extends AbstractService {
private TableMapper tableMapper;
- //创建一张表
+ // Create a table
public void create(TableMeta tableMeta) {
tableMapper.create(tableMeta);
}
- //创建多张表
+ // Create multiple tables
public void create(List tables) {
tables.stream().forEach(this::create);
}
-
}
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/FieldValueGenerator.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/FieldValueGenerator.java
index 73cd981a46..b3ce35231c 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/FieldValueGenerator.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/FieldValueGenerator.java
@@ -11,7 +11,8 @@ public class FieldValueGenerator {
public static Random random = new Random(System.currentTimeMillis());
- // 生成start到end的时间序列，时间戳为顺序，不含有乱序，field的value为随机生成
+ // Generate a time series from start to end, timestamps are in order without
+ // disorder, field values are randomly generated
public static List generate(long start, long end, long timeGap, List fieldMetaList) {
List values = new ArrayList<>();
@@ -29,9 +30,12 @@ public class FieldValueGenerator {
return values;
}
- // 生成start到end的时间序列，时间戳为顺序，含有乱序，rate为乱序的比例，range为乱序前跳范围，field的value为随机生成
+ // Generate a time series from start to end, timestamps are in order but include
+ // disorder, rate is the proportion of disorder, range is the jump range before
+ // disorder, field values are randomly generated
public static List disrupt(List values, int rate, long range) {
- long timeGap = (long) (values.get(1).getFields().get(0).getValue()) - (long) (values.get(0).getFields().get(0).getValue());
+ long timeGap = (long) (values.get(1).getFields().get(0).getValue())
+ - (long) (values.get(0).getFields().get(0).getValue());
int bugSize = values.size() * rate / 100;
Set bugIndSet = new HashSet<>();
while (bugIndSet.size() < bugSize) {
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableMetaGenerator.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableMetaGenerator.java
index 88e3c0d26a..7bdd72ec3b 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableMetaGenerator.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SubTableMetaGenerator.java
@@ -9,7 +9,7 @@ import java.util.List;
public class SubTableMetaGenerator {
- // 创建tableSize张子表，使用tablePrefix作为子表名的前缀，使用superTableMeta的元数据
+ // Create tableSize sub-tables, using tablePrefix as the prefix for sub-table names, and using the metadata from superTableMeta
// create table xxx using XXX tags(XXX)
public static List generate(SuperTableMeta superTableMeta, int tableSize, String tablePrefix) {
List subTableMetaList = new ArrayList<>();
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SuperTableMetaGenerator.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SuperTableMetaGenerator.java
index 05aefd01ac..383b492c5a 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SuperTableMetaGenerator.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/SuperTableMetaGenerator.java
@@ -10,10 +10,11 @@ import java.util.List;
public class SuperTableMetaGenerator {
- // 创建超级表，使用指定SQL语句
+ // Create super table using the specified SQL statement
public static SuperTableMeta generate(String superTableSQL) {
SuperTableMeta tableMeta = new SuperTableMeta();
- // for example : create table superTable (ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)
+ // for example : create table superTable (ts timestamp, temperature float,
+ // humidity int) tags(location nchar(64), groupId int)
superTableSQL = superTableSQL.trim().toLowerCase();
if (!superTableSQL.startsWith("create"))
throw new RuntimeException("invalid create super table SQL");
@@ -54,8 +55,9 @@ public class SuperTableMetaGenerator {
return tableMeta;
}
- // 创建超级表,指定field和tag的个数
- public static SuperTableMeta generate(String database, String name, int fieldSize, String fieldPrefix, int tagSize, String tagPrefix) {
+ // Create super table with specified number of fields and tags
+ public static SuperTableMeta generate(String database, String name, int fieldSize, String fieldPrefix, int tagSize,
+ String tagPrefix) {
if (fieldSize < 2 || tagSize < 1) {
throw new RuntimeException("create super table but fieldSize less than 2 or tagSize less than 1");
}
@@ -66,7 +68,8 @@ public class SuperTableMetaGenerator {
List fields = new ArrayList<>();
fields.add(new FieldMeta("ts", "timestamp"));
for (int i = 1; i <= fieldSize; i++) {
- fields.add(new FieldMeta(fieldPrefix + "" + i, TaosConstants.DATA_TYPES[i % TaosConstants.DATA_TYPES.length]));
+ fields.add(
+ new FieldMeta(fieldPrefix + "" + i, TaosConstants.DATA_TYPES[i % TaosConstants.DATA_TYPES.length]));
}
tableMetadata.setFields(fields);
// tags
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/TagValueGenerator.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/TagValueGenerator.java
index b8024fea45..f7b18ca7cf 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/TagValueGenerator.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/data/TagValueGenerator.java
@@ -9,7 +9,7 @@ import java.util.List;
public class TagValueGenerator {
- // 创建标签值：使用tagMetas
+ // Create tag values using tagMetas
public static List generate(List tagMetas) {
List tagValues = new ArrayList<>();
for (int i = 0; i < tagMetas.size(); i++) {
diff --git a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/TimeStampUtil.java b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/TimeStampUtil.java
index 9cfce16d82..53748169ae 100644
--- a/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/TimeStampUtil.java
+++ b/docs/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/TimeStampUtil.java
@@ -41,17 +41,17 @@ public class TimeStampUtil {
if (start == 0)
start = now - size * timeGap;
- // 如果size小于1异常
+ // If size is less than 1, throw an exception
if (size < 1)
throw new IllegalArgumentException("size less than 1.");
- // 如果timeGap为1，已经超长，需要前移start
+ // If timeGap is 1 and it exceeds the limit, move start forward
if (start + size > now) {
start = now - size;
return new TimeTuple(start, now, 1);
}
long end = start + (long) (timeGap * size);
if (end > now) {
- //压缩timeGap
+ // Compress timeGap
end = now;
double gap = (end - start) / (size * 1.0f);
if (gap < 1.0f) {
diff --git a/docs/examples/JDBC/taosdemo/src/main/resources/log4j.properties b/docs/examples/JDBC/taosdemo/src/main/resources/log4j.properties
index 352545854d..40b1478a24 100644
--- a/docs/examples/JDBC/taosdemo/src/main/resources/log4j.properties
+++ b/docs/examples/JDBC/taosdemo/src/main/resources/log4j.properties
@@ -1,21 +1,21 @@
-### 设置###
+### Settings ###
log4j.rootLogger=info,stdout
-### 输出信息到控制抬 ###
+### Output information to the console ###
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
-### 输出DEBUG 级别以上的日志到=logs/debug.log
+### Output logs of DEBUG level and above to logs/debug.log ###
log4j.appender.DebugLog=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugLog.File=logs/debug.log
log4j.appender.DebugLog.Append=true
log4j.appender.DebugLog.Threshold=DEBUG
log4j.appender.DebugLog.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
-### 输出ERROR 级别以上的日志到=logs/error.log
+### Output logs of ERROR level and above to logs/error.log ###
log4j.appender.ErrorLog=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorLog.File=logs/error.log
log4j.appender.ErrorLog.Append=true
log4j.appender.ErrorLog.Threshold=ERROR
log4j.appender.ErrorLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.ErrorLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
\ No newline at end of file
+log4j.appender.ErrorLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n