Skip to content

[Bug]Fix bug that BE crash when load ORC file #4350

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

Merged
morningman merged 4 commits into from
Aug 17, 2020
Merged

[Bug]Fix bug that BE crash when load ORC file #4350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8945e19
[Bug]Fix bug that BE crash when load ORC file
Aug 14, 2020
261d43a
fix compile
Aug 14, 2020
5fcfe02
use TimezoneError
Aug 14, 2020
2afd889
add url link
Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions be/src/exec/orc_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@
#include "runtime/runtime_state.h"
#include "runtime/tuple.h"

// orc include file didn't expose orc::TimezoneError
// we have to declare it by hand, following is the source code in orc link
// https://github.com/apache/orc/blob/84353fbfc447b06e0924024a8e03c1aaebd3e7a5/c%2B%2B/src/Timezone.hh#L104-L109
namespace orc {

class TimezoneError: public std::runtime_error {
public:
TimezoneError(const std::string& what);
TimezoneError(const TimezoneError&);
virtual ~TimezoneError() noexcept;
};

}

namespace doris {

class ORCFileStream : public orc::InputStream {
Expand Down Expand Up @@ -341,6 +355,11 @@ Status ORCScanner::get_next(Tuple* tuple, MemPool* tuple_pool, bool* eof) {
str_error << "ParseError : " << e.what();
LOG(WARNING) << str_error.str();
return Status::InternalError(str_error.str());
} catch (orc::TimezoneError& e) {
std::stringstream str_error;
str_error << "TimezoneError : " << e.what();
LOG(WARNING) << str_error.str();
return Status::InternalError(str_error.str());
}
}

Expand Down
1 change: 1 addition & 0 deletions be/src/exec/orc_scanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define ORC_SCANNER_H

#include <orc/OrcFile.hh>

#include "exec/base_scanner.h"

namespace doris {
Expand Down