Skip to content

M
MariaDB
Commit 1514387c authored by Rex's avatar Rex
Browse files
Options

MDEV-30771 Optimizer trace: table_scan.rows is traced as integer, change to double 

	Alter formatting of printed doubles written to the optimizer trace
	to ensure it is clear they ARE floating point numbers.
parent 99ee200b
Hide whitespace changes
Inline Side-by-side
Showing with 709 additions and 682 deletions
mysql-test/main/analyze_format_json.result
View file @ 1514387c
......@@ -184,7 +184,7 @@ ANALYZE
"buffer_size": "1Kb",
"join_type": "BNL",
"attached_condition": "tbl1.c > tbl2.c",
"r_filtered": 15.833
"r_filtered": 15.83
}
}
}
......@@ -225,7 +225,7 @@ ANALYZE
"ref": ["test.t1.a"],
"r_loops": 10,
"rows": 2,
"r_rows": 0.2,
"r_rows": 0.20,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 100,
......@@ -404,10 +404,10 @@ ANALYZE
"possible_keys": ["key1", "key2", "key3", "key4"],
"r_loops": 5,
"rows": 1010,
"r_rows": 203.8,
"r_rows": 203.80,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 98.135
"r_filtered": 98.14
}
}
}
......
mysql-test/main/analyze_stmt_orderby.result
View file @ 1514387c
......@@ -233,7 +233,7 @@ ANALYZE
"ref": ["test.t0.a"],
"r_loops": 10,
"rows": 1,
"r_rows": 0.4,
"r_rows": 0.40,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 100
......@@ -321,7 +321,7 @@ ANALYZE
"ref": ["test.t0.a"],
"r_loops": 10,
"rows": 1,
"r_rows": 0.4,
"r_rows": 0.40,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 100
......@@ -500,7 +500,7 @@ ANALYZE
"buffer_size": "119",
"join_type": "BNL",
"attached_condition": "t5.a = t6.a",
"r_filtered": 21.429
"r_filtered": 21.43
}
}
}
......
mysql-test/main/cte_recursive.result
View file @ 1514387c
......@@ -3819,7 +3819,7 @@ ANALYZE
"ref": ["func"],
"r_loops": 3,
"rows": 1,
"r_rows": 0.3333,
"r_rows": 0.33,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 100,
......@@ -4126,7 +4126,7 @@ ANALYZE
"ref": ["test.t1.c"],
"r_loops": 4,
"rows": 2,
"r_rows": 0.5,
"r_rows": 0.50,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 100
......
mysql-test/main/derived_cond_pushdown.result
View file @ 1514387c
......@@ -15466,7 +15466,7 @@ EXPLAIN
"access_type": "ALL",
"possible_keys": ["idx_b"],
"rows": 12,
"filtered": 83.333,
"filtered": 83.33,
"attached_condition": "t1.b <= 5 and t1.a is not null"
},
"table": {
......@@ -15741,7 +15741,7 @@ EXPLAIN
"access_type": "ALL",
"possible_keys": ["idx_b"],
"rows": 12,
"filtered": 83.333,
"filtered": 83.33,
"attached_condition": "t3.b <= 15 and t3.a is not null and t3.c is not null"
},
"table": {
......@@ -15894,7 +15894,7 @@ EXPLAIN
"access_type": "ALL",
"possible_keys": ["idx_b"],
"rows": 12,
"filtered": 83.333,
"filtered": 83.33,
"attached_condition": "t3.b <= 15 and t3.a is not null and t3.c is not null"
},
"table": {
......@@ -16126,7 +16126,7 @@ EXPLAIN
"table_name": "t2",
"access_type": "ALL",
"rows": 90,
"filtered": 63.281,
"filtered": 63.28,
"attached_condition": "t2.b < 40 and t2.a is not null"
},
"table": {
......@@ -16623,7 +16623,7 @@ EXPLAIN
"table_name": "t2",
"access_type": "ALL",
"rows": 90,
"filtered": 63.281,
"filtered": 63.28,
"attached_condition": "t2.b < 40 and t2.a is not null"
},
"table": {
......@@ -17732,7 +17732,7 @@ EXPLAIN
"used_key_parts": ["t1_id"],
"ref": ["test.t1.id"],
"rows": 3,
"filtered": 58.594,
"filtered": 58.59,
"index_condition": "t2.t1_id between 200 and 100000 and t2.t1_id = t3.t1_id",
"attached_condition": "t2.reporting_person = 1"
}
......
mysql-test/main/join_cache.result
View file @ 1514387c
......@@ -6216,7 +6216,7 @@ EXPLAIN
"key_length": "10",
"used_key_parts": ["kp1", "kp2"],
"rows": 836,
"filtered": 76.434,
"filtered": 76.43,
"index_condition": "b.kp2 <= 10",
"attached_condition": "b.kp2 <= 10 and b.col1 + 1 < 33333"
},
......
mysql-test/main/opt_trace.result
View file @ 1514387c
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/main/opt_trace_index_merge.result
View file @ 1514387c
......@@ -115,12 +115,12 @@ explain select * from t1 where a=1 or b=1 {
"using_mrr": false,
"index_only": true,
"rows": 1,
"cost": 1.1773,
"cost": 1.18,
"chosen": true
}
],
"index_to_merge": "a",
"cumulated_cost": 1.1773
"cumulated_cost": 1.18
},
{
"range_scan_alternatives": [
......@@ -131,15 +131,15 @@ explain select * from t1 where a=1 or b=1 {
"using_mrr": false,
"index_only": true,
"rows": 1,
"cost": 1.1773,
"cost": 1.18,
"chosen": true
}
],
"index_to_merge": "b",
"cumulated_cost": 2.3547
"cumulated_cost": 2.35
}
],
"cost_of_reading_ranges": 2.3547,
"cost_of_reading_ranges": 2.35,
"use_roworder_union": true,
"cause": "always cheaper than non roworder retrieval",
"analyzing_roworder_scans": [
......@@ -162,7 +162,7 @@ explain select * from t1 where a=1 or b=1 {
}
}
],
"index_roworder_union_cost": 4.1484,
"index_roworder_union_cost": 4.15,
"members": 2,
"chosen": true
}
......@@ -187,7 +187,7 @@ explain select * from t1 where a=1 or b=1 {
]
},
"rows_for_plan": 2,
"cost_for_plan": 4.1484,
"cost_for_plan": 4.15,
"chosen": true
}
}
......@@ -209,19 +209,19 @@ explain select * from t1 where a=1 or b=1 {
{
"access_type": "index_merge",
"resulting_rows": 2,
"cost": 4.1484,
"cost": 4.15,
"chosen": true
}
],
"chosen_access_method": {
"type": "index_merge",
"records": 2,
"cost": 4.1484,
"cost": 4.15,
"uses_join_buffering": false
}
},
"rows_for_plan": 2,
"cost_for_plan": 4.5484,
"cost_for_plan": 4.55,
"estimated_join_cardinality": 2
}
]
......@@ -318,7 +318,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
"using_mrr": false,
"index_only": false,
"rows": 2243,
"cost": 2844.1,
"cost": 2844.13,
"chosen": true
},
{
......@@ -329,7 +329,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
"using_mrr": false,
"index_only": false,
"rows": 2243,
"cost": 2844.1,
"cost": 2844.13,
"chosen": false,
"cause": "cost"
},
......@@ -341,7 +341,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
"using_mrr": false,
"index_only": false,
"rows": 2243,
"cost": 2844.1,
"cost": 2844.13,
"chosen": false,
"cause": "cost"
}
......@@ -352,10 +352,10 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
[
{
"index": "key1",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 58.252,
"disk_sweep_cost": 1923.1,
"cumulative_total_cost": 1981.4,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 58.25,
"disk_sweep_cost": 1923.14,
"cumulative_total_cost": 1981.40,
"usable": true,
"matching_rows_now": 2243,
"intersect_covering_with_this_index": false,
......@@ -363,23 +363,23 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
},
{
"index": "key2",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 116.5,
"disk_sweep_cost": 84.518,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 116.50,
"disk_sweep_cost": 84.52,
"cumulative_total_cost": 201.02,
"usable": true,
"matching_rows_now": 77.636,
"matching_rows_now": 77.64,
"intersect_covering_with_this_index": false,
"chosen": true
},
{
"index": "key3",
"index_scan_cost": 58.252,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 174.76,
"disk_sweep_cost": 0,
"cumulative_total_cost": 174.76,
"usable": true,
"matching_rows_now": 2.6872,
"matching_rows_now": 2.69,
"intersect_covering_with_this_index": true,
"chosen": true
}
......@@ -536,10 +536,10 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
[
{
"index": "key1",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 58.252,
"disk_sweep_cost": 1923.1,
"cumulative_total_cost": 1981.4,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 58.25,
"disk_sweep_cost": 1923.14,
"cumulative_total_cost": 1981.40,
"usable": true,
"matching_rows_now": 2243,
"intersect_covering_with_this_index": false,
......@@ -547,12 +547,12 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
},
{
"index": "key2",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 116.5,
"disk_sweep_cost": 84.518,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 116.50,
"disk_sweep_cost": 84.52,
"cumulative_total_cost": 201.02,
"usable": true,
"matching_rows_now": 77.636,
"matching_rows_now": 77.64,
"intersect_covering_with_this_index": false,
"chosen": true
}
......@@ -580,10 +580,10 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
[
{
"index": "key3",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 58.252,
"disk_sweep_cost": 1923.1,
"cumulative_total_cost": 1981.4,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 58.25,
"disk_sweep_cost": 1923.14,
"cumulative_total_cost": 1981.40,
"usable": true,
"matching_rows_now": 2243,
"intersect_covering_with_this_index": false,
......@@ -591,12 +591,12 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
},
{
"index": "key4",
"index_scan_cost": 58.252,
"cumulated_index_scan_cost": 116.5,
"disk_sweep_cost": 84.518,
"index_scan_cost": 58.25,
"cumulated_index_scan_cost": 116.50,
"disk_sweep_cost": 84.52,
"cumulative_total_cost": 201.02,
"usable": true,
"matching_rows_now": 77.636,
"matching_rows_now": 77.64,
"intersect_covering_with_this_index": false,
"chosen": true
}
......
mysql-test/main/opt_trace_index_merge_innodb.result
View file @ 1514387c
......@@ -88,7 +88,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
"range_analysis": {
"table_scan": {
"rows": 1000,
"cost": 206.1
"cost": 206.10
},
"potential_range_indexes": [
{
......@@ -131,7 +131,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
"using_mrr": false,
"index_only": false,
"rows": 1,
"cost": 2.3751,
"cost": 2.38,
"chosen": true
}
],
......@@ -139,10 +139,10 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
"intersecting_indexes": [
{
"index": "key1",
"index_scan_cost": 1.0001,
"cumulated_index_scan_cost": 1.0001,
"disk_sweep_cost": 1.0042,
"cumulative_total_cost": 2.0043,
"index_scan_cost": 1.00,
"cumulated_index_scan_cost": 1.00,
"disk_sweep_cost": 1.00,
"cumulative_total_cost": 2.00,
"usable": true,
"matching_rows_now": 1,
"intersect_covering_with_this_index": false,
......@@ -166,7 +166,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
"ranges": ["(1) <= (key1) <= (1)"]
},
"rows_for_plan": 1,
"cost_for_plan": 2.3751,
"cost_for_plan": 2.38,
"chosen": true
}
}
......@@ -176,7 +176,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
"rowid_filters": [
{
"key": "key1",
"build_cost": 1.1801,
"build_cost": 1.18,
"rows": 1
}
]
......@@ -226,7 +226,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
}
},
"rows_for_plan": 1,
"cost_for_plan": 2.2,
"cost_for_plan": 2.20,
"estimated_join_cardinality": 1
}
]
......
mysql-test/main/opt_trace_security.result
View file @ 1514387c
......@@ -80,7 +80,7 @@ select * from db1.t1 {
"table": "t1",
"table_scan": {
"rows": 3,
"cost": 2.0051
"cost": 2.01
}
}
]
......@@ -95,19 +95,19 @@ select * from db1.t1 {
{
"access_type": "scan",
"resulting_rows": 3,
"cost": 2.0051,
"cost": 2.01,
"chosen": true
}
],
"chosen_access_method": {
"type": "scan",
"records": 3,
"cost": 2.0051,
"cost": 2.01,
"uses_join_buffering": false
}
},
"rows_for_plan": 3,
"cost_for_plan": 2.6051,
"cost_for_plan": 2.61,
"estimated_join_cardinality": 3
}
]
......@@ -203,7 +203,7 @@ select * from db1.v1 {
"table": "t1",
"table_scan": {
"rows": 3,
"cost": 2.0051
"cost": 2.01
}
}
]
......@@ -218,19 +218,19 @@ select * from db1.v1 {
{
"access_type": "scan",
"resulting_rows": 3,
"cost": 2.0051,
"cost": 2.01,
"chosen": true
}
],
"chosen_access_method": {
"type": "scan",
"records": 3,
"cost": 2.0051,
"cost": 2.01,
"uses_join_buffering": false
}
},
"rows_for_plan": 3,
"cost_for_plan": 2.6051,
"cost_for_plan": 2.61,
"estimated_join_cardinality": 3
}
]
......
mysql-test/main/opt_trace_ucs2.result
View file @ 1514387c
......@@ -34,7 +34,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives'))
"using_mrr": false,
"index_only": false,
"rows": 2,
"cost": 3.7609,
"cost": 3.76,
"chosen": true
}
],
......
mysql-test/main/range.result
View file @ 1514387c
......@@ -2623,10 +2623,10 @@ EXPLAIN
"used_key_parts": ["e"]
},
"rows": 15,
"selectivity_pct": 14.423
"selectivity_pct": 14.42
},
"rows": 8,
"filtered": 14.423,
"filtered": 14.42,
"index_condition": "t2.d is not null",
"attached_condition": "(t2.d,t2.e) in (<cache>((3,3)),<cache>((7,7)),<cache>((8,8))) and octet_length(t2.f) = 1"
},
......@@ -2728,10 +2728,10 @@ EXPLAIN
"used_key_parts": ["e"]
},
"rows": 7,
"selectivity_pct": 6.7308
"selectivity_pct": 6.73
},
"rows": 7,
"filtered": 6.7308,
"filtered": 6.73,
"index_condition": "t2.d is not null",
"attached_condition": "(t2.d,t2.e) in (<cache>((4,4)),<cache>((7,7)),<cache>((8,8))) and octet_length(t2.f) = 1"
},
......
mysql-test/main/range_mrr_icp.result
View file @ 1514387c
......@@ -2625,7 +2625,7 @@ EXPLAIN
"key_length": "5",
"used_key_parts": ["d"],
"rows": 8,
"filtered": 14.423,
"filtered": 14.42,
"index_condition": "t2.d is not null",
"attached_condition": "(t2.d,t2.e) in (<cache>((3,3)),<cache>((7,7)),<cache>((8,8))) and octet_length(t2.f) = 1",
"mrr_type": "Rowid-ordered scan"
......@@ -2723,7 +2723,7 @@ EXPLAIN
"key_length": "5",
"used_key_parts": ["d"],
"rows": 7,
"filtered": 6.7308,
"filtered": 6.73,
"index_condition": "t2.d is not null",
"attached_condition": "(t2.d,t2.e) in (<cache>((4,4)),<cache>((7,7)),<cache>((8,8))) and octet_length(t2.f) = 1",
"mrr_type": "Rowid-ordered scan"
......
mysql-test/main/rowid_filter.result
View file @ 1514387c
......@@ -129,7 +129,7 @@ ANALYZE
"selectivity_pct": 11.69,
"r_rows": 605,
"r_lookups": 510,
"r_selectivity_pct": 11.765,
"r_selectivity_pct": 11.76,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
......@@ -260,7 +260,7 @@ ANALYZE
"r_rows": 510,
"r_total_time_ms": "REPLACED",
"filtered": 11.69,
"r_filtered": 11.765,
"r_filtered": 11.76,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
}
......@@ -375,10 +375,10 @@ EXPLAIN
"used_key_parts": ["l_shipDATE"]
},
"rows": 98,
"selectivity_pct": 1.632
"selectivity_pct": 1.63
},
"rows": 4,
"filtered": 1.632,
"filtered": 1.63,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-01-31'"
}
}
......@@ -434,18 +434,18 @@ ANALYZE
"used_key_parts": ["l_shipDATE"]
},
"rows": 98,
"selectivity_pct": 1.632,
"selectivity_pct": 1.63,
"r_rows": 98,
"r_lookups": 476,
"r_selectivity_pct": 2.3109,
"r_selectivity_pct": 2.31,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
"r_loops": 71,
"rows": 4,
"r_rows": 0.1549,
"r_rows": 0.15,
"r_total_time_ms": "REPLACED",
"filtered": 1.632,
"filtered": 1.63,
"r_filtered": 100,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-01-31'"
}
......@@ -507,7 +507,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 4.6,
"filtered": 4.60,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -561,8 +561,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 4.6,
"r_filtered": 11.224,
"filtered": 4.60,
"r_filtered": 11.22,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -640,10 +640,10 @@ EXPLAIN
"used_key_parts": ["o_totalprice"]
},
"rows": 139,
"selectivity_pct": 9.2667
"selectivity_pct": 9.27
},
"rows": 1,
"filtered": 9.2667,
"filtered": 9.27,
"attached_condition": "orders.o_totalprice between 180000 and 230000"
}
}
......@@ -689,7 +689,7 @@ ANALYZE
"selectivity_pct": 11.69,
"r_rows": 605,
"r_lookups": 510,
"r_selectivity_pct": 11.765,
"r_selectivity_pct": 11.76,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
......@@ -716,18 +716,18 @@ ANALYZE
"used_key_parts": ["o_totalprice"]
},
"rows": 139,
"selectivity_pct": 9.2667,
"selectivity_pct": 9.27,
"r_rows": 144,
"r_lookups": 59,
"r_selectivity_pct": 25.424,
"r_selectivity_pct": 25.42,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
"r_loops": 60,
"rows": 1,
"r_rows": 0.2667,
"r_rows": 0.27,
"r_total_time_ms": "REPLACED",
"filtered": 9.2667,
"filtered": 9.27,
"r_filtered": 100,
"attached_condition": "orders.o_totalprice between 180000 and 230000"
}
......@@ -799,7 +799,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 9.2667,
"filtered": 9.27,
"attached_condition": "orders.o_totalprice between 180000 and 230000"
}
}
......@@ -841,7 +841,7 @@ ANALYZE
"r_rows": 510,
"r_total_time_ms": "REPLACED",
"filtered": 11.69,
"r_filtered": 11.765,
"r_filtered": 11.76,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
},
......@@ -857,8 +857,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 9.2667,
"r_filtered": 26.667,
"filtered": 9.27,
"r_filtered": 26.67,
"attached_condition": "orders.o_totalprice between 180000 and 230000"
}
}
......@@ -930,10 +930,10 @@ EXPLAIN
"used_key_parts": ["l_shipDATE"]
},
"rows": 509,
"selectivity_pct": 8.4763
"selectivity_pct": 8.48
},
"rows": 4,
"filtered": 8.4763,
"filtered": 8.48,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -989,18 +989,18 @@ ANALYZE
"used_key_parts": ["l_shipDATE"]
},
"rows": 509,
"selectivity_pct": 8.4763,
"selectivity_pct": 8.48,
"r_rows": 510,
"r_lookups": 476,
"r_selectivity_pct": 7.7731,
"r_selectivity_pct": 7.77,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
"r_loops": 71,
"rows": 4,
"r_rows": 0.5211,
"r_rows": 0.52,
"r_total_time_ms": "REPLACED",
"filtered": 8.4763,
"filtered": 8.48,
"r_filtered": 100,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
......@@ -1088,7 +1088,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 8.4763,
"filtered": 8.48,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -1140,10 +1140,10 @@ ANALYZE
"ref": ["dbt3_s001.orders.o_orderkey"],
"r_loops": 71,
"rows": 4,
"r_rows": 6.7042,
"r_rows": 6.70,
"r_total_time_ms": "REPLACED",
"filtered": 8.4763,
"r_filtered": 7.7731,
"filtered": 8.48,
"r_filtered": 7.77,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -1230,7 +1230,7 @@ EXPLAIN
"key_length": "4",
"used_key_parts": ["l_receiptDATE"],
"rows": 18,
"filtered": 0.5662,
"filtered": 0.57,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1243,7 +1243,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 7.4667,
"filtered": 7.47,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1286,8 +1286,8 @@ ANALYZE
"rows": 18,
"r_rows": 18,
"r_total_time_ms": "REPLACED",
"filtered": 0.5662,
"r_filtered": 38.889,
"filtered": 0.57,
"r_filtered": 38.89,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1303,8 +1303,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 7.4667,
"r_filtered": 14.286,
"filtered": 7.47,
"r_filtered": 14.29,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1350,7 +1350,7 @@ EXPLAIN
"key_length": "4",
"used_key_parts": ["l_receiptDATE"],
"rows": 18,
"filtered": 0.5662,
"filtered": 0.57,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1363,7 +1363,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 7.4667,
"filtered": 7.47,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1406,8 +1406,8 @@ ANALYZE
"rows": 18,
"r_rows": 18,
"r_total_time_ms": "REPLACED",
"filtered": 0.5662,
"r_filtered": 38.889,
"filtered": 0.57,
"r_filtered": 38.89,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1423,8 +1423,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 7.4667,
"r_filtered": 14.286,
"filtered": 7.47,
"r_filtered": 14.29,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1471,7 +1471,7 @@ EXPLAIN
"key_length": "9",
"used_key_parts": ["o_totaldiscount"],
"rows": 39,
"filtered": 3.2,
"filtered": 3.20,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1489,7 +1489,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 3.0475,
"filtered": 3.05,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1526,8 +1526,8 @@ ANALYZE
"rows": 39,
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": 3.2,
"r_filtered": 2.439,
"filtered": 3.20,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1548,8 +1548,8 @@ ANALYZE
"rows": 4,
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": 3.0475,
"r_filtered": 66.667,
"filtered": 3.05,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1592,7 +1592,7 @@ EXPLAIN
"key_length": "9",
"used_key_parts": ["o_totaldiscount"],
"rows": 39,
"filtered": 3.2,
"filtered": 3.20,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1610,7 +1610,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 3.0475,
"filtered": 3.05,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1647,8 +1647,8 @@ ANALYZE
"rows": 39,
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": 3.2,
"r_filtered": 2.439,
"filtered": 3.20,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1669,8 +1669,8 @@ ANALYZE
"rows": 4,
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": 3.0475,
"r_filtered": 66.667,
"filtered": 3.05,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1782,7 +1782,7 @@ ANALYZE
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 2.439,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000 and orders.o_orderDATE between '1992-12-01' and '1997-01-01'"
},
......@@ -1804,7 +1804,7 @@ ANALYZE
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 66.667,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1913,7 +1913,7 @@ ANALYZE
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 2.439,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000 and orders.o_orderDATE between '1992-12-01' and '1997-01-01'"
},
......@@ -1935,7 +1935,7 @@ ANALYZE
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 66.667,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -2302,7 +2302,7 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 49.2,
"filtered": 49.20,
"r_filtered": 100,
"index_condition": "t1.nm like '500%'",
"attached_condition": "t1.fl2 = 0"
......@@ -2347,7 +2347,7 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 49.2,
"filtered": 49.20,
"r_filtered": 100,
"index_condition": "t1.nm like '500%'",
"attached_condition": "t1.fl2 = 0"
......
mysql-test/main/rowid_filter_innodb.result
View file @ 1514387c
......@@ -91,10 +91,10 @@ EXPLAIN
"used_key_parts": ["l_quantity"]
},
"rows": 605,
"selectivity_pct": 10.075
"selectivity_pct": 10.07
},
"rows": 510,
"filtered": 10.075,
"filtered": 10.07,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
}
......@@ -127,10 +127,10 @@ ANALYZE
"used_key_parts": ["l_quantity"]
},
"rows": 605,
"selectivity_pct": 10.075,
"selectivity_pct": 10.07,
"r_rows": 605,
"r_lookups": 510,
"r_selectivity_pct": 11.765,
"r_selectivity_pct": 11.76,
"r_buffer_size": "REPLACED",
"r_filling_time_ms": "REPLACED"
},
......@@ -138,7 +138,7 @@ ANALYZE
"rows": 510,
"r_rows": 60,
"r_total_time_ms": "REPLACED",
"filtered": 10.075,
"filtered": 10.07,
"r_filtered": 100,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
......@@ -229,7 +229,7 @@ EXPLAIN
"key_length": "4",
"used_key_parts": ["l_shipDATE"],
"rows": 510,
"filtered": 10.075,
"filtered": 10.07,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
}
......@@ -260,8 +260,8 @@ ANALYZE
"rows": 510,
"r_rows": 510,
"r_total_time_ms": "REPLACED",
"filtered": 10.075,
"r_filtered": 11.765,
"filtered": 10.07,
"r_filtered": 11.76,
"index_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'",
"attached_condition": "lineitem.l_quantity > 45"
}
......@@ -372,7 +372,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 4.7333,
"filtered": 4.73,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -427,8 +427,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 4.7333,
"r_filtered": 11.224,
"filtered": 4.73,
"r_filtered": 11.22,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -490,7 +490,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 4.7333,
"filtered": 4.73,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -545,8 +545,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 4.7333,
"r_filtered": 11.224,
"filtered": 4.73,
"r_filtered": 11.22,
"attached_condition": "orders.o_totalprice between 200000 and 230000"
}
}
......@@ -611,7 +611,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 0.8557,
"filtered": 0.86,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30' and lineitem.l_quantity > 45"
}
}
......@@ -667,10 +667,10 @@ ANALYZE
"ref": ["dbt3_s001.orders.o_orderkey"],
"r_loops": 144,
"rows": 4,
"r_rows": 6.625,
"r_rows": 6.62,
"r_total_time_ms": "REPLACED",
"filtered": 0.8557,
"r_filtered": 1.6771,
"filtered": 0.86,
"r_filtered": 1.68,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30' and lineitem.l_quantity > 45"
}
}
......@@ -741,7 +741,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 0.8557,
"filtered": 0.86,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30' and lineitem.l_quantity > 45"
}
}
......@@ -797,10 +797,10 @@ ANALYZE
"ref": ["dbt3_s001.orders.o_orderkey"],
"r_loops": 144,
"rows": 4,
"r_rows": 6.625,
"r_rows": 6.62,
"r_total_time_ms": "REPLACED",
"filtered": 0.8557,
"r_filtered": 1.6771,
"filtered": 0.86,
"r_filtered": 1.68,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30' and lineitem.l_quantity > 45"
}
}
......@@ -868,7 +868,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 8.4929,
"filtered": 8.49,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -921,10 +921,10 @@ ANALYZE
"ref": ["dbt3_s001.orders.o_orderkey"],
"r_loops": 71,
"rows": 4,
"r_rows": 6.7042,
"r_rows": 6.70,
"r_total_time_ms": "REPLACED",
"filtered": 8.4929,
"r_filtered": 7.7731,
"filtered": 8.49,
"r_filtered": 7.77,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -1012,7 +1012,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 8.4929,
"filtered": 8.49,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -1065,10 +1065,10 @@ ANALYZE
"ref": ["dbt3_s001.orders.o_orderkey"],
"r_loops": 71,
"rows": 4,
"r_rows": 6.7042,
"r_rows": 6.70,
"r_total_time_ms": "REPLACED",
"filtered": 8.4929,
"r_filtered": 7.7731,
"filtered": 8.49,
"r_filtered": 7.77,
"attached_condition": "lineitem.l_shipDATE between '1997-01-01' and '1997-06-30'"
}
}
......@@ -1155,7 +1155,7 @@ EXPLAIN
"key_length": "4",
"used_key_parts": ["l_receiptDATE"],
"rows": 18,
"filtered": 0.5662,
"filtered": 0.57,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1168,7 +1168,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 5.6667,
"filtered": 5.67,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1211,8 +1211,8 @@ ANALYZE
"rows": 18,
"r_rows": 18,
"r_total_time_ms": "REPLACED",
"filtered": 0.5662,
"r_filtered": 38.889,
"filtered": 0.57,
"r_filtered": 38.89,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1228,8 +1228,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 5.6667,
"r_filtered": 14.286,
"filtered": 5.67,
"r_filtered": 14.29,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1275,7 +1275,7 @@ EXPLAIN
"key_length": "4",
"used_key_parts": ["l_receiptDATE"],
"rows": 18,
"filtered": 0.5662,
"filtered": 0.57,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1288,7 +1288,7 @@ EXPLAIN
"used_key_parts": ["o_orderkey"],
"ref": ["dbt3_s001.lineitem.l_orderkey"],
"rows": 1,
"filtered": 5.6667,
"filtered": 5.67,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1331,8 +1331,8 @@ ANALYZE
"rows": 18,
"r_rows": 18,
"r_total_time_ms": "REPLACED",
"filtered": 0.5662,
"r_filtered": 38.889,
"filtered": 0.57,
"r_filtered": 38.89,
"index_condition": "lineitem.l_receiptDATE between '1996-10-05' and '1996-10-10'",
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-10-10'"
},
......@@ -1348,8 +1348,8 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 5.6667,
"r_filtered": 14.286,
"filtered": 5.67,
"r_filtered": 14.29,
"attached_condition": "orders.o_totalprice between 200000 and 250000"
}
}
......@@ -1396,7 +1396,7 @@ EXPLAIN
"key_length": "9",
"used_key_parts": ["o_totaldiscount"],
"rows": 41,
"filtered": 3.3333,
"filtered": 3.33,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1414,7 +1414,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 3.0475,
"filtered": 3.05,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1451,8 +1451,8 @@ ANALYZE
"rows": 41,
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": 3.3333,
"r_filtered": 2.439,
"filtered": 3.33,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1473,8 +1473,8 @@ ANALYZE
"rows": 4,
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": 3.0475,
"r_filtered": 66.667,
"filtered": 3.05,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1517,7 +1517,7 @@ EXPLAIN
"key_length": "9",
"used_key_parts": ["o_totaldiscount"],
"rows": 41,
"filtered": 3.3333,
"filtered": 3.33,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1535,7 +1535,7 @@ EXPLAIN
"used_key_parts": ["l_orderkey"],
"ref": ["dbt3_s001.orders.o_orderkey"],
"rows": 4,
"filtered": 3.0475,
"filtered": 3.05,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1572,8 +1572,8 @@ ANALYZE
"rows": 41,
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": 3.3333,
"r_filtered": 2.439,
"filtered": 3.33,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000"
},
......@@ -1594,8 +1594,8 @@ ANALYZE
"rows": 4,
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": 3.0475,
"r_filtered": 66.667,
"filtered": 3.05,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1707,7 +1707,7 @@ ANALYZE
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 2.439,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000 and orders.o_orderDATE between '1992-12-01' and '1997-01-01'"
},
......@@ -1729,7 +1729,7 @@ ANALYZE
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 66.667,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -1838,7 +1838,7 @@ ANALYZE
"r_rows": 41,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 2.439,
"r_filtered": 2.44,
"index_condition": "orders.o_totaldiscount between 18000 and 20000",
"attached_condition": "orders.o_totalprice between 200000 and 220000 and orders.o_orderDATE between '1992-12-01' and '1997-01-01'"
},
......@@ -1860,7 +1860,7 @@ ANALYZE
"r_rows": 6,
"r_total_time_ms": "REPLACED",
"filtered": "REPLACED",
"r_filtered": 66.667,
"r_filtered": 66.67,
"attached_condition": "lineitem.l_shipDATE between '1996-10-01' and '1996-12-01'"
}
}
......@@ -2227,7 +2227,7 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 49.2,
"filtered": 49.20,
"r_filtered": 100,
"index_condition": "t1.nm like '500%'",
"attached_condition": "t1.fl2 = 0"
......@@ -2272,7 +2272,7 @@ ANALYZE
"rows": 1,
"r_rows": 1,
"r_total_time_ms": "REPLACED",
"filtered": 49.2,
"filtered": 49.20,
"r_filtered": 100,
"index_condition": "t1.nm like '500%'",
"attached_condition": "t1.fl2 = 0"
......@@ -2581,7 +2581,7 @@ EXPLAIN
}
},
"rows": 1,
"filtered": 3.1746,
"filtered": 3.17,
"attached_condition": "t1.f1 is null and t1.f2 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')"
}
}
......@@ -2608,7 +2608,7 @@ EXPLAIN
}
},
"rows": 1,
"filtered": 3.1746,
"filtered": 3.17,
"attached_condition": "t1.f1 is null and t1.f2 is null and (t1.f2 between 'a' and 'z' or t1.f1 = 'a')"
}
}
......@@ -3620,7 +3620,7 @@ ANALYZE
"rows": 24,
"r_rows": 80,
"r_total_time_ms": "REPLACED",
"filtered": 14.464,
"filtered": 14.46,
"r_filtered": 100
},
"buffer_type": "incremental",
......
sql/my_json_writer.cc
View file @ 1514387c
......@@ -217,7 +217,24 @@ void Json_writer::add_size(longlong val)
void Json_writer::add_double(double val)
{
char buf[64];
size_t len= my_snprintf(buf, sizeof(buf), "%lg", val);
size_t len;
if (((val - (longlong)val) < OPTIMIZER_DOUBLE_TO_INT_PRECISION)
|| (-((longlong)val - val) < OPTIMIZER_DOUBLE_TO_INT_PRECISION))
return Json_writer::add_ll((longlong)val);
if ( (val > OPTIMIZER_DOUBLE_TO_EXPONENT_VALUE)
||(-val > OPTIMIZER_DOUBLE_TO_EXPONENT_VALUE)
||(val > 0 && val < OPTIMIZER_DOUBLE_MIN_VALUE)
||(val < 0 && val > OPTIMIZER_DOUBLE_MIN_VALUE)
)
len= my_snprintf(buf, sizeof(buf), "%g", val);
else
#if OPTIMIZER_SHOW_DOUBLE_PRECISION
len= my_snprintf(buf, sizeof(buf), "%.*lf",
OPTIMIZER_DOUBLE_PRECISION, val);
#else
len= my_snprintf(buf, sizeof(buf), "%.*lg",
OPTIMIZER_DOUBLE_SIGNIFICANT_DIGITS, val);
#endif
add_unquoted_str(buf, len);
}
......
sql/my_json_writer.h
View file @ 1514387c
......@@ -40,6 +40,16 @@ class Opt_trace_context;
class Json_writer;
struct TABLE_LIST;
// See Json_writer::add_double() for usage
#define OPTIMIZER_SHOW_DOUBLE_PRECISION true
#if OPTIMIZER_SHOW_DOUBLE_PRECISION
# define OPTIMIZER_DOUBLE_PRECISION 2
# define OPTIMIZER_DOUBLE_MIN_VALUE 0.005
#else
# define OPTIMIZER_DOUBLE_SIGNIFICANT_DIGITS 6
#endif
#define OPTIMIZER_DOUBLE_TO_INT_PRECISION 0.00000001
#define OPTIMIZER_DOUBLE_TO_EXPONENT_VALUE 999999
/*
Single_line_formatting_helper is used by Json_writer to do better formatting
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7