Skip to content

refactor: replace OnceLock with LazyLock #13641

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

Merged
comphead merged 2 commits into from
Dec 4, 2024
Merged

refactor: replace OnceLock with LazyLock #13641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3946812
refactor: Replace OnceLock with LazyLock
jonahgao Dec 4, 2024
5968564
Fix typo
jonahgao Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions datafusion/common/src/types/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
// under the License.

use crate::types::{LogicalTypeRef, NativeType};
use std::sync::{Arc, OnceLock};
use std::sync::{Arc, LazyLock};

macro_rules! singleton {
($name:ident, $getter:ident, $ty:ident) => {
// TODO: Use LazyLock instead of getter function when MSRV gets bumped
static $name: OnceLock<LogicalTypeRef> = OnceLock::new();
static $name: LazyLock<LogicalTypeRef> =
LazyLock::new(|| Arc::new(NativeType::$ty));

#[doc = "Getter for singleton instance of a logical type representing"]
#[doc = concat!("[`NativeType::", stringify!($ty), "`].")]
pub fn $getter() -> LogicalTypeRef {
Copy link
Member Author

@jonahgao jonahgao Dec 4, 2024

Choose a reason for hiding this comment

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

Current callers require a LogicalTypeRef, so this getter still seems to be needed.

Arc::clone($name.get_or_init(|| Arc::new(NativeType::$ty)))
Arc::clone(&$name)
}
};
}
Expand Down
12 changes: 6 additions & 6 deletions datafusion/expr/src/logical_plan/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,10 @@
use arrow::datatypes::DataType;
use datafusion_common::{DFSchema, DFSchemaRef};
use std::fmt::{self, Display};
use std::sync::{Arc, OnceLock};
use std::sync::{Arc, LazyLock};

use crate::{expr_vec_fmt, Expr, LogicalPlan};

/// Statements have a unchanging empty schema.
/// TODO: Use `LazyLock` when MSRV is 1.80.0
static STATEMENT_EMPTY_SCHEMA: OnceLock<DFSchemaRef> = OnceLock::new();

/// Various types of Statements.
///
/// # Transactions:
Expand Down Expand Up @@ -54,7 +50,11 @@ pub enum Statement {
impl Statement {
/// Get a reference to the logical plan's schema
pub fn schema(&self) -> &DFSchemaRef {
STATEMENT_EMPTY_SCHEMA.get_or_init(|| Arc::new(DFSchema::empty()))
// Statements have an unchanging empty schema.
static STATEMENT_EMPTY_SCHEMA: LazyLock<DFSchemaRef> =
LazyLock::new(|| Arc::new(DFSchema::empty()));

&STATEMENT_EMPTY_SCHEMA
}

/// Return a descriptive string describing the type of this
Expand Down