Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at c317ffb [master] Rename Expression::push_datum() to push_constant(). (#54)

susumu.yata null+****@clear*****
Tue Sep 16 15:35:59 JST 2014

• Previous message: [Groonga-commit] droonga/wikipedia-search.wiki at 3821e07 [master] Updated 実験環境（仮想環境）の構築 (markdown)
• Next message: [Groonga-commit] groonga/grnxx at 0b21d58 [master] Disable "_id" and "_score" in Expression::push_column(). (#54)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2014-09-16 15:35:59 +0900 (Tue, 16 Sep 2014)

  New Revision: c317ffbecf0e9c89650f405c5e1550ff52dd380c
  https://github.com/groonga/grnxx/commit/c317ffbecf0e9c89650f405c5e1550ff52dd380c

  Message:
    Rename Expression::push_datum() to push_constant(). (#54)

  Modified files:
    benchmark/benchmark_adjuster.cpp
    include/grnxx/expression.hpp
    lib/grnxx/expression.cpp
    test/test_expression.cpp
    test/test_pipeline.cpp

  Modified: benchmark/benchmark_adjuster.cpp (+1 -1)
===================================================================
--- benchmark/benchmark_adjuster.cpp    2014-09-16 13:23:20 +0900 (09145ad)
+++ benchmark/benchmark_adjuster.cpp    2014-09-16 15:35:59 +0900 (aff5135)
@@ -163,7 +163,7 @@ void test_adjust2() {
   // Create an adjuster (Float).
   assert(expression_builder->push_column(&error, "Int"));
   assert(expression_builder->push_operator(&error, grnxx::TO_FLOAT_OPERATOR));
-  assert(expression_builder->push_datum(&error, grnxx::Float(100.0)));
+  assert(expression_builder->push_constant(&error, grnxx::Float(100.0)));
   assert(expression_builder->push_operator(&error, grnxx::DIVISION_OPERATOR));
   assert(expression_builder->push_column(&error, "Float"));
   assert(expression_builder->push_operator(&error, grnxx::PLUS_OPERATOR));

  Modified: include/grnxx/expression.hpp (+1 -1)
===================================================================
--- include/grnxx/expression.hpp    2014-09-16 13:23:20 +0900 (b7ef969)
+++ include/grnxx/expression.hpp    2014-09-16 15:35:59 +0900 (2918644)
@@ -211,7 +211,7 @@ class ExpressionBuilder {
   // On success, returns true.
   // On failure, returns false and stores error information into "*error" if
   // "error" != nullptr.
-  bool push_datum(Error *error, const Datum &datum);
+  bool push_constant(Error *error, const Datum &datum);
 
   // Push a node associated with row IDs of Records.
   //

  Modified: lib/grnxx/expression.cpp (+4 -4)
===================================================================
--- lib/grnxx/expression.cpp    2014-09-16 13:23:20 +0900 (afc2d55)
+++ lib/grnxx/expression.cpp    2014-09-16 15:35:59 +0900 (62c3256)
@@ -2679,7 +2679,7 @@ class Builder {
   // On success, returns true.
   // On failure, returns false and stores error information into "*error" if
   // "error" != nullptr.
-  bool push_datum(Error *error, const Datum &datum);
+  bool push_constant(Error *error, const Datum &datum);
 
   // Push a node associated with row IDs of Records.
   //
@@ -2818,7 +2818,7 @@ unique_ptr<Builder> Builder::create(Error *error, const Table *table) {
   return builder;
 }
 
-bool Builder::push_datum(Error *error, const Datum &datum) {
+bool Builder::push_constant(Error *error, const Datum &datum) {
   // Reserve a space for a new node.
   if (!stack_.reserve(error, stack_.size() + 1)) {
     return false;
@@ -3761,8 +3761,8 @@ unique_ptr<ExpressionBuilder> ExpressionBuilder::create(Error *error,
 
 ExpressionBuilder::~ExpressionBuilder() {}
 
-bool ExpressionBuilder::push_datum(Error *error, const Datum &datum) {
-  return builders_.back()->push_datum(error, datum);
+bool ExpressionBuilder::push_constant(Error *error, const Datum &datum) {
+  return builders_.back()->push_constant(error, datum);
 }
 
 bool ExpressionBuilder::push_row_id(Error *error) {

  Modified: test/test_expression.cpp (+16 -16)
===================================================================
--- test/test_expression.cpp    2014-09-16 13:23:20 +0900 (ed29747)
+++ test/test_expression.cpp    2014-09-16 15:35:59 +0900 (a7dbed1)
@@ -400,7 +400,7 @@ void test_constant() {
   assert(builder);
 
   // Test an expression (true).
-  assert(builder->push_datum(&error, grnxx::Bool(true)));
+  assert(builder->push_constant(&error, grnxx::Bool(true)));
   auto expression = builder->release(&error);
   assert(expression);
 
@@ -420,7 +420,7 @@ void test_constant() {
   assert(records.size() == test.table->num_rows());
 
   // Test an expression (false).
-  assert(builder->push_datum(&error, grnxx::Bool(false)));
+  assert(builder->push_constant(&error, grnxx::Bool(false)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -435,7 +435,7 @@ void test_constant() {
   assert(records.size() == 0);
 
   // Test an expression (100).
-  assert(builder->push_datum(&error, grnxx::Int(100)));
+  assert(builder->push_constant(&error, grnxx::Int(100)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -451,7 +451,7 @@ void test_constant() {
   }
 
   // Test an expression (1.25).
-  assert(builder->push_datum(&error, grnxx::Float(1.25)));
+  assert(builder->push_constant(&error, grnxx::Float(1.25)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -469,7 +469,7 @@ void test_constant() {
   }
 
   // Test an expression ({ 123, 456 }).
-  assert(builder->push_datum(&error, grnxx::GeoPoint(123, 456)));
+  assert(builder->push_constant(&error, grnxx::GeoPoint(123, 456)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -481,7 +481,7 @@ void test_constant() {
   }
 
   // Test an expression ("ABC").
-  assert(builder->push_datum(&error, grnxx::Text("ABC")));
+  assert(builder->push_constant(&error, grnxx::Text("ABC")));
   expression = builder->release(&error);
   assert(expression);
 
@@ -493,7 +493,7 @@ void test_constant() {
   }
 
   // Test an expression ({ true, false, true }).
-  assert(builder->push_datum(
+  assert(builder->push_constant(
       &error, grnxx::BoolVector({ true, false, true })));
   expression = builder->release(&error);
   assert(expression);
@@ -508,7 +508,7 @@ void test_constant() {
 
   // Test an expression ({ 123, -456, 789 }).
   grnxx::Int int_values[] = { 123, -456, 789 };
-  assert(builder->push_datum(&error, grnxx::IntVector(int_values, 3)));
+  assert(builder->push_constant(&error, grnxx::IntVector(int_values, 3)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -521,7 +521,7 @@ void test_constant() {
 
   // Test an expression ({ 1.25, -4.5, 6.75 }).
   grnxx::Float float_values[] = { 1.25, -4.5, 6.75 };
-  assert(builder->push_datum(&error, grnxx::FloatVector(float_values, 3)));
+  assert(builder->push_constant(&error, grnxx::FloatVector(float_values, 3)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -536,7 +536,7 @@ void test_constant() {
   grnxx::GeoPoint geo_point_values[] = {
     { 123, 456 }, { 789, 123 }, { 456, 789 }
   };
-  assert(builder->push_datum(
+  assert(builder->push_constant(
       &error, grnxx::GeoPointVector(geo_point_values, 3)));
   expression = builder->release(&error);
   assert(expression);
@@ -551,7 +551,7 @@ void test_constant() {
 
   // Test an expression ({ "abc", "DEF", "ghi" }).
   grnxx::Text text_values[] = { "abc", "DEF", "ghi" };
-  assert(builder->push_datum(&error, grnxx::TextVector(text_values, 3)));
+  assert(builder->push_constant(&error, grnxx::TextVector(text_values, 3)));
   expression = builder->release(&error);
   assert(expression);
 
@@ -2673,7 +2673,7 @@ void test_division() {
   // Test an expression (Int / (Int2 + 1)).
   assert(builder->push_column(&error, "Int"));
   assert(builder->push_column(&error, "Int2"));
-  assert(builder->push_datum(&error, grnxx::Int(1)));
+  assert(builder->push_constant(&error, grnxx::Int(1)));
   assert(builder->push_operator(&error, grnxx::PLUS_OPERATOR));
   assert(builder->push_operator(&error, grnxx::DIVISION_OPERATOR));
   expression = builder->release(&error);
@@ -2749,7 +2749,7 @@ void test_modulus() {
   // Test an expression (Int % (Int2 + 1)).
   assert(builder->push_column(&error, "Int"));
   assert(builder->push_column(&error, "Int2"));
-  assert(builder->push_datum(&error, grnxx::Int(1)));
+  assert(builder->push_constant(&error, grnxx::Int(1)));
   assert(builder->push_operator(&error, grnxx::PLUS_OPERATOR));
   assert(builder->push_operator(&error, grnxx::MODULUS_OPERATOR));
   expression = builder->release(&error);
@@ -3101,7 +3101,7 @@ void test_sequential_filter() {
   assert(builder->push_column(&error, "Int"));
   assert(builder->push_column(&error, "Int2"));
   assert(builder->push_operator(&error, grnxx::PLUS_OPERATOR));
-  assert(builder->push_datum(&error, grnxx::Int(100)));
+  assert(builder->push_constant(&error, grnxx::Int(100)));
   assert(builder->push_operator(&error, grnxx::LESS_OPERATOR));
   auto expression = builder->release(&error);
   assert(expression);
@@ -3183,7 +3183,7 @@ void test_sequential_evaluate() {
   // Test an expression (Int + Int(Float * 100.0)).
   assert(builder->push_column(&error, "Int"));
   assert(builder->push_column(&error, "Float"));
-  assert(builder->push_datum(&error, 100.0));
+  assert(builder->push_constant(&error, 100.0));
   assert(builder->push_operator(&error, grnxx::MULTIPLICATION_OPERATOR));
   assert(builder->push_operator(&error, grnxx::TO_INT_OPERATOR));
   assert(builder->push_operator(&error, grnxx::PLUS_OPERATOR));
@@ -3230,7 +3230,7 @@ void test_partial_filter() {
   assert(builder->push_column(&error, "Float"));
   assert(builder->push_column(&error, "Float2"));
   assert(builder->push_operator(&error, grnxx::MULTIPLICATION_OPERATOR));
-  assert(builder->push_datum(&error, grnxx::Float(0.25)));
+  assert(builder->push_constant(&error, grnxx::Float(0.25)));
   assert(builder->push_operator(&error, grnxx::GREATER_OPERATOR));
   auto expression = builder->release(&error);
   assert(expression);

  Modified: test/test_pipeline.cpp (+4 -4)
===================================================================
--- test/test_pipeline.cpp    2014-09-16 13:23:20 +0900 (fdf047b)
+++ test/test_pipeline.cpp    2014-09-16 15:35:59 +0900 (0a35e00)
@@ -128,10 +128,10 @@ void test_filter() {
   // Create a filter (Bool && (Int < 50) && (Float < 0.5)).
   assert(expression_builder->push_column(&error, "Bool"));
   assert(expression_builder->push_column(&error, "Int"));
-  assert(expression_builder->push_datum(&error, grnxx::Int(50)));
+  assert(expression_builder->push_constant(&error, grnxx::Int(50)));
   assert(expression_builder->push_operator(&error, grnxx::LESS_OPERATOR));
   assert(expression_builder->push_column(&error, "Float"));
-  assert(expression_builder->push_datum(&error, grnxx::Float(0.5)));
+  assert(expression_builder->push_constant(&error, grnxx::Float(0.5)));
   assert(expression_builder->push_operator(&error, grnxx::LESS_OPERATOR));
   assert(expression_builder->push_operator(&error,
                                            grnxx::LOGICAL_AND_OPERATOR));
@@ -170,7 +170,7 @@ void test_filter() {
   constexpr grnxx::Int FILTER_LIMIT  = 2345;
   assert(expression_builder->push_column(&error, "Bool"));
   assert(expression_builder->push_column(&error, "Int"));
-  assert(expression_builder->push_datum(&error, grnxx::Int(50)));
+  assert(expression_builder->push_constant(&error, grnxx::Int(50)));
   assert(expression_builder->push_operator(&error, grnxx::LESS_OPERATOR));
   assert(expression_builder->push_operator(&error,
                                            grnxx::LOGICAL_AND_OPERATOR));
@@ -225,7 +225,7 @@ void test_adjuster() {
 
   // Create an adjuster (Float * 100.0).
   assert(expression_builder->push_column(&error, "Float"));
-  assert(expression_builder->push_datum(&error, grnxx::Float(100.0)));
+  assert(expression_builder->push_constant(&error, grnxx::Float(100.0)));
   assert(expression_builder->push_operator(&error,
                                            grnxx::MULTIPLICATION_OPERATOR));
   expression = expression_builder->release(&error);
-------------- next part --------------
HTML����������������������������...
下载 

• Previous message: [Groonga-commit] droonga/wikipedia-search.wiki at 3821e07 [master] Updated 実験環境（仮想環境）の構築 (markdown)
• Next message: [Groonga-commit] groonga/grnxx at 0b21d58 [master] Disable "_id" and "_score" in Expression::push_column(). (#54)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]