Skip to content

chore: use Arc::unwrap_or_clone in more places#21823

Open
Dandandan wants to merge 1 commit intoapache:mainfrom
Dandandan:use-arc-unwrap-or-clone
Open

chore: use Arc::unwrap_or_clone in more places#21823
Dandandan wants to merge 1 commit intoapache:mainfrom
Dandandan:use-arc-unwrap-or-clone

Conversation

@Dandandan
Copy link
Copy Markdown
Contributor

@Dandandan Dandandan commented Apr 24, 2026

Which issue does this PR close?

  • Closes #.

Rationale for this change

Avoid deep-copying values behind Arc when the Arc is uniquely owned by using Arc::unwrap_or_clone.

What changes are included in this PR?

Replaces several owned Arc pointee clones with Arc::unwrap_or_clone, including logical plans, schemas, fields, expressions, and statistics.

Are these changes tested?

Are there any user-facing changes?

No.

@github-actions github-actions Bot added sql SQL Planner logical-expr Logical plan and expressions optimizer Optimizer rules core Core DataFusion crate substrait Changes to the substrait crate datasource Changes to the datasource crate ffi Changes to the ffi crate physical-plan Changes to the physical-plan crate labels Apr 24, 2026
@Dandandan
Copy link
Copy Markdown
Contributor Author

run benchmark sql_planner

@adriangbot
Copy link
Copy Markdown

🤖 Criterion benchmark running (GKE) | trigger
Instance: c4a-highmem-16 (12 vCPU / 65 GiB) | Linux bench-c4311430624-1807-fxxr6 6.12.55+ #1 SMP Sun Feb 1 08:59:41 UTC 2026 aarch64 GNU/Linux

CPU Details (lscpu)
Architecture:                            aarch64
CPU op-mode(s):                          64-bit
Byte Order:                              Little Endian
CPU(s):                                  16
On-line CPU(s) list:                     0-15
Vendor ID:                               ARM
Model name:                              Neoverse-V2
Model:                                   1
Thread(s) per core:                      1
Core(s) per cluster:                     16
Socket(s):                               -
Cluster(s):                              1
Stepping:                                r0p1
BogoMIPS:                                2000.00
Flags:                                   fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm sb paca pacg dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh rng bti
L1d cache:                               1 MiB (16 instances)
L1i cache:                               1 MiB (16 instances)
L2 cache:                                32 MiB (16 instances)
L3 cache:                                80 MiB (1 instance)
NUMA node(s):                            1
NUMA node0 CPU(s):                       0-15
Vulnerability Gather data sampling:      Not affected
Vulnerability Indirect target selection: Not affected
Vulnerability Itlb multihit:             Not affected
Vulnerability L1tf:                      Not affected
Vulnerability Mds:                       Not affected
Vulnerability Meltdown:                  Not affected
Vulnerability Mmio stale data:           Not affected
Vulnerability Reg file data sampling:    Not affected
Vulnerability Retbleed:                  Not affected
Vulnerability Spec rstack overflow:      Not affected
Vulnerability Spec store bypass:         Mitigation; Speculative Store Bypass disabled via prctl
Vulnerability Spectre v1:                Mitigation; __user pointer sanitization
Vulnerability Spectre v2:                Mitigation; CSV2, BHB
Vulnerability Srbds:                     Not affected
Vulnerability Tsa:                       Not affected
Vulnerability Tsx async abort:           Not affected
Vulnerability Vmscape:                   Not affected

Comparing use-arc-unwrap-or-clone (b1d45ba) to 067ba4b (merge-base) diff
BENCH_NAME=sql_planner
BENCH_COMMAND=cargo bench --features=parquet --bench sql_planner
BENCH_FILTER=
Results will be posted here when complete


File an issue against this benchmark runner

@adriangbot
Copy link
Copy Markdown

🤖 Criterion benchmark completed (GKE) | trigger

Instance: c4a-highmem-16 (12 vCPU / 65 GiB)

