From a353e3699f627c6ab04e947d9dc25a05a969c2b1 Mon Sep 17 00:00:00 2001 From: Srinivas Lade Date: Sat, 1 Jul 2023 18:20:32 -0400 Subject: [PATCH] Some Last Cleanup --- cpp/src/arrow/filesystem/azurefs.cc | 9 +++------ cpp/src/arrow/filesystem/azurefs.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc index c3fd33a3c2f5c..0158c0cec74e1 100644 --- a/cpp/src/arrow/filesystem/azurefs.cc +++ b/cpp/src/arrow/filesystem/azurefs.cc @@ -29,7 +29,7 @@ namespace fs { AzureOptions::AzureOptions() {} bool AzureOptions::Equals(const AzureOptions& other) const { - return (scheme == other.scheme && account_dfs_url == other.account_dfs_url && + return (account_dfs_url == other.account_dfs_url && account_blob_url == other.account_blob_url && credentials_kind == other.credentials_kind); } @@ -40,8 +40,6 @@ bool AzureOptions::Equals(const AzureOptions& other) const { class AzureFileSystem::Impl { public: io::IOContext io_context_; - std::string dfs_endpoint_url_; - std::string blob_endpoint_url_; bool is_hierarchical_namespace_enabled_; AzureOptions options_; @@ -49,10 +47,9 @@ class AzureFileSystem::Impl { : io_context_(io_context), options_(std::move(options)) {} Status Init() { - dfs_endpoint_url_ = options_.account_dfs_url; - blob_endpoint_url_ = options_.account_blob_url; - if (options_.backend == AzureBackend::Azurite) { + // gen1Client_->GetAccountInfo().Value.IsHierarchicalNamespaceEnabled + // throws error in azurite is_hierarchical_namespace_enabled_ = false; } return Status::OK(); diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h index 7d8eb62f6388d..45087668db00e 100644 --- a/cpp/src/arrow/filesystem/azurefs.h +++ b/cpp/src/arrow/filesystem/azurefs.h @@ -65,7 +65,6 @@ enum class AzureBackend : bool { /// Options for the AzureFileSystem implementation. struct ARROW_EXPORT AzureOptions { - std::string scheme; std::string account_dfs_url; std::string account_blob_url; AzureBackend backend = AzureBackend::Azure; @@ -88,7 +87,8 @@ struct ARROW_EXPORT AzureOptions { /// ABFS (Azure Blob Storage - https://azure.microsoft.com/en-us/products/storage/blobs/) /// object-based cloud storage system. /// -/// ADLS (Azure Data Lake Storage - https://azure.microsoft.com/en-us/products/storage/data-lake-storage/) +/// ADLS (Azure Data Lake Storage - +/// https://azure.microsoft.com/en-us/products/storage/data-lake-storage/) /// is a scalable data storage system designed for big-data applications. /// ADLS provides filesystem semantics, file-level security, and Hadoop /// compatibility. Gen1 exists as a separate object that will retired