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.

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

*: add a blacklist to disallow pushing down specific expressions (#10688) #10998

Merged
merged 7 commits into from
Jul 3, 2019

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Jul 1, 2019

cherry-pick #10688

Should merge pingcap/parser#368 first

@XuHuaiyu XuHuaiyu added sig/execution SIG execution type/2.1 cherry-pick type/enhancement The issue or PR belongs to an enhancement. labels Jul 1, 2019
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@XuHuaiyu XuHuaiyu requested a review from qw4990 July 1, 2019 07:33
@XuHuaiyu
Copy link
Contributor Author

XuHuaiyu commented Jul 2, 2019

  1. upgrade from 2.1.13 to this commit:
tidb [127.0.0.1]> select * from mysql.expr_pushdown_blacklist;
ERROR 1146 (42S02): Table 'mysql.expr_pushdown_blacklist' doesn't exist

tidb [127.0.0.1]> select * from tidb where variable_name='tidb_server_version';
+---------------------+----------------+-----------------------------------+
| VARIABLE_NAME       | VARIABLE_VALUE | COMMENT                           |
+---------------------+----------------+-----------------------------------+
| tidb_server_version | 24             | Bootstrap version. Do not delete. |
+---------------------+----------------+-----------------------------------+
1 row in set (0.01 sec)

tidb [127.0.0.1]> select tidb_Version();
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| tidb_Version()                                                                                                                                                                                                                                                                                                                 |
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Release Version: v2.1.13-1-gc30c923
Git Commit Hash: c30c923ddfdf832b09fae301ad42e7590fa3d5e9
Git Branch: release-2.1
UTC Build Time: 2019-07-02 06:46:03
GoVersion: go version go1.12 linux/amd64
Race Enabled: false
TiKV Min Version: 2.1.0-alpha.1-ff3dd160846b7d1aed9079c389fc188f7f5ea13e
Check Table Before Drop: false |
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
1 row in set (0.00 sec)

after upgrade:

tidb> select * from mysql.tidb where variable_name="tidb_server_version";
+---------------------+----------------+-----------------------------------+
| VARIABLE_NAME       | VARIABLE_VALUE | COMMENT                           |
+---------------------+----------------+-----------------------------------+
| tidb_server_version | 25             | Bootstrap version. Do not delete. |
+---------------------+----------------+-----------------------------------+

tidb> show tables;
+-------------------------+
| Tables_in_mysql         |
+-------------------------+
| GLOBAL_VARIABLES        |
| columns_priv            |
| db                      |
| expr_pushdown_blacklist |
| gc_delete_range         |
| gc_delete_range_done    |
| help_topic              |
| stats_buckets           |
| stats_feedback          |
| stats_histograms        |
| stats_meta              |
| tables_priv             |
| tidb                    |
| user                    |
+-------------------------+
14 rows in set (0.01 sec)
  1. degrade from this commit to 2.1.13
tidb> select * from mysql.tidb where variable_name="tidb_server_version";
+---------------------+----------------+-----------------------------------+
| VARIABLE_NAME       | VARIABLE_VALUE | COMMENT                           |
+---------------------+----------------+-----------------------------------+
| tidb_server_version | 25             | Bootstrap version. Do not delete. |
+---------------------+----------------+-----------------------------------+

tidb> show tables;
+-------------------------+
| Tables_in_mysql         |
+-------------------------+
| GLOBAL_VARIABLES        |
| columns_priv            |
| db                      |
| expr_pushdown_blacklist |
| gc_delete_range         |
| gc_delete_range_done    |
| help_topic              |
| stats_buckets           |
| stats_feedback          |
| stats_histograms        |
| stats_meta              |
| tables_priv             |
| tidb                    |
| user                    |
+-------------------------+
14 rows in set (0.00 sec)

@XuHuaiyu XuHuaiyu force-pushed the cherry-pick-expr-blacklist branch from 37441ba to 383544b Compare July 3, 2019 02:28
@XuHuaiyu
Copy link
Contributor Author

XuHuaiyu commented Jul 3, 2019

/run-all-tests

@XuHuaiyu
Copy link
Contributor Author

XuHuaiyu commented Jul 3, 2019

/run-all-tests tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

@zz-jason zz-jason added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Jul 3, 2019
zz-jason
zz-jason previously approved these changes Jul 3, 2019
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zz-jason
Copy link
Member

zz-jason commented Jul 3, 2019

/run-integration-ddl-test tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

@XuHuaiyu
Copy link
Contributor Author

XuHuaiyu commented Jul 3, 2019

/run-integration-ddl-test tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zz-jason zz-jason merged commit 29f559a into pingcap:release-2.1 Jul 3, 2019
@zz-jason zz-jason added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/execution SIG execution status/LGT2 Indicates that a PR has LGTM 2. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants