Skip to content

Commit 88d40e9

Browse files
ivanmorozov333ivanmorozov333
authored
correct not null flags usage in tests (#7293)
1 parent 0c28fec commit 88d40e9

File tree

5 files changed

+28
-17
lines changed

5 files changed

+28
-17
lines changed

‎ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,26 +125,25 @@ bool WriteDataImpl(TTestBasicRuntime& runtime, TActorId& sender, const ui64 shar
125125
}
126126

127127
bool WriteData(TTestBasicRuntime& runtime, TActorId& sender, const ui64 shardId, const ui64 writeId, const ui64 tableId, const TString& data,
128-
const std::vector<NArrow::NTest::TTestColumn>& ydbSchema, std::vector<ui64>* writeIds, const NEvWrite::EModificationType mType,
129-
const std::set<std::string>& notNullColumns) {
128+
const std::vector<NArrow::NTest::TTestColumn>& ydbSchema, std::vector<ui64>* writeIds, const NEvWrite::EModificationType mType) {
130129
NLongTxService::TLongTxId longTxId;
131130
UNIT_ASSERT(longTxId.ParseString("ydb://long-tx/01ezvvxjdk2hd4vdgjs68knvp8?node_id=1"));
132131
return WriteDataImpl(
133-
runtime, sender, shardId, tableId, longTxId, writeId, data, NArrow::MakeArrowSchema(ydbSchema, notNullColumns), writeIds, mType);
132+
runtime, sender, shardId, tableId, longTxId, writeId, data, NArrow::MakeArrowSchema(ydbSchema), writeIds, mType);
134133
}
135134

136135
bool WriteData(TTestBasicRuntime& runtime, TActorId& sender, const ui64 writeId, const ui64 tableId, const TString& data,
137136
const std::vector<NArrow::NTest::TTestColumn>& ydbSchema, bool waitResult, std::vector<ui64>* writeIds,
138-
const NEvWrite::EModificationType mType, const std::set<std::string>& notNullColumns) {
137+
const NEvWrite::EModificationType mType) {
139138
NLongTxService::TLongTxId longTxId;
140139
UNIT_ASSERT(longTxId.ParseString("ydb://long-tx/01ezvvxjdk2hd4vdgjs68knvp8?node_id=1"));
141140
if (writeIds) {
142141
return WriteDataImpl(runtime, sender, TTestTxConfig::TxTablet0, tableId, longTxId, writeId, data,
143-
NArrow::MakeArrowSchema(ydbSchema, notNullColumns), writeIds, mType);
142+
NArrow::MakeArrowSchema(ydbSchema), writeIds, mType);
144143
}
145144
std::vector<ui64> ids;
146145
return WriteDataImpl(runtime, sender, TTestTxConfig::TxTablet0, tableId, longTxId, writeId, data,
147-
NArrow::MakeArrowSchema(ydbSchema, notNullColumns), waitResult ? &ids : nullptr, mType);
146+
NArrow::MakeArrowSchema(ydbSchema), waitResult ? &ids : nullptr, mType);
148147
}
149148

150149
std::optional<ui64> WriteData(TTestBasicRuntime& runtime, TActorId& sender, const NLongTxService::TLongTxId& longTxId,

‎ydb/core/tx/columnshard/test_helper/columnshard_ut_common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,11 @@ void PlanWriteTx(TTestBasicRuntime& runtime, TActorId& sender, NOlap::TSnapshot
407407

408408
bool WriteData(TTestBasicRuntime& runtime, TActorId& sender, const ui64 shardId, const ui64 writeId, const ui64 tableId, const TString& data,
409409
const std::vector<NArrow::NTest::TTestColumn>& ydbSchema, std::vector<ui64>* writeIds,
410-
const NEvWrite::EModificationType mType = NEvWrite::EModificationType::Upsert, const std::set<std::string>& notNullColumns = {});
410+
const NEvWrite::EModificationType mType = NEvWrite::EModificationType::Upsert);
411411

412412
bool WriteData(TTestBasicRuntime& runtime, TActorId& sender, const ui64 writeId, const ui64 tableId, const TString& data,
413413
const std::vector<NArrow::NTest::TTestColumn>& ydbSchema, bool waitResult = true, std::vector<ui64>* writeIds = nullptr,
414-
const NEvWrite::EModificationType mType = NEvWrite::EModificationType::Upsert, const std::set<std::string>& notNullColumns = {});
414+
const NEvWrite::EModificationType mType = NEvWrite::EModificationType::Upsert);
415415

416416
std::optional<ui64> WriteData(TTestBasicRuntime& runtime, TActorId& sender, const NLongTxService::TLongTxId& longTxId,
417417
ui64 tableId, const ui64 writePartId, const TString& data,

‎ydb/core/tx/columnshard/test_helper/helper.cpp‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ NKikimrSchemeOp::TOlapColumnDescription TTestColumn::CreateColumn(const ui32 id)
3636
return col;
3737
}
3838

