Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at 6301578 [master] Remove is_valid().

susumu.yata null+****@clear*****
Tue Jul 2 15:16:59 JST 2013

• Previous message: [Groonga-commit] groonga/grnxx at bd541c6 [master] Add error handling.
• Next message: [Groonga-commit] groonga/grnxx at 3643f16 [master] Use grnxx::Exception.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2013-07-02 15:16:59 +0900 (Tue, 02 Jul 2013)

  New Revision: 630157802732328b673c214ba26b0169aff01318
  https://github.com/groonga/grnxx/commit/630157802732328b673c214ba26b0169aff01318

  Message:
    Remove is_valid().

  Modified files:
    lib/grnxx/storage.hpp
    test/test_storage.cpp

  Modified: lib/grnxx/storage.hpp (+0 -10)
===================================================================
--- lib/grnxx/storage.hpp    2013-07-02 15:16:28 +0900 (e74e612)
+++ lib/grnxx/storage.hpp    2013-07-02 15:16:59 +0900 (6fc0151)
@@ -81,11 +81,6 @@ struct StorageOptions {
 
   // Return true iff the options are valid.
   explicit operator bool() const;
-  // TODO: Obsolete. Use operator bool() instead.
-  // Return true if the parameters are valid.
-  bool is_valid() const {
-    return static_cast<bool>(*this);
-  }
 };
 
 StringBuilder &operator<<(StringBuilder &builder,
@@ -103,11 +98,6 @@ class StorageNode {
   explicit operator bool() const {
     return header_ != nullptr;
   }
-  // TODO: Obsolete. Use operator bool() instead.
-  // Return true iff "header_" != nullptr.
-  bool is_valid() const {
-    return static_cast<bool>(*this);
-  }
 
   // Return the ID.
   uint32_t id() const;

  Modified: test/test_storage.cpp (+32 -32)
===================================================================
--- test/test_storage.cpp    2013-07-02 15:16:28 +0900 (bb7312d)
+++ test/test_storage.cpp    2013-07-02 15:16:59 +0900 (64e0175)
@@ -389,47 +389,47 @@ void test_storage_create_node() {
   storage.reset(grnxx::Storage::create(FILE_PATH));
   assert(storage);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 20);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 20));
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 24);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 24));
   node = storage->create_node(-1, 1 << 16);
-  assert(!node.is_valid());
+  assert(!node);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, -1);
-  assert(!node.is_valid());
+  assert(!node);
 
   storage.reset(grnxx::Storage::create(FILE_PATH, grnxx::STORAGE_TEMPORARY));
   assert(storage);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 20);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 20));
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 24);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 24));
   node = storage->create_node(-1, 1 << 16);
-  assert(!node.is_valid());
+  assert(!node);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, -1);
-  assert(!node.is_valid());
+  assert(!node);
 
   storage.reset(grnxx::Storage::create(nullptr));
   assert(storage);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 20);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 20));
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 24);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 24));
   node = storage->create_node(-1, 1 << 16);
-  assert(!node.is_valid());
+  assert(!node);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, -1);
-  assert(!node.is_valid());
+  assert(!node);
 
   assert(grnxx::Storage::unlink(FILE_PATH));
 }
@@ -447,24 +447,24 @@ void test_storage_open_node() {
                                        options));
   assert(storage);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 20);
-  assert(node.is_valid());
+  assert(node);
   node_id_1 = node.id();
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 24);
-  assert(node.is_valid());
+  assert(node);
   node_id_2 = node.id();
 
   storage.reset(grnxx::Storage::open(FILE_PATH));
   assert(storage);
   node = storage->open_node(grnxx::STORAGE_ROOT_NODE_ID);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == options.root_size);
   node = storage->open_node(node_id_1);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 20));
   node = storage->open_node(node_id_2);
-  assert(node.is_valid());
+  assert(node);
   assert(node.status() == grnxx::STORAGE_NODE_ACTIVE);
   assert(node.size() == (1 << 24));
 
@@ -479,9 +479,9 @@ void test_storage_unlink_node() {
   storage.reset(grnxx::Storage::create(nullptr));
   assert(storage);
   node_1 = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 20);
-  assert(node_1.is_valid());
+  assert(node_1);
   node_2 = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 24);
-  assert(node_2.is_valid());
+  assert(node_2);
 
   assert(storage->unlink_node(node_1.id()));
   assert(node_1.status() == grnxx::STORAGE_NODE_UNLINKED);
@@ -497,32 +497,32 @@ void test_storage_sweep() {
   storage.reset(grnxx::Storage::create(nullptr));
   assert(storage);
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 18);
-  assert(node.is_valid());
-  assert(storage->create_node(node.id(), 1 << 18).is_valid());
-  assert(storage->create_node(node.id(), 1 << 18).is_valid());
+  assert(node);
+  assert(storage->create_node(node.id(), 1 << 18));
+  assert(storage->create_node(node.id(), 1 << 18));
   uint64_t total_size = storage->total_size();
   for (int i = 0; i < 100; ++i) {
     assert(storage->unlink_node(node.id()));
     assert(storage->sweep(grnxx::Duration(0)));
     node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 1 << 18);
-    assert(node.is_valid());
-    assert(storage->create_node(node.id(), 1 << 18).is_valid());
-    assert(storage->create_node(node.id(), 1 << 18).is_valid());
+    assert(node);
+    assert(storage->create_node(node.id(), 1 << 18));
+    assert(storage->create_node(node.id(), 1 << 18));
     assert(storage->total_size() == total_size);
   }
 
   node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 0);
-  assert(node.is_valid());
-  assert(storage->create_node(node.id(), 0).is_valid());
-  assert(storage->create_node(node.id(), 0).is_valid());
+  assert(node);
+  assert(storage->create_node(node.id(), 0));
+  assert(storage->create_node(node.id(), 0));
   total_size = storage->total_size();
   for (int i = 0; i < 100; ++i) {
     assert(storage->unlink_node(node.id()));
     assert(storage->sweep(grnxx::Duration(0)));
     node = storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, 0);
-    assert(node.is_valid());
-    assert(storage->create_node(node.id(), 0).is_valid());
-    assert(storage->create_node(node.id(), 0).is_valid());
+    assert(node);
+    assert(storage->create_node(node.id(), 0));
+    assert(storage->create_node(node.id(), 0));
     assert(storage->total_size() == total_size);
   }
 }
@@ -704,7 +704,7 @@ void test_storage_random_queries() {
       }
       const grnxx::StorageNode node =
           storage->create_node(grnxx::STORAGE_ROOT_NODE_ID, size);
-      assert(node.is_valid());
+      assert(node);
       id_set.insert(node.id());
     }
   }
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at bd541c6 [master] Add error handling.
• Next message: [Groonga-commit] groonga/grnxx at 3643f16 [master] Use grnxx::Exception.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]