CPU Details (lscpu)
Architecture:                            aarch64
CPU op-mode(s):                          64-bit
Byte Order:                              Little Endian
CPU(s):                                  16
On-line CPU(s) list:                     0-15
Vendor ID:                               ARM
Model name:                              Neoverse-V2
Model:                                   1
Thread(s) per core:                      1
Core(s) per cluster:                     16
Socket(s):                               -
Cluster(s):                              1
Stepping:                                r0p1
BogoMIPS:                                2000.00
Flags:                                   fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm sb paca pacg dcpodp sve2 sveaes svepmull svebitperm svesha3 svesm4 flagm2 frint svei8mm svebf16 i8mm bf16 dgh rng bti
L1d cache:                               1 MiB (16 instances)
L1i cache:                               1 MiB (16 instances)
L2 cache:                                32 MiB (16 instances)
L3 cache:                                80 MiB (1 instance)
NUMA node(s):                            1
NUMA node0 CPU(s):                       0-15
Vulnerability Gather data sampling:      Not affected
Vulnerability Indirect target selection: Not affected
Vulnerability Itlb multihit:             Not affected
Vulnerability L1tf:                      Not affected
Vulnerability Mds:                       Not affected
Vulnerability Meltdown:                  Not affected
Vulnerability Mmio stale data:           Not affected
Vulnerability Reg file data sampling:    Not affected
Vulnerability Retbleed:                  Not affected
Vulnerability Spec rstack overflow:      Not affected
Vulnerability Spec store bypass:         Mitigation; Speculative Store Bypass disabled via prctl
Vulnerability Spectre v1:                Mitigation; __user pointer sanitization
Vulnerability Spectre v2:                Mitigation; CSV2, BHB
Vulnerability Srbds:                     Not affected
Vulnerability Tsa:                       Not affected
Vulnerability Tsx async abort:           Not affected
Vulnerability Vmscape:                   Not affected
Details

