Skip to content

Commit

Permalink
corrected limit check on number of vectors in a filter
Browse files Browse the repository at this point in the history
  • Loading branch information
rsharris committed Jul 4, 2022
1 parent aaab732 commit edf4d62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions cmd_bf_operate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void BFOperateCommand::op_and()

if (bfA->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[0] + "\" contains more than one bit vector");
if (bfB->numBitVectors > 2)
if (bfB->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[1] + "\" contains more than one bit vector");
if (bvA->compressor() != bvcomp_uncompressed)
fatal ("error: \"" + bfFilenames[0] + "\" doesn't contain an uncompressed bit vector");
Expand Down Expand Up @@ -277,7 +277,7 @@ void BFOperateCommand::op_or()

if (bfA->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[0] + "\" contains more than one bit vector");
if (bfB->numBitVectors > 2)
if (bfB->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[1] + "\" contains more than one bit vector");
if (bvA->compressor() != bvcomp_uncompressed)
fatal ("error: \"" + bfFilenames[0] + "\" doesn't contain an uncompressed bit vector");
Expand Down Expand Up @@ -312,7 +312,7 @@ void BFOperateCommand::op_xor()

if (bfA->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[0] + "\" contains more than one bit vector");
if (bfB->numBitVectors > 2)
if (bfB->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[1] + "\" contains more than one bit vector");
if (bvA->compressor() != bvcomp_uncompressed)
fatal ("error: \"" + bfFilenames[0] + "\" doesn't contain an uncompressed bit vector");
Expand Down Expand Up @@ -347,7 +347,7 @@ void BFOperateCommand::op_eq()

if (bfA->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[0] + "\" contains more than one bit vector");
if (bfB->numBitVectors > 2)
if (bfB->numBitVectors > 1)
fatal ("error: \"" + bfFilenames[1] + "\" contains more than one bit vector");
if (bvA->compressor() != bvcomp_uncompressed)
fatal ("error: \"" + bfFilenames[0] + "\" doesn't contain an uncompressed bit vector");
Expand Down
4 changes: 2 additions & 2 deletions cmd_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class VersionCommand: public Command
public:
static const unsigned int major = 2;
static const unsigned int minor = 0;
static const unsigned int subMinor = 5;
static const std::uint32_t date = 0x20220702;
static const unsigned int subMinor = 6;
static const std::uint32_t date = 0x20220703;

public:
VersionCommand(const std::string& name): Command(name) {}
Expand Down

0 comments on commit edf4d62

Please sign in to comment.