Merge branch 'cleanup'

Author: ban-nobuhiro

include/shirakami/result_info.h

@@ -75,34 +75,34 @@ inline constexpr std::string_view to_string_view(reason_code rc) noexcept {
     using namespace std::string_view_literals;
     switch (rc) {
         case reason_code::UNKNOWN:
-            return "UNKNOWN"sv; // NOLINT
+            return "UNKNOWN"sv;
         case reason_code::KVS_DELETE:
-            return "KVS_DELETE"sv; // NOLINT
+            return "KVS_DELETE"sv;
         case reason_code::KVS_INSERT:
-            return "KVS_INSERT"sv; // NOLINT
+            return "KVS_INSERT"sv;
         case reason_code::KVS_UPDATE:
-            return "KVS_UPDATE"sv; // NOLINT
+            return "KVS_UPDATE"sv;
         case reason_code::CC_LTX_PHANTOM_AVOIDANCE:
-            return "CC_LTX_PHANTOM_AVOIDANCE"sv; //NOLINT
+            return "CC_LTX_PHANTOM_AVOIDANCE"sv;
         case reason_code::CC_LTX_READ_AREA_VIOLATION:
-            return "CC_LTX_READ_AREA_VIOLATION"sv; // NOLINT
+            return "CC_LTX_READ_AREA_VIOLATION"sv;
         case reason_code::CC_LTX_READ_UPPER_BOUND_VIOLATION:
-            return "CC_LTX_READ_UPPER_BOUND_VIOLATION"sv; // NOLINT
+            return "CC_LTX_READ_UPPER_BOUND_VIOLATION"sv;
         case reason_code::CC_LTX_WRITE_COMMITTED_READ_PROTECTION:
-            return "CC_LTX_WRITE_COMMITTED_READ_PROTECTION"sv; // NOLINT
+            return "CC_LTX_WRITE_COMMITTED_READ_PROTECTION"sv;
         case reason_code::CC_OCC_READ_VERIFY:
-            return "CC_OCC_READ_VERIFY"sv; // NOLINT
+            return "CC_OCC_READ_VERIFY"sv;
         case reason_code::CC_OCC_WP_VERIFY:
-            return "CC_OCC_WP_VERIFY"sv; // NOLINT
+            return "CC_OCC_WP_VERIFY"sv;
         case reason_code::CC_OCC_PHANTOM_AVOIDANCE:
-            return "CC_OCC_PHANTOM_AVOIDANCE"sv; //NOLINT
+            return "CC_OCC_PHANTOM_AVOIDANCE"sv;
         case reason_code::USER_ABORT:
-            return "USER_ABORT"sv; // NOLINT
+            return "USER_ABORT"sv;
     }
     std::abort();
 }
 
