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

Fix NPE error when creating table with bool column #1864

Merged
merged 1 commit into from
Sep 25, 2019
Merged

Fix NPE error when creating table with bool column #1864

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
Fix NPE error when creating table with bool column
  • Loading branch information
wubiao committed Sep 25, 2019
commit 78dfbb07fcf144a342f7ba5383c35d9c47719945
1 change: 1 addition & 0 deletions be/src/olap/aggregate_func.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ AggregateFuncResolver::AggregateFuncResolver() {
add_aggregate_mapping<OLAP_FIELD_AGGREGATION_NONE, OLAP_FIELD_TYPE_DATETIME>();
add_aggregate_mapping<OLAP_FIELD_AGGREGATION_NONE, OLAP_FIELD_TYPE_CHAR>();
add_aggregate_mapping<OLAP_FIELD_AGGREGATION_NONE, OLAP_FIELD_TYPE_VARCHAR>();
add_aggregate_mapping<OLAP_FIELD_AGGREGATION_NONE, OLAP_FIELD_TYPE_BOOL>();

// Min Aggregate Function
add_aggregate_mapping<OLAP_FIELD_AGGREGATION_MIN, OLAP_FIELD_TYPE_TINYINT>();
Expand Down
1 change: 1 addition & 0 deletions be/src/olap/key_coder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class KeyCoderResolver {
add_mapping<OLAP_FIELD_TYPE_DECIMAL>();
add_mapping<OLAP_FIELD_TYPE_CHAR>();
add_mapping<OLAP_FIELD_TYPE_VARCHAR>();
add_mapping<OLAP_FIELD_TYPE_BOOL>();
}

template<FieldType field_type>
Expand Down
5 changes: 5 additions & 0 deletions be/src/olap/tablet_schema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ FieldType TabletColumn::get_field_type_by_string(const std::string& type_str) {
type = OLAP_FIELD_TYPE_DECIMAL;
} else if (0 == upper_type_str.compare(0, 7, "VARCHAR")) {
type = OLAP_FIELD_TYPE_VARCHAR;
} else if (0 == upper_type_str.compare("BOOLEAN")) {
type = OLAP_FIELD_TYPE_BOOL;
} else if (0 == upper_type_str.compare(0, 3, "HLL")) {
type = OLAP_FIELD_TYPE_HLL;
} else if (0 == upper_type_str.compare("STRUCT")) {
Expand Down Expand Up @@ -156,6 +158,8 @@ std::string TabletColumn::get_string_by_field_type(FieldType type) {
case OLAP_FIELD_TYPE_VARCHAR:
return "VARCHAR";

case OLAP_FIELD_TYPE_BOOL:
return "BOOLEAN";
case OLAP_FIELD_TYPE_HLL:
return "HLL";

Expand Down Expand Up @@ -204,6 +208,7 @@ std::string TabletColumn::get_string_by_aggregation_type(FieldAggregationMethod
uint32_t TabletColumn::get_field_length_by_type(TPrimitiveType::type type, uint32_t string_length) {
switch (type) {
case TPrimitiveType::TINYINT:
case TPrimitiveType::BOOLEAN:
return 1;
case TPrimitiveType::SMALLINT:
return 2;
Expand Down
1 change: 1 addition & 0 deletions fe/src/main/java/org/apache/doris/common/util/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class Util {
TYPE_STRING_MAP.put(PrimitiveType.DECIMAL, "decimal(%d,%d)");
TYPE_STRING_MAP.put(PrimitiveType.DECIMALV2, "decimal(%d,%d)");
TYPE_STRING_MAP.put(PrimitiveType.HLL, "varchar(%d)");
TYPE_STRING_MAP.put(PrimitiveType.BOOLEAN, "bool");
}

private static class CmdWorker extends Thread {
Expand Down