Skip to content

Commit 944fbbb

Browse files
committed
review changes
1 parent bae4ed4 commit 944fbbb

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Statistic.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,10 @@ public enum Statistic {
322322
TYPE_COUNTER),
323323

324324
/* Stream Reads */
325+
STREAM_READ_ANALYTICS_OPENED(
326+
StreamStatisticNames.STREAM_READ_ANALYTICS_OPENED,
327+
"Total count of times an analytics input stream to object store data was opened",
328+
TYPE_COUNTER),
325329
STREAM_READ_BYTES(
326330
StreamStatisticNames.STREAM_READ_BYTES,
327331
"Bytes read from an input stream in read() calls",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ public abstract class AbstractS3AMockTest {
5454

5555
protected S3AFileSystem fs;
5656
protected S3Client s3;
57+
protected Configuration conf;
5758

5859
@Before
5960
public void setup() throws Exception {
60-
Configuration conf = createConfiguration();
61+
conf = createConfiguration();
6162
fs = new S3AFileSystem();
6263
URI uri = URI.create(FS_S3A + "://" + BUCKET);
6364
// unset S3CSE property from config to avoid pathIOE.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ public void testMalformedParquetFooter() throws IOException {
140140
* row group, which contains the column data for a subset of rows. A single parquet file
141141
* can contain multiple row groups, this allows for further parallelisation, as each row group
142142
* can be processed independently.
143-
*
144-
* @throws IOException any IO problem
145143
*/
146144
@Test
147145
public void testMultiRowGroupParquet() throws Throwable {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import static org.mockito.Mockito.verify;
4545
import static org.mockito.Mockito.when;
4646

47+
import static org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfAnalyticsAcceleratorEnabled;
48+
4749
/**
4850
* Uses mocks to check that the {@link ResponseInputStream<GetObjectResponse>} is
4951
* closed when {@link org.apache.hadoop.fs.CanUnbuffer#unbuffer} is called.
@@ -55,6 +57,8 @@ public class TestS3AUnbuffer extends AbstractS3AMockTest {
5557
@Test
5658
public void testUnbuffer() throws IOException {
5759
// Create mock ObjectMetadata for getFileStatus()
60+
skipIfAnalyticsAcceleratorEnabled(conf,
61+
"Analytics accelerator does not support unbuffer");
5862
Path path = new Path("/file");
5963
HeadObjectResponse objectMetadata = HeadObjectResponse.builder()
6064
.contentLength(1L)

0 commit comments

Comments
 (0)