susumu.yata
null+****@clear*****
Wed Aug 20 19:58:51 JST 2014
susumu.yata 2014-08-20 19:58:51 +0900 (Wed, 20 Aug 2014) New Revision: 2c5d5cd2ad676c10a7692ac785b721e6c181ff21 https://github.com/groonga/grnxx/commit/2c5d5cd2ad676c10a7692ac785b721e6c181ff21 Message: Add missing default options. Modified files: include/grnxx/pipeline.hpp include/grnxx/types.hpp lib/grnxx/types.cpp Modified: include/grnxx/pipeline.hpp (+5 -5) =================================================================== --- include/grnxx/pipeline.hpp 2014-08-20 18:54:40 +0900 (47fe582) +++ include/grnxx/pipeline.hpp 2014-08-20 19:58:51 +0900 (87294fc) @@ -14,9 +14,6 @@ class Node; using PipelineNode = pipeline::Node; -struct PipelineOptions { -}; - class Pipeline { public: ~Pipeline(); @@ -77,7 +74,8 @@ class PipelineBuilder { // "error" != nullptr. bool push_filter(Error *error, unique_ptr<Expression> &&expression, - Int offset, Int limit); + Int offset = 0, + Int limit = numeric_limits<Int>::max()); // Push an adjuster. // @@ -106,7 +104,9 @@ class PipelineBuilder { // On success, returns a pointer to the expression. // On failure, returns nullptr and stores error information into "*error" if // "error" != nullptr. - unique_ptr<Pipeline> release(Error *error, const PipelineOptions &options); + unique_ptr<Pipeline> release( + Error *error, + const PipelineOptions &options = PipelineOptions()); private: const Table *table_; Modified: include/grnxx/types.hpp (+4 -0) =================================================================== --- include/grnxx/types.hpp 2014-08-20 18:54:40 +0900 (aadfeff) +++ include/grnxx/types.hpp 2014-08-20 19:58:51 +0900 (37632b4) @@ -416,6 +416,10 @@ struct SorterOptions { SorterOptions(); }; +struct PipelineOptions { + PipelineOptions(); +}; + // Database temporary object types. class Datum; class Cursor; Modified: lib/grnxx/types.cpp (+2 -0) =================================================================== --- lib/grnxx/types.cpp 2014-08-20 18:54:40 +0900 (d656302) +++ lib/grnxx/types.cpp 2014-08-20 19:58:51 +0900 (64b8a2e) @@ -60,6 +60,8 @@ SorterOptions::SorterOptions() : offset(0), limit(numeric_limits<Int>::max()) {} +PipelineOptions::PipelineOptions() {} + SortOrder::SortOrder() : expression(), type(REGULAR_ORDER) {} SortOrder::SortOrder(SortOrder &&order) -------------- next part -------------- HTML����������������������������...下载
