1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
use std::collections::HashMap;
use anyhow::anyhow;
use async_trait::async_trait;
use aws_sdk_s3tables::operation::create_table::CreateTableOutput;
use aws_sdk_s3tables::operation::get_namespace::GetNamespaceOutput;
use aws_sdk_s3tables::operation::get_table::GetTableOutput;
use aws_sdk_s3tables::operation::list_tables::ListTablesOutput;
use aws_sdk_s3tables::types::OpenTableFormat;
use iceberg::io::FileIO;
use iceberg::spec::{TableMetadata, TableMetadataBuilder};
use iceberg::table::Table;
use iceberg::{
Catalog, Error, ErrorKind, Namespace, NamespaceIdent, Result, TableCommit, TableCreation,
TableIdent,
};
use typed_builder::TypedBuilder;
use crate::utils::{create_metadata_location, create_sdk_config};
/// S3Tables catalog configuration.
#[derive(Debug, TypedBuilder)]
pub struct S3TablesCatalogConfig {
/// Unlike other buckets, S3Tables bucket is not a physical bucket, but a virtual bucket
/// that is managed by s3tables. We can't directly access the bucket with path like
/// s3://{bucket_name}/{file_path}, all the operations are done with respect of the bucket
/// ARN.
table_bucket_arn: String,
/// Properties for the catalog. The available properties are:
/// - `profile_name`: The name of the AWS profile to use.
/// - `region_name`: The AWS region to use.
/// - `aws_access_key_id`: The AWS access key ID to use.
/// - `aws_secret_access_key`: The AWS secret access key to use.
/// - `aws_session_token`: The AWS session token to use.
#[builder(default)]
properties: HashMap<String, String>,
/// Endpoint URL for the catalog.
#[builder(default, setter(strip_option(fallback = endpoint_url_opt)))]
endpoint_url: Option<String>,
}
/// S3Tables catalog implementation.
#[derive(Debug)]
pub struct S3TablesCatalog {
config: S3TablesCatalogConfig,
s3tables_client: aws_sdk_s3tables::Client,
file_io: FileIO,
}
impl S3TablesCatalog {
/// Creates a new S3Tables catalog.
pub async fn new(config: S3TablesCatalogConfig) -> Result<Self> {
let aws_config = create_sdk_config(&config.properties, config.endpoint_url.clone()).await;
let s3tables_client = aws_sdk_s3tables::Client::new(&aws_config);
// parse bucket name from ARN format like: arn:aws:s3:<region>:<account>:bucket/<bucket_name>
let bucket_name = config
.table_bucket_arn
.rsplit(":bucket/")
.next()
.ok_or_else(|| {
Error::new(
ErrorKind::DataInvalid,
format!("Invalid bucket ARN format: {}", config.table_bucket_arn),
)
})?;
let file_io = FileIO::from_path(&format!("s3://{}", bucket_name))?
.with_props(&config.properties)
.build()?;
Ok(Self {
config,
s3tables_client,
file_io,
})
}
}
#[async_trait]
impl Catalog for S3TablesCatalog {
/// List namespaces from s3tables catalog.
///
/// S3Tables doesn't support nested namespaces. If parent is provided, it will
/// return an empty list.
async fn list_namespaces(
&self,
parent: Option<&NamespaceIdent>,
) -> Result<Vec<NamespaceIdent>> {
if parent.is_some() {
return Ok(vec![]);
}
let mut result = Vec::new();
let mut continuation_token = None;
loop {
let mut req = self
.s3tables_client
.list_namespaces()
.table_bucket_arn(self.config.table_bucket_arn.clone());
if let Some(token) = continuation_token {
req = req.continuation_token(token);
}
let resp = req.send().await.map_err(from_aws_sdk_error)?;
for ns in resp.namespaces() {
result.push(NamespaceIdent::from_vec(ns.namespace().to_vec())?);
}
continuation_token = resp.continuation_token().map(|s| s.to_string());
if continuation_token.is_none() {
break;
}
}
Ok(result)
}
/// Creates a new namespace with the given identifier and properties.
///
/// Attempts to create a namespace defined by the `namespace`. The `properties`
/// parameter is ignored.
///
/// The following naming rules apply to namespaces:
///
/// - Names must be between 3 (min) and 63 (max) characters long.
/// - Names can consist only of lowercase letters, numbers, and underscores (_).
/// - Names must begin and end with a letter or number.
/// - Names must not contain hyphens (-) or periods (.).
///
/// This function can return an error in the following situations:
///
/// - Errors from the underlying database creation process, converted using
/// `from_aws_sdk_error`.
async fn create_namespace(
&self,
namespace: &NamespaceIdent,
_properties: HashMap<String, String>,
) -> Result<Namespace> {
let req = self
.s3tables_client
.create_namespace()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string());
req.send().await.map_err(from_aws_sdk_error)?;
Ok(Namespace::with_properties(
namespace.clone(),
HashMap::new(),
))
}
/// Retrieves a namespace by its identifier.
///
/// Validates the given namespace identifier and then queries the
/// underlying database client to fetch the corresponding namespace data.
/// Constructs a `Namespace` object with the retrieved data and returns it.
///
/// This function can return an error in any of the following situations:
/// - If there is an error querying the database, returned by
/// `from_aws_sdk_error`.
async fn get_namespace(&self, namespace: &NamespaceIdent) -> Result<Namespace> {
let req = self
.s3tables_client
.get_namespace()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string());
let resp: GetNamespaceOutput = req.send().await.map_err(from_aws_sdk_error)?;
let properties = HashMap::new();
Ok(Namespace::with_properties(
NamespaceIdent::from_vec(resp.namespace().to_vec())?,
properties,
))
}
/// Checks if a namespace exists within the s3tables catalog.
///
/// Validates the namespace identifier by querying the s3tables catalog
/// to determine if the specified namespace exists.
///
/// # Returns
/// A `Result<bool>` indicating the outcome of the check:
/// - `Ok(true)` if the namespace exists.
/// - `Ok(false)` if the namespace does not exist, identified by a specific
/// `IsNotFoundException` variant.
/// - `Err(...)` if an error occurs during validation or the s3tables catalog
/// query, with the error encapsulating the issue.
async fn namespace_exists(&self, namespace: &NamespaceIdent) -> Result<bool> {
let req = self
.s3tables_client
.get_namespace()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string());
match req.send().await {
Ok(_) => Ok(true),
Err(err) => {
if err.as_service_error().map(|e| e.is_not_found_exception()) == Some(true) {
Ok(false)
} else {
Err(from_aws_sdk_error(err))
}
}
}
}
/// Updates the properties of an existing namespace.
///
/// S3Tables doesn't support updating namespace properties, so this function
/// will always return an error.
async fn update_namespace(
&self,
_namespace: &NamespaceIdent,
_properties: HashMap<String, String>,
) -> Result<()> {
Err(Error::new(
ErrorKind::FeatureUnsupported,
"Update namespace is not supported for s3tables catalog",
))
}
/// Drops an existing namespace from the s3tables catalog.
///
/// Validates the namespace identifier and then deletes the corresponding
/// namespace from the s3tables catalog.
///
/// This function can return an error in the following situations:
/// - Errors from the underlying database deletion process, converted using
/// `from_aws_sdk_error`.
async fn drop_namespace(&self, namespace: &NamespaceIdent) -> Result<()> {
let req = self
.s3tables_client
.delete_namespace()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string());
req.send().await.map_err(from_aws_sdk_error)?;
Ok(())
}
/// Lists all tables within a given namespace.
///
/// Retrieves all tables associated with the specified namespace and returns
/// their identifiers.
///
/// This function can return an error in the following situations:
/// - Errors from the underlying database query process, converted using
/// `from_aws_sdk_error`.
async fn list_tables(&self, namespace: &NamespaceIdent) -> Result<Vec<TableIdent>> {
let mut result = Vec::new();
let mut continuation_token = None;
loop {
let mut req = self
.s3tables_client
.list_tables()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string());
if let Some(token) = continuation_token {
req = req.continuation_token(token);
}
let resp: ListTablesOutput = req.send().await.map_err(from_aws_sdk_error)?;
for table in resp.tables() {
result.push(TableIdent::new(
NamespaceIdent::from_vec(table.namespace().to_vec())?,
table.name().to_string(),
));
}
continuation_token = resp.continuation_token().map(|s| s.to_string());
if continuation_token.is_none() {
break;
}
}
Ok(result)
}
/// Creates a new table within a specified namespace.
///
/// Attempts to create a table defined by the `creation` parameter. The metadata
/// location is generated by the s3tables catalog, looks like:
///
/// s3://{RANDOM WAREHOUSE LOCATION}/metadata/{VERSION}-{UUID}.metadata.json
///
/// We have to get this random warehouse location after the table is created.
///
/// This function can return an error in the following situations:
/// - If the location of the table is set by user, identified by a specific
/// `DataInvalid` variant.
/// - Errors from the underlying database creation process, converted using
/// `from_aws_sdk_error`.
async fn create_table(
&self,
namespace: &NamespaceIdent,
mut creation: TableCreation,
) -> Result<Table> {
let table_ident = TableIdent::new(namespace.clone(), creation.name.clone());
// create table
let create_resp: CreateTableOutput = self
.s3tables_client
.create_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string())
.format(OpenTableFormat::Iceberg)
.name(table_ident.name())
.send()
.await
.map_err(from_aws_sdk_error)?;
// prepare metadata location. the warehouse location is generated by s3tables catalog,
// which looks like: s3://e6c9bf20-991a-46fb-kni5xs1q2yxi3xxdyxzjzigdeop1quse2b--table-s3
let metadata_location = match &creation.location {
Some(_) => {
return Err(Error::new(
ErrorKind::DataInvalid,
"The location of the table is generated by s3tables catalog, can't be set by user.",
));
}
None => {
let get_resp: GetTableOutput = self
.s3tables_client
.get_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string())
.name(table_ident.name())
.send()
.await
.map_err(from_aws_sdk_error)?;
let warehouse_location = get_resp.warehouse_location().to_string();
create_metadata_location(warehouse_location, 0)?
}
};
// write metadata to file
creation.location = Some(metadata_location.clone());
let metadata = TableMetadataBuilder::from_table_creation(creation)?
.build()?
.metadata;
self.file_io
.new_output(&metadata_location)?
.write(serde_json::to_vec(&metadata)?.into())
.await?;
// update metadata location
self.s3tables_client
.update_table_metadata_location()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(namespace.to_url_string())
.name(table_ident.name())
.metadata_location(metadata_location.clone())
.version_token(create_resp.version_token())
.send()
.await
.map_err(from_aws_sdk_error)?;
let table = Table::builder()
.identifier(table_ident)
.metadata_location(metadata_location)
.metadata(metadata)
.file_io(self.file_io.clone())
.build()?;
Ok(table)
}
/// Loads an existing table from the s3tables catalog.
///
/// Retrieves the metadata location of the specified table and constructs a
/// `Table` object with the retrieved metadata.
///
/// This function can return an error in the following situations:
/// - If the table does not have a metadata location, identified by a specific
/// `Unexpected` variant.
/// - Errors from the underlying database query process, converted using
/// `from_aws_sdk_error`.
async fn load_table(&self, table_ident: &TableIdent) -> Result<Table> {
let req = self
.s3tables_client
.get_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(table_ident.namespace().to_url_string())
.name(table_ident.name());
let resp: GetTableOutput = req.send().await.map_err(from_aws_sdk_error)?;
// when a table is created, it's possible that the metadata location is not set.
let metadata_location = resp.metadata_location().ok_or_else(|| {
Error::new(
ErrorKind::Unexpected,
format!(
"Table {} does not have metadata location",
table_ident.name()
),
)
})?;
let input_file = self.file_io.new_input(metadata_location)?;
let metadata_content = input_file.read().await?;
let metadata = serde_json::from_slice::<TableMetadata>(&metadata_content)?;
let table = Table::builder()
.identifier(table_ident.clone())
.metadata(metadata)
.metadata_location(metadata_location)
.file_io(self.file_io.clone())
.build()?;
Ok(table)
}
/// Drops an existing table from the s3tables catalog.
///
/// Validates the table identifier and then deletes the corresponding
/// table from the s3tables catalog.
///
/// This function can return an error in the following situations:
/// - Errors from the underlying database deletion process, converted using
/// `from_aws_sdk_error`.
async fn drop_table(&self, table: &TableIdent) -> Result<()> {
let req = self
.s3tables_client
.delete_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(table.namespace().to_url_string())
.name(table.name());
req.send().await.map_err(from_aws_sdk_error)?;
Ok(())
}
/// Checks if a table exists within the s3tables catalog.
///
/// Validates the table identifier by querying the s3tables catalog
/// to determine if the specified table exists.
///
/// # Returns
/// A `Result<bool>` indicating the outcome of the check:
/// - `Ok(true)` if the table exists.
/// - `Ok(false)` if the table does not exist, identified by a specific
/// `IsNotFoundException` variant.
/// - `Err(...)` if an error occurs during validation or the s3tables catalog
/// query, with the error encapsulating the issue.
async fn table_exists(&self, table_ident: &TableIdent) -> Result<bool> {
let req = self
.s3tables_client
.get_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(table_ident.namespace().to_url_string())
.name(table_ident.name());
match req.send().await {
Ok(_) => Ok(true),
Err(err) => {
if err.as_service_error().map(|e| e.is_not_found_exception()) == Some(true) {
Ok(false)
} else {
Err(from_aws_sdk_error(err))
}
}
}
}
/// Renames an existing table within the s3tables catalog.
///
/// Validates the source and destination table identifiers and then renames
/// the source table to the destination table.
///
/// This function can return an error in the following situations:
/// - Errors from the underlying database renaming process, converted using
/// `from_aws_sdk_error`.
async fn rename_table(&self, src: &TableIdent, dest: &TableIdent) -> Result<()> {
let req = self
.s3tables_client
.rename_table()
.table_bucket_arn(self.config.table_bucket_arn.clone())
.namespace(src.namespace().to_url_string())
.name(src.name())
.new_namespace_name(dest.namespace().to_url_string())
.new_name(dest.name());
req.send().await.map_err(from_aws_sdk_error)?;
Ok(())
}
/// Updates an existing table within the s3tables catalog.
///
/// This function is still in development and will always return an error.
async fn update_table(&self, _commit: TableCommit) -> Result<Table> {
Err(Error::new(
ErrorKind::FeatureUnsupported,
"Updating a table is not supported yet",
))
}
}
/// Format AWS SDK error into iceberg error
pub(crate) fn from_aws_sdk_error<T>(error: aws_sdk_s3tables::error::SdkError<T>) -> Error
where T: std::fmt::Debug {
Error::new(
ErrorKind::Unexpected,
"Operation failed for hitting aws skd error".to_string(),
)
.with_source(anyhow!("aws sdk error: {:?}", error))
}
#[cfg(test)]
mod tests {
use iceberg::spec::{NestedField, PrimitiveType, Schema, Type};
use super::*;
async fn load_s3tables_catalog_from_env() -> Result<Option<S3TablesCatalog>> {
let table_bucket_arn = match std::env::var("TABLE_BUCKET_ARN").ok() {
Some(table_bucket_arn) => table_bucket_arn,
None => return Ok(None),
};
let config = S3TablesCatalogConfig::builder()
.table_bucket_arn(table_bucket_arn)
.build();
Ok(Some(S3TablesCatalog::new(config).await?))
}
#[tokio::test]
async fn test_s3tables_list_namespace() {
let catalog = match load_s3tables_catalog_from_env().await {
Ok(Some(catalog)) => catalog,
Ok(None) => return,
Err(e) => panic!("Error loading catalog: {}", e),
};
let namespaces = catalog.list_namespaces(None).await.unwrap();
assert!(!namespaces.is_empty());
}
#[tokio::test]
async fn test_s3tables_list_tables() {
let catalog = match load_s3tables_catalog_from_env().await {
Ok(Some(catalog)) => catalog,
Ok(None) => return,
Err(e) => panic!("Error loading catalog: {}", e),
};
let tables = catalog
.list_tables(&NamespaceIdent::new("aws_s3_metadata".to_string()))
.await
.unwrap();
assert!(!tables.is_empty());
}
#[tokio::test]
async fn test_s3tables_load_table() {
let catalog = match load_s3tables_catalog_from_env().await {
Ok(Some(catalog)) => catalog,
Ok(None) => return,
Err(e) => panic!("Error loading catalog: {}", e),
};
let table = catalog
.load_table(&TableIdent::new(
NamespaceIdent::new("aws_s3_metadata".to_string()),
"query_storage_metadata".to_string(),
))
.await
.unwrap();
println!("{:?}", table);
}
#[tokio::test]
async fn test_s3tables_create_delete_namespace() {
let catalog = match load_s3tables_catalog_from_env().await {
Ok(Some(catalog)) => catalog,
Ok(None) => return,
Err(e) => panic!("Error loading catalog: {}", e),
};
let namespace = NamespaceIdent::new("test_s3tables_create_delete_namespace".to_string());
catalog
.create_namespace(&namespace, HashMap::new())
.await
.unwrap();
assert!(catalog.namespace_exists(&namespace).await.unwrap());
catalog.drop_namespace(&namespace).await.unwrap();
assert!(!catalog.namespace_exists(&namespace).await.unwrap());
}
#[tokio::test]
async fn test_s3tables_create_delete_table() {
let catalog = match load_s3tables_catalog_from_env().await {
Ok(Some(catalog)) => catalog,
Ok(None) => return,
Err(e) => panic!("Error loading catalog: {}", e),
};
let creation = {
let schema = Schema::builder()
.with_schema_id(0)
.with_fields(vec![
NestedField::required(1, "foo", Type::Primitive(PrimitiveType::Int)).into(),
NestedField::required(2, "bar", Type::Primitive(PrimitiveType::String)).into(),
])
.build()
.unwrap();
TableCreation::builder()
.name("test_s3tables_create_delete_table".to_string())
.properties(HashMap::new())
.schema(schema)
.build()
};
let namespace = NamespaceIdent::new("test_s3tables_create_delete_table".to_string());
let table_ident = TableIdent::new(
namespace.clone(),
"test_s3tables_create_delete_table".to_string(),
);
catalog.drop_namespace(&namespace).await.ok();
catalog.drop_table(&table_ident).await.ok();
catalog
.create_namespace(&namespace, HashMap::new())
.await
.unwrap();
catalog.create_table(&namespace, creation).await.unwrap();
assert!(catalog.table_exists(&table_ident).await.unwrap());
catalog.drop_table(&table_ident).await.unwrap();
assert!(!catalog.table_exists(&table_ident).await.unwrap());
catalog.drop_namespace(&namespace).await.unwrap();
}
}