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

Split AstToExecutor from dbgFuncCoprocessor. #4610

Merged

ti-chi-bot merged 11 commits into pingcap:master from ywqzzy:split_ast2executor

Apr 12, 2022

Contributor

ywqzzy commented Apr 7, 2022 •

edited

Loading

What problem does this PR solve?

Issue Number: ref #4609

Problem Summary:
Need to provide Ast to tipb::Executor helper functions for Interpreter test framework, but all of them are in .cpp file.

What is changed and how it works?

Move Ast to tipb::Executor helper functions to astToExecutor.h

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


          split files

bcf6e73

Member

ti-chi-bot commented Apr 7, 2022 •

edited

Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

SeaRise
yibin87

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.

ti-chi-bot added release-note-none size/XXL needs-rebase labels

Member

ti-chi-bot commented Apr 7, 2022

@ywqzzy: PR needs rebase.

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 kubernetes/test-infra repository.

ywqzzy changed the title ~~Split AstToExecutor from dbgFuncCoprocessor.~~ [DNM] Split AstToExecutor from dbgFuncCoprocessor.

ywqzzy changed the title ~~[DNM] Split AstToExecutor from dbgFuncCoprocessor.~~ Split AstToExecutor from dbgFuncCoprocessor.

ywqzzy mentioned this pull request

Interpreter & Executor & MPP unit test framework #4609

Closed

54 tasks

fuzhe1989 reviewed

View reviewed changes

dbms/src/Debug/AstToExecutor.cpp Outdated

+                  }
+                  else if (ASTFunction * func = typeid_cast<ASTFunction *>(ast.get()))
+                  {
+                      /// aggregation function is handled in Aggregation, so just treated as a column

Contributor

fuzhe1989 Apr 7, 2022

how about move this branch into another function?

Contributor Author

ywqzzy Apr 7, 2022

how about move this branch into another function?

Good idea. I will refactor them all.

dbms/src/Debug/AstToExecutor.cpp Outdated

+                  }
+                  else if (ASTFunction * func = typeid_cast<ASTFunction *>(ast.get()))
+                  {
+                      /// check function

Contributor

fuzhe1989 Apr 7, 2022

ditto

Contributor Author

ywqzzy Apr 11, 2022

done

dbms/src/Debug/AstToExecutor.cpp Outdated

+              }
+              } // namespace
+              String LOCAL_HOST = "127.0.0.1:3930";

Contributor

fuzhe1989 Apr 7, 2022

move to anonymous namespace?

Contributor Author

ywqzzy Apr 11, 2022

done. I have moved it into namespace db::debug.

dbms/src/Debug/AstToExecutor.h Outdated

+                  }
+                  virtual bool toTiPBExecutor(tipb::Executor * tipb_executor, uint32_t collator_id, const MPPInfo & mpp_info, const Context & context)
+                      = 0;
+                  virtual void toMPPSubPlan(size_t & executor_index, const DAGProperties & properties, std::unordered_map<String, std::pair<std::shared_ptr<ExchangeReceiver>, std::shared_ptr<ExchangeSender>>> & exchange_map)

Contributor

fuzhe1989 Apr 7, 2022

is executor_index expected to be mutable to derived classes of Executor?

dbms/src/Debug/AstToExecutor.h Outdated

+                  tipb::ExchangeType type;
+                  TaskMetas task_metas;
+                  std::vector<size_t> partition_keys;
+                  ExchangeSender(size_t & index, const DAGSchema & output, tipb::ExchangeType type_, const std::vector<size_t> & partition_keys_ = {})

Contributor

fuzhe1989 Apr 7, 2022

is index mutable?

Contributor Author

ywqzzy Apr 11, 2022

it is mutable

dbms/src/Debug/AstToExecutor.h Outdated

