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

feat(rust): introduce catalog interface for rust module #3300

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions rust/lance-arrow/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -930,10 +930,7 @@ mod tests {
DataType::Struct(fields.clone()),
false,
)]);
let children = types
.iter()
.map(|ty| new_empty_array(ty))
.collect::<Vec<_>>();
let children = types.iter().map(new_empty_array).collect::<Vec<_>>();
let batch = RecordBatch::try_new(
Arc::new(schema.clone()),
vec![Arc::new(StructArray::new(fields, children, None)) as ArrayRef],
Expand Down
10 changes: 10 additions & 0 deletions rust/lance/src/catalog.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright The Lance Authors

pub(crate) mod catalog_trait;
pub(crate) mod dataset_identifier;
pub(crate) mod namespace;

pub use catalog_trait::Catalog;
pub use dataset_identifier::DatasetIdentifier;
pub use namespace::Namespace;
95 changes: 95 additions & 0 deletions rust/lance/src/catalog/catalog_trait.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright The Lance Authors

use crate::catalog::dataset_identifier::DatasetIdentifier;
use crate::catalog::namespace::Namespace;
use crate::dataset::Dataset;
use std::collections::{HashMap, HashSet};

pub trait Catalog {
/// Initialize the catalog.
fn initialize(&self, name: &str, properties: &HashMap<&str, &str>) -> Result<(), String>;

/// List all datasets under a specified namespace.
fn list_datasets(&self, namespace: &Namespace) -> Vec<DatasetIdentifier>;

/// Create a new dataset in the catalog.
fn create_dataset(
Copy link
Contributor

Choose a reason for hiding this comment

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

I think using register_dataset interface to register an existed lance dataset is also needed.

&self,
identifier: &DatasetIdentifier,
location: &str,
) -> Result<Dataset, String>;

/// Check if a dataset exists in the catalog.
fn dataset_exists(&self, identifier: &DatasetIdentifier) -> bool;

/// Drop a dataset from the catalog.
fn drop_dataset(&self, identifier: &DatasetIdentifier) -> Result<(), String>;

/// Drop a dataset from the catalog and purge the metadata.
fn drop_dataset_with_purge(
&self,
identifier: &DatasetIdentifier,
purge: &bool,
) -> Result<(), String>;

/// Rename a dataset in the catalog.
fn rename_dataset(
&self,
from: &DatasetIdentifier,
to: &DatasetIdentifier,
) -> Result<(), String>;

/// Load a dataset from the catalog.
fn load_dataset(&self, name: &DatasetIdentifier) -> Result<Dataset, String>;

/// Invalidate cached table metadata from current catalog.
fn invalidate_dataset(&self, identifier: &DatasetIdentifier) -> Result<(), String>;

/// Register a dataset in the catalog.
fn register_dataset(&self, identifier: &DatasetIdentifier) -> Result<Dataset, String>;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @SaintBacchus it's here


/// Create a namespace in the catalog.
fn create_namespace(
&self,
namespace: &Namespace,
metadata: HashMap<String, String>,
) -> Result<(), String>;

/// List top-level namespaces from the catalog.
fn list_namespaces(&self) -> Vec<Namespace> {
self.list_child_namespaces(&Namespace::empty())
.unwrap_or_default()
}

/// List child namespaces from the namespace.
fn list_child_namespaces(&self, namespace: &Namespace) -> Result<Vec<Namespace>, String>;

/// Load metadata properties for a namespace.
fn load_namespace_metadata(
&self,
namespace: &Namespace,
) -> Result<HashMap<String, String>, String>;

/// Drop a namespace.
fn drop_namespace(&self, namespace: &Namespace) -> Result<bool, String>;

/// Set a collection of properties on a namespace in the catalog.
fn set_properties(
&self,
namespace: &Namespace,
properties: HashMap<String, String>,
) -> Result<bool, String>;

/// Remove a set of property keys from a namespace in the catalog.
fn remove_properties(
&self,
namespace: &Namespace,
properties: HashSet<String>,
) -> Result<bool, String>;

/// Checks whether the Namespace exists.
fn namespace_exists(&self, namespace: &Namespace) -> bool {
self.load_namespace_metadata(namespace).is_ok()
}
}
171 changes: 171 additions & 0 deletions rust/lance/src/catalog/dataset_identifier.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright The Lance Authors

use crate::catalog::namespace::Namespace;
use std::fmt;
use std::hash::{Hash, Hasher};

#[derive(Clone, Debug)]
pub struct DatasetIdentifier {
namespace: Namespace,
name: String,
}

impl DatasetIdentifier {
pub fn of(names: &[&str]) -> Self {
assert!(
!names.is_empty(),
"Cannot create dataset identifier without a dataset name"
);
let namespace = Namespace::of(&names[..names.len() - 1]);
let name = names[names.len() - 1].to_string();
Self { namespace, name }
}

pub fn of_namespace(namespace: Namespace, name: &str) -> Self {
assert!(!name.is_empty(), "Invalid dataset name: null or empty");
Self {
namespace,
name: name.to_string(),
}
}

pub fn parse(identifier: &str) -> Self {
let parts: Vec<&str> = identifier.split('.').collect();
Self::of(&parts)
}

pub fn has_namespace(&self) -> bool {
!self.namespace.is_empty()
}

pub fn namespace(&self) -> &Namespace {
&self.namespace
}

pub fn name(&self) -> &str {
&self.name
}

pub fn to_lowercase(&self) -> Self {
let new_levels: Vec<String> = self
.namespace
.levels()
.iter()
.map(|s| s.to_lowercase())
.collect();
let new_name = self.name.to_lowercase();
Self::of_namespace(
Namespace::of(&new_levels.iter().map(String::as_str).collect::<Vec<&str>>()),
&new_name,
)
}
}

impl PartialEq for DatasetIdentifier {
fn eq(&self, other: &Self) -> bool {
self.namespace == other.namespace && self.name == other.name
}
}

impl Eq for DatasetIdentifier {}

impl Hash for DatasetIdentifier {
fn hash<H: Hasher>(&self, state: &mut H) {
self.namespace.hash(state);
self.name.hash(state);
}
}

impl fmt::Display for DatasetIdentifier {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if self.has_namespace() {
write!(f, "{}.{}", self.namespace, self.name)
} else {
write!(f, "{}", self.name)
}
}
}

