Skip to content

Commit

Permalink
remove bad operators IGNIETFERRO-1048 p33 check:https://ci.yandex-tea…
Browse files Browse the repository at this point in the history 
…m.ru/check/210c5 __FORCE_COMMIT__

ref:c8db65cbd7de2f49d18696797f94ca673b14cf37
  • Loading branch information
danlark committed Dec 5, 2018
1 parent afe37f1 commit ebf0fb6
Show file tree
Hide file tree
Showing 29 changed files with 144 additions and 144 deletions.
12 changes: 6 additions & 6 deletions library/blockcodecs/codecs_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {

TBuffer Buffer(TStringBuf b) {
TBuffer bb;
bb.Assign(~b, +b);
bb.Assign(b.data(), b.size());
return bb;
}

Expand All @@ -38,7 +38,7 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {

TCodecList lst = ListAllCodecs();

for (size_t i = 0; i < +lst; ++i) {
for (size_t i = 0; i < lst.size(); ++i) {
const ICodec* c = Codec(lst[i]);
const auto h = MultiHash(c->Name(), i, 1);

Expand All @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {

//Cout << c->Name() << Endl;

for (size_t j = 0; j < +datas; ++j) {
for (size_t j = 0; j < datas.size(); ++j) {
const TBuffer& data = datas[j];
TString res;

Expand Down Expand Up @@ -152,13 +152,13 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {
datas.push_back(TString(i, (char)(i % 128)));
}

for (size_t i = 0; i < +datas; ++i) {
for (size_t i = 0; i < datas.size(); ++i) {
res += datas[i];
}

TCodecList lst = ListAllCodecs();

for (size_t i = 0; i < +lst; ++i) {
for (size_t i = 0; i < lst.size(); ++i) {
TStringStream ss;

const ICodec* c = Codec(lst[i]);
Expand All @@ -174,7 +174,7 @@ Y_UNIT_TEST_SUITE(TBlockCodecsTest) {
{
TCodedOutput out(&ss, c, 1234);

for (size_t j = 0; j < +datas; ++j) {
for (size_t j = 0; j < datas.size(); ++j) {
out << datas[j];
}

Expand Down
8 changes: 4 additions & 4 deletions library/charset/codepage_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ void TCodepageTest::TestUTFFromUnknownPlane() {
// test TChar version
// bytebuffer of len writtenbytes contains sampletext of len samplelen chars in utf8
TUtf16String wtr = CharToWide(TStringBuf(bytebuffer, writtenbytes), CODES_UNKNOWNPLANE);
TChar* strend = wtr.begin() + +wtr;
TChar* strend = wtr.begin() + wtr.size();
DecodeUnknownPlane(wtr.begin(), strend, CODES_UTF8);
wtr.resize(strend - ~wtr, 'Q');
UNIT_ASSERT_VALUES_EQUAL(+wtr, samplelen);
for (size_t i = 0; i < +wtr; ++i) {
wtr.resize(strend - wtr.data(), 'Q');
UNIT_ASSERT_VALUES_EQUAL(wtr.size(), samplelen);
for (size_t i = 0; i < wtr.size(); ++i) {
if (sampletext[i] >= 0x10000) {
UNIT_ASSERT_VALUES_EQUAL(wtr[i], ' ');
} else {
Expand Down
28 changes: 14 additions & 14 deletions library/charset/wide_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,40 +230,40 @@ void TConversionTest::TestYandexEncoding() {

void TConversionTest::TestRecodeIntoString() {
TString sYandex(UnicodeText.size() * 4, 'x');
const char* sdata = ~sYandex;
const char* sdata = sYandex.data();
TStringBuf sres = NDetail::Recode<wchar16>(UnicodeText, sYandex, CODES_YANDEX);
UNIT_ASSERT(sYandex == YandexText); // same content
UNIT_ASSERT(~sYandex == sdata); // reserved buffer reused
UNIT_ASSERT(~sYandex == ~sres); // same buffer
UNIT_ASSERT(+sYandex == +sres); // same size
UNIT_ASSERT(sYandex.data() == sdata); // reserved buffer reused
UNIT_ASSERT(sYandex.data() == sres.data()); // same buffer
UNIT_ASSERT(sYandex.size() == sres.size()); // same size
TEST_WCHAR32(sYandex, UnicodeText, CODES_YANDEX);

TUtf16String sUnicode;
sUnicode.reserve(YandexText.size() * 4);
const wchar16* wdata = ~sUnicode;
const wchar16* wdata = sUnicode.data();
TWtringBuf wres = NDetail::Recode<char>(YandexText, sUnicode, CODES_YANDEX);
UNIT_ASSERT(sUnicode == UnicodeText); // same content
UNIT_ASSERT(~sUnicode == wdata); // reserved buffer reused
UNIT_ASSERT(~sUnicode == ~wres); // same buffer
UNIT_ASSERT(+sUnicode == +wres); // same size
UNIT_ASSERT(sUnicode.data() == wdata); // reserved buffer reused
UNIT_ASSERT(sUnicode.data() == wres.data()); // same buffer
UNIT_ASSERT(sUnicode.size() == wres.size()); // same size

TString sUtf8 = " ";
size_t scap = sUtf8.capacity();
sres = NDetail::Recode<wchar16>(UnicodeText, sUtf8, CODES_UTF8);
UNIT_ASSERT(sUtf8 == UTF8Text); // same content
UNIT_ASSERT(sUtf8.capacity() > scap); // increased buffer capacity (supplied was too small)
UNIT_ASSERT(~sUtf8 == ~sres); // same buffer
UNIT_ASSERT(+sUtf8 == +sres); // same size
UNIT_ASSERT(sUtf8.data() == sres.data()); // same buffer
UNIT_ASSERT(sUtf8.size() == sres.size()); // same size
TEST_WCHAR32(sUtf8, UnicodeText, CODES_UTF8);

sUnicode.clear();
wdata = ~sUnicode;
wdata = sUnicode.data();
TUtf16String copy = sUnicode; // increase ref-counter
wres = NDetail::Recode<char>(UTF8Text, sUnicode, CODES_UTF8);
UNIT_ASSERT(sUnicode == UnicodeText); // same content
UNIT_ASSERT(~sUnicode != wdata); // re-allocated (shared buffer supplied)
UNIT_ASSERT(~sUnicode == ~wres); // same buffer
UNIT_ASSERT(+sUnicode == +wres); // same content
UNIT_ASSERT(sUnicode.data() != wdata); // re-allocated (shared buffer supplied)
UNIT_ASSERT(sUnicode.data() == wres.data()); // same buffer
UNIT_ASSERT(sUnicode.size() == wres.size()); // same content
}

static TString GenerateJunk(size_t seed) {
Expand Down
4 changes: 2 additions & 2 deletions library/coroutine/engine/coroutine_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ namespace NCoroWaitWakeLivelockBug {
TState state;

for (auto& subState : state.Subs) {
subState.Cont = cont->Executor()->Create(DoSub, &subState, ~subState.Name)->ContPtr();
subState.Cont = cont->Executor()->Create(DoSub, &subState, subState.Name.data())->ContPtr();
}

cont->Join(
Expand Down Expand Up @@ -610,7 +610,7 @@ namespace NCoroTestFastPathWake {

// These guys are to be woken up right away
for (auto& subState : state.Subs) {
subState.Cont = cont->Executor()->Create(DoSub, &subState, ~subState.Name)->ContPtr();
subState.Cont = cont->Executor()->Create(DoSub, &subState, subState.Name.data())->ContPtr();
}

// Give way
Expand Down
4 changes: 2 additions & 2 deletions library/dbg_output/dump.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ namespace NPrivate {
inline void Pointer(const V* v) {
if (v && !Visited.has((size_t)v)) {
Visited.insert((size_t)v);
*this << DumpRaw("(") << DumpRaw(~TypeName(v)) << DumpRaw("*)") << Hex((size_t)v) << DumpRaw(" -> ") << *v;
*this << DumpRaw("(") << DumpRaw(TypeName(v).data()) << DumpRaw("*)") << Hex((size_t)v) << DumpRaw(" -> ") << *v;
Visited.erase((size_t)v);
} else {
*this << DumpRaw("(") << DumpRaw(~TypeName<V>()) << DumpRaw("*)nullptr");
*this << DumpRaw("(") << DumpRaw(TypeName<V>().data()) << DumpRaw("*)nullptr");
}
}

Expand Down
6 changes: 3 additions & 3 deletions library/digest/md5/md5_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ Y_UNIT_TEST_SUITE(TMD5Test) {

{
TFixedBufferFileOutput fo(tmpFile);
fo.Write(~s, +s);
fo.Write(s.data(), s.size());
}

char fileBuf[100];
char memBuf[100];
TString fileHash = MD5::File(~tmpFile, fileBuf);
TString memoryHash = MD5::Data((const unsigned char*)~s, +s, memBuf);
TString fileHash = MD5::File(tmpFile.data(), fileBuf);
TString memoryHash = MD5::Data((const unsigned char*)s.data(), s.size(), memBuf);

UNIT_ASSERT_EQUAL(fileHash, memoryHash);

Expand Down
82 changes: 41 additions & 41 deletions library/dot_product/dot_product_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,79 +37,79 @@ Y_UNIT_TEST_SUITE(TDocProductTestSuite) {

Y_UNIT_TEST(TestDotProduct8) {
TVector<i8> a(100);
FillWithRandomNumbers(~a, 179, 100);
FillWithRandomNumbers(a.data(), 179, 100);
TVector<i8> b(100);
FillWithRandomNumbers(~b, 239, 100);
FillWithRandomNumbers(b.data(), 239, 100);

for (ui32 i = 0; i < 30; ++i) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
UNIT_ASSERT_EQUAL(DotProduct(~a + i, ~b + i, length), (SimpleDotProduct<i32, i8>(~a + i, ~b + i, length)));
UNIT_ASSERT_EQUAL(DotProductSlow(~a + i, ~b + i, length), (SimpleDotProduct<i32, i8>(~a + i, ~b + i, length)));
UNIT_ASSERT_EQUAL(DotProduct(a.data() + i, b.data() + i, length), (SimpleDotProduct<i32, i8>(a.data() + i, b.data() + i, length)));
UNIT_ASSERT_EQUAL(DotProductSlow(a.data() + i, b.data() + i, length), (SimpleDotProduct<i32, i8>(a.data() + i, b.data() + i, length)));
}
}
}

Y_UNIT_TEST(TestDotProduct32) {
TVector<i32> a(100);
FillWithRandomNumbers(~a, 179, 100);
FillWithRandomNumbers(a.data(), 179, 100);
TVector<i32> b(100);
FillWithRandomNumbers(~b, 239, 100);
FillWithRandomNumbers(b.data(), 239, 100);

for (ui32 i = 0; i < 30; ++i) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
UNIT_ASSERT_EQUAL(DotProduct(~a + i, ~b + i, length), (SimpleDotProduct<i64, i32>(~a + i, ~b + i, length)));
UNIT_ASSERT_EQUAL(DotProductSlow(~a + i, ~b + i, length), (SimpleDotProduct<i64, i32>(~a + i, ~b + i, length)));
UNIT_ASSERT_EQUAL(DotProduct(a.data() + i, b.data() + i, length), (SimpleDotProduct<i64, i32>(a.data() + i, b.data() + i, length)));
UNIT_ASSERT_EQUAL(DotProductSlow(a.data() + i, b.data() + i, length), (SimpleDotProduct<i64, i32>(a.data() + i, b.data() + i, length)));
}
}
}

Y_UNIT_TEST(TestDotProductf) {
TVector<float> a(100);
FillWithRandomFloats(~a, 179, 100);
FillWithRandomFloats(a.data(), 179, 100);
TVector<float> b(100);
FillWithRandomFloats(~b, 239, 100);
FillWithRandomFloats(b.data(), 239, 100);

for (ui32 i = 0; i < 30; ++i) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
UNIT_ASSERT(std::fabs(DotProduct(~a + i, ~b + i, length) - (SimpleDotProduct<float, float>(~a + i, ~b + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProductSlow(~a + i, ~b + i, length) - (SimpleDotProduct<float, float>(~a + i, ~b + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProduct(a.data() + i, b.data() + i, length) - (SimpleDotProduct<float, float>(a.data() + i, b.data() + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProductSlow(a.data() + i, b.data() + i, length) - (SimpleDotProduct<float, float>(a.data() + i, b.data() + i, length))) < EPSILON);
}
}
}

Y_UNIT_TEST(TestL2NormSqaredf) {
TVector<float> a(100);
FillWithRandomFloats(~a, 179, 100);
FillWithRandomFloats(a.data(), 179, 100);
TVector<float> b(100);
FillWithRandomFloats(~b, 239, 100);
FillWithRandomFloats(b.data(), 239, 100);

for (ui32 i = 0; i < 30; ++i) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
UNIT_ASSERT(std::fabs(L2NormSquared(~a + i, length) - DotProductSlow(~a + i, ~a + i, length)) < EPSILON);
UNIT_ASSERT(std::fabs(L2NormSquared(~b + i, length) - DotProductSlow(~b + i, ~b + i, length)) < EPSILON);
UNIT_ASSERT(std::fabs(L2NormSquared(a.data() + i, length) - DotProductSlow(a.data() + i, a.data() + i, length)) < EPSILON);
UNIT_ASSERT(std::fabs(L2NormSquared(b.data() + i, length) - DotProductSlow(b.data() + i, b.data() + i, length)) < EPSILON);
}
}
}

Y_UNIT_TEST(TestDotProductd) {
TVector<double> a(100);
FillWithRandomFloats(~a, 179, 100);
FillWithRandomFloats(a.data(), 179, 100);
TVector<double> b(100);
FillWithRandomFloats(~b, 239, 100);
FillWithRandomFloats(b.data(), 239, 100);

for (ui32 i = 0; i < 30; ++i) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
UNIT_ASSERT(std::fabs(DotProduct(~a + i, ~b + i, length) - (SimpleDotProduct<double, double>(~a + i, ~b + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProductSlow(~a + i, ~b + i, length) - (SimpleDotProduct<double, double>(~a + i, ~b + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProduct(a.data() + i, b.data() + i, length) - (SimpleDotProduct<double, double>(a.data() + i, b.data() + i, length))) < EPSILON);
UNIT_ASSERT(std::fabs(DotProductSlow(a.data() + i, b.data() + i, length) - (SimpleDotProduct<double, double>(a.data() + i, b.data() + i, length))) < EPSILON);
}
}
}

Y_UNIT_TEST(TestCombinedDotProductf) {
TVector<float> a(100);
FillWithRandomFloats(~a, 179, 100);
FillWithRandomFloats(a.data(), 179, 100);
TVector<float> b(100);
FillWithRandomFloats(~b, 239, 100);
FillWithRandomFloats(b.data(), 239, 100);

auto simple3WayProduct = [](const float* l, const float* r, ui32 length) -> TTriWayDotProduct<float> {
return {
Expand All @@ -126,23 +126,23 @@ Y_UNIT_TEST_SUITE(TDocProductTestSuite) {
for (ui32 length = 1; length + i + 1 < a.size(); ++length) {
const TString testCaseExpl = TStringBuilder() << "i = " << i << "; length = " << length;
{
const float c1 = cosine(TriWayDotProduct(~a + i, ~b + i, length));
const float c2 = cosine(simple3WayProduct(~a + i, ~b + i, length));
const float c1 = cosine(TriWayDotProduct(a.data() + i, b.data() + i, length));
const float c2 = cosine(simple3WayProduct(a.data() + i, b.data() + i, length));
UNIT_ASSERT_DOUBLES_EQUAL_C(c1, c2, EPSILON, testCaseExpl);
}
{
// Left
auto cpl = TriWayDotProduct(~a + i, ~b + i, length, ETriWayDotProductComputeMask::Left);
auto cnl = simple3WayProduct(~a + i, ~b + i, length);
auto cpl = TriWayDotProduct(a.data() + i, b.data() + i, length, ETriWayDotProductComputeMask::Left);
auto cnl = simple3WayProduct(a.data() + i, b.data() + i, length);
UNIT_ASSERT_DOUBLES_EQUAL(cpl.RR, 1.0, EPSILON);
cpl.RR = 1;
cnl.RR = 1;
UNIT_ASSERT_DOUBLES_EQUAL_C(cosine(cpl), cosine(cnl), EPSILON, testCaseExpl);
}
{
// Right
auto cpr = TriWayDotProduct(~a + i, ~b + i, length, ETriWayDotProductComputeMask::Right);
auto cnr = simple3WayProduct(~a + i, ~b + i, length);
auto cpr = TriWayDotProduct(a.data() + i, b.data() + i, length, ETriWayDotProductComputeMask::Right);
auto cnr = simple3WayProduct(a.data() + i, b.data() + i, length);
UNIT_ASSERT_DOUBLES_EQUAL(cpr.LL, 1.0, EPSILON);
cpr.LL = 1;
cnr.LL = 1;
Expand All @@ -165,14 +165,14 @@ Y_UNIT_TEST_SUITE(TDocProductTestSuite) {

Y_UNIT_TEST(TestDotProductFloatStability) {
TVector<float> a(1003);
FillWithRandomFloats(~a, 179, a.size());
FillWithRandomFloats(a.data(), 179, a.size());
TVector<float> b(1003);
FillWithRandomFloats(~b, 239, b.size());
FillWithRandomFloats(b.data(), 239, b.size());

float res = DotProduct(~a, ~b, a.size());
float res = DotProduct(a.data(), b.data(), a.size());

for (ui32 i = 0; i < 30; ++i)
UNIT_ASSERT_VALUES_EQUAL(DotProduct(~a, ~b, a.size()), res);
UNIT_ASSERT_VALUES_EQUAL(DotProduct(a.data(), b.data(), a.size()), res);

#ifdef _sse_
UNIT_ASSERT_VALUES_EQUAL(ToString(res), "250.502");
Expand All @@ -181,14 +181,14 @@ Y_UNIT_TEST_SUITE(TDocProductTestSuite) {

Y_UNIT_TEST(TestDotProductDoubleStability) {
TVector<double> a(1003);
FillWithRandomFloats(~a, 13133, a.size());
FillWithRandomFloats(a.data(), 13133, a.size());
TVector<double> b(1003);
FillWithRandomFloats(~b, 1121, b.size());
FillWithRandomFloats(b.data(), 1121, b.size());

double res = DotProduct(~a, ~b, a.size());
double res = DotProduct(a.data(), b.data(), a.size());

for (ui32 i = 0; i < 30; ++i)
UNIT_ASSERT_VALUES_EQUAL(DotProduct(~a, ~b, a.size()), res);
UNIT_ASSERT_VALUES_EQUAL(DotProduct(a.data(), b.data(), a.size()), res);

#ifdef _sse_
UNIT_ASSERT_VALUES_EQUAL(ToString(res), "235.7826026");
Expand All @@ -197,15 +197,15 @@ Y_UNIT_TEST_SUITE(TDocProductTestSuite) {

Y_UNIT_TEST(TestDotProductCharStability) {
TVector<i8> a(1003);
FillWithRandomNumbers(~a, 1079, a.size());
FillWithRandomNumbers(a.data(), 1079, a.size());
TVector<i8> b(1003);
FillWithRandomNumbers(~b, 2139, b.size());
FillWithRandomNumbers(b.data(), 2139, b.size());

ui32 res = DotProduct(~a, ~b, a.size());
ui32 res = DotProduct(a.data(), b.data(), a.size());

for (ui32 i = 0; i < 30; ++i) {
UNIT_ASSERT_VALUES_EQUAL(DotProduct(~a, ~b, a.size()), res);
UNIT_ASSERT_VALUES_EQUAL(DotProductSlow(~a, ~b, a.size()), res);
UNIT_ASSERT_VALUES_EQUAL(DotProduct(a.data(), b.data(), a.size()), res);
UNIT_ASSERT_VALUES_EQUAL(DotProductSlow(a.data(), b.data(), a.size()), res);
}

UNIT_ASSERT_VALUES_EQUAL(res, 90928);
Expand Down
4 changes: 2 additions & 2 deletions library/fast_exp/benchmark/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Y_CPU_BENCHMARK(FastExpPure, iface) {
const auto& data = *Singleton<TData>();

for (size_t x = 0; x < iface.Iterations(); ++x) {
Y_DO_NOT_OPTIMIZE_AWAY(fast_exp(data[x % +data]));
Y_DO_NOT_OPTIMIZE_AWAY(fast_exp(data[x % data.size()]));
}
}

Expand Down Expand Up @@ -86,6 +86,6 @@ Y_CPU_BENCHMARK(LibcPure, iface) {
const auto& data = *Singleton<TData>();

for (size_t x = 0; x < iface.Iterations(); ++x) {
Y_DO_NOT_OPTIMIZE_AWAY(std::exp(data[x % +data]));
Y_DO_NOT_OPTIMIZE_AWAY(std::exp(data[x % data.size()]));
}
}
4 changes: 2 additions & 2 deletions library/getopt/ut/last_getopt_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace {
TOptsParseResultTestWrapper(const TOpts* opts, TVector<const char*> argv)
: Argv_(argv)
{
Init(opts, (int)+Argv_, ~Argv_);
Init(opts, (int)Argv_.size(), Argv_.data());
}
};

Expand All @@ -40,7 +40,7 @@ struct TOptsParserTester {

void Initialize() {
if (!Parser_)
Parser_.Reset(new TOptsParser(&Opts_, (int)+Argv_, ~Argv_));
Parser_.Reset(new TOptsParser(&Opts_, (int)Argv_.size(), Argv_.data()));
}

void Accept() {
Expand Down
Loading

0 comments on commit ebf0fb6

Please sign in to comment.