Skip to content

Cherry-pick latest changes of Roaring UDF to 25-1-stable #17712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maximyurchuk merged 2 commits into from
Apr 25, 2025
Merged

Cherry-pick latest changes of Roaring UDF to 25-1-stable #17712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f7bfc
Introduce Intersect operation to Roaring UDF (#17611)
jsjant Apr 23, 2025
f18218e
Introduce Add and IsEmpty operations to Roaring UDF (#17650)
jsjant Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 157 additions & 2 deletions ydb/library/yql/udfs/common/roaring/roaring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,120 @@ namespace {
}
};

class TRoaringIntersect: public TBoxedValue {
public:
TRoaringIntersect(TSourcePosition pos)
: Pos_(pos)
{
}

static TStringRef Name() {
return TStringRef::Of("Intersect");
}

private:
TUnboxedValue Run(const IValueBuilder* valueBuilder,
const TUnboxedValuePod* args) const override {
Y_UNUSED(valueBuilder);
try {
auto* left = GetBitmapFromArg(args[0]);
auto* right = GetBitmapFromArg(args[1]);

return TUnboxedValuePod(roaring_bitmap_intersect(left, right));
} catch (const std::exception& e) {
UdfTerminate((TStringBuilder() << Pos_ << " " << e.what()).data());
}
}

TSourcePosition Pos_;
};

class TRoaringIntersectWithBinary: public TBoxedValue {
public:
TRoaringIntersectWithBinary(TSourcePosition pos)
: Pos_(pos)
{
}

static TStringRef Name() {
return TStringRef::Of("IntersectWithBinary");
}

private:
TUnboxedValue Run(const IValueBuilder* valueBuilder,
const TUnboxedValuePod* args) const override {
Y_UNUSED(valueBuilder);
try {
auto* left = GetBitmapFromArg(args[0]);
auto* right = DeserializePortable(args[1].AsStringRef());

auto intersect = roaring_bitmap_intersect(left, right);
roaring_bitmap_free(right);
return TUnboxedValuePod(intersect);

} catch (const std::exception& e) {
UdfTerminate((TStringBuilder() << Pos_ << " " << e.what()).data());
}
}

TSourcePosition Pos_;
};

class TRoaringIsEmpty: public TBoxedValue {
public:
TRoaringIsEmpty(TSourcePosition pos)
: Pos_(pos)
{
}

static TStringRef Name() {
return TStringRef::Of("IsEmpty");
}

private:
TUnboxedValue Run(const IValueBuilder* valueBuilder,
const TUnboxedValuePod* args) const override {
Y_UNUSED(valueBuilder);
try {
auto* left = GetBitmapFromArg(args[0]);

return TUnboxedValuePod(roaring_bitmap_is_empty(left));
} catch (const std::exception& e) {
UdfTerminate((TStringBuilder() << Pos_ << " " << e.what()).data());
}
}

TSourcePosition Pos_;
};

class TRoaringAdd: public TBoxedValue {
public:
TRoaringAdd(TSourcePosition pos)
: Pos_(pos)
{
}

static TStringRef Name() {
return TStringRef::Of("Add");
}

private:
TUnboxedValue Run(const IValueBuilder* valueBuilder,
const TUnboxedValuePod* args) const override {
Y_UNUSED(valueBuilder);
try {
auto* bitmap = GetBitmapFromArg(args[0]);
roaring_bitmap_add(bitmap, args[1].Get<ui32>());

return args[0];
} catch (const std::exception& e) {
UdfTerminate((TStringBuilder() << Pos_ << " " << e.what()).data());
}
}

TSourcePosition Pos_;
};

class TRoaringModule: public IUdfModule {
public:
class TMemoryHookInitializer {
Expand Down Expand Up @@ -484,15 +598,21 @@ namespace {
auto typesOnly = (flags & TFlags::TypesOnly);

if (TRoaringDeserialize::Name() == name) {
builder.Returns<TResource<RoaringResourceName>>().Args()->Add<TAutoMap<char*>>();
builder.Returns<TResource<RoaringResourceName>>()
.OptionalArgs(1)
.Args()
->Add<TAutoMap<char*>>()
.Add<TOptional<ui32>>();

if (!typesOnly) {
builder.Implementation(new TRoaringDeserialize(builder.GetSourcePosition()));
}
} else if (TRoaringFromUint32List::Name() == name) {
builder.Returns<TResource<RoaringResourceName>>()
.OptionalArgs(1)
.Args()
->Add<TListType<ui32>>();
->Add<TListType<ui32>>()
.Add<TOptional<ui32>>();

if (!typesOnly) {
builder.Implementation(new TRoaringFromUint32List(builder.GetSourcePosition()));
Expand Down Expand Up @@ -611,6 +731,41 @@ namespace {
if (!typesOnly) {
builder.Implementation(new TRoaringNaiveBulkAndWithBinary(builder.GetSourcePosition()));
}
} else if (TRoaringIntersect::Name() == name) {
builder.Returns<bool>()
.Args()
->Add<TAutoMap<TResource<RoaringResourceName>>>()
.Add<TAutoMap<TResource<RoaringResourceName>>>();

if (!typesOnly) {
builder.Implementation(new TRoaringIntersect(builder.GetSourcePosition()));
}
} else if (TRoaringIntersectWithBinary::Name() == name) {
builder.Returns<bool>()
.Args()
->Add<TAutoMap<TResource<RoaringResourceName>>>()
.Add<TAutoMap<char*>>();

if (!typesOnly) {
builder.Implementation(new TRoaringIntersectWithBinary(builder.GetSourcePosition()));
}
} else if (TRoaringIsEmpty::Name() == name) {
builder.Returns<bool>()
.Args()
->Add<TAutoMap<TResource<RoaringResourceName>>>();

if (!typesOnly) {
builder.Implementation(new TRoaringIsEmpty(builder.GetSourcePosition()));
}
} else if (TRoaringAdd::Name() == name) {
builder.Returns<TResource<RoaringResourceName>>()
.Args()
->Add<TAutoMap<TResource<RoaringResourceName>>>()
.Add<ui32>();

if (!typesOnly) {
builder.Implementation(new TRoaringAdd(builder.GetSourcePosition()));
}
} else {
TStringBuilder sb;
sb << "Unknown function: " << name.Data();
Expand Down
5 changes: 5 additions & 0 deletions ydb/library/yql/udfs/common/roaring/test/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"test.test[aggregation]": [
{
"uri": "file://test.test_aggregation_/results.txt"
}
],
"test.test[cardinality]": [
{
"uri": "file://test.test_cardinality_/results.txt"
Expand Down
48 changes: 48 additions & 0 deletions ydb/library/yql/udfs/common/roaring/test/canondata/test.test_aggregation_/results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[
{
"Write" = [
{
"Type" = [
"ListType";
[
"StructType";
[
[
"key";
[
"DataType";
"String"
]
];
[
"column1";
[
"ListType";
[
"DataType";
"Uint32"
]
]
]
]
]
];
"Data" = [
[
"baz";
[
"3"
]
];
[
"foo";
[
"1";
"2"
]
]
]
}
]
}
]
Loading
Loading