database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-36463 Change expression_cache name to subquery_cache, and make appropriate changes to the test files

Browse Source
This commit is contained in:
bsrikanth-mariadb
2025-04-14 23:07:07 -04:00
parent 10c063f9f0
commit b6391d4e03
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/analyze_format_json.result
View File

@@ -1000,7 +1000,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"r_loops": 0, "r_loops": 0,
"query_block": { "query_block": {
@@ -1098,7 +1098,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"r_loops": 0, "r_loops": 0,
"query_block": { "query_block": {

6
mysql-test/main/explain_json.result
View File

@@ -404,7 +404,7 @@ EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
@@ -451,7 +451,7 @@ EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
@@ -2112,7 +2112,7 @@ EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,

2
mysql-test/main/order_by.result
View File

@@ -4523,7 +4523,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 50, "r_loops": 50,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {

12
mysql-test/main/show_analyze_json.result
View File

@@ -638,7 +638,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"r_loops": 0, "r_loops": 0,
"query_block": { "query_block": {
@@ -707,7 +707,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 2, "r_loops": 2,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {
@@ -781,7 +781,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 2, "r_loops": 2,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {
@@ -1077,7 +1077,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 1, "r_loops": 1,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {
@@ -1135,7 +1135,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 2, "r_loops": 2,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {
@@ -1194,7 +1194,7 @@ SHOW ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 3, "r_loops": 3,
"r_hit_ratio": 0, "r_hit_ratio": 0,
"query_block": { "query_block": {

18
mysql-test/main/show_explain_json.result
View File

@@ -421,7 +421,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -476,7 +476,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -531,7 +531,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -942,7 +942,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -987,7 +987,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -1032,7 +1032,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -1092,7 +1092,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -1137,7 +1137,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",
@@ -1182,7 +1182,7 @@ SHOW EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
"cost": "COST_REPLACED", "cost": "COST_REPLACED",

2
mysql-test/main/subselect4.result
View File

@@ -2911,7 +2911,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "disabled", "state": "disabled",
"r_loops": 0, "r_loops": 0,
"query_block": { "query_block": {

12
mysql-test/main/subselect_cache.result
View File

@@ -72,7 +72,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 10, "r_loops": 10,
"r_hit_ratio": 60, "r_hit_ratio": 60,
"query_block": { "query_block": {
@@ -137,7 +137,7 @@ ANALYZE
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 10, "r_loops": 10,
"r_hit_ratio": 60, "r_hit_ratio": 60,
"query_block": { "query_block": {
@@ -189,7 +189,7 @@ ANALYZE
} }
}, },
{ {
"expression_cache": { "subquery_cache": {
"r_loops": 10, "r_loops": 10,
"r_hit_ratio": 60, "r_hit_ratio": 60,
"query_block": { "query_block": {
@@ -243,7 +243,7 @@ EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,
@@ -288,7 +288,7 @@ EXPLAIN
], ],
"subqueries": [ "subqueries": [
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"union_result": { "union_result": {
@@ -329,7 +329,7 @@ EXPLAIN
} }
}, },
{ {
"expression_cache": { "subquery_cache": {
"state": "uninitialized", "state": "uninitialized",
"query_block": { "query_block": {
"select_id": 2, "select_id": 2,

2
sql/sql_explain.cc
View File

@@ -967,7 +967,7 @@ bool Explain_node::print_explain_json_cache(Json_writer *writer,
if (cache_tracker) if (cache_tracker)
{ {
cache_tracker->fetch_current_stats(); cache_tracker->fetch_current_stats();
writer->add_member("expression_cache").start_object(); writer->add_member("subquery_cache").start_object();
if (cache_tracker->state != Expression_cache_tracker::OK) if (cache_tracker->state != Expression_cache_tracker::OK)
{ {
writer->add_member("state"). writer->add_member("state").