aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplatypus179 <platypus179@yandex-team.ru>2022-02-10 16:49:46 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:46 +0300
commit2cd8af5a38e7de1bbb2a78b578853f5229cbf0c4 (patch)
treea987cb390cb661bdba14dbcd2d1bebbd795e8484
parentff241e1daf76d79ed38015cdb76d55eb3a33ac27 (diff)
downloadydb-2cd8af5a38e7de1bbb2a78b578853f5229cbf0c4.tar.gz
Restoring authorship annotation for <platypus179@yandex-team.ru>. Commit 1 of 2.
-rw-r--r--library/cpp/http/io/stream.cpp26
-rw-r--r--library/cpp/http/io/stream.h8
-rw-r--r--library/cpp/http/io/stream_ut.cpp102
3 files changed, 68 insertions, 68 deletions
diff --git a/library/cpp/http/io/stream.cpp b/library/cpp/http/io/stream.cpp
index 6689be684f..9a5ff8d0af 100644
--- a/library/cpp/http/io/stream.cpp
+++ b/library/cpp/http/io/stream.cpp
@@ -7,7 +7,7 @@
#include <util/stream/length.h>
#include <util/stream/multi.h>
#include <util/stream/null.h>
-#include <util/stream/tee.h>
+#include <util/stream/tee.h>
#include <util/system/compat.h>
#include <util/system/yassert.h>
@@ -623,10 +623,10 @@ public:
return FirstLine_;
}
- inline size_t SentSize() const noexcept {
- return SizeCalculator_.Length();
- }
-
+ inline size_t SentSize() const noexcept {
+ return SizeCalculator_.Length();
+ }
+
private:
static inline bool IsResponse(const TString& s) noexcept {
return strnicmp(s.data(), "HTTP/", 5) == 0;
@@ -835,8 +835,8 @@ private:
Output_ = Streams_.Add(new TChunkedOutput(Output_));
}
- Output_ = Streams_.Add(new TTeeOutput(Output_, &SizeCalculator_));
-
+ Output_ = Streams_.Add(new TTeeOutput(Output_, &SizeCalculator_));
+
if (IsBodyEncodingEnabled() && encoder) {
Output_ = Streams_.Add((*encoder)(Output_).Release());
}
@@ -872,8 +872,8 @@ private:
bool CompressionHeaderEnabled_;
bool Finished_;
-
- TSizeCalculator SizeCalculator_;
+
+ TSizeCalculator SizeCalculator_;
};
THttpOutput::THttpOutput(IOutputStream* slave)
@@ -962,10 +962,10 @@ const TString& THttpOutput::FirstLine() const noexcept {
return Impl_->FirstLine();
}
-size_t THttpOutput::SentSize() const noexcept {
- return Impl_->SentSize();
-}
-
+size_t THttpOutput::SentSize() const noexcept {
+ return Impl_->SentSize();
+}
+
unsigned ParseHttpRetCode(const TStringBuf& ret) {
const TStringBuf code = StripString(StripString(ret.After(' ')).Before(' '));
diff --git a/library/cpp/http/io/stream.h b/library/cpp/http/io/stream.h
index 78ca4fc814..df5b0c0fdf 100644
--- a/library/cpp/http/io/stream.h
+++ b/library/cpp/http/io/stream.h
@@ -153,10 +153,10 @@ public:
/// Возвращает первую строку HTTP-запроса/ответа
const TString& FirstLine() const noexcept;
- /// Возвращает размер отправленных данных (без заголовков, с учётом сжатия, без
- /// учёта chunked transfer encoding)
- size_t SentSize() const noexcept;
-
+ /// Возвращает размер отправленных данных (без заголовков, с учётом сжатия, без
+ /// учёта chunked transfer encoding)
+ size_t SentSize() const noexcept;
+
private:
void DoWrite(const void* buf, size_t len) override;
void DoFlush() override;
diff --git a/library/cpp/http/io/stream_ut.cpp b/library/cpp/http/io/stream_ut.cpp
index 1ea35df675..7e20ba455b 100644
--- a/library/cpp/http/io/stream_ut.cpp
+++ b/library/cpp/http/io/stream_ut.cpp
@@ -50,8 +50,8 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) {
}
Output().Finish();
- Parent_->LastRequestSentSize_ = Output().SentSize();
-
+ Parent_->LastRequestSentSize_ = Output().SentSize();
+
return true;
}
@@ -69,13 +69,13 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) {
return new TRequest(this);
}
- size_t LastRequestSentSize() const {
- return LastRequestSentSize_;
- }
-
+ size_t LastRequestSentSize() const {
+ return LastRequestSentSize_;
+ }
+
private:
TString Res_;
- size_t LastRequestSentSize_ = 0;
+ size_t LastRequestSentSize_ = 0;
};
Y_UNIT_TEST(TestCodings1) {
@@ -664,7 +664,7 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) {
TString result = outBuf.Str();
UNIT_ASSERT(!result.Contains(TStringBuf("0\r\n")));
}
-
+
Y_UNIT_TEST(TestHttpOutputDisableCompressionHeader) {
TMemoryInput request("GET / HTTP/1.1\r\nAccept-Encoding: gzip\r\n\r\n");
const TString data = "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq";
@@ -686,47 +686,47 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) {
UNIT_ASSERT(result.Contains(data));
}
- size_t DoTestHttpOutputSize(const TString& res, bool enableCompession) {
- TTestHttpServer serverImpl(res);
- TPortManager pm;
-
- const ui16 port = pm.GetPort();
- THttpServer server(&serverImpl,
- THttpServer::TOptions(port)
- .EnableKeepAlive(true)
- .EnableCompression(enableCompession));
- UNIT_ASSERT(server.Start());
-
- TNetworkAddress addr("localhost", port);
- TSocket s(addr);
-
- {
- TSocketOutput so(s);
- THttpOutput out(&so);
- out << "GET / HTTP/1.1\r\n"
- "Host: www.yandex.ru\r\n"
- "Connection: Keep-Alive\r\n"
- "Accept-Encoding: gzip\r\n"
- "\r\n";
- out.Finish();
- }
-
- TSocketInput si(s);
- THttpInput input(&si);
-
- unsigned httpCode = ParseHttpRetCode(input.FirstLine());
- UNIT_ASSERT_VALUES_EQUAL(httpCode, 200u);
-
- UNIT_ASSERT_VALUES_EQUAL(res, input.ReadAll());
-
- server.Stop();
-
- return serverImpl.LastRequestSentSize();
- }
-
- Y_UNIT_TEST(TestHttpOutputSize) {
- TString res = "qqqqqq";
- UNIT_ASSERT_VALUES_EQUAL(res.size(), DoTestHttpOutputSize(res, false));
- UNIT_ASSERT_VALUES_UNEQUAL(res.size(), DoTestHttpOutputSize(res, true));
- }
+ size_t DoTestHttpOutputSize(const TString& res, bool enableCompession) {
+ TTestHttpServer serverImpl(res);
+ TPortManager pm;
+
+ const ui16 port = pm.GetPort();
+ THttpServer server(&serverImpl,
+ THttpServer::TOptions(port)
+ .EnableKeepAlive(true)
+ .EnableCompression(enableCompession));
+ UNIT_ASSERT(server.Start());
+
+ TNetworkAddress addr("localhost", port);
+ TSocket s(addr);
+
+ {
+ TSocketOutput so(s);
+ THttpOutput out(&so);
+ out << "GET / HTTP/1.1\r\n"
+ "Host: www.yandex.ru\r\n"
+ "Connection: Keep-Alive\r\n"
+ "Accept-Encoding: gzip\r\n"
+ "\r\n";
+ out.Finish();
+ }
+
+ TSocketInput si(s);
+ THttpInput input(&si);
+
+ unsigned httpCode = ParseHttpRetCode(input.FirstLine());
+ UNIT_ASSERT_VALUES_EQUAL(httpCode, 200u);
+
+ UNIT_ASSERT_VALUES_EQUAL(res, input.ReadAll());
+
+ server.Stop();
+
+ return serverImpl.LastRequestSentSize();
+ }
+
+ Y_UNIT_TEST(TestHttpOutputSize) {
+ TString res = "qqqqqq";
+ UNIT_ASSERT_VALUES_EQUAL(res.size(), DoTestHttpOutputSize(res, false));
+ UNIT_ASSERT_VALUES_UNEQUAL(res.size(), DoTestHttpOutputSize(res, true));
+ }
} // THttpStreamTest suite