unikdahal commented on code in PR #5361: URL: https://github.com/apache/datafusion-comet/pull/5361#discussion_r3915571533
########## native/core/src/execution/operators/iceberg_common.rs: ########## @@ -0,0 +1,142 @@ +// 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. + +//! Helpers shared between the Iceberg scan and Iceberg write operators. + +use std::collections::HashMap; +use std::sync::Arc; + +use datafusion::common::DataFusionError; +use iceberg::io::{FileIO, FileIOBuilder, StorageFactory}; +use iceberg_storage_opendal::{CustomAwsCredentialLoader, OpenDalStorageFactory}; + +use crate::cloud::s3::credential_bridge::{AccessMode, CometS3CredentialBridge}; + +/// Activation key for the `CometS3CredentialProvider` SPI, read from a catalog's `s3.*` property +/// bag. +const ICEBERG_PROVIDER_CLASS_PROPERTY: &str = "s3.comet.credential.provider.class"; + +/// Key prefixes forwarded to iceberg-rust's `FileIO`. The full unfiltered catalog bag (catalog +/// URI, OAuth tokens, credentials.uri, tenant-id, etc.) is kept upstream so +/// `CometS3CredentialBridge` can read whatever the vendor needs. +const STORAGE_PROPERTY_PREFIXES: &[&str] = &["s3.", "gcs.", "adls.", "client."]; Review Comment: Thanks. I think removing OSS from the shared factory introduces a regression on the existing read path, though. storage_factory_for is now shared by reads and writes. Before this refactor, iceberg_scan.rs had an OpenDalStorageFactory::Oss arm, and CometScanRule still explicitly treats oss as a supported Iceberg scan scheme. HadoopFileIO is also accepted by the scan-side FileIO compatibility check, so an oss:// table can reach native scan even without a dedicated OSS Java FileIO. That means such a scan can still pass JVM eligibility but now fail here with Unsupported storage scheme: oss. Could we preserve OpenDalStorageFactory::Oss for AccessMode::Read and reject it only for AccessMode::Write until OSS write configuration/testing exists? A read regression test would also pin that this write-safety change doesn't remove an existing scan capability. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
