susumu.yata
null+****@clear*****
Mon Sep 22 17:24:17 JST 2014
susumu.yata 2014-09-22 17:24:17 +0900 (Mon, 22 Sep 2014) New Revision: 798554f027202ad9e8219f3bf13d3b34a5897990 https://github.com/groonga/grnxx/commit/798554f027202ad9e8219f3bf13d3b34a5897990 Message: Move the definition of AndMerger::progress() into Merger. (#66) Modified files: include/grnxx/merger.hpp lib/grnxx/merger.cpp Modified: include/grnxx/merger.hpp (+1 -1) =================================================================== --- include/grnxx/merger.hpp 2014-09-22 17:22:23 +0900 (1c15487) +++ include/grnxx/merger.hpp 2014-09-22 17:24:17 +0900 (97944d5) @@ -36,7 +36,7 @@ class Merger { // On success, returns true. // On failure, returns false and stores error information into "*error" if // "error" != nullptr. - virtual bool progress(Error *error) = 0; + virtual bool progress(Error *error); // Finish merging. // Modified: lib/grnxx/merger.cpp (+5 -7) =================================================================== --- lib/grnxx/merger.cpp 2014-09-22 17:22:23 +0900 (84e3ead) +++ lib/grnxx/merger.cpp 2014-09-22 17:24:17 +0900 (48f66de) @@ -17,8 +17,6 @@ class AndMerger : public Merger { Array<Record> *input_records_2, Array<Record> *output_records); - bool progress(Error *error); - bool finish(Error *error); private: @@ -62,11 +60,6 @@ bool AndMerger::reset(Error *, return true; } -bool AndMerger::progress(Error *) { - // TODO: Incremental merging is not supported yet. - return true; -} - bool AndMerger::finish(Error *error) { // Create a hash table from the smaller input. Array<Record> *filter_records; @@ -174,6 +167,11 @@ unique_ptr<Merger> Merger::create(Error *error, const MergerOptions &options) { } } +bool Merger::progress(Error *) { + // TODO: Incremental merging is not supported yet. + return true; +} + bool Merger::merge(Error *error, Array<Record> *input_records_1, Array<Record> *input_records_2, -------------- next part -------------- HTML����������������������������...Download