-inline std::ostream& operator<<(std::ostream& out, reason_code rc) { // NOLINT
+inline std::ostream& operator<<(std::ostream& out, reason_code rc) {
     return out << to_string_view(rc);
 }
 

include/shirakami/scheme.h

@@ -42,16 +42,16 @@ inline constexpr std::string_view to_string_view(scan_endpoint ep) noexcept {
     using namespace std::string_view_literals;
     switch (ep) {
         case scan_endpoint::EXCLUSIVE:
-            return "EXCLUSIVE"sv; //NOLINT
+            return "EXCLUSIVE"sv;
         case scan_endpoint::INCLUSIVE:
-            return "INCLUSIVE"sv; //NOLINT
+            return "INCLUSIVE"sv;
         case scan_endpoint::INF:
-            return "INF"sv; //NOLINT
+            return "INF"sv;
     }
     std::abort();
 }
 
-inline std::ostream& operator<<(std::ostream& out, scan_endpoint op) { // NOLINT
+inline std::ostream& operator<<(std::ostream& out, scan_endpoint op) {
     return out << to_string_view(op);
 }
 
@@ -258,90 +258,88 @@ enum class Status : std::int32_t { // NOLINT
     INTERNAL_WARN_PREMATURE,
 };
 
-inline constexpr std::string_view to_string_view( // NOLINT
-        const Status value) noexcept {
+inline constexpr std::string_view to_string_view(const Status value) noexcept {
     using namespace std::string_view_literals;
     switch (value) {
         case Status::WARN_ALREADY_BEGIN:
-            return "WARN_ALREADY_BEGIN"sv; // NOLINT
+            return "WARN_ALREADY_BEGIN"sv;
         case Status::WARN_ALREADY_EXISTS:
-            return "WARN_ALREADY_EXISTS"sv; // NOLINT
+            return "WARN_ALREADY_EXISTS"sv;
         case Status::WARN_ALREADY_INIT:
-            return "WARN_ALREADY_INIT"sv; // NOLINT
+            return "WARN_ALREADY_INIT"sv;
         case Status::WARN_CANCEL_PREVIOUS_INSERT:
-            return "WARN_CANCEL_PREVIOUS_INSERT"sv; // NOLINT
+            return "WARN_CANCEL_PREVIOUS_INSERT"sv;
         case Status::WARN_CANCEL_PREVIOUS_UPSERT:
-            return "WARN_CANCEL_PREVIOUS_UPSERT"sv; // NOLINT
+            return "WARN_CANCEL_PREVIOUS_UPSERT"sv;
         case Status::WARN_CONCURRENT_INSERT:
-            return "WARN_CONCURRENT_INSERT"sv; // NOLINT
+            return "WARN_CONCURRENT_INSERT"sv;
         case Status::WARN_CONCURRENT_UPDATE:
-            return "WARN_CONCURRENT_UPDATE"sv; // NOLINT
+            return "WARN_CONCURRENT_UPDATE"sv;
         case Status::WARN_CONFLICT_ON_WRITE_PRESERVE:
-            return "WARN_CONFLICT_ON_WRITE_PRESERVE"sv; // NOLINT
+            return "WARN_CONFLICT_ON_WRITE_PRESERVE"sv;
         case Status::WARN_ILLEGAL_OPERATION:
-            return "WARN_ILLEGAL_OPERATION"sv; // NOLINT
+            return "WARN_ILLEGAL_OPERATION"sv;
         case Status::WARN_INVALID_ARGS:
-            return "WARN_INVALID_ARGS"sv; // NOLINT
+            return "WARN_INVALID_ARGS"sv;
         case Status::WARN_INVALID_HANDLE:
-            return "WARN_INVALID_HANDLE"sv; // NOLINT
+            return "WARN_INVALID_HANDLE"sv;
         case Status::WARN_INVALID_KEY_LENGTH:
-            return "WARN_INVALID_KEY_LENGTH"sv; // NOLINT
+            return "WARN_INVALID_KEY_LENGTH"sv;
         case Status::WARN_MAX_OPEN_SCAN:
-            return "WARN_MAX_OPEN_SCAN"sv; // NOLINT
+            return "WARN_MAX_OPEN_SCAN"sv;
         case Status::WARN_NOT_BEGIN:
-            return "WARN_NOT_BEGIN"sv; // NOLINT
+            return "WARN_NOT_BEGIN"sv;
         case Status::WARN_NOT_FOUND:
-            return "WARN_NOT_FOUND"sv; // NOLINT
+            return "WARN_NOT_FOUND"sv;
         case Status::WARN_NOT_IN_A_SESSION:
-            return "WARN_NOT_IN_A_SESSION"sv; // NOLINT
+            return "WARN_NOT_IN_A_SESSION"sv;
         case Status::WARN_NOT_INIT:
-            return "WARN_NOT_INIT"sv; // NOLINT
+            return "WARN_NOT_INIT"sv;
         case Status::WARN_PREMATURE:
-            return "WARN_PREMATURE"sv; // NOLINT
+            return "WARN_PREMATURE"sv;
         case Status::WARN_SCAN_LIMIT:
-            return "WARN_SCAN_LIMIT"sv; // NOLINT
+            return "WARN_SCAN_LIMIT"sv;
         case Status::WARN_STORAGE_ID_DEPLETION:
-            return "WARN_STORAGE_ID_DEPLETION"sv; // NOLINT
+            return "WARN_STORAGE_ID_DEPLETION"sv;
         case Status::WARN_STORAGE_NOT_FOUND:
-            return "WARN_STORAGE_NOT_FOUND"sv; // NOLINT
+            return "WARN_STORAGE_NOT_FOUND"sv;
         case Status::WARN_WAITING_FOR_OTHER_TX:
-            return "WARN_WAITING_FOR_OTHER_TX"sv; // NOLINT
+            return "WARN_WAITING_FOR_OTHER_TX"sv;
         case Status::WARN_WRITE_WITHOUT_WP:
-            return "WARN_WRITE_WITHOUT_WP"sv; // NOLINT
+            return "WARN_WRITE_WITHOUT_WP"sv;
         case Status::OK:
-            return "OK"sv; // NOLINT
+            return "OK"sv;
         case Status::ERR_CC:
-            return "ERR_CC"sv; // NOLINT
+            return "ERR_CC"sv;
         case Status::ERR_READ_AREA_VIOLATION:
-            return "ERR_READ_AREA_VIOLATION"sv; // NOLINT
+            return "ERR_READ_AREA_VIOLATION"sv;
         case Status::ERR_FATAL:
-            return "ERR_FATAL"sv; // NOLINT
+            return "ERR_FATAL"sv;
         case Status::ERR_FATAL_INDEX:
-            return "ERR_FATAL_INDEX"sv; // NOLINT
+            return "ERR_FATAL_INDEX"sv;
         case Status::ERR_INVALID_CONFIGURATION:
-            return "ERR_INVALID_CONFIGURATION"sv; // NOLINT
+            return "ERR_INVALID_CONFIGURATION"sv;
         case Status::ERR_KVS:
-            return "ERR_KVS"sv; // NOLINT
+            return "ERR_KVS"sv;
         case Status::ERR_NOT_IMPLEMENTED:
-            return "ERR_NOT_IMPLEMENTED"sv; // NOLINT
+            return "ERR_NOT_IMPLEMENTED"sv;
         case Status::ERR_SESSION_LIMIT:
-            return "ERR_SESSION_LIMIT"sv; // NOLINT
+            return "ERR_SESSION_LIMIT"sv;
         case Status::INTERNAL_BEGIN:
-            return "INTERNAL_BEGIN"sv; // NOLINT
+            return "INTERNAL_BEGIN"sv;
         case Status::INTERNAL_WARN_NOT_DELETED:
-            return "INTERNAL_WARN_NOT_DELETED"sv; // NOLINT
+            return "INTERNAL_WARN_NOT_DELETED"sv;
         case Status::INTERNAL_WARN_NOT_FOUND:
-            return "INTERNAL_WARN_NOT_FOUND"sv; // NOLINT
+            return "INTERNAL_WARN_NOT_FOUND"sv;
         case Status::INTERNAL_WARN_CONCURRENT_INSERT:
-            return "INTERNAL_WARN_CONCURRENT_INSERT"sv; // NOLINT
+            return "INTERNAL_WARN_CONCURRENT_INSERT"sv;
         case Status::INTERNAL_WARN_PREMATURE:
-            return "INTERNAL_WARN_PREMATURE"sv; // NOLINT
+            return "INTERNAL_WARN_PREMATURE"sv;
     }
     std::abort();
 }
 
-inline std::ostream& operator<<(std::ostream& out,
-                                const Status value) { // NOLINT
+inline std::ostream& operator<<(std::ostream& out, const Status value) {
     return out << to_string_view(value);
 }
 
@@ -358,35 +356,34 @@ enum class OP_TYPE : std::int32_t {
     UPSERT,
 };
 
-inline constexpr std::string_view to_string_view( // NOLINT
-        const OP_TYPE op) noexcept {
+inline constexpr std::string_view to_string_view(const OP_TYPE op) noexcept {
     using namespace std::string_view_literals;
     switch (op) {
         case OP_TYPE::ABORT:
-            return "ABORT"sv; // NOLINT
+            return "ABORT"sv;
         case OP_TYPE::BEGIN:
-            return "BEGIN"sv; // NOLINT
+            return "BEGIN"sv;
         case OP_TYPE::COMMIT:
-            return "COMMIT"sv; // NOLINT
+            return "COMMIT"sv;
         case OP_TYPE::DELETE:
-            return "DELETE"sv; // NOLINT
+            return "DELETE"sv;
         case OP_TYPE::INSERT:
-            return "INSERT"sv; // NOLINT
+            return "INSERT"sv;
         case OP_TYPE::NONE:
-            return "NONE"sv; // NOLINT
+            return "NONE"sv;
         case OP_TYPE::SCAN:
-            return "SCAN"sv; // NOLINT
+            return "SCAN"sv;
         case OP_TYPE::SEARCH:
-            return "SEARCH"sv; // NOLINT
+            return "SEARCH"sv;
         case OP_TYPE::UPDATE:
-            return "UPDATE"sv; // NOLINT
+            return "UPDATE"sv;
         case OP_TYPE::UPSERT:
-            return "UPSERT"sv; // NOLINT
+            return "UPSERT"sv;
     }
     std::abort();
 }
 
-inline std::ostream& operator<<(std::ostream& out, const OP_TYPE op) { // NOLINT
+inline std::ostream& operator<<(std::ostream& out, const OP_TYPE op) {
     return out << to_string_view(op);
 }
 

include/shirakami/transaction_options.h

@@ -153,11 +153,11 @@ to_string_view(const transaction_options::transaction_type tp) noexcept {
     using namespace std::string_view_literals;
     switch (tp) {
         case transaction_options::transaction_type::SHORT:
-            return "SHORT"sv; // NOLINT
+            return "SHORT"sv;
         case transaction_options::transaction_type::LONG:
-            return "LONG"sv; // NOLINT
+            return "LONG"sv;
         case transaction_options::transaction_type::READ_ONLY:
-            return "READ_ONLY"sv; // NOLINT
+            return "READ_ONLY"sv;
     }
     /**
      * LOG_FIRST_N マクロは下記エラーによって利用できない。

src/concurrency_control/interface/helper.cpp

@@ -14,26 +14,11 @@
 #include "concurrency_control/include/wp.h"
 #include "concurrency_control/interface/long_tx/include/long_tx.h"
 #include "concurrency_control/interface/read_only_tx/include/read_only_tx.h"
-
 #include "database/include/logging.h"
-
-#ifdef PWAL
-
-#include "concurrency_control/include/lpwal.h"
-
-#include "datastore/limestone/include/datastore.h"
-#include "datastore/limestone/include/limestone_api_helper.h"
-
-#include "limestone/api/datastore.h"
-
-#endif
-
 #include "index/yakushima/include/interface.h"
 
 #include "shirakami/interface.h"
 
-#include "boost/filesystem/path.hpp"
-
 #include "glog/logging.h"
 
 namespace shirakami {

src/concurrency_control/interface/session_management.cpp

@@ -14,24 +14,10 @@
 #include "concurrency_control/interface/long_tx/include/long_tx.h"
 #include "concurrency_control/interface/read_only_tx/include/read_only_tx.h"
 #include "database/include/logging.h"
-
-#ifdef PWAL
-
-#include "concurrency_control/include/lpwal.h"
-
-#include "datastore/limestone/include/datastore.h"
-#include "datastore/limestone/include/limestone_api_helper.h"
-
-#include "limestone/api/datastore.h"
-
-#endif
-
 #include "index/yakushima/include/interface.h"
 
 #include "shirakami/interface.h"
 
-#include "boost/filesystem/path.hpp"
-
 #include "glog/logging.h"
 
 namespace shirakami {

src/concurrency_control/interface/shut_down.cpp

@@ -38,8 +38,6 @@
 
 #include "shirakami/interface.h"
 
-#include "boost/filesystem/path.hpp"
-
 #include "glog/logging.h"
 
 namespace shirakami {

src/concurrency_control/interface/tx_begin.cpp

@@ -14,24 +14,10 @@
 #include "concurrency_control/interface/long_tx/include/long_tx.h"
 #include "concurrency_control/interface/read_only_tx/include/read_only_tx.h"
 #include "database/include/logging.h"
-
-#ifdef PWAL
-
-#include "concurrency_control/include/lpwal.h"
-
-#include "datastore/limestone/include/datastore.h"
-#include "datastore/limestone/include/limestone_api_helper.h"
-
-#include "limestone/api/datastore.h"
-
-#endif
-
 #include "index/yakushima/include/interface.h"
 
 #include "shirakami/interface.h"
 
-#include "boost/filesystem/path.hpp"
-
 #include "glog/logging.h"
 
 namespace shirakami {

test/concurrency_control/short_tx/delete_upsert/short_upsert_delete_test.cpp

@@ -16,7 +16,7 @@ using namespace shirakami;
 
 Storage st{};
 
-class upsert_after_delete : public ::testing::Test { // NOLINT
+class upsert_delete : public ::testing::Test { // NOLINT
 public:
     static void call_once_f() {
         google::InitGoogleLogging(
@@ -35,7 +35,7 @@ class upsert_after_delete : public ::testing::Test { // NOLINT
     static inline std::once_flag init_google_; // NOLINT
 };
 
-TEST_F(upsert_after_delete, simple) { // NOLINT
+TEST_F(upsert_delete, simple) { // NOLINT
     create_storage("", st);
     std::string k("k"); // NOLINT
     std::string v("v"); // NOLINT

test/tsurugi_issues/tsurugi_issue751_test.cpp

@@ -34,7 +34,7 @@ class tsurugi_issue751_test : public ::testing::Test { // NOLINT
 // related-to: tsurugi-issues issue #751
 // related-to: shirakami issue #141
 
-// an implementation for ti751/si141 causes this regression
+// one of proposed-fix for ti751/si141 causes this regression
 TEST_F(tsurugi_issue751_test, jogasaki_update_range) {
     Storage st{};
     ASSERT_OK(create_storage("", st));
@@ -76,7 +76,7 @@ TEST_F(tsurugi_issue751_test, jogasaki_update_range) {
     ASSERT_OK(leave(s));
 }
 
-// an implementation for ti751/si141 causes this regression
+// one of proposed-fix for ti751/si141 causes this regression
 TEST_F(tsurugi_issue751_test, search_insert_delete) {
     Storage st{};
     ASSERT_OK(create_storage("", st));