Optimize Aggregator/Join/Set keys #6135

solotzg · 2022-10-14T06:22:28Z

What problem does this PR solve?

Issue Number: ref #5294

What is changed and how it works?

optimize agg with one string key
- type: str-bin, str-bin-padding
- struct AggregationMethodOneKeyStringNoCache
optimize agg with two keys
- type: number-64-bytes, str-bin, str-bin-padding
- struct AggregationMethodFastPathTwoKeysNoCache

AggregationMethodOneKeyStringNoCache and AggregationMethodFastPathTwoKeysNoCache will generate empty data for string column because such column will be discarded.

tiflash/dbms/src/Columns/IColumn.h

Lines 160 to 173 in 84c2650

    
               /** Deserializes a value that was serialized using IColumn::serializeValueIntoArena method. 
        
                 * Returns pointer to the position after the read data. 
        
                 * Note: 
        
                 * 1. For string columns with collation it is actually impossible to restore the value. 
        
                 *     In this case, the column restored by this function is discarded, the compiler will add a 
        
                 *     special aggregate function(any) as the group by column's output. For example: 
        
                 *         select string_column, count(*) from table group by string_column 
        
                 *     if string_column has collation information, the query will be rewrite to 
        
                 *         select any(string_column), count(*) from table group by string_column 
        
                 * 2. The input parameter `collator` does not work well for complex columns(column tuple), 
        
                 *     but it is only used by TiDB , which does not support complex columns, so just ignore 
        
                 *     the complex column will be ok. 
        
                 */ 
        
               virtual const char * deserializeAndInsertFromArena(const char * pos, std::shared_ptr<TiDB::ITiDBCollator> collator = nullptr) = 0;

tiflash/dbms/src/Flash/Coprocessor/DAGExpressionAnalyzer.cpp

Lines 272 to 306 in 84c2650

    
           if (collator != nullptr) 
        
           { 
        
               /// if the column is a string with collation info, the `sort_key` of the column is used during 
        
               /// aggregation, but we can not reconstruct the origin column by `sort_key`, so add an extra 
        
               /// extra aggregation function any(group_by_column) here as the output of the group by column 
        
               const String & agg_func_name = "any"; 
        
               AggregateDescription aggregate; 
        
               DataTypes types(1); 
        
               aggregate.argument_names.resize(1); 
        
               types[0] = type; 
        
               aggregate.argument_names[0] = name; 
        
               String func_string = genFuncString(agg_func_name, aggregate.argument_names); 
        
               bool duplicate = false; 
        
               for (const auto & pre_agg : aggregate_descriptions) 
        
               { 
        
                   if (pre_agg.column_name == func_string) 
        
                   { 
        
                       aggregated_columns.emplace_back(func_string, pre_agg.function->getReturnType()); 
        
                       duplicate = true; 
        
                       break; 
        
                   } 
        
               } 
        
               if (duplicate) 
        
                   continue; 
        
               aggregate.column_name = func_string; 
        
               aggregate.parameters = Array(); 
        
               aggregate.function = AggregateFunctionFactory::instance().get(agg_func_name, types, {}, 0, false); 
        
               aggregate.function->setCollator(getCollatorFromExpr(expr)); 
        
               aggregate_descriptions.push_back(aggregate); 
        
               DataTypePtr result_type = aggregate.function->getReturnType(); 
        
               // this is a temp result since implicit cast maybe added on these aggregated_columns 
        
               aggregated_columns.emplace_back(func_string, result_type); 
        
           }

optimize ColumnString::deserializeAndInsertFromArena by same way above.

We may need JIT for further optimization about AGG/JOIN/SET later.

Benchmark

ENV

TiFlash x 1
limit cpu up to 2000%
original commit: 49ca973
ClickBench

Time(s)	Original	Optimized	Improvement: (Original) / (Optimized) - 1.0
ClickBench TiFlash x 1 TIFLASH-REPLICA 1
Q14	2.075	1.835	13.08%
Q15	1.21	1.155	4.76%
Q17	3.695	3.365	9.81%
Q18	2.925	2.805	4.28%
Q34	6.4	6.085	5.18%
Q35	6.575	6.28	4.70%
TPCH-100 TiFlash x 1 TIFLASH-REPLICA 1
Q1	7.28	7.08	2.82%

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

