File tree Expand file tree Collapse file tree 4 files changed +9
-1
lines changed
hadoop-tools/hadoop-aws/src
main/java/org/apache/hadoop/fs/s3a/impl/streams
test/java/org/apache/hadoop/fs/s3a Expand file tree Collapse file tree 4 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ public final class StreamIntegration {
7777 /**
7878 * What is the default type?
7979 */
80- public static final InputStreamType DEFAULT_STREAM_TYPE = InputStreamType .Classic ;
80+ public static final InputStreamType DEFAULT_STREAM_TYPE = InputStreamType .Analytics ;
8181
8282 /**
8383 * Configuration deprecation log for warning about use of the
Original file line number Diff line number Diff line change 4242import static org .apache .hadoop .fs .contract .ContractTestUtils .assertCapabilities ;
4343import static org .apache .hadoop .fs .contract .ContractTestUtils .dataset ;
4444import static org .apache .hadoop .fs .contract .ContractTestUtils .writeDataset ;
45+ import static org .apache .hadoop .fs .s3a .Constants .INPUT_STREAM_TYPE ;
4546import static org .apache .hadoop .fs .s3a .S3ATestUtils .disablePrefetching ;
47+ import static org .apache .hadoop .fs .s3a .impl .streams .InputStreamType .Classic ;
4648import static org .apache .hadoop .fs .statistics .IOStatisticAssertions .assertThatStatisticCounter ;
4749import static org .apache .hadoop .fs .statistics .IOStatisticAssertions .verifyStatisticCounterValue ;
4850import static org .apache .hadoop .fs .statistics .StreamStatisticNames .STREAM_READ_BYTES ;
@@ -69,6 +71,7 @@ public class ITestS3AIOStatisticsContext extends AbstractS3ATestBase {
6971 protected Configuration createConfiguration () {
7072 Configuration configuration = super .createConfiguration ();
7173 disablePrefetching (configuration );
74+ configuration .setEnum (INPUT_STREAM_TYPE , Classic );
7275 enableIOStatisticsContext ();
7376 return configuration ;
7477 }
Original file line number Diff line number Diff line change 4646import static org .apache .hadoop .fs .s3a .Constants .CHECKSUM_VALIDATION ;
4747import static org .apache .hadoop .fs .s3a .Constants .ESTABLISH_TIMEOUT ;
4848import static org .apache .hadoop .fs .s3a .Constants .INPUT_FADVISE ;
49+ import static org .apache .hadoop .fs .s3a .Constants .INPUT_STREAM_TYPE ;
4950import static org .apache .hadoop .fs .s3a .Constants .MAXIMUM_CONNECTIONS ;
5051import static org .apache .hadoop .fs .s3a .Constants .MAX_ERROR_RETRIES ;
5152import static org .apache .hadoop .fs .s3a .Constants .READAHEAD_RANGE ;
5556import static org .apache .hadoop .fs .s3a .S3ATestUtils .disablePrefetching ;
5657import static org .apache .hadoop .fs .s3a .S3ATestUtils .removeBaseAndBucketOverrides ;
5758import static org .apache .hadoop .fs .s3a .impl .ConfigurationHelper .setDurationAsSeconds ;
59+ import static org .apache .hadoop .fs .s3a .impl .streams .InputStreamType .Classic ;
5860import static org .apache .hadoop .fs .statistics .IOStatisticAssertions .verifyStatisticCounterValue ;
5961import static org .apache .hadoop .fs .statistics .IOStatisticsSupport .retrieveIOStatistics ;
6062import static org .apache .hadoop .fs .statistics .StreamStatisticNames .STREAM_READ_ABORTED ;
@@ -106,6 +108,7 @@ public ITestUnbufferDraining() {
106108 @ Override
107109 public Configuration createConfiguration () {
108110 Configuration conf = disablePrefetching (super .createConfiguration ());
111+ conf .setEnum (INPUT_STREAM_TYPE , Classic );
109112 removeBaseAndBucketOverrides (conf ,
110113 ASYNC_DRAIN_THRESHOLD ,
111114 CHECKSUM_VALIDATION ,
Original file line number Diff line number Diff line change 6161import static org .apache .hadoop .fs .s3a .S3ATestUtils .disablePrefetching ;
6262import static org .apache .hadoop .fs .s3a .S3ATestUtils .getInputStreamStatistics ;
6363import static org .apache .hadoop .fs .s3a .S3ATestUtils .getS3AInputStream ;
64+ import static org .apache .hadoop .fs .s3a .impl .streams .InputStreamType .Classic ;
6465import static org .apache .hadoop .fs .s3a .test .PublicDatasetTestUtils .isUsingDefaultExternalDataFile ;
6566import static org .apache .hadoop .fs .statistics .IOStatisticAssertions .assertThatStatisticMinimum ;
6667import static org .apache .hadoop .fs .statistics .IOStatisticAssertions .lookupMaximumStatistic ;
@@ -102,6 +103,7 @@ public class ITestS3AInputStreamPerformance extends S3AScaleTestBase {
102103 @ Override
103104 protected Configuration createScaleConfiguration () {
104105 Configuration conf = disablePrefetching (super .createScaleConfiguration ());
106+ conf .setEnum (INPUT_STREAM_TYPE , Classic );
105107 if (isUsingDefaultExternalDataFile (conf )) {
106108 S3ATestUtils .removeBaseAndBucketOverrides (
107109 conf ,
You can’t perform that action at this time.
0 commit comments