Skip to content

Commit 46755c7

Browse files
committed
Format fix
1 parent 2c95f35 commit 46755c7

File tree

2 files changed

+19
-30
lines changed

2 files changed

+19
-30
lines changed

src/types/redis_bitmap.cc

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -589,18 +589,16 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
589589
j += sizeof(uint64_t) * 4;
590590
frag_minlen -= sizeof(uint64_t) * 4;
591591
}
592-
} else if (op_flag == kBitOpDiff
593-
|| op_flag == kBitOpDiff1
594-
|| op_flag == kBitOpAndOr) {
592+
} else if (op_flag == kBitOpDiff || op_flag == kBitOpDiff1 || op_flag == kBitOpAndOr) {
595593
size_t processed = 0;
596594
size_t k = 0;
597595

598-
while(frag_minlen >= sizeof(uint64_t)*4) {
596+
while (frag_minlen >= sizeof(uint64_t) * 4) {
599597
for (uint64_t i = 1; i < frag_numkeys; i++) {
600-
lres[0] |= lp[i][k+0];
601-
lres[1] |= lp[i][k+1];
602-
lres[2] |= lp[i][k+2];
603-
lres[3] |= lp[i][k+3];
598+
lres[0] |= lp[i][k + 0];
599+
lres[1] |= lp[i][k + 1];
600+
lres[2] |= lp[i][k + 2];
601+
lres[3] |= lp[i][k + 3];
604602
}
605603
k += 4;
606604
lres += 4;
@@ -618,7 +616,7 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
618616
lres[1] = (first_key[1] & ~lres[1]);
619617
lres[2] = (first_key[2] & ~lres[2]);
620618
lres[3] = (first_key[3] & ~lres[3]);
621-
lres+=4;
619+
lres += 4;
622620
first_key += 4;
623621
}
624622
break;
@@ -647,19 +645,19 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
647645
uint64_t lcommon_bits[4];
648646
size_t k = 0;
649647

650-
while(frag_minlen >= sizeof(uint64_t)*4) {
648+
while (frag_minlen >= sizeof(uint64_t) * 4) {
651649
memset(lcommon_bits, 0, sizeof(lcommon_bits));
652650

653651
for (size_t i = 1; i < frag_numkeys; i++) {
654-
lcommon_bits[0] |= (lres[0] & lp[i][k+0]);
655-
lcommon_bits[1] |= (lres[1] & lp[i][k+1]);
656-
lcommon_bits[2] |= (lres[2] & lp[i][k+2]);
657-
lcommon_bits[3] |= (lres[3] & lp[i][k+3]);
658-
659-
lres[0] ^= lp[i][k+0];
660-
lres[1] ^= lp[i][k+1];
661-
lres[2] ^= lp[i][k+2];
662-
lres[3] ^= lp[i][k+3];
652+
lcommon_bits[0] |= (lres[0] & lp[i][k + 0]);
653+
lcommon_bits[1] |= (lres[1] & lp[i][k + 1]);
654+
lcommon_bits[2] |= (lres[2] & lp[i][k + 2]);
655+
lcommon_bits[3] |= (lres[3] & lp[i][k + 3]);
656+
657+
lres[0] ^= lp[i][k + 0];
658+
lres[1] ^= lp[i][k + 1];
659+
lres[2] ^= lp[i][k + 2];
660+
lres[3] ^= lp[i][k + 3];
663661
}
664662

665663
lres[0] &= ~lcommon_bits[0];
@@ -706,7 +704,7 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
706704
break;
707705
}
708706
}
709-
switch(op_flag) {
707+
switch (op_flag) {
710708
case kBitOpDiff:
711709
frag_res[j] = (output & ~disjunction);
712710
break;

src/types/redis_bitmap.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,7 @@
2929
#include "storage/redis_db.h"
3030
#include "storage/redis_metadata.h"
3131

32-
enum BitOpFlags {
33-
kBitOpAnd,
34-
kBitOpOr,
35-
kBitOpXor,
36-
kBitOpNot,
37-
kBitOpDiff,
38-
kBitOpDiff1,
39-
kBitOpAndOr,
40-
kBitOpOne
41-
};
32+
enum BitOpFlags { kBitOpAnd, kBitOpOr, kBitOpXor, kBitOpNot, kBitOpDiff, kBitOpDiff1, kBitOpAndOr, kBitOpOne };
4233

4334
namespace redis {
4435

0 commit comments

Comments
 (0)