None

Signed-off-by: Zhigao Tong <[email protected]>

ti-chi-bot · 2022-10-14T06:22:29Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

windtalker
zanmato1984

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

solotzg · 2022-10-14T07:24:56Z

/rebuild

Signed-off-by: Zhigao Tong <[email protected]>

…ze-agg

Signed-off-by: Zhigao Tong <[email protected]>

solotzg · 2022-10-21T09:57:51Z

/run-all-tests

Signed-off-by: Zhigao Tong <[email protected]>

solotzg · 2022-10-21T10:04:43Z

/run-all-tests

Signed-off-by: Zhigao Tong <[email protected]>

solotzg · 2022-10-24T06:36:37Z

/run-all-tests

Signed-off-by: Zhigao Tong <[email protected]>

solotzg · 2022-10-25T09:42:05Z

/run-all-tests

Signed-off-by: Zhigao Tong <[email protected]>

solotzg · 2022-10-28T09:02:25Z

/run-sanitizer-test asan

solotzg · 2022-10-28T09:32:46Z

/hold

solotzg · 2022-10-28T09:32:51Z

/merge

ti-chi-bot · 2022-10-28T09:32:52Z

@solotzg: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot · 2022-10-28T09:32:53Z

This pull request has been accepted and is ready to merge.

Commit hash: 4940a43

solotzg · 2022-10-28T10:05:07Z

/run-all-tests

solotzg · 2022-10-28T10:05:18Z

/run-sanitizer-test asan

solotzg · 2022-10-28T15:17:40Z

/merge

ti-chi-bot · 2022-10-28T15:17:41Z

@solotzg: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot · 2022-10-28T15:17:43Z

This pull request has been accepted and is ready to merge.

Commit hash: 8105e41

solotzg · 2022-10-28T15:19:40Z

/run-sanitizer-test asan tsan

solotzg · 2022-10-29T02:31:45Z

/unhold

solotzg · 2022-10-29T02:31:51Z

/merge

ti-chi-bot · 2022-10-29T02:31:52Z

@solotzg: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ref pingcap#5294 Signed-off-by: CalvinNeo <[email protected]>

solotzg added 3 commits October 14, 2022 11:46

optimize join keys; set; agg keys;

b9410c8

clang-tidy

97ec367

refine type names

96e1050

Signed-off-by: Zhigao Tong <[email protected]>

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 14, 2022

format

b634530

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2022

Merge branch 'master' into optimize-agg

5ac64fe

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 17, 2022

solotzg added 5 commits October 19, 2022 11:27

refine

adcb675

Signed-off-by: Zhigao Tong <[email protected]>

Merge branch 'optimize-agg' of github.com:solotzg/tiflash into optimi…

4526a9b

…ze-agg

rename modules

54c48e1

Signed-off-by: Zhigao Tong <[email protected]>

inline more code

5786509

more test code

565ed1c

Signed-off-by: Zhigao Tong <[email protected]>

refine more

46d02f9

Signed-off-by: Zhigao Tong <[email protected]>

solotzg added 2 commits October 21, 2022 19:58

Merge branch 'master' into optimize-agg

cad5b45

optimize agg keys with collation

2cd37e1

Signed-off-by: Zhigao Tong <[email protected]>

optimize agg key insert

cd617e1

Signed-off-by: Zhigao Tong <[email protected]>

optimize str deserializeAndInsertFromArena

f9eb9e0

Signed-off-by: Zhigao Tong <[email protected]>

solotzg added type/enhancement The issue or PR belongs to an enhancement. type/performance labels Oct 26, 2022

add comment

0da4b44

solotzg requested review from zanmato1984 and windtalker October 26, 2022 11:57

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 28, 2022

ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 28, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 28, 2022

Merge branch 'master' into optimize-agg

c7cf652

solotzg added 2 commits October 28, 2022 22:34

fix asan

ae7b3b5

Merge remote-tracking branch 'origin/optimize-agg' into optimize-agg

8105e41

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Oct 28, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 28, 2022

Merge branch 'master' into optimize-agg

bc83c20

ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2022

ti-chi-bot merged commit 1a50e00 into pingcap:master Oct 29, 2022

