You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2025/05/31 19:59:22 UTC
Change in asterixdb[master]: Merge branch 'gerrit/ionic' into 'master'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19864 )
Change subject: Merge branch 'gerrit/ionic' into 'master'
......................................................................
Merge branch 'gerrit/ionic' into 'master'
Change-Id: Idaae7d6906e39513691a35bd243286638660e72d
---
M asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
M asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/aws/s3/S3CloudClient.java
3 files changed, 35 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/64/19864/1
diff --git a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/aws/s3/S3CloudClient.java b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/aws/s3/S3CloudClient.java
index 5c56c2e..8a28f53 100644
--- a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/aws/s3/S3CloudClient.java
+++ b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/aws/s3/S3CloudClient.java
@@ -33,11 +33,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-<<<<<<< HEAD (bab942 [ASTERIXDB-3603][FUN] Runtime changes for transform function)
import java.util.function.Function;
-=======
import java.util.function.Predicate;
->>>>>>> BRANCH (167e58 [ASTERIXDB-3616][EXT]: Add retry logic for external cloud wr)
import org.apache.asterix.cloud.CloudResettableInputStream;
import org.apache.asterix.cloud.IWriteBufferProvider;
diff --git a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
index eeaa62e..88542cf 100644
--- a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
+++ b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/azure/blobstorage/AzBlobStorageCloudClient.java
@@ -392,27 +392,17 @@
// Hence this implementation is a no op.
}
-<<<<<<< HEAD (bab942 [ASTERIXDB-3603][FUN] Runtime changes for transform function)
- private static BlobServiceClient buildClient(AzBlobStorageClientConfig config) {
- BlobServiceClientBuilder blobServiceClientBuilder = new BlobServiceClientBuilder();
- blobServiceClientBuilder.endpoint(getEndpoint(config));
- blobServiceClientBuilder.httpLogOptions(AzureConstants.HTTP_LOG_OPTIONS);
- configCredentialsToAzClient(blobServiceClientBuilder, config);
- return blobServiceClientBuilder.buildClient();
-=======
@Override
public Predicate<Exception> getObjectNotFoundExceptionPredicate() {
return ex -> (ex instanceof BlobStorageException bse) && bse.getErrorCode().equals(BlobErrorCode.BLOB_NOT_FOUND);
}
private static BlobContainerClient buildClient(AzBlobStorageClientConfig config) {
- BlobContainerClientBuilder blobContainerClientBuilder =
- new BlobContainerClientBuilder().containerName(config.getBucket()).endpoint(getEndpoint(config));
- configCredentialsToAzClient(blobContainerClientBuilder, config);
- BlobContainerClient blobContainerClient = blobContainerClientBuilder.buildClient();
- blobContainerClient.createIfNotExists();
- return blobContainerClient;
->>>>>>> BRANCH (167e58 [ASTERIXDB-3616][EXT]: Add retry logic for external cloud wr)
+ BlobServiceClientBuilder blobServiceClientBuilder = new BlobServiceClientBuilder();
+ blobServiceClientBuilder.endpoint(getEndpoint(config));
+ blobServiceClientBuilder.httpLogOptions(AzureConstants.HTTP_LOG_OPTIONS);
+ configCredentialsToAzClient(blobServiceClientBuilder, config);
+ return blobServiceClientBuilder.buildClient();
}
private static void configCredentialsToAzClient(BlobServiceClientBuilder builder,
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19864
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Idaae7d6906e39513691a35bd243286638660e72d
Gerrit-Change-Number: 19864
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange