groonga/grnxx at 296e71e [master] Remove meaningless validity checks. (#130) (Groonga-commit) - Groonga - fulltext search engine.

susumu.yata	2014-12-24 12:39:08 +0900 (Wed, 24 Dec 2014)

  New Revision: 296e71e490f4dea5c33b812c6b061be270ee9351
  https://github.com/groonga/grnxx/commit/296e71e490f4dea5c33b812c6b061be270ee9351

  Message:
    Remove meaningless validity checks. (#130)

  Modified files:
    lib/grnxx/impl/column/scalar/int.cpp

  Modified: lib/grnxx/impl/column/scalar/int.cpp (+8 -8)
===================================================================

--- lib/grnxx/impl/column/scalar/int.cpp    2014-12-22 18:27:25 +0900 (d8da1b0)
+++ lib/grnxx/impl/column/scalar/int.cpp    2014-12-24 12:39:08 +0900 (f95cb79)
@@ -143,7 +143,7 @@ bool Column<Int>::contains(const Datum &datum) const {
     switch (value_size_) {
       case 8: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_8_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_8_[i] == value.raw()) {
             return true;
           }
         }
@@ -151,7 +151,7 @@ bool Column<Int>::contains(const Datum &datum) const {
       }
       case 16: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_16_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_16_[i] == value.raw()) {
             return true;
           }
         }
@@ -159,7 +159,7 @@ bool Column<Int>::contains(const Datum &datum) const {
       }
       case 32: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_32_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_32_[i] == value.raw()) {
             return true;
           }
         }
@@ -167,7 +167,7 @@ bool Column<Int>::contains(const Datum &datum) const {
       }
       default: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if (values_64_[i].match(value) && table_->_test_row(i)) {
+          if (values_64_[i].match(value)) {
             return true;
           }
         }
@@ -224,7 +224,7 @@ Int Column<Int>::find_one(const Datum &datum) const {
     switch (value_size_) {
       case 8: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_8_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_8_[i] == value.raw()) {
             return Int(i);
           }
         }
@@ -232,7 +232,7 @@ Int Column<Int>::find_one(const Datum &datum) const {
       }
       case 16: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_16_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_16_[i] == value.raw()) {
             return Int(i);
           }
         }
@@ -240,7 +240,7 @@ Int Column<Int>::find_one(const Datum &datum) const {
       }
       case 32: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if ((values_32_[i] == value.raw()) && table_->_test_row(i)) {
+          if (values_32_[i] == value.raw()) {
             return Int(i);
           }
         }
@@ -248,7 +248,7 @@ Int Column<Int>::find_one(const Datum &datum) const {
       }
       default: {
         for (size_t i = 0; i < valid_size; ++i) {
-          if (values_64_[i].match(value) && table_->_test_row(i)) {
+          if (values_64_[i].match(value)) {
             return Int(i);
           }
         }
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at 296e71e [master] Remove meaningless validity checks. (#130)