solotzg deleted the optimize-agg branch October 29, 2022 03:00

solotzg mentioned this pull request Oct 29, 2022

Improve the performance of new collation releated function/executor #5294

Closed

9 tasks

CalvinNeo pushed a commit to CalvinNeo/tiflash that referenced this pull request Nov 4, 2022

Optimize Aggregator/Join/Set keys (pingcap#6135)

e2bd485

ref pingcap#5294 Signed-off-by: CalvinNeo <[email protected]>

solotzg mentioned this pull request Nov 11, 2022

Group by multi string column in cop/batchCop mode will truncate the last char of group by columns #6294

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimize Aggregator/Join/Set keys #6135

Optimize Aggregator/Join/Set keys #6135

solotzg commented Oct 14, 2022 •

edited

Loading

ti-chi-bot commented Oct 14, 2022 •

edited

Loading

solotzg commented Oct 14, 2022

solotzg commented Oct 21, 2022

solotzg commented Oct 21, 2022

solotzg commented Oct 24, 2022

solotzg commented Oct 25, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 29, 2022

solotzg commented Oct 29, 2022

ti-chi-bot commented Oct 29, 2022

	/** Deserializes a value that was serialized using IColumn::serializeValueIntoArena method.
	* Returns pointer to the position after the read data.
	* Note:
	* 1. For string columns with collation it is actually impossible to restore the value.
	* In this case, the column restored by this function is discarded, the compiler will add a
	* special aggregate function(any) as the group by column's output. For example:
	* select string_column, count(*) from table group by string_column
	* if string_column has collation information, the query will be rewrite to
	* select any(string_column), count(*) from table group by string_column
	* 2. The input parameter `collator` does not work well for complex columns(column tuple),
	* but it is only used by TiDB , which does not support complex columns, so just ignore
	* the complex column will be ok.
	*/
	virtual const char * deserializeAndInsertFromArena(const char * pos, std::shared_ptr<TiDB::ITiDBCollator> collator = nullptr) = 0;

	if (collator != nullptr)
	{
	/// if the column is a string with collation info, the `sort_key` of the column is used during
	/// aggregation, but we can not reconstruct the origin column by `sort_key`, so add an extra
	/// extra aggregation function any(group_by_column) here as the output of the group by column
	const String & agg_func_name = "any";
	AggregateDescription aggregate;

	DataTypes types(1);
	aggregate.argument_names.resize(1);
	types[0] = type;
	aggregate.argument_names[0] = name;

	String func_string = genFuncString(agg_func_name, aggregate.argument_names);
	bool duplicate = false;
	for (const auto & pre_agg : aggregate_descriptions)
	{
	if (pre_agg.column_name == func_string)
	{
	aggregated_columns.emplace_back(func_string, pre_agg.function->getReturnType());
	duplicate = true;
	break;
	}
	}
	if (duplicate)
	continue;
	aggregate.column_name = func_string;
	aggregate.parameters = Array();
	aggregate.function = AggregateFunctionFactory::instance().get(agg_func_name, types, {}, 0, false);
	aggregate.function->setCollator(getCollatorFromExpr(expr));
	aggregate_descriptions.push_back(aggregate);
	DataTypePtr result_type = aggregate.function->getReturnType();
	// this is a temp result since implicit cast maybe added on these aggregated_columns
	aggregated_columns.emplace_back(func_string, result_type);
	}

Optimize Aggregator/Join/Set keys #6135

Optimize Aggregator/Join/Set keys #6135

Conversation

solotzg commented Oct 14, 2022 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Benchmark

Check List

Release note

ti-chi-bot commented Oct 14, 2022 • edited Loading

solotzg commented Oct 14, 2022

solotzg commented Oct 21, 2022

solotzg commented Oct 21, 2022

solotzg commented Oct 24, 2022

solotzg commented Oct 25, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

ti-chi-bot commented Oct 28, 2022

solotzg commented Oct 28, 2022

solotzg commented Oct 29, 2022

solotzg commented Oct 29, 2022

ti-chi-bot commented Oct 29, 2022

solotzg commented Oct 14, 2022 •

edited

Loading

ti-chi-bot commented Oct 14, 2022 •

edited

Loading