From aac941b3f0fe5a6feed81d0c8101c96e941bc557 Mon Sep 17 00:00:00 2001 From: Yueh-Hsuan Chiang Date: Thu, 17 Jul 2014 16:37:25 -0700 Subject: [PATCH] Fixed a signed and unsigned comparison in Compaction Summary: Fixed a signed and unsigned comparison in Compaction Test Plan: make db_test export ROCKSDB_TESTS=Compaction ./db_test --- db/compaction.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/db/compaction.h b/db/compaction.h index 0ea0a71ea4..6f1f96e49c 100644 --- a/db/compaction.h +++ b/db/compaction.h @@ -57,9 +57,8 @@ class Compaction { // compaction input level. // The function will return 0 if when "compaction_input_level" < 0 // or "compaction_input_level" >= "num_input_levels()". - int num_input_files(int compaction_input_level) const { - if (compaction_input_level >= 0 && - compaction_input_level < inputs_.size()) { + int num_input_files(size_t compaction_input_level) const { + if (compaction_input_level < inputs_.size()) { return inputs_[compaction_input_level].size(); } return 0; @@ -75,9 +74,8 @@ class Compaction { // specified compaction input level. // REQUIREMENT: "compaction_input_level" must be >= 0 and // < "input_levels()" - FileMetaData* input(int compaction_input_level, int i) const { - assert(compaction_input_level < inputs_.size() && - compaction_input_level >= 0); + FileMetaData* input(size_t compaction_input_level, int i) const { + assert(compaction_input_level < inputs_.size()); return inputs_[compaction_input_level][i]; } @@ -85,9 +83,8 @@ class Compaction { // input level. // REQUIREMENT: "compaction_input_level" must be >= 0 and // < "input_levels()" - std::vector* const inputs(int compaction_input_level) { - assert(compaction_input_level < inputs_.size() && - compaction_input_level >= 0); + std::vector* const inputs(size_t compaction_input_level) { + assert(compaction_input_level < inputs_.size()); return &inputs_[compaction_input_level].files; }