-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #705 from taosdata/main
merge main to 3.0
- Loading branch information
Showing
18 changed files
with
771 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
taosbenchmark-3.2.2 | ||
taosdump-2.5.2 | ||
2.5.3 | ||
taosbenchmark-3.2.3 | ||
taosdump-2.5.4 | ||
2.5.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
{ | ||
"filetype": "insert", | ||
"cfgdir": "/etc/taos", | ||
"host": "127.0.0.1", | ||
"port": 6030, | ||
"user": "root", | ||
"password": "taosdata", | ||
"connection_pool_size": 8, | ||
"thread_count": 4, | ||
"create_table_thread_count": 7, | ||
"result_file": "./insert_res.txt", | ||
"confirm_parameter_prompt": "no", | ||
"insert_interval": 0, | ||
"interlace_rows": 100, | ||
"num_of_records_per_req": 20000, | ||
"prepared_rand": 10000, | ||
"chinese": "no", | ||
"escape_character": "yes", | ||
"databases": [ | ||
{ | ||
"dbinfo": { | ||
"name": "smartmeters", | ||
"drop": "yes", | ||
"vgroups": 4, | ||
"duration": 3650, | ||
"pages": 512, | ||
"minrows":10000, | ||
"maxrows":20000, | ||
"stt_trigger":1, | ||
"wal_retention_period": 10, | ||
"wal_retention_size": 100, | ||
"cachemodel": "'both'", | ||
"precision": "ms" | ||
}, | ||
"super_tables": [ | ||
{ | ||
"name": "meters", | ||
"child_table_exists": "no", | ||
"childtable_count": 100000, | ||
"childtable_prefix": "d", | ||
"auto_create_table": "no", | ||
"batch_create_tbl_num": 5, | ||
"data_source": "rand", | ||
"insert_mode": "taosc", | ||
"non_stop_mode": "no", | ||
"line_protocol": "line", | ||
"insert_rows": 100000, | ||
"childtable_limit": 10, | ||
"childtable_offset": 100, | ||
"interlace_rows": 0, | ||
"insert_interval": 0, | ||
"partial_col_num": 0, | ||
"disorder_ratio": 0, | ||
"disorder_range": 1000, | ||
"timestamp_step": 900000, | ||
"angle_step": 180000, | ||
"start_timestamp": "2020-06-01 00:00:00.000", | ||
"sample_format": "csv", | ||
"sample_file": "./sample.csv", | ||
"use_sample_ts": "no", | ||
"tags_file": "", | ||
"columns": [ | ||
{ "type": "FLOAT", "name": "current", "fun": "3*sin(x)+10*random(2)"}, | ||
{ "type": "INT", "name": "voltage", "fun": "40*sin(x)+200*random(10)"}, | ||
{ "type": "FLOAT", "name": "phase", "fun": "1*sin(x)+1*random(3)"} | ||
], | ||
"tags": [ | ||
{ | ||
"type": "TINYINT", | ||
"name": "groupid", | ||
"max": 10, | ||
"min": 1 | ||
}, | ||
{ | ||
"name": "location", | ||
"type": "BINARY", | ||
"len": 16, | ||
"values": ["BJ.HaiDian", "BJ.ChaoYang","BJ.FengTai", | ||
"BJ.DongCheng", "BJ.XiCheng", "Bj.YanQing", "BJ.MenTouGou", | ||
"BJ.HuaiRou", "BJ.PingGu", "BJ.MiYun", | ||
"SH.HuangPu", "SH.XuHui", "SH.ChangNing", "SH.JingAn", "SH.PuTuo", | ||
"SH.HongKou", "SH.YangPu", "SH.MinHang", "SH.BaoShan", "SH.JiaDing", | ||
"SH.JinShan", "SH.SongJiang", "SH.QingPu", "SH.FengXian", "SH.ChongMing", | ||
"SH.PuDong" | ||
] | ||
} | ||
] | ||
} | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
{ | ||
"filetype": "insert", | ||
"cfgdir": "/etc/taos", | ||
"host": "127.0.0.1", | ||
"port": 6030, | ||
"user": "root", | ||
"password": "taosdata", | ||
"connection_pool_size": 8, | ||
"thread_count": 4, | ||
"create_table_thread_count": 7, | ||
"result_file": "./insert_res.txt", | ||
"confirm_parameter_prompt": "no", | ||
"insert_interval": 0, | ||
"interlace_rows": 100, | ||
"num_of_records_per_req": 100, | ||
"prepared_rand": 3600, | ||
"chinese": "no", | ||
"escape_character": "yes", | ||
"databases": [ | ||
{ | ||
"dbinfo": { | ||
"name": "test", | ||
"drop": "yes", | ||
"precision": "ms" | ||
}, | ||
"super_tables": [ | ||
{ | ||
"name": "meters", | ||
"child_table_exists": "no", | ||
"childtable_count": 1000, | ||
"childtable_prefix": "d", | ||
"auto_create_table": "no", | ||
"batch_create_tbl_num": 5, | ||
"data_source": "rand", | ||
"insert_mode": "taosc", | ||
"non_stop_mode": "no", | ||
"line_protocol": "line", | ||
"insert_rows": 1000, | ||
"childtable_limit": 10, | ||
"childtable_offset": 100, | ||
"interlace_rows": 0, | ||
"insert_interval": 0, | ||
"partial_col_num": 0, | ||
"disorder_ratio": 0, | ||
"disorder_range": 1000, | ||
"timestamp_step": 1000, | ||
"angle_step": 500, | ||
"start_timestamp": "2020-10-01 00:00:00.000", | ||
"sample_format": "csv", | ||
"sample_file": "./sample.csv", | ||
"use_sample_ts": "no", | ||
"tags_file": "", | ||
"columns": [ | ||
{ "type": "FLOAT", "name": "current", "fun": "3*sin(x)+10*random(2)"}, | ||
{ "type": "INT", "name": "voltage", "fun": "40*sin(x)+200*random(10)"}, | ||
{ "type": "FLOAT", "name": "phase", "fun": "1*sin(x)+1*random(3)"} | ||
], | ||
"tags": [ | ||
{ | ||
"type": "TINYINT", | ||
"name": "groupid", | ||
"max": 10, | ||
"min": 1 | ||
}, | ||
{ | ||
"name": "location", | ||
"type": "BINARY", | ||
"len": 16, | ||
"values": ["San Francisco", "Los Angles", "San Diego", | ||
"San Jose", "Palo Alto", "Campbell", "Mountain View", | ||
"Sunnyvale", "Santa Clara", "Cupertino"] | ||
} | ||
] | ||
} | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.