group                                                 main                                   use-arc-unwrap-or-clone
-----                                                 ----                                   -----------------------
logical_aggregate_with_join                           1.01    415.1±0.84µs        ? ?/sec    1.00    411.4±0.89µs        ? ?/sec
logical_plan_struct_join_agg_sort                     1.06    175.9±1.31µs        ? ?/sec    1.00    165.2±0.81µs        ? ?/sec
logical_select_all_from_1000                          1.05      8.4±0.04ms        ? ?/sec    1.00      8.0±0.02ms        ? ?/sec
logical_select_one_from_700                           1.01    273.4±1.17µs        ? ?/sec    1.00    270.9±1.19µs        ? ?/sec
logical_trivial_join_high_numbered_columns            1.01    253.5±0.79µs        ? ?/sec    1.00    251.6±0.92µs        ? ?/sec
logical_trivial_join_low_numbered_columns             1.00    240.7±0.87µs        ? ?/sec    1.00    240.3±0.76µs        ? ?/sec
physical_intersection                                 1.04    573.2±1.32µs        ? ?/sec    1.00    552.7±2.66µs        ? ?/sec
physical_join_consider_sort                           1.02   1018.9±4.92µs        ? ?/sec    1.00   1000.9±2.75µs        ? ?/sec
physical_join_distinct                                1.01    236.0±0.81µs        ? ?/sec    1.00    233.4±0.90µs        ? ?/sec
physical_many_self_joins                              1.01      7.7±0.04ms        ? ?/sec    1.00      7.6±0.03ms        ? ?/sec
physical_plan_clickbench_all                          1.02    128.6±0.41ms        ? ?/sec    1.00    126.2±0.37ms        ? ?/sec
physical_plan_clickbench_q1                           1.03   1347.8±7.14µs        ? ?/sec    1.00   1313.9±5.84µs        ? ?/sec
physical_plan_clickbench_q10                          1.02      2.0±0.01ms        ? ?/sec    1.00   1999.9±5.26µs        ? ?/sec
physical_plan_clickbench_q11                          1.02      2.2±0.01ms        ? ?/sec    1.00      2.2±0.01ms        ? ?/sec
physical_plan_clickbench_q12                          1.00      2.3±0.01ms        ? ?/sec    1.00      2.3±0.01ms        ? ?/sec
physical_plan_clickbench_q13                          1.00      2.0±0.01ms        ? ?/sec    1.00      2.0±0.01ms        ? ?/sec
physical_plan_clickbench_q14                          1.00      2.2±0.01ms        ? ?/sec    1.00      2.2±0.01ms        ? ?/sec
physical_plan_clickbench_q15                          1.02      2.1±0.02ms        ? ?/sec    1.00      2.1±0.01ms        ? ?/sec
physical_plan_clickbench_q16                          1.00   1738.1±5.50µs        ? ?/sec    1.00  1732.0±10.22µs        ? ?/sec
physical_plan_clickbench_q17                          1.03  1791.3±10.36µs        ? ?/sec    1.00   1747.5±5.84µs        ? ?/sec
physical_plan_clickbench_q18                          1.00   1600.1±5.30µs        ? ?/sec    1.00  1594.7±21.16µs        ? ?/sec
physical_plan_clickbench_q19                          1.00   1987.1±6.10µs        ? ?/sec    1.01      2.0±0.01ms        ? ?/sec
physical_plan_clickbench_q2                           1.02   1765.0±5.28µs        ? ?/sec    1.00   1722.0±5.54µs        ? ?/sec
physical_plan_clickbench_q20                          1.00   1503.9±5.93µs        ? ?/sec    1.00   1501.9±5.68µs        ? ?/sec
physical_plan_clickbench_q21                          1.00   1746.8±5.95µs        ? ?/sec    1.00   1740.6±5.63µs        ? ?/sec
physical_plan_clickbench_q22                          1.00      2.2±0.02ms        ? ?/sec    1.00      2.2±0.01ms        ? ?/sec
physical_plan_clickbench_q23                          1.00      2.4±0.01ms        ? ?/sec    1.02      2.4±0.01ms        ? ?/sec
physical_plan_clickbench_q24                          1.00      5.6±0.01ms        ? ?/sec    1.03      5.8±0.02ms        ? ?/sec
physical_plan_clickbench_q25                          1.00  1883.4±10.54µs        ? ?/sec    1.01   1910.9±5.20µs        ? ?/sec
physical_plan_clickbench_q26                          1.00   1719.4±5.68µs        ? ?/sec    1.01   1736.9±5.21µs        ? ?/sec
physical_plan_clickbench_q27                          1.00   1921.1±6.88µs        ? ?/sec    1.00   1930.6±4.26µs        ? ?/sec
physical_plan_clickbench_q28                          1.00      2.4±0.01ms        ? ?/sec    1.00      2.4±0.01ms        ? ?/sec
physical_plan_clickbench_q29                          1.00      2.6±0.01ms        ? ?/sec    1.00      2.6±0.01ms        ? ?/sec
physical_plan_clickbench_q3                           1.04   1623.6±6.32µs        ? ?/sec    1.00   1566.2±7.15µs        ? ?/sec
physical_plan_clickbench_q30                          1.00     16.4±0.03ms        ? ?/sec    1.00     16.4±0.03ms        ? ?/sec
physical_plan_clickbench_q31                          1.00      2.5±0.01ms        ? ?/sec    1.01      2.5±0.01ms        ? ?/sec
physical_plan_clickbench_q32                          1.00      2.5±0.01ms        ? ?/sec    1.01      2.5±0.01ms        ? ?/sec
physical_plan_clickbench_q33                          1.00   1991.3±7.21µs        ? ?/sec    1.00   1999.3±5.68µs        ? ?/sec
physical_plan_clickbench_q34                          1.00   1743.8±8.85µs        ? ?/sec    1.00   1750.7±6.94µs        ? ?/sec
physical_plan_clickbench_q35                          1.02   1813.6±6.27µs        ? ?/sec    1.00   1776.8±5.96µs        ? ?/sec
physical_plan_clickbench_q36                          1.02      2.1±0.01ms        ? ?/sec    1.00      2.1±0.01ms        ? ?/sec
physical_plan_clickbench_q37                          1.01      2.6±0.01ms        ? ?/sec    1.00      2.6±0.01ms        ? ?/sec
physical_plan_clickbench_q38                          1.01      2.6±0.01ms        ? ?/sec    1.00      2.6±0.01ms        ? ?/sec
physical_plan_clickbench_q39                          1.01      2.7±0.01ms        ? ?/sec    1.00      2.6±0.01ms        ? ?/sec
physical_plan_clickbench_q4                           1.03   1416.3±4.83µs        ? ?/sec    1.00   1381.7±6.49µs        ? ?/sec
physical_plan_clickbench_q40                          1.01      3.5±0.01ms        ? ?/sec    1.00      3.4±0.01ms        ? ?/sec
physical_plan_clickbench_q41                          1.01      2.9±0.02ms        ? ?/sec    1.00      2.9±0.01ms        ? ?/sec
physical_plan_clickbench_q42                          1.00      3.1±0.01ms        ? ?/sec    1.01      3.1±0.01ms        ? ?/sec
physical_plan_clickbench_q43                          1.00      3.2±0.01ms        ? ?/sec    1.00      3.2±0.01ms        ? ?/sec
physical_plan_clickbench_q44                          1.01  1513.2±20.26µs        ? ?/sec    1.00  1500.2±12.04µs        ? ?/sec
physical_plan_clickbench_q45                          1.03  1530.1±14.63µs        ? ?/sec    1.00   1491.0±5.79µs        ? ?/sec
physical_plan_clickbench_q46                          1.03  1875.5±10.23µs        ? ?/sec    1.00   1821.6±5.99µs        ? ?/sec
physical_plan_clickbench_q47                          1.03      2.7±0.03ms        ? ?/sec    1.00      2.6±0.01ms        ? ?/sec
physical_plan_clickbench_q48                          1.02      2.8±0.01ms        ? ?/sec    1.00      2.8±0.01ms        ? ?/sec
physical_plan_clickbench_q49                          1.03      2.9±0.02ms        ? ?/sec    1.00      2.9±0.01ms        ? ?/sec
physical_plan_clickbench_q5                           1.03   1562.8±5.34µs        ? ?/sec    1.00  1524.0±11.68µs        ? ?/sec
physical_plan_clickbench_q50                          1.03      2.9±0.02ms        ? ?/sec    1.00      2.8±0.02ms        ? ?/sec
physical_plan_clickbench_q51                          1.03   1968.5±9.74µs        ? ?/sec    1.00   1919.9±9.32µs        ? ?/sec
physical_plan_clickbench_q6                           1.03   1577.2±5.30µs        ? ?/sec    1.00   1536.2±7.47µs        ? ?/sec
physical_plan_clickbench_q7                           1.03   1615.5±5.94µs        ? ?/sec    1.00   1567.9±5.20µs        ? ?/sec
physical_plan_clickbench_q8                           1.03   1926.8±5.40µs        ? ?/sec    1.00   1875.7±5.87µs        ? ?/sec
physical_plan_clickbench_q9                           1.01   1900.3±7.55µs        ? ?/sec    1.00   1874.8±5.86µs        ? ?/sec
physical_plan_struct_join_agg_sort                    1.03  1344.7±11.54µs        ? ?/sec    1.00   1305.6±2.05µs        ? ?/sec
physical_plan_tpcds_all                               1.02    742.2±2.05ms        ? ?/sec    1.00    726.5±7.58ms        ? ?/sec
physical_plan_tpch_all                                1.02     48.6±0.88ms        ? ?/sec    1.00     47.6±0.08ms        ? ?/sec
physical_plan_tpch_q1                                 1.01   1539.2±2.67µs        ? ?/sec    1.00   1517.5±3.69µs        ? ?/sec
physical_plan_tpch_q10                                1.01      2.9±0.00ms        ? ?/sec    1.00      2.9±0.01ms        ? ?/sec
physical_plan_tpch_q11                                1.02      2.5±0.00ms        ? ?/sec    1.00      2.5±0.01ms        ? ?/sec
physical_plan_tpch_q12                                1.01   1283.1±2.38µs        ? ?/sec    1.00   1269.8±2.20µs        ? ?/sec
physical_plan_tpch_q13                                1.00    973.9±2.38µs        ? ?/sec    1.00    977.2±2.06µs        ? ?/sec
physical_plan_tpch_q14                                1.02   1397.3±3.44µs        ? ?/sec    1.00   1376.1±2.60µs        ? ?/sec
physical_plan_tpch_q16                                1.01   1628.6±2.50µs        ? ?/sec    1.00   1615.0±2.46µs        ? ?/sec
physical_plan_tpch_q17                                1.02   1756.4±4.23µs        ? ?/sec    1.00   1727.8±4.07µs        ? ?/sec
physical_plan_tpch_q18                                1.00   1858.7±3.56µs        ? ?/sec    1.01  1872.6±11.29µs        ? ?/sec
physical_plan_tpch_q19                                1.03      2.4±0.01ms        ? ?/sec    1.00      2.4±0.00ms        ? ?/sec
physical_plan_tpch_q2                                 1.00      4.3±0.01ms        ? ?/sec    1.00      4.3±0.03ms        ? ?/sec
physical_plan_tpch_q20                                1.01      2.3±0.01ms        ? ?/sec    1.00      2.3±0.00ms        ? ?/sec
physical_plan_tpch_q21                                1.00      3.1±0.00ms        ? ?/sec    1.00      3.1±0.01ms        ? ?/sec
physical_plan_tpch_q22                                1.03      2.0±0.02ms        ? ?/sec    1.00   1981.8±2.63µs        ? ?/sec
physical_plan_tpch_q3                                 1.01   1981.7±3.23µs        ? ?/sec    1.00   1969.3±6.38µs        ? ?/sec
physical_plan_tpch_q4                                 1.02   1153.5±2.58µs        ? ?/sec    1.00   1133.4±3.83µs        ? ?/sec
physical_plan_tpch_q5                                 1.02      2.6±0.01ms        ? ?/sec    1.00      2.5±0.00ms        ? ?/sec
physical_plan_tpch_q6                                 1.05    664.9±2.17µs        ? ?/sec    1.00    632.5±2.20µs        ? ?/sec
physical_plan_tpch_q7                                 1.02      3.2±0.01ms        ? ?/sec    1.00      3.1±0.01ms        ? ?/sec
physical_plan_tpch_q8                                 1.02      4.2±0.01ms        ? ?/sec    1.00      4.1±0.01ms        ? ?/sec
physical_plan_tpch_q9                                 1.02      2.9±0.00ms        ? ?/sec    1.00      2.9±0.02ms        ? ?/sec
physical_select_aggregates_from_200                   1.00     14.5±0.03ms        ? ?/sec    1.01     14.6±0.03ms        ? ?/sec
physical_select_all_from_1000                         1.03     18.1±0.06ms        ? ?/sec    1.00     17.5±0.04ms        ? ?/sec
physical_select_one_from_700                          1.04    731.6±6.45µs        ? ?/sec    1.00    702.7±2.20µs        ? ?/sec
physical_sorted_union_order_by_10_int64               1.01      4.7±0.01ms        ? ?/sec    1.00      4.7±0.01ms        ? ?/sec
physical_sorted_union_order_by_10_uint64              1.01     11.4±0.04ms        ? ?/sec    1.00     11.3±0.03ms        ? ?/sec
physical_sorted_union_order_by_50_int64               1.00    113.2±0.22ms        ? ?/sec    1.00    113.1±0.25ms        ? ?/sec
physical_sorted_union_order_by_50_uint64              1.01    605.6±1.60ms        ? ?/sec    1.00    602.4±8.07ms        ? ?/sec
physical_theta_join_consider_sort                     1.01   1041.4±6.91µs        ? ?/sec    1.00   1032.4±2.57µs        ? ?/sec
physical_unnest_to_join                               1.01   1198.1±6.58µs        ? ?/sec    1.00   1182.7±3.36µs        ? ?/sec
physical_window_function_partition_by_12_on_values    1.02    736.4±2.40µs        ? ?/sec    1.00    719.6±1.57µs        ? ?/sec
physical_window_function_partition_by_30_on_values    1.01   1476.1±8.87µs        ? ?/sec    1.00   1456.7±4.04µs        ? ?/sec
physical_window_function_partition_by_4_on_values     1.04    442.3±1.58µs        ? ?/sec    1.00    423.3±1.12µs        ? ?/sec
physical_window_function_partition_by_7_on_values     1.04    551.1±1.40µs        ? ?/sec    1.00    531.9±1.50µs        ? ?/sec
physical_window_function_partition_by_8_on_values     1.03    592.6±1.94µs        ? ?/sec    1.00    575.1±1.58µs        ? ?/sec
with_param_values_many_columns                        1.00    458.8±2.57µs        ? ?/sec    1.00    459.1±3.36µs        ? ?/sec

Resource Usage

base (merge-base)

Metric Value
Wall time 1250.3s
Peak memory 19.7 GiB
Avg memory 19.7 GiB
CPU user 1493.2s
CPU sys 1.8s
Peak spill 0 B

branch

Metric Value
Wall time 1255.3s
Peak memory 19.7 GiB
Avg memory 19.7 GiB
CPU user 1495.2s
CPU sys 1.3s
Peak spill 0 B

File an issue against this benchmark runner

@Dandandan
Copy link
Copy Markdown
Contributor Author

@neilconway FYI

Copy link
Copy Markdown
Contributor

@neilconway neilconway left a comment

Choose a reason for hiding this comment

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

Nice! lgtm

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

Labels

core Core DataFusion crate datasource Changes to the datasource crate ffi Changes to the ffi crate logical-expr Logical plan and expressions optimizer Optimizer rules physical-plan Changes to the physical-plan crate sql SQL Planner substrait Changes to the substrait crate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants