Skip to content

Commit

Permalink
Some Last Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
srilman committed Jul 1, 2023
1 parent f0cfffa commit a353e36
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions cpp/src/arrow/filesystem/azurefs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -40,19 +40,16 @@ 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_;

explicit Impl(AzureOptions options, io::IOContext io_context)
: 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();
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/filesystem/azurefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit a353e36

Please sign in to comment.