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.

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

[Enhancement] Support audic statistics for insert statement (backport #29901) #30175

Merged
merged 2 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2023

This is an automatic backport of pull request #29901 done by Mergify.
Cherry-pick of 728573e has failed:

On branch mergify/bp/branch-2.5/pr-29901
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 728573e241.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/exec/CMakeLists.txt
	new file:   be/src/exec/pipeline/audit_statistics_reporter.cpp
	new file:   be/src/exec/pipeline/audit_statistics_reporter.h
	modified:   be/src/exec/pipeline/exec_state_reporter.cpp
	modified:   be/src/exec/pipeline/sink/export_sink_operator.cpp
	modified:   be/src/exec/pipeline/sink/memory_scratch_sink_operator.cpp
	modified:   be/src/runtime/query_statistics.cpp
	modified:   be/src/runtime/query_statistics.h
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/QeProcessor.java
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/QeProcessorImpl.java
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
	modified:   gensrc/thrift/FrontendService.thrift
	new file:   test/sql/test_audit/R/test_audit_log
	new file:   test/sql/test_audit/T/test_audit_log
	new file:   test/sql/test_audit/T/test_audit_log.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   be/src/exec/pipeline/olap_table_sink_operator.cpp
	both modified:   be/src/exec/pipeline/pipeline_driver_executor.cpp
	both modified:   be/src/exec/pipeline/pipeline_driver_executor.h
	deleted by us:   be/src/exec/pipeline/sink/iceberg_table_sink_operator.cpp
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java
	deleted by us:   fe/fe-core/src/main/java/com/starrocks/qe/scheduler/Coordinator.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* [Enhancement] Support audic statistics for insert statement

Signed-off-by: liuyehcf <1559500551@qq.com>

* update test

Signed-off-by: liuyehcf <1559500551@qq.com>

* update 2

Signed-off-by: liuyehcf <1559500551@qq.com>

---------

Signed-off-by: liuyehcf <1559500551@qq.com>
(cherry picked from commit 728573e)

# Conflicts:
#	be/src/exec/pipeline/olap_table_sink_operator.cpp
#	be/src/exec/pipeline/pipeline_driver_executor.cpp
#	be/src/exec/pipeline/pipeline_driver_executor.h
#	be/src/exec/pipeline/sink/iceberg_table_sink_operator.cpp
#	fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java
#	fe/fe-core/src/main/java/com/starrocks/qe/scheduler/Coordinator.java
#	fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java
@mergify
Copy link
Contributor Author

mergify bot commented Aug 30, 2023

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-29901 branch August 30, 2023 13:31
@liuyehcf liuyehcf restored the mergify/bp/branch-2.5/pr-29901 branch August 31, 2023 01:21
@liuyehcf liuyehcf reopened this Aug 31, 2023
@liuyehcf liuyehcf force-pushed the mergify/bp/branch-2.5/pr-29901 branch from 89fc92e to accff6a Compare August 31, 2023 01:44
Signed-off-by: liuyehcf <1559500551@qq.com>
@liuyehcf liuyehcf force-pushed the mergify/bp/branch-2.5/pr-29901 branch from accff6a to 9980b23 Compare August 31, 2023 02:21
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 9 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.20.1) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@wanpengfei-git
Copy link
Collaborator

[FE Incremental Coverage Report]

😞 fail : 3 / 42 (07.14%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/qe/QeProcessorImpl.java 0 22 00.00% [154, 155, 156, 157, 159, 160, 161, 162, 163, 164, 165, 166, 169, 170, 171, 172, 174, 175, 176, 177, 178, 179]
🔵 com/starrocks/service/FrontendServiceImpl.java 0 1 00.00% [826]
🔵 com/starrocks/qe/Coordinator.java 1 17 05.88% [2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2567, 2569]
🔵 com/starrocks/qe/StmtExecutor.java 2 2 100.00% []

@wanpengfei-git
Copy link
Collaborator

[BE Incremental Coverage Report]

😞 fail : 10 / 37 (27.03%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 src/exec/pipeline/sink/export_sink_operator.cpp 0 1 00.00% [181]
🔵 src/exec/pipeline/fragment_executor.cpp 0 1 00.00% [198]
🔵 src/exec/pipeline/olap_table_sink_operator.cpp 0 1 00.00% [80]
🔵 src/runtime/query_statistics.cpp 0 13 00.00% [44, 45, 46, 48, 49, 50, 51, 52, 53, 58, 59, 60, 61]
🔵 src/exec/pipeline/exec_state_reporter.cpp 0 1 00.00% [152]
🔵 src/exec/pipeline/sink/memory_scratch_sink_operator.cpp 0 3 00.00% [37, 39, 133]
🔵 src/exec/pipeline/pipeline_driver_executor.cpp 10 17 58.82% [239, 241, 256, 257, 258, 268, 269]

@liuyehcf liuyehcf merged commit 5419c90 into branch-2.5 Aug 31, 2023
@liuyehcf liuyehcf deleted the mergify/bp/branch-2.5/pr-29901 branch August 31, 2023 04:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants