Skip to content

Commit 64bc773

Browse files
authored
HADOOP-19480. S3A: Upgrades AAL version to 1.0.0. (#7469) (#7603)
Contributed by: Ahmar Suhail
1 parent 471e00d commit 64bc773

File tree

2 files changed

+1
-33
lines changed

2 files changed

+1
-33
lines changed

hadoop-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
<aws-java-sdk.version>1.12.720</aws-java-sdk.version>
207207
<aws-java-sdk-v2.version>2.29.52</aws-java-sdk-v2.version>
208208
<amazon-s3-encryption-client-java.version>3.1.1</amazon-s3-encryption-client-java.version>
209-
<amazon-s3-analyticsaccelerator-s3.version>0.0.4</amazon-s3-analyticsaccelerator-s3.version>
209+
<amazon-s3-analyticsaccelerator-s3.version>1.0.0</amazon-s3-analyticsaccelerator-s3.version>
210210
<aws.eventstream.version>1.0.1</aws.eventstream.version>
211211
<hsqldb.version>2.7.1</hsqldb.version>
212212
<frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AAnalyticsAcceleratorStreamReading.java

-32
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
import software.amazon.s3.analyticsaccelerator.S3SeekableInputStreamConfiguration;
4040
import software.amazon.s3.analyticsaccelerator.common.ConnectorConfiguration;
41-
import software.amazon.s3.analyticsaccelerator.util.PrefetchMode;
4241

4342
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_READ_POLICY;
4443
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_READ_POLICY_PARQUET;
@@ -64,8 +63,6 @@
6463
public class ITestS3AAnalyticsAcceleratorStreamReading extends AbstractS3ATestBase {
6564

6665
private static final String PHYSICAL_IO_PREFIX = "physicalio";
67-
private static final String LOGICAL_IO_PREFIX = "logicalio";
68-
6966

7067
private Path externalTestFile;
7168

@@ -177,35 +174,6 @@ public void testMultiRowGroupParquet() throws Throwable {
177174
verifyStatisticCounterValue(ioStats, STREAM_READ_ANALYTICS_OPENED, 1);
178175
}
179176

180-
@Test
181-
public void testConnectorFrameworkConfigurable() {
182-
describe("Verify S3 connector framework reads configuration");
183-
184-
Configuration conf = new Configuration(getConfiguration());
185-
186-
//Disable Predictive Prefetching
187-
conf.set(ANALYTICS_ACCELERATOR_CONFIGURATION_PREFIX +
188-
"." + LOGICAL_IO_PREFIX + ".prefetching.mode", "all");
189-
190-
//Set Blobstore Capacity
191-
conf.setInt(ANALYTICS_ACCELERATOR_CONFIGURATION_PREFIX +
192-
"." + PHYSICAL_IO_PREFIX + ".blobstore.capacity", 1);
193-
194-
ConnectorConfiguration connectorConfiguration =
195-
new ConnectorConfiguration(conf, ANALYTICS_ACCELERATOR_CONFIGURATION_PREFIX);
196-
197-
S3SeekableInputStreamConfiguration configuration =
198-
S3SeekableInputStreamConfiguration.fromConfiguration(connectorConfiguration);
199-
200-
Assertions.assertThat(configuration.getLogicalIOConfiguration().getPrefetchingMode())
201-
.as("AnalyticsStream configuration is not set to expected value")
202-
.isSameAs(PrefetchMode.ALL);
203-
204-
Assertions.assertThat(configuration.getPhysicalIOConfiguration().getBlobStoreCapacity())
205-
.as("AnalyticsStream configuration is not set to expected value")
206-
.isEqualTo(1);
207-
}
208-
209177
@Test
210178
public void testInvalidConfigurationThrows() throws Exception {
211179
describe("Verify S3 connector framework throws with invalid configuration");

0 commit comments

Comments
 (0)