Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at 3965e9c [master] Update error handling.

susumu.yata null+****@clear*****
Fri Aug 1 13:49:31 JST 2014

• Previous message: [Groonga-commit] groonga/grnxx at a59f7e9 [master] Remove an old comment.
• Next message: [Groonga-commit] groonga/grnxx at 14793e2 [master] Add an argument "offset" to Expression::adjust(). (#31)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2014-08-01 13:49:31 +0900 (Fri, 01 Aug 2014)

  New Revision: 3965e9c2ad46aff3c24324a0580a47bec72c7835
  https://github.com/groonga/grnxx/commit/3965e9c2ad46aff3c24324a0580a47bec72c7835

  Message:
    Update error handling.

  Modified files:
    include/grnxx/error.hpp
    lib/grnxx/expression.cpp
    lib/grnxx/table.cpp

  Modified: include/grnxx/error.hpp (+1 -0)
===================================================================
--- include/grnxx/error.hpp    2014-08-01 11:07:48 +0900 (55d147f)
+++ include/grnxx/error.hpp    2014-08-01 13:49:31 +0900 (1a07df7)
@@ -16,6 +16,7 @@ enum ErrorCode {
   NO_KEY_COLUMN,      // The table has no key column.
   INVALID_ARGUMENT,   // Invalid argument.
   INVALID_OPERATION,  // Invalid operation.
+  INVALID_OPERAND,    // Invalid operand.
   NOT_SUPPORTED_YET   // The operation is not supported yet.
 };
 

  Modified: lib/grnxx/expression.cpp (+25 -53)
===================================================================
--- lib/grnxx/expression.cpp    2014-08-01 11:07:48 +0900 (f723eef)
+++ lib/grnxx/expression.cpp    2014-08-01 13:49:31 +0900 (1241b81)
@@ -76,7 +76,7 @@ class Node : public ExpressionNode {
   virtual bool filter(Error *error, RecordSet *record_set);
   virtual bool adjust(Error *error, RecordSet *record_set);
 
-  virtual bool evaluate(Error *error, const RecordSubset &record_set);
+  virtual bool evaluate(Error *error, const RecordSubset &record_set) = 0;
 
   T get(Int i) const {
     return values_[i];
@@ -88,8 +88,8 @@ class Node : public ExpressionNode {
 
 template <typename T>
 bool Node<T>::filter(Error *error, RecordSet *record_set) {
-  // TODO: Define "This type is not supported" error.
-  GRNXX_ERROR_SET(error, NOT_SUPPORTED_YET, "Not supported yet");
+  // Only Node<Bool> supports filter().
+  GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation");
   return false;
 }
 
@@ -110,8 +110,8 @@ bool Node<Bool>::filter(Error *error, RecordSet *record_set) {
 
 template <typename T>
 bool Node<T>::adjust(Error *error, RecordSet *record_set) {
-  // TODO: Define "This type is not supported" error.
-  GRNXX_ERROR_SET(error, NOT_SUPPORTED_YET, "Not supported yet");
+  // Only Node<Float> supports filter().
+  GRNXX_ERROR_SET(error, INVALID_OPERATION, "Invalid operation");
   return false;
 }
 
@@ -126,13 +126,6 @@ bool Node<Float>::adjust(Error *error, RecordSet *record_set) {
   return true;
 }
 
-template <typename T>
-bool Node<T>::evaluate(Error *error, const RecordSubset &record_set) {
-  // TODO: This should be a pure virtual function.
-  GRNXX_ERROR_SET(error, NOT_SUPPORTED_YET, "Not supported yet");
-  return false;
-}
-
 // -- DatumNode --
 
 template <typename T>
@@ -964,8 +957,7 @@ ExpressionBuilder::ExpressionBuilder(const Table *table) : table_(table) {}
 
 bool ExpressionBuilder::push_positive_operator(Error *error) {
   if (stack_.size() < 1) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &arg = stack_[stack_.size() - 1];
@@ -976,8 +968,7 @@ bool ExpressionBuilder::push_positive_operator(Error *error) {
       return true;
     }
     default: {
-      // TODO: Define a better error code.
-      GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+      GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
       return false;
     }
   }
@@ -985,8 +976,7 @@ bool ExpressionBuilder::push_positive_operator(Error *error) {
 
 bool ExpressionBuilder::push_negative_operator(Error *error) {
   if (stack_.size() < 1) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1005,8 +995,7 @@ bool ExpressionBuilder::push_negative_operator(Error *error) {
       break;
     }
     default: {
-      // TODO: Define a better error code.
-      GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+      GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
       return false;
     }
   }
@@ -1020,8 +1009,7 @@ bool ExpressionBuilder::push_negative_operator(Error *error) {
 
 bool ExpressionBuilder::push_to_int_operator(Error *error) {
   if (stack_.size() < 1) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1038,8 +1026,7 @@ bool ExpressionBuilder::push_to_int_operator(Error *error) {
       break;
     }
     default: {
-      // TODO: Define a better error code.
-      GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+      GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
       return false;
     }
   }
@@ -1053,8 +1040,7 @@ bool ExpressionBuilder::push_to_int_operator(Error *error) {
 
 bool ExpressionBuilder::push_to_float_operator(Error *error) {
   if (stack_.size() < 1) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1071,8 +1057,7 @@ bool ExpressionBuilder::push_to_float_operator(Error *error) {
       return true;
     }
     default: {
-      // TODO: Define a better error code.
-      GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+      GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
       return false;
     }
   }
@@ -1086,16 +1071,14 @@ bool ExpressionBuilder::push_to_float_operator(Error *error) {
 
 bool ExpressionBuilder::push_logical_and_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if ((lhs->data_type() != BOOL_DATA) ||
       (rhs->data_type() != BOOL_DATA)) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
     return false;
   }
   unique_ptr<ExpressionNode> node(
@@ -1111,16 +1094,14 @@ bool ExpressionBuilder::push_logical_and_operator(Error *error) {
 
 bool ExpressionBuilder::push_logical_or_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if ((lhs->data_type() != BOOL_DATA) ||
       (rhs->data_type() != BOOL_DATA)) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Wrong type");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Invalid data type");
     return false;
   }
   unique_ptr<ExpressionNode> node(
@@ -1137,15 +1118,13 @@ bool ExpressionBuilder::push_logical_or_operator(Error *error) {
 template <typename T>
 bool ExpressionBuilder::push_equality_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if (lhs->data_type() != rhs->data_type()) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Type conflict");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Data type conflict");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1204,15 +1183,13 @@ bool ExpressionBuilder::push_equality_operator(Error *error) {
 template <typename T>
 bool ExpressionBuilder::push_comparison_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if (lhs->data_type() != rhs->data_type()) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Type conflict");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Data type conflict");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1259,15 +1236,13 @@ bool ExpressionBuilder::push_comparison_operator(Error *error) {
 template <typename T>
 bool ExpressionBuilder::push_bitwise_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if (lhs->data_type() != rhs->data_type()) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Type conflict");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Data type conflict");
     return false;
   }
   unique_ptr<ExpressionNode> node;
@@ -1284,7 +1259,6 @@ bool ExpressionBuilder::push_bitwise_operator(Error *error) {
           functor, std::move(lhs), std::move(rhs)));
       break;
     }
-    // TODO: Support other comparable types.
     default: {
       GRNXX_ERROR_SET(error, NOT_SUPPORTED_YET, "Not supported yet");
       return false;
@@ -1302,15 +1276,13 @@ bool ExpressionBuilder::push_bitwise_operator(Error *error) {
 template <typename T>
 bool ExpressionBuilder::push_arithmetic_operator(Error *error) {
   if (stack_.size() < 2) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Not enough operands");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Not enough operands");
     return false;
   }
   auto &lhs = stack_[stack_.size() - 2];
   auto &rhs = stack_[stack_.size() - 1];
   if (lhs->data_type() != rhs->data_type()) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Type conflict");
+    GRNXX_ERROR_SET(error, INVALID_OPERAND, "Type conflict");
     return false;
   }
   unique_ptr<ExpressionNode> node;

  Modified: lib/grnxx/table.cpp (+2 -2)
===================================================================
--- lib/grnxx/table.cpp    2014-08-01 11:07:48 +0900 (f5aa9ba)
+++ lib/grnxx/table.cpp    2014-08-01 13:49:31 +0900 (09322ee)
@@ -539,8 +539,8 @@ Int Table::find_zero_bit() const {
 
 bool Table::reserve_bit(Error *error, Int i) {
   if (i > MAX_ROW_ID) {
-    // TODO: Define a better error code.
-    GRNXX_ERROR_SET(error, INVALID_ARGUMENT, "Invalid argument");
+    GRNXX_ERROR_SET(error, INVALID_ARGUMENT,
+                    "Invalid argument: i = %" PRIi64, i);
     return false;
   }
   // Resize the bitmap if required.
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at a59f7e9 [master] Remove an old comment.
• Next message: [Groonga-commit] groonga/grnxx at 14793e2 [master] Add an argument "offset" to Expression::adjust(). (#31)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]