39+
std::set<std::string> TTestColumn::GetNullableSet(const std::vector<TTestColumn>& columns) {
40+
std::set<std::string> result;
41+
for (auto&& i : columns) {
42+
if (!i.GetNullable()) {
43+
result.emplace(i.GetName());
44+
}
45+
}
46+
return result;
47+
}
48+
3949
std::vector<std::pair<TString, NKikimr::NScheme::TTypeInfo>> TTestColumn::ConvertToPairs(const std::vector<TTestColumn>& columns) {
4050
std::vector<std::pair<TString, NScheme::TTypeInfo>> result;
4151
for (auto&& i : columns) {
@@ -70,15 +80,15 @@ std::vector<NKikimr::NArrow::NTest::TTestColumn> TTestColumn::CropSchema(const s
7080

7181
namespace NKikimr::NArrow {
7282

73-
std::vector<std::shared_ptr<arrow::Field>> MakeArrowFields(
74-
const std::vector<NTest::TTestColumn>& columns, const std::set<std::string>& notNullColumns /*= {}*/) {
83+
std::vector<std::shared_ptr<arrow::Field>> MakeArrowFields(const std::vector<NTest::TTestColumn>& columns) {
84+
std::set<std::string> notNullColumns = NTest::TTestColumn::GetNullableSet(columns);
7585
auto result = MakeArrowFields(NTest::TTestColumn::ConvertToPairs(columns), notNullColumns);
7686
UNIT_ASSERT_C(result.ok(), result.status().ToString());
7787
return result.ValueUnsafe();
7888
}
7989

80-
std::shared_ptr<arrow::Schema> MakeArrowSchema(
81-
const std::vector<NTest::TTestColumn>& columns, const std::set<std::string>& notNullColumns /*= {}*/) {
90+
std::shared_ptr<arrow::Schema> MakeArrowSchema(const std::vector<NTest::TTestColumn>& columns) {
91+
std::set<std::string> notNullColumns = NTest::TTestColumn::GetNullableSet(columns);
8292
auto result = MakeArrowSchema(NTest::TTestColumn::ConvertToPairs(columns), notNullColumns);
8393
UNIT_ASSERT_C(result.ok(), result.status().ToString());
8494
return result.ValueUnsafe();

‎ydb/core/tx/columnshard/test_helper/helper.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class TTestColumn {
5252
YDB_ACCESSOR_DEF(NScheme::TTypeInfo, Type);
5353
YDB_ACCESSOR_DEF(TString, StorageId);
5454
YDB_ACCESSOR_DEF(TString, AccessorClassName);
55+
YDB_ACCESSOR(bool, Nullable, true);
5556

5657
public:
5758
explicit TTestColumn(const TString& name, const NScheme::TTypeInfo& type)
@@ -65,13 +66,14 @@ class TTestColumn {
6566
static THashMap<TString, NScheme::TTypeInfo> ConvertToHash(const std::vector<TTestColumn>& columns);
6667
static std::vector<TTestColumn> BuildFromPairs(const std::vector<std::pair<TString, NScheme::TTypeInfo>>& columns);
6768
static std::vector<TTestColumn> CropSchema(const std::vector<TTestColumn>& input, const ui32 size);
69+
static std::set<std::string> GetNullableSet(const std::vector<TTestColumn>& columns);
6870
};
6971

7072
}
7173

7274
namespace NKikimr::NArrow {
7375

74-
std::vector<std::shared_ptr<arrow::Field>> MakeArrowFields(const std::vector<NTest::TTestColumn>& columns, const std::set<std::string>& notNullColumns = {});
75-
std::shared_ptr<arrow::Schema> MakeArrowSchema(const std::vector<NTest::TTestColumn>& columns, const std::set<std::string>& notNullColumns = {});
76+
std::vector<std::shared_ptr<arrow::Field>> MakeArrowFields(const std::vector<NTest::TTestColumn>& columns);
77+
std::shared_ptr<arrow::Schema> MakeArrowSchema(const std::vector<NTest::TTestColumn>& columns);
7678

7779
}

‎ydb/core/tx/schemeshard/ut_olap/ut_olap.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static const TString defaultTableSchema = R"(
4040
)";
4141

4242
static const TVector<NArrow::NTest::TTestColumn> defaultYdbSchema = {
43-
NArrow::NTest::TTestColumn("timestamp", TTypeInfo(NTypeIds::Timestamp) ),
43+
NArrow::NTest::TTestColumn("timestamp", TTypeInfo(NTypeIds::Timestamp)).SetNullable(false),
4444
NArrow::NTest::TTestColumn("data", TTypeInfo(NTypeIds::Utf8) )
4545
};
4646

@@ -713,7 +713,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
713713
TSet<ui64> txIds;
714714
for (ui32 i = 0; i < 10; ++i) {
715715
std::vector<ui64> writeIds;
716-
NTxUT::WriteData(runtime, sender, shardId, ++writeId, pathId, data, defaultYdbSchema, &writeIds, NEvWrite::EModificationType::Upsert, { "timestamp" });
716+
NTxUT::WriteData(runtime, sender, shardId, ++writeId, pathId, data, defaultYdbSchema, &writeIds, NEvWrite::EModificationType::Upsert);
717717
NTxUT::ProposeCommit(runtime, sender, shardId, ++txId, writeIds);
718718
txIds.insert(txId);
719719
}
@@ -725,7 +725,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
725725

726726
// trigger periodic stats at shard (after timeout)
727727
std::vector<ui64> writeIds;
728-
NTxUT::WriteData(runtime, sender, shardId, ++writeId, pathId, data, defaultYdbSchema, &writeIds, NEvWrite::EModificationType::Upsert, { "timestamp" });
728+
NTxUT::WriteData(runtime, sender, shardId, ++writeId, pathId, data, defaultYdbSchema, &writeIds, NEvWrite::EModificationType::Upsert);
729729
NTxUT::ProposeCommit(runtime, sender, shardId, ++txId, writeIds);
730730
NTxUT::PlanCommit(runtime, sender, shardId, ++planStep, {txId});
731731
}

0 commit comments

Comments
 (0)