Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

taos-tools 3.0 branch to main #808

Merged
merged 67 commits into from
Oct 17, 2024
Merged

taos-tools 3.0 branch to main #808

merged 67 commits into from
Oct 17, 2024

Conversation

DuanKuanJun
Copy link
Contributor

No description provided.

DuanKuanJun and others added 30 commits September 26, 2024 21:02
@DuanKuanJun
fix: first submit code
23ce324
@DuanKuanJun
fix: build passed
93ec9f3
@DuanKuanJun
fix: progressive mode write succ
0b30d99
@DuanKuanJun
fix: stmt2 progressive mode write ok
7f96350
@DuanKuanJun
feat: stmt2 write with progressive test passed
448cd62
@DuanKuanJun
fix: interlace mode first passed
12a92b7
@DuanKuanJun
fix: stmt2 interlace mode and auto create table test passed
7475c37
@DuanKuanJun
enh: stmt2 progresive mode auto create table passed
5738ef1
@DuanKuanJun
fix: taodumpTest.py case not passed
2f664f7
@DuanKuanJun
Merge branch '3.0' into feat/TD-32248-3.0
deabec0
@DuanKuanJun
feat: fix coverage build error
ca7af25
@DuanKuanJun
fix: build error
80d064e
@DuanKuanJun
fix: build error again
ec127d9
@DuanKuanJun
fix: bindv is not check null
e04bad6
@DuanKuanJun
fix: interlace mode id test ok
5954e68
@DuanKuanJun
fix: batch mode test passed
2ac2d41
@DuanKuanJun
fix: stmt2_insert.py passed ok except one
39e8c06
@DuanKuanJun
Merge pull request #800 from taosdata/feat/TD-32248-3.0
f8d6782 
feat: taos-tools first submit code support stmt2
@DuanKuanJun
fix: stmt with stbInfo incorrect
34b6a51
@DuanKuanJun
Merge pull request #801 from taosdata/feat/TD-32248-3.0
65b87cc 
fix: stmt with stbInfo incorrect
@DuanKuanJun
fix: interlace mode call many time stmt2_bind_param
bc66aff
@DuanKuanJun
fix: stmt2_insert.py case add interlace mode
522f133
@DuanKuanJun
if stmt is interlace mode , report error and quit taosbenchmark
ed35362
@DuanKuanJun
fix: judge stmt2 mode
8ab3ea4
@DuanKuanJun
Merge pull request #802 from taosdata/feat/TD-32248-3.0
05cc3c3 
fix: interlace mode call many time stmt2_bind_param
@DuanKuanJun
modify interlace_rows must zero if stmt2
3c2abea
@DuanKuanJun
fix: tags and columns name compare ignore case
6e8e931
@DuanKuanJun
fix: format error
1373314
@DuanKuanJun
Merge pull request #803 from taosdata/fix/TD-32511-3.0
84d9a5c 
fix: searchBArray tags with strcasecmp replace strcmp
@DuanKuanJun
enh: first submit
84216a8
DuanKuanJun and others added 28 commits October 15, 2024 09:34
@DuanKuanJun
fix:start windows build
d40e269
@DuanKuanJun
fix: windows build switch new dev
969d6c9
@DuanKuanJun
fix: windows build uses microsoft/setup-msvc@v1
8dd636e
@DuanKuanJun
fix: windows remove first build
f86c2a9
@DuanKuanJun
fix: windows remove first build1
c870e53
@DuanKuanJun
fix: windows build with j8
a9036b7
@DuanKuanJun
Merge pull request #804 from taosdata/enh/TD-32535-3.0
edbdcf3 
enh: first submit for ci case fixed
@DuanKuanJun
fix: use nmake to build windows
e6181dd
@DuanKuanJun
fix: window2022 special
9cdcb80
@DuanKuanJun
fix: windows disabled uses: ms-dev
6a6dca0
@DuanKuanJun
fix: windows add vcvar call
888c2a7
@DuanKuanJun
fix: windows add vcvar call1
20b91c0
@DuanKuanJun
fix: reduce build code
f9644e1
@DuanKuanJun
fix: reduce build code to one
ec952aa
@DuanKuanJun
fix: restore origin
7190ce7
@DuanKuanJun
fix: add make clean jom clean command
844252e
@DuanKuanJun
fix: add make clean jom clean command
85e8789
@DuanKuanJun
fix: add rmdir debug
fb41e4d
@DuanKuanJun
fix: add rmdir debug
22147d0
@DuanKuanJun
windows: replace with del remove file
a412fb5
@DuanKuanJun
windows: github method remove file
fee5dd4
@DuanKuanJun
windows: github method remove file1
28cec00
@DuanKuanJun
windows: github method remove file2
62fc32c
@DuanKuanJun
windows: github method remove file2
c7c3a41
@DuanKuanJun
enh: windows build TDengine passed
9708d77
@YamingPei
Merge pull request #806 from taosdata/enh/TD-32535-3.0
25cecc4 
fix: use nmake to build windows
@DuanKuanJun
fix: hostname can not set default value
c2bef18
@DuanKuanJun
Merge pull request #807 from taosdata/enh/TD-32535-3.0
905c66e 
fix: hostname can not set default value
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 17, 2024
View reviewed changes
src/benchUtil.c
// calc total size
int32_t tableSize = sizeof(char *) + sizeof(TAOS_STMT2_BIND *) + sizeof(TAOS_STMT2_BIND *) +
sizeof(TAOS_STMT2_BIND) * tagCnt + sizeof(TAOS_STMT2_BIND) * colCnt;
int32_t size = sizeof(TAOS_STMT2_BINDV) + tableSize * capacity;

Check failure

Code scanning / CodeQL

Multiplication result converted to larger type High

Multiplication result may overflow 'int' before it is converted to 'unsigned long'.

Copilot Autofix AI 7 days ago

To fix the problem, we need to ensure that the multiplication is performed using a larger integer type to prevent overflow. This can be achieved by casting one of the operands to a larger type, such as int64_t, before performing the multiplication. This way, the multiplication will be done using 64-bit integers, and the result will be safely stored in the int32_t variable.

Specifically, we will cast tableSize to int64_t before multiplying it by capacity on line 1353. This change will ensure that the multiplication is performed using 64-bit integers, preventing overflow.

Suggested changeset 1
src/benchUtil.c

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/src/benchUtil.c b/src/benchUtil.c
--- a/src/benchUtil.c
+++ b/src/benchUtil.c
@@ -1352,3 +1352,3 @@
                         sizeof(TAOS_STMT2_BIND) * tagCnt + sizeof(TAOS_STMT2_BIND) * colCnt;
-    int32_t size = sizeof(TAOS_STMT2_BINDV) + tableSize * capacity;
+    int32_t size = sizeof(TAOS_STMT2_BINDV) + (int64_t)tableSize * capacity;
     TAOS_STMT2_BINDV *bindv = benchCalloc(1, size, false);
EOF
@@ -1352,3 +1352,3 @@
sizeof(TAOS_STMT2_BIND) * tagCnt + sizeof(TAOS_STMT2_BIND) * colCnt;
int32_t size = sizeof(TAOS_STMT2_BINDV) + tableSize * capacity;
int32_t size = sizeof(TAOS_STMT2_BINDV) + (int64_t)tableSize * capacity;
TAOS_STMT2_BINDV *bindv = benchCalloc(1, size, false);
Copilot is powered by AI and may make mistakes. Always verify output.
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
Unable to commit as this autofix suggestion is now outdated
@DuanKuanJun DuanKuanJun merged commit 5a7814f into main Oct 17, 2024
19 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DuanKuanJun @YamingPei