Skip to content

Fix core issue of 4447 and change declare order for compatibility #4448

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 1 commit into from
Aug 26, 2020
Merged

Fix core issue of 4447 and change declare order for compatibility #4448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion be/src/exec/broker_scan_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ BrokerScanNode::~BrokerScanNode() {
}

// We use the ParttitionRange to compare here. It should not be a member function of PartitionInfo
// class becaurce there are some other member in it.
// class because there are some other member in it.
static bool compare_part_use_range(const PartitionInfo* v1, const PartitionInfo* v2) {
return v1->range() < v2->range();
}
Expand Down
8 changes: 6 additions & 2 deletions be/src/exec/json_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,14 @@ Status JsonReader::_handle_simple_json(Tuple* tuple, const std::vector<SlotDescr
bool JsonReader::_write_values_by_jsonpath(rapidjson::Value& objectValue, MemPool* tuple_pool, Tuple* tuple, const std::vector<SlotDescriptor*>& slot_descs) {
int nullcount = 0;
bool valid = true;
size_t column_num = std::min(slot_descs.size(), _parsed_jsonpaths.size());
size_t column_num = slot_descs.size();

for (size_t i = 0; i < column_num; i++) {
rapidjson::Value* json_values = JsonFunctions::get_json_array_from_parsed_json(_parsed_jsonpaths[i], &objectValue, _origin_json_doc.GetAllocator());
rapidjson::Value* json_values = nullptr;
if (LIKELY( i < _parsed_jsonpaths.size())) {
json_values = JsonFunctions::get_json_array_from_parsed_json(_parsed_jsonpaths[i], &objectValue, _origin_json_doc.GetAllocator());
}

if (json_values == nullptr) {
// not match in jsondata.
if (slot_descs[i]->is_nullable()) {
Expand Down
1 change: 1 addition & 0 deletions be/src/runtime/plan_fragment_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ namespace doris {
PlanFragmentExecutor::PlanFragmentExecutor(
ExecEnv* exec_env, const report_status_callback& report_status_cb)
: _exec_env(exec_env),
_plan(nullptr),
_report_status_cb(report_status_cb),
_report_thread_active(false),
_done(false),
Expand Down
4 changes: 2 additions & 2 deletions gensrc/thrift/PlanNodes.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ include "Partitions.thrift"
enum TPlanNodeType {
OLAP_SCAN_NODE,
MYSQL_SCAN_NODE,
ODBC_SCAN_NODE,
CSV_SCAN_NODE,
SCHEMA_SCAN_NODE,
HASH_JOIN_NODE,
Expand All @@ -50,7 +49,8 @@ enum TPlanNodeType {
REPEAT_NODE,
ASSERT_NUM_ROWS_NODE,
INTERSECT_NODE,
EXCEPT_NODE
EXCEPT_NODE,
ODBC_SCAN_NODE
}

// phases of an execution node
Expand Down
4 changes: 2 additions & 2 deletions gensrc/thrift/Types.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ enum TEtlState {

enum TTableType {
MYSQL_TABLE, // Deprecated
ODBC_TABLE,
OLAP_TABLE,
SCHEMA_TABLE,
KUDU_TABLE, // Deprecated
BROKER_TABLE,
ES_TABLE
ES_TABLE,
ODBC_TABLE
}

enum TOdbcTableType {
Expand Down