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

[opt](scan) unify the local and remote scan bytes stats for all scanners for 2.1 #45167

Merged
merged 6 commits into from
Dec 10, 2024
Merged

[opt](scan) unify the local and remote scan bytes stats for all scanners for 2.1 #45167

merged 6 commits into from
Dec 10, 2024

Conversation

morningman
Copy link
Contributor

@morningman morningman commented Dec 9, 2024 •
edited
Loading

pick part of #40493

TODO: not working with s3 reader

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@morningman
Copy link
Contributor Author

run buildall

zhiqiang-hhhh
zhiqiang-hhhh approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@zhiqiang-hhhh zhiqiang-hhhh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modification on OLAP table LGTM

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 9, 2024

PR approved by anyone and no changes requested.

@morningman
Copy link
Contributor Author

run buildall

github-actions[bot]
github-actions bot reviewed Dec 9, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

be/src/io/io_common.h
@@ -19,6 +19,8 @@

#include <gen_cpp/Types_types.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: 'gen_cpp/Types_types.h' file not found [clang-diagnostic-error]

#include <gen_cpp/Types_types.h>
         ^

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 36.49% (9559/26199)
Line Coverage: 27.92% (78568/281354)
Region Coverage: 26.60% (40329/151638)
Branch Coverage: 23.35% (20435/87500)
Coverage Report: http://coverage.selectdb-in.cc/coverage/72f9a1ecccc8640e41e6e169d391eee2380b9f7b_72f9a1ecccc8640e41e6e169d391eee2380b9f7b/report/index.html

@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 36.50% (9565/26208)
Line Coverage: 27.91% (78538/281393)
Region Coverage: 26.58% (40308/151653)
Branch Coverage: 23.34% (20420/87500)
Coverage Report: http://coverage.selectdb-in.cc/coverage/d9ee5e3a1090789321b1a5d625f88aeeff35a07c_d9ee5e3a1090789321b1a5d625f88aeeff35a07c/report/index.html

@yiguolei yiguolei merged commit 5d3f0a2 into apache:branch-2.1 Dec 10, 2024
21 of 23 checks passed
@lide-reed lide-reed mentioned this pull request Dec 27, 2024
Merged
morningman pushed a commit that referenced this pull request Dec 30, 2024
@lide-reed
[fix](audit-loader) Fix the bug that causes audit loader to fail. (#4…
1af18d0 
…6119)

Fix the bug that causes audit loader to fail.
Related PR: #45167 #40493

The bug causes audit loader fail as following errors in audit.log.
```
2024-12-27 11:47:47,001 [stream_load] |Label=audit_log_20241227_114552_856_127_0_0_1_8030|Db=__internal_schema|Table=audit_log|User=|ClientIp=10.0.1.3|Status=Success|Message=OK|Url=http://10.0.1.4:8040/api/_load_error_log?file=__shard_7/error_log_insert_stmt_c24ed0d941f59867-ec08b8542bc2a4a1_c24ed0d941f59867_ec08b8542bc2a4a1|TotalRows=34|LoadedRows=0|FilteredRows=34|UnselectedRows=0|LoadBytes=6887|StartTime=2024-12-27 11:45:52.858|FinishTime=2024-12-27 11:45:52.888
```
The detail error is:
```
curl http://10.0.1.4:8040/api/_load_error_log?file=__shard_7/error_log_insert_stmt_c24ed0d941f59867-ec08b8542bc2a4a1_c24ed0d941f59867_ec08b8542bc2a4a1

Reason: actual column number in csv file is  more than  schema column number.actual number: 29, schema column number: 27; line delimiter: [
], column separator: [  ], result values:
```

Co-authored-by: derenli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@zhiqiang-hhhh zhiqiang-hhhh zhiqiang-hhhh approved these changes

Assignees
No one assigned
Labels
dev/2.1.8-merged reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@morningman @doris-robot @zhiqiang-hhhh @yiguolei