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

some bug fix #179

Merged
merged 9 commits into from
Aug 15, 2019
Merged

some bug fix #179

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ae41fe
add all scalar function sig in scalarFunMap
windtalker Aug 13, 2019
9fe7bb6
fix literal expr decode
windtalker Aug 14, 2019
2eb5966
merge pingcap/tics cop
windtalker Aug 14, 2019
76903f5
enable ltrim && rtrim
windtalker Aug 14, 2019
06d762f
code refine
windtalker Aug 14, 2019
11af01b
use throw instead of rethrow in DAGDriver.cpp
windtalker Aug 14, 2019
1d8b0f2
Merge branch 'cop' of https://github.com/pingcap/tics into new_cop
windtalker Aug 15, 2019
de9b338
1. fix decode UInt literal error, 2. support mysqlDecimal type
windtalker Aug 15, 2019
448b1e3
format code
windtalker Aug 15, 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
24 changes: 14 additions & 10 deletions dbms/src/Flash/Coprocessor/DAGUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <Core/Types.h>
#include <Interpreters/Context.h>
#include <Storages/Transaction/Codec.h>
#include <Storages/Transaction/TiKVRecordFormat.h>

#include <unordered_map>

Expand Down Expand Up @@ -59,7 +60,7 @@ String exprToString(const tipb::Expr & expr, const NamesAndTypesList & input_col
case tipb::ExprType::Null:
return "NULL";
case tipb::ExprType::Int64:
return std::to_string(DecodeInt<Int64>(cursor, expr.val()));
return std::to_string(RecordKVFormat::decodeInt64(RecordKVFormat::read<UInt64>(expr.val().data())));
case tipb::ExprType::Uint64:
return std::to_string(DecodeInt<UInt64>(cursor, expr.val()));
case tipb::ExprType::Float32:
Expand All @@ -68,8 +69,10 @@ String exprToString(const tipb::Expr & expr, const NamesAndTypesList & input_col
case tipb::ExprType::String:
case tipb::ExprType::Bytes:
return expr.val();
case tipb::ExprType::MysqlDecimal:
return DecodeDecimal(cursor, expr.val()).toString();
case tipb::ExprType::ColumnRef:
column_id = DecodeInt<Int64>(cursor, expr.val());
column_id = RecordKVFormat::decodeInt64(RecordKVFormat::read<UInt64>(expr.val().data()));
if (column_id < 0 || column_id >= (ColumnID)input_col.size())
{
throw Exception("Column id out of bound", ErrorCodes::COP_BAD_DAG_REQUEST);
Expand All @@ -83,19 +86,19 @@ String exprToString(const tipb::Expr & expr, const NamesAndTypesList & input_col
case tipb::ExprType::First:
if (!agg_func_map.count(expr.tp()))
{
throw Exception(tipb::ExprType_Name(expr.tp()) + "not supported", ErrorCodes::UNSUPPORTED_METHOD);
throw Exception(tipb::ExprType_Name(expr.tp()) + " not supported", ErrorCodes::UNSUPPORTED_METHOD);
}
func_name = agg_func_map.find(expr.tp())->second;
break;
case tipb::ExprType::ScalarFunc:
if (!scalar_func_map.count(expr.sig()))
{
throw Exception(tipb::ScalarFuncSig_Name(expr.sig()) + "not supported", ErrorCodes::UNSUPPORTED_METHOD);
throw Exception(tipb::ScalarFuncSig_Name(expr.sig()) + " not supported", ErrorCodes::UNSUPPORTED_METHOD);
}
func_name = scalar_func_map.find(expr.sig())->second;
break;
default:
throw Exception(tipb::ExprType_Name(expr.tp()) + "not supported", ErrorCodes::UNSUPPORTED_METHOD);
throw Exception(tipb::ExprType_Name(expr.tp()) + " not supported", ErrorCodes::UNSUPPORTED_METHOD);
}
// build function expr
if (isInOrGlobalInOperator(func_name) && for_parser)
Expand Down Expand Up @@ -194,7 +197,7 @@ Field decodeLiteral(const tipb::Expr & expr)
case tipb::ExprType::Null:
return Field();
case tipb::ExprType::Int64:
return DecodeInt<Int64>(cursor, expr.val());
return RecordKVFormat::decodeInt64(RecordKVFormat::read<UInt64>(expr.val().data()));
case tipb::ExprType::Uint64:
return DecodeInt<UInt64>(cursor, expr.val());
case tipb::ExprType::Float32:
Expand All @@ -203,25 +206,26 @@ Field decodeLiteral(const tipb::Expr & expr)
case tipb::ExprType::String:
case tipb::ExprType::Bytes:
return expr.val();
case tipb::ExprType::MysqlBit:
case tipb::ExprType::MysqlDecimal:
return DecodeDecimal(cursor, expr.val());
case tipb::ExprType::MysqlBit:
case tipb::ExprType::MysqlDuration:
case tipb::ExprType::MysqlEnum:
case tipb::ExprType::MysqlHex:
case tipb::ExprType::MysqlSet:
case tipb::ExprType::MysqlTime:
case tipb::ExprType::MysqlJson:
case tipb::ExprType::ValueList:
throw Exception(tipb::ExprType_Name(expr.tp()) + "is not supported yet", ErrorCodes::UNSUPPORTED_METHOD);
throw Exception(tipb::ExprType_Name(expr.tp()) + " is not supported yet", ErrorCodes::UNSUPPORTED_METHOD);
default:
throw Exception("Should not reach here: not a literal expression", ErrorCodes::LOGICAL_ERROR);
}
}

ColumnID getColumnID(const tipb::Expr & expr)
{
size_t cursor = 0;
return DecodeInt<Int64>(cursor, expr.val());
auto column_id = RecordKVFormat::decodeInt64(RecordKVFormat::read<UInt64>(expr.val().data()));
return column_id;
}

bool isInOrGlobalInOperator(const String & name) { return name == "in" || name == "notIn" || name == "globalIn" || name == "globalNotIn"; }
Expand Down