Skip to content

feat(bitop): Support DIFF, DIFF1, ANDOR, and ONE for command BITOP #3388

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

Open
xuzifu666 wants to merge 6 commits into
base: unstable
Choose a base branch
from
+372 −13
Open

feat(bitop): Support DIFF, DIFF1, ANDOR, and ONE for command BITOP #3388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8409425
feat(bitop): Support DIFF, DIFF1, ANDOR, and ONE for command BITOP
xuzifu666 Mar 9, 2026
f7fd483
Merge branch 'unstable' into opt_bit
jihuayu Mar 10, 2026
ba7510a
Merge branch 'unstable' into opt_bit
jihuayu Apr 8, 2026
f59794d
Merge branch 'unstable' into opt_bit
jihuayu Apr 8, 2026
f68871a
Merge branch 'unstable' into opt_bit
aleksraiden Apr 8, 2026
df138c3
Merge branch 'unstable' into opt_bit
jihuayu Apr 8, 2026
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
8 changes: 8 additions & 0 deletions src/commands/cmd_bit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,14 @@ class CommandBitOp : public Commander {
op_flag_ = kBitOpXor;
else if (opname == "not")
op_flag_ = kBitOpNot;
else if (opname == "diff")
op_flag_ = kBitOpDiff;
else if (opname == "diff1")
op_flag_ = kBitOpDiff1;
else if (opname == "andor")
op_flag_ = kBitOpAndor;
else if (opname == "one")
op_flag_ = kBitOpOne;
else
return {Status::RedisInvalidCmd, errInvalidSyntax};
if (op_flag_ == kBitOpNot && args.size() != 4) {
Expand Down
175 changes: 162 additions & 13 deletions src/types/redis_bitmap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,89 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
apply_fast_path_op([](uint64_t &a, uint64_t b) { a |= b; });
} else if (op_flag == kBitOpXor) {
apply_fast_path_op([](uint64_t &a, uint64_t b) { a ^= b; });
} else if (op_flag == kBitOpDiff) {
// DIFF: dest = X & ~(Y1 | Y2 | ...)
while (frag_minlen >= sizeof(uint64_t) * 4) {
uint64_t y_or[4] = {0};
for (uint64_t i = 1; i < frag_numkeys; i++) {
y_or[0] |= lp[i][0];
y_or[1] |= lp[i][1];
y_or[2] |= lp[i][2];
y_or[3] |= lp[i][3];
lp[i] += 4;
}
lres[0] &= ~y_or[0];
lres[1] &= ~y_or[1];
lres[2] &= ~y_or[2];
lres[3] &= ~y_or[3];
lres += 4;
j += sizeof(uint64_t) * 4;
frag_minlen -= sizeof(uint64_t) * 4;
}
} else if (op_flag == kBitOpDiff1) {
// DIFF1: dest = (Y1 | Y2 | ...) & ~X
while (frag_minlen >= sizeof(uint64_t) * 4) {
uint64_t y_or[4] = {0};
for (uint64_t i = 1; i < frag_numkeys; i++) {
y_or[0] |= lp[i][0];
y_or[1] |= lp[i][1];
y_or[2] |= lp[i][2];
y_or[3] |= lp[i][3];
lp[i] += 4;
}
lres[0] = y_or[0] & ~lres[0];
lres[1] = y_or[1] & ~lres[1];
lres[2] = y_or[2] & ~lres[2];
lres[3] = y_or[3] & ~lres[3];
lres += 4;
j += sizeof(uint64_t) * 4;
frag_minlen -= sizeof(uint64_t) * 4;
}
} else if (op_flag == kBitOpAndor) {
// ANDOR: dest = X & (Y1 | Y2 | ...)
while (frag_minlen >= sizeof(uint64_t) * 4) {
uint64_t y_or[4] = {0};
for (uint64_t i = 1; i < frag_numkeys; i++) {
y_or[0] |= lp[i][0];
y_or[1] |= lp[i][1];
y_or[2] |= lp[i][2];
y_or[3] |= lp[i][3];
lp[i] += 4;
}
lres[0] &= y_or[0];
lres[1] &= y_or[1];
lres[2] &= y_or[2];
lres[3] &= y_or[3];
lres += 4;
j += sizeof(uint64_t) * 4;
frag_minlen -= sizeof(uint64_t) * 4;
}
} else if (op_flag == kBitOpOne) {
// ONE: dest = 1 if exactly one input has bit set
while (frag_minlen >= sizeof(uint64_t) * 4) {
for (uint64_t k = 0; k < 4; k++) {
uint64_t count[64] = {0};
for (uint64_t i = 0; i < frag_numkeys; i++) {
for (int bit = 0; bit < 64; bit++) {
if (lp[i][k] & (1ULL << bit)) {
count[bit]++;
}
}
}
lres[k] = 0;
for (int bit = 0; bit < 64; bit++) {
if (count[bit] == 1) {
lres[k] |= (1ULL << bit);
}
}
}
for (uint64_t i = 0; i < frag_numkeys; i++) {
lp[i] += 4;
}
lres += 4;
j += sizeof(uint64_t) * 4;
frag_minlen -= sizeof(uint64_t) * 4;
}
} else if (op_flag == kBitOpNot) {
while (frag_minlen >= sizeof(uint64_t) * 4) {
lres[0] = ~lres[0];
Expand All @@ -595,23 +678,89 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st

uint8_t output = 0, byte = 0;
for (; j < frag_maxlen; j++) {
output = (fragments[0].size() <= j) ? 0 : fragments[0][j];
if (op_flag == kBitOpNot) output = ~output;
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
switch (op_flag) {
case kBitOpAnd:
switch (op_flag) {
case kBitOpAnd:
output = (fragments[0].size() <= j) ? 0 : fragments[0][j];
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
output &= byte;
break;
case kBitOpOr:
}
break;
case kBitOpOr:
output = (fragments[0].size() <= j) ? 0 : fragments[0][j];
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
output |= byte;
break;
case kBitOpXor:
}
break;
case kBitOpXor:
output = (fragments[0].size() <= j) ? 0 : fragments[0][j];
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
output ^= byte;
break;
default:
break;
}
break;
case kBitOpNot:
output = (fragments[0].size() <= j) ? 0 : fragments[0][j];
output = ~output;
break;
case kBitOpDiff: {
// DIFF: dest[i] = X[i] & ~(Y1[i] | Y2[i] | ...)
// BITOP DIFF destkey X [Y1 Y2 ...]
uint8_t x = (fragments[0].size() <= j) ? 0 : fragments[0][j];
uint8_t y_or = 0;
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
y_or |= byte;
}
output = x & ~y_or;
break;
}
case kBitOpDiff1: {
// DIFF1: dest[i] = (Y1[i] | Y2[i] | ...) & ~X[i]
// BITOP DIFF1 destkey X [Y1 Y2 ...]
uint8_t x = (fragments[0].size() <= j) ? 0 : fragments[0][j];
uint8_t y_or = 0;
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
y_or |= byte;
}
output = y_or & ~x;
break;
}
case kBitOpAndor: {
// ANDOR: dest[i] = X[i] & (Y1[i] | Y2[i] | ...)
// BITOP ANDOR destkey X [Y1 Y2 ...]
uint8_t x = (fragments[0].size() <= j) ? 0 : fragments[0][j];
uint8_t y_or = 0;
for (uint64_t i = 1; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
y_or |= byte;
}
output = x & y_or;
break;
}
case kBitOpOne: {
// ONE: dest[i] = 1 if exactly one input has bit set
// BITOP ONE destkey X1 [X2 X3 ...]
output = 0;
for (int bit = 0; bit < 8; bit++) {
int count = 0;
for (uint64_t i = 0; i < frag_numkeys; i++) {
byte = (fragments[i].size() <= j) ? 0 : fragments[i][j];
if (byte & (1 << bit)) {
count++;
}
}
if (count == 1) {
output |= (1 << bit);
}
}
break;
}
default:
output = 0;
break;
}
frag_res[j] = output;
}
Expand Down
4 changes: 4 additions & 0 deletions src/types/redis_bitmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ enum BitOpFlags {
kBitOpOr,
kBitOpXor,
kBitOpNot,
kBitOpDiff,
kBitOpDiff1,
kBitOpAndor,
kBitOpOne,
};

namespace redis {
Expand Down
Loading
Loading