From 20400c203ad1bcd59a88ddda4d4f1b215dae52e5 Mon Sep 17 00:00:00 2001 From: mwish Date: Wed, 26 Jun 2024 21:12:17 +0800 Subject: [PATCH] Resolve comments --- cpp/src/arrow/io/buffered_test.cc | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/cpp/src/arrow/io/buffered_test.cc b/cpp/src/arrow/io/buffered_test.cc index dd83aba6f1f62..cbf2c2cf06938 100644 --- a/cpp/src/arrow/io/buffered_test.cc +++ b/cpp/src/arrow/io/buffered_test.cc @@ -330,7 +330,7 @@ class TestBufferedInputStream : public FileTestFixture { } void MakeExample1(int64_t buffer_size, MemoryPool* pool = default_memory_pool(), - bool fill_raw_read_bound = false) { + int64_t raw_read_bound = -1) { test_data_ = kExample1; ASSERT_OK_AND_ASSIGN(auto file_out, FileOutputStream::Open(path_)); @@ -339,14 +339,8 @@ class TestBufferedInputStream : public FileTestFixture { ASSERT_OK_AND_ASSIGN(auto file_in, ReadableFile::Open(path_)); raw_ = file_in; - if (!fill_raw_read_bound) { - ASSERT_OK_AND_ASSIGN(buffered_, - BufferedInputStream::Create(buffer_size, pool, raw_)); - } else { - ASSERT_OK_AND_ASSIGN(auto file_size, file_in->GetSize()); - ASSERT_OK_AND_ASSIGN( - buffered_, BufferedInputStream::Create(buffer_size, pool, raw_, file_size)); - } + ASSERT_OK_AND_ASSIGN( + buffered_, BufferedInputStream::Create(buffer_size, pool, raw_, raw_read_bound)); } protected: @@ -484,17 +478,16 @@ TEST_F(TestBufferedInputStream, SetBufferSize) { // bytes could buffer. TEST_F(TestBufferedInputStream, BufferSizeLimit) { { - MakeExample1(/*buffer_size=*/100000, default_memory_pool(), - /*fill_raw_read_bound=*/true); - // buffer_sizes should be limited to the size of the data - EXPECT_EQ(test_data_.size(), buffered_->buffer_size()); + // Buffer size should not exceeds raw_read_bound + MakeExample1(/*buffer_size=*/100000, default_memory_pool(), /*raw_read_bound=*/15); + EXPECT_EQ(15, buffered_->buffer_size()); } - { - MakeExample1(/*buffer_size=*/10, default_memory_pool(), /*fill_raw_read_bound=*/true); + // Set a buffer size after read. + MakeExample1(/*buffer_size=*/10, default_memory_pool(), /*raw_read_bound=*/15); ASSERT_OK(buffered_->Read(10)); ASSERT_OK(buffered_->SetBufferSize(/*new_buffer_size=*/100000)); - EXPECT_EQ(test_data_.size() - 10, buffered_->buffer_size()); + EXPECT_EQ(5, buffered_->buffer_size()); } }