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

add some log about implicit cast #188

Merged
merged 12 commits into from
Aug 21, 2019
Merged

add some log about implicit cast #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
283f19d
check validation of dag exprs field type
windtalker Aug 16, 2019
22c7ddd
format code
windtalker Aug 16, 2019
0c998ac
address comments
windtalker Aug 16, 2019
d9df281
add more filter test
windtalker Aug 19, 2019
59cff30
Merge branch 'cop' of https://github.com/pingcap/tics into xf_cop
windtalker Aug 19, 2019
a560044
add data type tests
windtalker Aug 20, 2019
dc8b237
Merge branch 'cop' of https://github.com/pingcap/tics into xf_cop
windtalker Aug 20, 2019
db1b66d
remove useless comment
windtalker Aug 20, 2019
97b159a
disable decimal test
windtalker Aug 20, 2019
4155d54
add some log about implicit cast
windtalker Aug 20, 2019
e4de721
Merge branch 'cop' of https://github.com/pingcap/tics into xf_cop
windtalker Aug 20, 2019
9342b5f
address comment
windtalker Aug 21, 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
10 changes: 8 additions & 2 deletions dbms/src/Flash/Coprocessor/DAGExpressionAnalyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ static String genFuncString(const String & func_name, const Names & argument_nam
}

DAGExpressionAnalyzer::DAGExpressionAnalyzer(const NamesAndTypesList & source_columns_, const Context & context_)
: source_columns(source_columns_), context(context_)
: source_columns(source_columns_),
context(context_),
after_agg(false),
implicit_cast_count(0),
log(&Logger::get("DAGExpressionAnalyzer"))
{
settings = context.getSettings();
after_agg = false;
}

void DAGExpressionAnalyzer::appendAggregation(
Expand Down Expand Up @@ -253,6 +256,9 @@ String DAGExpressionAnalyzer::appendCastIfNeeded(const tipb::Expr & expr, Expres
// todo ignore nullable info??
if (expected_type->getName() != actual_type->getName())
{
LOG_DEBUG(
log, __PRETTY_FUNCTION__ << " Add implicit cast: from " << actual_type->getName() << " to " << expected_type->getName());
implicit_cast_count++;
// need to add cast function
// first construct the second argument
tipb::Expr type_expr;
Expand Down
3 changes: 3 additions & 0 deletions dbms/src/Flash/Coprocessor/DAGExpressionAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class DAGExpressionAnalyzer : private boost::noncopyable
Settings settings;
const Context & context;
bool after_agg;
Int32 implicit_cast_count;
zanmato1984 marked this conversation as resolved.
Show resolved Hide resolved
Poco::Logger * log;

public:
DAGExpressionAnalyzer(const NamesAndTypesList & source_columns_, const Context & context_);
Expand All @@ -54,6 +56,7 @@ class DAGExpressionAnalyzer : private boost::noncopyable
const NamesAndTypesList & getCurrentInputColumns();
void makeExplicitSet(const tipb::Expr & expr, const Block & sample_block, bool create_ordered_set, const String & left_arg_name);
String applyFunction(const String & func_name, Names & arg_names, ExpressionActionsPtr & actions);
Int32 getImplicitCastCount() { return implicit_cast_count; };
};

} // namespace DB
3 changes: 3 additions & 0 deletions dbms/src/Flash/Coprocessor/InterpreterDAG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,9 @@ BlockIO InterpreterDAG::execute()

BlockIO res;
res.in = pipeline.firstStream();

LOG_DEBUG(
log, __PRETTY_FUNCTION__ << " Convert DAG request to BlockIO, adding " << analyzer->getImplicitCastCount() << " implicit cast");
return res;
}
} // namespace DB