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

fixed issue #74 of keyword error #76

Merged
merged 3 commits into from
Jan 14, 2019
Merged

fixed issue #74 of keyword error #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
568c858
fixed issue #74 of keyword error
Jan 10, 2019
7704a4f
change var name from bool_flag to bool_val
Jan 14, 2019
f83e1d5
Merge branch 'master' into boolean_keyword_change_for_thrift
dutor Jan 14, 2019
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
6 changes: 3 additions & 3 deletions src/console/CmdProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void CmdProcessor::calColumnWidths(
case cpp2::ColumnValue::Type::__EMPTY__: {
break;
}
case cpp2::ColumnValue::Type::boolean: {
case cpp2::ColumnValue::Type::bool_val: {
// Enough to hold "false"
if (widths[idx] < 5UL) {
widths[idx] = 5UL;
Expand Down Expand Up @@ -243,8 +243,8 @@ void CmdProcessor::printData(const cpp2::ExecutionResponse& resp,
std::cout << folly::stringPrintf(fmt.c_str(), ' ');
break;
}
case cpp2::ColumnValue::Type::boolean: {
PRINT_FIELD_VALUE(col.get_boolean() ? "true" : "false");
case cpp2::ColumnValue::Type::bool_val: {
PRINT_FIELD_VALUE(col.get_bool_val() ? "true" : "false");
break;
}
case cpp2::ColumnValue::Type::integer: {
Expand Down
4 changes: 2 additions & 2 deletions src/graph/test/TestBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ class TestBase : public ::testing::Test {
return v.get_timestamp();
case ColumnType::id:
return v.get_id();
case ColumnType::boolean:
return v.get_boolean();
case ColumnType::bool_val:
return v.get_bool_val();
default:
throw TestError() << "Cannot convert unknown dynamic column type to integer: "
<< static_cast<int32_t>(v.getType());
Expand Down
2 changes: 1 addition & 1 deletion src/interface/graph.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct DateTime {

union ColumnValue {
// Simple types
1: bool boolean,
1: bool bool_val,
2: i64 integer;
3: IdType id;
4: float single_precision;
Expand Down