+              struct ExchangeReceiver : Executor
+              {
+                  TaskMetas task_metas;
+                  ExchangeReceiver(size_t & index, const DAGSchema & output)

Contributor

fuzhe1989 Apr 7, 2022

ditto

dbms/src/Debug/AstToExecutor.h Outdated

+              {
+                  TableInfo table_info;
+                  /// used by column pruner
+                  TableScan(size_t & index_, const DAGSchema & output_schema_, TableInfo & table_info_)

Contributor

fuzhe1989 Apr 7, 2022

ditto, the same as table_info_.

Contributor Author

ywqzzy Apr 11, 2022

done

dbms/src/Debug/AstToExecutor.h Outdated

+              struct Selection : public Executor
+              {
+                  std::vector<ASTPtr> conditions;
+                  Selection(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> && conditions_)

Contributor

fuzhe1989 Apr 7, 2022

Suggested change

      
                Selection(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> && conditions_)
          
                Selection(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> conditions_)

Contributor Author

ywqzzy Apr 11, 2022

done.

dbms/src/Debug/AstToExecutor.h Outdated

+              {
+                  std::vector<ASTPtr> order_columns;
+                  size_t limit;
+                  TopN(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> && order_columns_, size_t limit_)

Contributor

fuzhe1989 Apr 7, 2022

Suggested change

      
                TopN(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> && order_columns_, size_t limit_)
          
                TopN(size_t & index_, const DAGSchema & output_schema_, std::vector<ASTPtr> order_columns_, size_t limit_)

Contributor Author

ywqzzy Apr 11, 2022

done

ti-chi-bot removed the needs-rebase label

pingcap deleted a comment from sre-bot

pingcap deleted a comment from sre-bot

pingcap deleted a comment from ti-chi-bot

pingcap deleted a comment from sre-bot


          Merge branch 'master' of https://github.com/pingcap/tics into split_a…

…st2executor

ywqzzy force-pushed the split_ast2executor branch from fbb50e5 to 0704608 Compare

April 7, 2022 13:09


          format.

0723e16

Contributor Author

ywqzzy commented Apr 7, 2022

/run-all-tests

Collaborator

sre-bot commented Apr 7, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MockExecutor.h                    521               310    40.50%          61                31    49.18%        1335               806    39.63%         502               303    39.64%
dbgFuncCoprocessor.cpp            406               326    19.70%          35                25    28.57%         833               676    18.85%         290               244    15.86%
dbgFuncCoprocessor.h                1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             928               636    31.47%          97                56    42.27%        2169              1482    31.67%         792               547    30.93%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17020      9515             44.10%    191828  96449        49.72%

full coverage report (for internal network access only)


          update.

8577edb

Contributor Author

ywqzzy commented Apr 8, 2022

/run-all-tests

Collaborator

sre-bot commented Apr 8, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MockExecutor.cpp                  499               294    41.08%          44                20    54.55%        1309               788    39.80%         498               299    39.96%
MockExecutor.h                     22                16    27.27%          17                11    35.29%          26                18    30.77%           4                 4     0.00%
dbgFuncCoprocessor.cpp            406               326    19.70%          35                25    28.57%         833               676    18.85%         290               244    15.86%
dbgFuncCoprocessor.h                1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             928               636    31.47%          97                56    42.27%        2169              1482    31.67%         792               547    30.93%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17020      9515             44.10%    191828  96430        49.73%

full coverage report (for internal network access only)

SeaRise requested review from SeaRise and windtalker

April 8, 2022 04:02


          fix bug.

ed5552e

Contributor Author

ywqzzy commented Apr 8, 2022

/run-all-tests

Collaborator

sre-bot commented Apr 8, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MockExecutor.cpp                  498               294    40.96%          44                20    54.55%        1305               791    39.39%         498               300    39.76%
MockExecutor.h                     29                19    34.48%          18                11    38.89%          44                25    43.18%          10                 8    20.00%
dbgFuncCoprocessor.cpp            406               326    19.70%          35                25    28.57%         833               676    18.85%         290               244    15.86%
dbgFuncCoprocessor.h                1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             934               639    31.58%          98                56    42.86%        2183              1492    31.65%         798               552    30.83%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17020      9515             44.10%    191828  96448        49.72%

full coverage report (for internal network access only)

Contributor Author

ywqzzy commented Apr 8, 2022

/run-integration-test

SeaRise approved these changes

View reviewed changes

ti-chi-bot added the status/LGT1 label


          Rename file. Remove annotations.

fbdcff5

Contributor Author

ywqzzy commented Apr 11, 2022

ti-chi-bot requested a review from yibin87

April 11, 2022 04:31


          format.

dde71b5

yibin87 reviewed

View reviewed changes

dbms/src/Debug/astToExecutor.cpp Outdated Show resolved Hide resolved

ywqzzy added 2 commits

April 11, 2022 15:38


          resolve comments.

4bffc53


          fix comments.

8f523db

ywqzzy requested review from yibin87 and fuzhe1989

April 11, 2022 07:47

Contributor Author

ywqzzy commented Apr 11, 2022

/run-all-tests

Collaborator

sre-bot commented Apr 11, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
astToExecutor.cpp                 500               294    41.20%          46                20    56.52%        1311               791    39.66%         498               300    39.76%
astToExecutor.h                    29                19    34.48%          18                11    38.89%          44                25    43.18%          10                 8    20.00%
dbgFuncCoprocessor.cpp            406               326    19.70%          35                25    28.57%         833               676    18.85%         290               244    15.86%
dbgFuncCoprocessor.h                1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             936               639    31.73%         100                56    44.00%        2189              1492    31.84%         798               552    30.83%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17023      9510             44.13%    191899  96432        49.75%

full coverage report (for internal network access only)

yibin87 approved these changes

View reviewed changes

Contributor

yibin87 left a comment

LGTM

ti-chi-bot added status/LGT2 and removed status/LGT1 labels


          Merge branch 'master' of https://github.com/pingcap/tics into split_a…

880bf9f

…st2executor

fuzhe1989 approved these changes

View reviewed changes

windtalker approved these changes

View reviewed changes

Contributor

windtalker left a comment

Others LGTM

dbms/src/Debug/astToExecutor.cpp Outdated

+                  {"group_concat", tipb::ExprType::GroupConcat},
+              });
+              DAGColumnInfo toNullableDAGColumnInfo(DAGColumnInfo & input)

Contributor

windtalker Apr 12, 2022

Make the parameter const?


          update.

f8a5692

ywqzzy force-pushed the split_ast2executor branch from 4035bb4 to f8a5692 Compare

April 12, 2022 04:10

Contributor Author

ywqzzy commented Apr 12, 2022

/merge

Member

ti-chi-bot commented Apr 12, 2022

@ywqzzy: 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.

Member

ti-chi-bot commented Apr 12, 2022

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

Commit hash: f8a5692

ti-chi-bot added the status/can-merge label

Collaborator

sre-bot commented Apr 12, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
astToExecutor.cpp                 500               294    41.20%          46                20    56.52%        1311               791    39.66%         498               300    39.76%
astToExecutor.h                    29                19    34.48%          18                11    38.89%          44                25    43.18%          10                 8    20.00%
dbgFuncCoprocessor.cpp            406               326    19.70%          35                25    28.57%         833               676    18.85%         290               244    15.86%
dbgFuncCoprocessor.h                1                 0   100.00%           1                 0   100.00%           1                 0   100.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             936               639    31.73%         100                56    44.00%        2189              1492    31.84%         798               552    30.83%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17023      9510             44.13%    191899  96429        49.75%

full coverage report (for internal network access only)

ti-chi-bot merged commit 9b8c999 into pingcap:master

JaySon-Huang mentioned this pull request

sanitizer: stack-use-after-scope in FilterParserTest #4476

Closed

ywqzzy mentioned this pull request

*:Fix MppInfo saving reference to temporary object. #4638

Merged

12 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-note-none size/XXL status/can-merge status/LGT2