andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Completely remove argv_ since no one use it

Browse Source 
There are still warning in some other environment, just move that useless variable `argv_`
This commit is contained in:
kailiu 2013-12-12 16:36:38 -08:00
parent 0e24f97b9f
commit 0cd1521af5
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db/db_test.cc
View File

@ -2590,12 +2590,11 @@ class DeleteFilter : public CompactionFilter {
class ChangeFilter : public CompactionFilter { class ChangeFilter : public CompactionFilter {
public: public:
explicit ChangeFilter(int argv) : argv_(argv) {} explicit ChangeFilter() {}
virtual bool Filter(int level, const Slice& key, virtual bool Filter(int level, const Slice& key,
const Slice& value, std::string* new_value, const Slice& value, std::string* new_value,
bool* value_changed) const override { bool* value_changed) const override {
assert(argv_ == 100);
assert(new_value != nullptr); assert(new_value != nullptr);
*new_value = NEW_VALUE; *new_value = NEW_VALUE;
*value_changed = true; *value_changed = true;
@ -2605,9 +2604,6 @@ class ChangeFilter : public CompactionFilter {
virtual const char* Name() const override { virtual const char* Name() const override {
return "ChangeFilter"; return "ChangeFilter";
} }
private:
const int __attribute__((unused)) argv_;
}; };
class KeepFilterFactory : public CompactionFilterFactory { class KeepFilterFactory : public CompactionFilterFactory {
@ -2636,19 +2632,16 @@ class DeleteFilterFactory : public CompactionFilterFactory {
class ChangeFilterFactory : public CompactionFilterFactory { class ChangeFilterFactory : public CompactionFilterFactory {
public: public:
explicit ChangeFilterFactory(int argv) : argv_(argv) {} explicit ChangeFilterFactory() {}
virtual std::unique_ptr<CompactionFilter> virtual std::unique_ptr<CompactionFilter>
CreateCompactionFilter(const CompactionFilter::Context& context) override { CreateCompactionFilter(const CompactionFilter::Context& context) override {
return std::unique_ptr<CompactionFilter>(new ChangeFilter(argv_)); return std::unique_ptr<CompactionFilter>(new ChangeFilter());
} }
virtual const char* Name() const override { virtual const char* Name() const override {
return "ChangeFilterFactory"; return "ChangeFilterFactory";
} }
private:
const int argv_;
}; };
TEST(DBTest, CompactionFilter) { TEST(DBTest, CompactionFilter) {
@ -2795,7 +2788,7 @@ TEST(DBTest, CompactionFilterWithValueChange) {
options.num_levels = 3; options.num_levels = 3;
options.max_mem_compaction_level = 0; options.max_mem_compaction_level = 0;
options.compaction_filter_factory = options.compaction_filter_factory =
std::make_shared<ChangeFilterFactory>(100); std::make_shared<ChangeFilterFactory>();
Reopen(&options); Reopen(&options);
// Write 100K+1 keys, these are written to a few files // Write 100K+1 keys, these are written to a few files