#[cfg(test)]
mod tests {
use super::*;
use std::hash::DefaultHasher;

#[test]
fn test_dataset_identifier_of() {
let ds_id = DatasetIdentifier::of(&["namespace1", "namespace2", "dataset"]);
assert_eq!(
ds_id.namespace().levels(),
&vec!["namespace1".to_string(), "namespace2".to_string()]
);
assert_eq!(ds_id.name(), "dataset");
}

#[test]
fn test_dataset_identifier_of_namespace() {
let namespace = Namespace::of(&["namespace1", "namespace2"]);
let ds_id = DatasetIdentifier::of_namespace(namespace.clone(), "dataset");
assert_eq!(ds_id.namespace(), &namespace);
assert_eq!(ds_id.name(), "dataset");
}

#[test]
fn test_dataset_identifier_parse() {
let ds_id = DatasetIdentifier::parse("namespace1.namespace2.dataset");
assert_eq!(
ds_id.namespace().levels(),
&vec!["namespace1".to_string(), "namespace2".to_string()]
);
assert_eq!(ds_id.name(), "dataset");
}

#[test]
fn test_dataset_identifier_has_namespace() {
let ds_id = DatasetIdentifier::parse("namespace1.namespace2.dataset");
assert!(ds_id.has_namespace());

let ds_id_no_ns = DatasetIdentifier::of(&["dataset"]);
assert!(!ds_id_no_ns.has_namespace());
}

#[test]
fn test_dataset_identifier_to_lowercase() {
let ds_id = DatasetIdentifier::parse("Namespace1.Namespace2.Dataset");
let lower_ds_id = ds_id.to_lowercase();
assert_eq!(
lower_ds_id.namespace().levels(),
&vec!["namespace1".to_string(), "namespace2".to_string()]
);
assert_eq!(lower_ds_id.name(), "dataset");
}

#[test]
fn test_dataset_identifier_equality() {
let ds_id1 = DatasetIdentifier::parse("namespace1.namespace2.dataset");
let ds_id2 = DatasetIdentifier::parse("namespace1.namespace2.dataset");
let ds_id3 = DatasetIdentifier::parse("namespace1.namespace2.other_dataset");
assert_eq!(ds_id1, ds_id2);
assert_ne!(ds_id1, ds_id3);
}

#[test]
fn test_dataset_identifier_hash() {
let ds_id1 = DatasetIdentifier::parse("namespace1.namespace2.dataset");
let ds_id2 = DatasetIdentifier::parse("namespace1.namespace2.dataset");
let mut hasher1 = DefaultHasher::new();
ds_id1.hash(&mut hasher1);
let mut hasher2 = DefaultHasher::new();
ds_id2.hash(&mut hasher2);
assert_eq!(hasher1.finish(), hasher2.finish());
}

#[test]
fn test_dataset_identifier_display() {
let ds_id = DatasetIdentifier::parse("namespace1.namespace2.dataset");
assert_eq!(format!("{}", ds_id), "namespace1.namespace2.dataset");

let ds_id_no_ns = DatasetIdentifier::of(&["dataset"]);
assert_eq!(format!("{}", ds_id_no_ns), "dataset");
}
}
Loading
Loading