Skip to content

Commit ed3994a

Browse files
authored
Merge 5312027 into a54252c
2 parents a54252c + 5312027 commit ed3994a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1157
-213
lines changed

ydb/core/formats/arrow/rows/view.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ std::partial_ordering TSimpleRow::operator<=>(const TSimpleRow& item) const {
1313
return TSimpleRowViewV0(Data).Compare(TSimpleRowViewV0(item.Data), Schema).GetResult();
1414
}
1515

16+
bool TSimpleRow::operator==(const TSimpleRow& item) const {
17+
return (*this <=> item) == std::partial_ordering::equivalent;
18+
}
19+
1620
std::shared_ptr<arrow::RecordBatch> TSimpleRow::ToBatch() const {
1721
auto builders = NArrow::MakeBuilders(Schema);
1822
AddToBuilders(builders).Validate();

ydb/core/formats/arrow/rows/view.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class TSimpleRow {
116116
std::partial_ordering CompareNotNull(const TSimpleRow& item) const;
117117

118118
std::partial_ordering operator<=>(const TSimpleRow& item) const;
119+
bool operator==(const TSimpleRow& item) const;
119120
};
120121

121122
} // namespace NKikimr::NArrow

ydb/core/kqp/ut/common/kqp_ut_common.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@ struct TKikimrSettings: public TTestFeatureFlagsHolder<TKikimrSettings> {
101101
exchangerSettings->SetMaxDelayMs(10);
102102
AppConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
103103
AppConfig.MutableColumnShardConfig()->SetMaxInFlightIntervalsOnRequest(1);
104+
AppConfig.MutableColumnShardConfig()->SetAlterObjectEnabled(true);
104105
FeatureFlags.SetEnableSparsedColumns(true);
105106
FeatureFlags.SetEnableWritePortionsOnInsert(true);
106107
FeatureFlags.SetEnableParameterizedDecimal(true);
107108
FeatureFlags.SetEnableTopicAutopartitioningForCDC(true);
108109
FeatureFlags.SetEnableFollowerStats(true);
109110
FeatureFlags.SetEnableColumnStore(true);
111+
FeatureFlags.SetEnableDuplicateFilterInColumnShard(true);
110112
}
111113

112114
TKikimrSettings& SetAppConfig(const NKikimrConfig::TAppConfig& value) { AppConfig = value; return *this; }

ydb/core/kqp/ut/olap/aggregations_ut.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Y_UNIT_TEST_SUITE(KqpOlapAggregations) {
3636
}
3737

3838
{
39+
WriteTestData(kikimr, "/Root/olapStore/olapTable", 10000, 3000000, 1000);
40+
WriteTestData(kikimr, "/Root/olapStore/olapTable", 10000, 3000000, 1000);
3941
WriteTestData(kikimr, "/Root/olapStore/olapTable", 10000, 3000000, 1000);
4042
WriteTestData(kikimr, "/Root/olapStore/olapTable", 11000, 3001000, 1000);
4143
WriteTestData(kikimr, "/Root/olapStore/olapTable", 12000, 3002000, 1000);
@@ -99,7 +101,7 @@ Y_UNIT_TEST_SUITE(KqpOlapAggregations) {
99101
UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
100102
TString result = StreamResultToYson(it);
101103
Cout << result << Endl;
102-
CompareYson(result, R"([[23000u;]])");
104+
CompareYson(result, R"([[25000u;]])");
103105
}
104106
}
105107

0 commit comments

Comments
 (0)