>From Hussain Towaileb <[email protected]>: Hussain Towaileb has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20466?usp=email )
Change subject: [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS ...................................................................... [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS Details: - Avoid importing old azure-storage as hadoop 3.3.4 is compatible with Azure SDK v12. Ext-ref: MB-68683 Change-Id: Id2ed162f300f1549296fcdfc0e87b65e61421a6b Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20466 Reviewed-by: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureConstants.java M asterixdb/pom.xml 2 files changed, 7 insertions(+), 13 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; Verified diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureConstants.java index 9ade27b..675981f 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureConstants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureConstants.java @@ -60,6 +60,6 @@ public static final String HADOOP_AZURE_FS_ACCOUNT_KEY = "fs.azure.account.key"; //Used when a connectionString is provided public static final String HADOOP_AZURE_FS_SAS = "fs.azure.sas"; - public static final String HADOOP_AZURE_BLOB_PROTOCOL = "wasbs"; + public static final String HADOOP_AZURE_BLOB_PROTOCOL = "abfss"; public static final String HADOOP_AZURE_DATALAKE_PROTOCOL = "abfss"; } diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 05f0f37..909b455 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1799,21 +1799,15 @@ <!-- Hadoop AWS end --> <!-- Hadoop Azure start --> <dependency> - <!-- Pick a newer Azure connector --> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-storage</artifactId> - <version>${hadoop-azuresdk.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-azure</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-storage</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Hadoop Azure end --> <!-- Hadoop GCS start --> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20466?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: Id2ed162f300f1549296fcdfc0e87b65e61421a6b Gerrit-Change-Number: 20466 Gerrit-PatchSet: 4 Gerrit-Owner: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]>
