@@ -589,18 +589,16 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
589
589
j += sizeof (uint64_t ) * 4 ;
590
590
frag_minlen -= sizeof (uint64_t ) * 4 ;
591
591
}
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 ) {
595
593
size_t processed = 0 ;
596
594
size_t k = 0 ;
597
595
598
- while (frag_minlen >= sizeof (uint64_t )* 4 ) {
596
+ while (frag_minlen >= sizeof (uint64_t ) * 4 ) {
599
597
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 ];
604
602
}
605
603
k += 4 ;
606
604
lres += 4 ;
@@ -618,7 +616,7 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
618
616
lres[1 ] = (first_key[1 ] & ~lres[1 ]);
619
617
lres[2 ] = (first_key[2 ] & ~lres[2 ]);
620
618
lres[3 ] = (first_key[3 ] & ~lres[3 ]);
621
- lres+= 4 ;
619
+ lres += 4 ;
622
620
first_key += 4 ;
623
621
}
624
622
break ;
@@ -647,19 +645,19 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
647
645
uint64_t lcommon_bits[4 ];
648
646
size_t k = 0 ;
649
647
650
- while (frag_minlen >= sizeof (uint64_t )* 4 ) {
648
+ while (frag_minlen >= sizeof (uint64_t ) * 4 ) {
651
649
memset (lcommon_bits, 0 , sizeof (lcommon_bits));
652
650
653
651
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 ];
663
661
}
664
662
665
663
lres[0 ] &= ~lcommon_bits[0 ];
@@ -706,7 +704,7 @@ rocksdb::Status Bitmap::BitOp(engine::Context &ctx, BitOpFlags op_flag, const st
706
704
break ;
707
705
}
708
706
}
709
- switch (op_flag) {
707
+ switch (op_flag) {
710
708
case kBitOpDiff :
711
709
frag_res[j] = (output & ~disjunction);
712
710
break ;
0 commit comments