Skip to content

Commit 80bef38

Browse files
authored
Replace DAT with AAL (#300)
## Description of change This PR replaces all remaining references to DAT with AAL, reflecting the current and accurate name of the project. These legacy references have been updated for consistency and clarity. #### Relevant issues N/A #### Does this contribution introduce any breaking changes to the existing APIs or behaviors? No #### Does this contribution introduce any new public APIs or behaviors? No #### How was the contribution tested? No need to test #### Does this contribution need a changelog entry? N/A --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and I agree to the terms of the [Developer Certificate of Origin (DCO)](https://developercertificate.org/).
1 parent 4f1a897 commit 80bef38

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

input-stream/src/integrationTest/java/software/amazon/s3/analyticsaccelerator/access/ConcurrencyCorrectnessTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.jupiter.params.provider.MethodSource;
2626

2727
/**
28-
* This tests concurrency and thread safety of teh shared state. While the DAT InputStream itself is
28+
* This tests concurrency and thread safety of teh shared state. While the AAL InputStream itself is
2929
* not thread-safe, the shared state that multiple streams access and manipulate should be.
3030
*/
3131
public class ConcurrencyCorrectnessTest extends IntegrationTestBase {

input-stream/src/integrationTest/java/software/amazon/s3/analyticsaccelerator/access/IntegrationTestBase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected S3ExecutionContext getS3ExecutionContext() {
7777
}
7878

7979
/**
80-
* Applies the same read stream pattern to both S3 based and DAT based streams Calculates the
80+
* Applies the same read stream pattern to both S3 based and AAL based streams Calculates the
8181
* CRC32-C checksum on all bytes read and compares them at the end to verify the results are the
8282
* same
8383
*
@@ -136,7 +136,7 @@ protected void testChangingEtagMidStream(
136136
int bufferSize = (int) s3Object.getSize();
137137
byte[] buffer = new byte[bufferSize];
138138

139-
// Create the s3DATClientStreamReader - that creates the shared state
139+
// Create the s3AALClientStreamReader - that creates the shared state
140140
try (S3AALClientStreamReader s3AALClientStreamReader =
141141
this.createS3AALClientStreamReader(s3ClientKind, AALInputStreamConfigurationKind)) {
142142

@@ -214,7 +214,7 @@ protected void testChangingEtagAfterStreamPassesAndReturnsCachedObject(
214214
@NonNull AALInputStreamConfigurationKind AALInputStreamConfigurationKind)
215215
throws IOException {
216216
int bufferSize = (int) s3Object.getSize();
217-
// Create the s3DATClientStreamReader - that creates the shared state
217+
// Create the s3AALClientStreamReader - that creates the shared state
218218
try (S3AALClientStreamReader s3AALClientStreamReader =
219219
this.createS3AALClientStreamReader(s3ClientKind, AALInputStreamConfigurationKind)) {
220220
S3SeekableInputStream stream =
@@ -303,7 +303,7 @@ protected void testAALReadConcurrency(
303303
Optional.of(directChecksum),
304304
OpenStreamInformation.DEFAULT);
305305

306-
// Create the s3DATClientStreamReader - that creates the shared state
306+
// Create the s3AALClientStreamReader - that creates the shared state
307307
try (S3AALClientStreamReader s3AALClientStreamReader =
308308
this.createS3AALClientStreamReader(s3ClientKind, AALInputStreamConfigurationKind)) {
309309
// Create the thread pool
@@ -317,7 +317,7 @@ protected void testAALReadConcurrency(
317317
try {
318318
// Run multiple iterations
319319
for (int j = 0; j < iterations; j++) {
320-
// Run DAT on the thread
320+
// Run AAL on the thread
321321
// This will create a new stream every time, but all streams will share state
322322
Crc32CChecksum datChecksum = new Crc32CChecksum();
323323
executeReadPatternOnAAL(

input-stream/src/jmh/java/software/amazon/s3/analyticsaccelerator/benchmarks/AALBenchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import software.amazon.s3.analyticsaccelerator.access.StreamReadPatternKind;
2323

2424
/**
25-
* Benchmarks that measure performance of DAT via CRT by replaying all patterns against multiple
25+
* Benchmarks that measure performance of AAL via CRT by replaying all patterns against multiple
2626
* object sizes
2727
*/
2828
public class AALBenchmark extends BenchmarkBase {
@@ -36,7 +36,7 @@ public class AALBenchmark extends BenchmarkBase {
3636
*/
3737
@Override
3838
protected void executeBenchmark() throws IOException {
39-
executeReadPatternOnDAT();
39+
executeReadPatternOnAAL();
4040
}
4141

4242
/**

input-stream/src/jmh/java/software/amazon/s3/analyticsaccelerator/benchmarks/BenchmarkBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public S3ExecutionContext getS3ExecutionContext() {
100100
*
101101
* @return {@link AALInputStreamConfigurationKind}
102102
*/
103-
protected AALInputStreamConfigurationKind getDATInputStreamConfigurationKind() {
103+
protected AALInputStreamConfigurationKind getAALInputStreamConfigurationKind() {
104104
return AALInputStreamConfigurationKind.DEFAULT;
105105
}
106106

@@ -117,18 +117,18 @@ public void execute() throws Exception {
117117
protected abstract void executeBenchmark() throws Exception;
118118

119119
/**
120-
* Executes the pattern on DAT based on the contextual parameters.
120+
* Executes the pattern on AAL based on the contextual parameters.
121121
*
122122
* @throws IOException if IO error is thrown
123123
*/
124-
protected void executeReadPatternOnDAT() throws IOException {
124+
protected void executeReadPatternOnAAL() throws IOException {
125125
S3Object s3Object = this.getObject();
126126
executeReadPatternOnAAL(
127127
this.getClientKind(),
128128
s3Object,
129129
this.getReadPatternKind().getStreamReadPattern(s3Object),
130130
// Use default configuration
131-
this.getDATInputStreamConfigurationKind(),
131+
this.getAALInputStreamConfigurationKind(),
132132
Optional.empty(),
133133
OpenStreamInformation.DEFAULT);
134134
}

input-stream/src/jmh/java/software/amazon/s3/analyticsaccelerator/benchmarks/ComparisonBenchmarkBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public abstract class ComparisonBenchmarkBase extends BenchmarkBase {
3535
@Override
3636
protected void executeBenchmark() throws IOException {
3737
switch (this.getS3InputStreamKind()) {
38-
case S3_DAT_GET:
39-
this.executeReadPatternOnDAT();
38+
case S3_AAL_GET:
39+
this.executeReadPatternOnAAL();
4040
break;
4141
case S3_SDK_GET:
4242
this.executeReadPatternDirectly();

input-stream/src/jmh/java/software/amazon/s3/analyticsaccelerator/benchmarks/S3ClientAndStreamKind.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
@Getter
2626
public enum S3ClientAndStreamKind {
2727
SDK_ASYNC_JAVA(S3ClientKind.SDK_V2_JAVA_ASYNC, S3InputStreamKind.S3_SDK_GET),
28-
SDK_DAT_JAVA(S3ClientKind.SDK_V2_JAVA_ASYNC, S3InputStreamKind.S3_DAT_GET),
28+
SDK_AAL_JAVA(S3ClientKind.SDK_V2_JAVA_ASYNC, S3InputStreamKind.S3_AAL_GET),
2929
SDK_ASYNC_CRT(S3ClientKind.SDK_V2_CRT_ASYNC, S3InputStreamKind.S3_SDK_GET),
30-
SDK_DAT_CRT(S3ClientKind.SDK_V2_CRT_ASYNC, S3InputStreamKind.S3_DAT_GET);
30+
SDK_AAL_CRT(S3ClientKind.SDK_V2_CRT_ASYNC, S3InputStreamKind.S3_AAL_GET);
3131

3232
private final S3ClientKind clientKind;
3333
private final S3InputStreamKind inputStreamKind;

input-stream/src/jmh/java/software/amazon/s3/analyticsaccelerator/benchmarks/StreamPatternComparisonBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/**
2626
* This benchmarks fixes the ReadPattern, and then, for each object size, replays the pattern on
27-
* "raw" clients as well as "DAT" streams that sit on the clients The main point here is to
27+
* "raw" clients as well as "AAL" streams that sit on the clients The main point here is to
2828
* determine which combo is the fastest for each pattern.
2929
*/
3030
public abstract class StreamPatternComparisonBenchmark extends ComparisonBenchmarkBase {

input-stream/src/testFixtures/java/software/amazon/s3/analyticsaccelerator/access/ExecutionBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void executeReadPatternDirectly(
118118
*
119119
* @param s3ClientKind S3 client kind to use
120120
* @param s3Object {@link S3Object} S3 Object to run the pattern on
121-
* @param AALInputStreamConfigurationKind DAT configuration
121+
* @param AALInputStreamConfigurationKind AAL configuration
122122
* @param streamReadPattern the read pattern
123123
* @param checksum checksum to update, if specified
124124
* @param openStreamInformation contains the open stream information
@@ -143,7 +143,7 @@ protected void executeReadPatternOnAAL(
143143
* Executes a pattern on AAL
144144
*
145145
* @param s3Object {@link S3Object} S3 Object to run the pattern on
146-
* @param s3AALClientStreamReader DAT stream reader
146+
* @param s3AALClientStreamReader AAL stream reader
147147
* @param streamReadPattern the read pattern
148148
* @param checksum checksum to update, if specified
149149
* @param openStreamInformation contains the open stream information

input-stream/src/testFixtures/java/software/amazon/s3/analyticsaccelerator/access/S3AALClientStreamReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import software.amazon.s3.analyticsaccelerator.util.OpenStreamInformation;
2929
import software.amazon.s3.analyticsaccelerator.util.S3URI;
3030

31-
/** Client stream reader based on DAT */
31+
/** Client stream reader based on AAL */
3232
public class S3AALClientStreamReader extends S3StreamReaderBase {
3333
@NonNull @Getter private final S3SdkObjectClient sdkObjectClient;
3434
@NonNull @Getter private final S3SeekableInputStreamFactory s3SeekableInputStreamFactory;

input-stream/src/testFixtures/java/software/amazon/s3/analyticsaccelerator/access/S3InputStreamKind.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public enum S3InputStreamKind {
2525
// SDK backed
2626
S3_SDK_GET("SDK"),
2727
// Ours
28-
S3_DAT_GET("DAT");
28+
S3_AAL_GET("AAL");
2929
private final String value;
3030
}

0 commit comments

Comments
 (0)