mirror of
https://github.com/nestriness/cdc-file-transfer.git
synced 2026-01-30 12:15:36 +02:00
42f5ee9b44
Fixes an issue in UnzstdStream where the Read() method always tries to read new input data if no input data is available, instead of first trying to uncompress. Since zstd maintains internal buffers, uncompression might succeed even without reading more input, so this is faster. This bug can lead to pipeline stalls in cdc_rsync.
119 lines
3.9 KiB
C++
119 lines
3.9 KiB
C++
// Copyright 2022 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "cdc_rsync/zstd_stream.h"
|
|
|
|
#include "cdc_rsync/base/fake_socket.h"
|
|
#include "cdc_rsync_server/unzstd_stream.h"
|
|
#include "common/status_test_macros.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
namespace cdc_ft {
|
|
namespace {
|
|
|
|
class ZstdStreamTest : public ::testing::Test {
|
|
protected:
|
|
FakeSocket socket_;
|
|
ZstdStream cstream_{&socket_, /*level=*/6, /*num_threads=*/8};
|
|
UnzstdStream dstream_{&socket_};
|
|
};
|
|
|
|
TEST_F(ZstdStreamTest, Small) {
|
|
const std::string want = "Lorem ipsum gibberisulum foobarberis";
|
|
EXPECT_OK(cstream_.Write(want.data(), want.size()));
|
|
EXPECT_OK(cstream_.Finish());
|
|
|
|
Buffer buff(1024);
|
|
size_t bytes_read;
|
|
bool eof = false;
|
|
EXPECT_OK(dstream_.Read(buff.data(), buff.size(), &bytes_read, &eof));
|
|
EXPECT_TRUE(eof);
|
|
std::string got(buff.data(), bytes_read);
|
|
EXPECT_EQ(got, want);
|
|
}
|
|
|
|
TEST_F(ZstdStreamTest, AutoFlushesAfterTimeout) {
|
|
const std::string want = "Lorem ipsum gibberisulum foobarberis";
|
|
cstream_.AutoFlushAfter(absl::Milliseconds(10));
|
|
EXPECT_OK(cstream_.Write(want.data(), want.size()));
|
|
// Note: No flush! cstream_ will compress and send the data after 10 ms.
|
|
|
|
// Only read as much data as we have written, or else dstream_.Read() will
|
|
// expect more data.
|
|
Buffer buff(want.size());
|
|
size_t bytes_read;
|
|
bool eof = false;
|
|
EXPECT_OK(dstream_.Read(buff.data(), buff.size(), &bytes_read, &eof));
|
|
EXPECT_FALSE(eof);
|
|
std::string got(buff.data(), bytes_read);
|
|
EXPECT_EQ(got, want);
|
|
}
|
|
|
|
// Regression test for an issue in UnzstdStream, where the reader tried to read
|
|
// from the socket even though the output data was still available in internal
|
|
// buffers.
|
|
TEST_F(ZstdStreamTest, DeliversOutputBeforeReadingNewData) {
|
|
const std::string want1 = "I want";
|
|
const std::string want2 = "to eat cookies";
|
|
cstream_.AutoFlushAfter(absl::Milliseconds(10));
|
|
EXPECT_OK(cstream_.Write(want1.data(), want1.size()));
|
|
EXPECT_OK(cstream_.Write(want2.data(), want2.size()));
|
|
// Note: No flush! cstream_ will compress and send the data after 10 ms.
|
|
|
|
Buffer buff1(want1.size());
|
|
Buffer buff2(want2.size());
|
|
size_t bytes_read1, bytes_read2;
|
|
bool eof1 = false, eof2 = false;
|
|
EXPECT_OK(dstream_.Read(buff1.data(), buff1.size(), &bytes_read1, &eof1));
|
|
|
|
// There was a bug in dstream_.Read(), where the method would first try to
|
|
// read new input before uncompressing data, even though the data was already
|
|
// present in internal buffers.
|
|
EXPECT_OK(dstream_.Read(buff2.data(), buff2.size(), &bytes_read2, &eof2));
|
|
EXPECT_FALSE(eof1);
|
|
EXPECT_FALSE(eof2);
|
|
std::string got1(buff1.data(), bytes_read1);
|
|
std::string got2(buff2.data(), bytes_read2);
|
|
EXPECT_EQ(got1, want1);
|
|
EXPECT_EQ(got2, want2);
|
|
}
|
|
|
|
TEST_F(ZstdStreamTest, Large) {
|
|
Buffer want(1024 * 1024 * 10 + 12345);
|
|
constexpr uint64_t prime = 919393;
|
|
for (size_t n = 0; n < want.size(); ++n) {
|
|
want.data()[n] = ((n * prime) % 26) + 'a';
|
|
}
|
|
|
|
constexpr int kChunkSize = 19 * 1024;
|
|
for (size_t pos = 0; pos < want.size(); pos += kChunkSize) {
|
|
size_t size = std::min<size_t>(kChunkSize, want.size() - pos);
|
|
EXPECT_OK(cstream_.Write(want.data() + pos, size));
|
|
}
|
|
EXPECT_OK(cstream_.Finish());
|
|
|
|
bool eof = false;
|
|
Buffer buff(128 * 1024);
|
|
Buffer got;
|
|
while (!eof) {
|
|
size_t bytes_read;
|
|
EXPECT_OK(dstream_.Read(buff.data(), buff.size(), &bytes_read, &eof));
|
|
got.append(buff.data(), bytes_read);
|
|
}
|
|
EXPECT_EQ(want, got);
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace cdc_ft
|