Refactor: Fixed remaining issues with private header inclusion in pub…

…lic include files
project-tsurugi · Sep 5, 2024 · d25d897 · d25d897
1 parent 86b22fc
commit d25d897
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/include/limestone/api/datastore.h b/include/limestone/api/datastore.h
@@ -37,7 +37,6 @@
 #include <limestone/api/write_version_type.h>
 #include <limestone/api/tag_repository.h>
 #include <limestone/api/restore_progress.h>
-#include <limestone/api/rotation_task.h>
 
 namespace limestone::internal {
     class compaction_catalog; 

diff --git a/src/limestone/datastore.cpp b/src/limestone/datastore.cpp
@@ -28,7 +28,7 @@
 #include <limestone/api/datastore.h>
 #include "internal.h"
 
-#include <limestone/api/rotation_task.h>
+#include "rotation_task.h"
 #include "log_entry.h"
 #include "online_compaction.h"
 #include "compaction_catalog.h"

diff --git a/src/limestone/dblog_scan.h b/src/limestone/dblog_scan.h
@@ -20,6 +20,7 @@
 #include "internal.h"
 #include "log_entry.h"
 
+
 namespace limestone::internal {
 // accessing dblogdir before db start
 class dblog_scan {
@@ -181,7 +182,6 @@ class dblog_scan {
 
     static bool is_wal(const boost::filesystem::path& p) { return p.filename().string().rfind(log_channel_prefix, 0) == 0; }
     static bool is_detached_wal(const boost::filesystem::path& p) {
-        std::cerr << "is_detached_wal: " << p << std::endl;
         auto filename = p.filename().string();
         return (filename.length() > 9 && filename.rfind(log_channel_prefix, 0) == 0);
     }

diff --git a/src/limestone/log_channel.cpp b/src/limestone/log_channel.cpp
@@ -26,6 +26,7 @@
 #include <limestone/api/datastore.h>
 #include "internal.h"
 #include "log_entry.h"
+#include "rotation_task.h"
 
 namespace limestone::api {
 

diff --git a/src/limestone/rotation_task.cpp b/src/limestone/rotation_task.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <limestone/api/rotation_task.h>
 #include <limestone/api/datastore.h>
+#include "rotation_task.h"
 
 namespace limestone::api {
 

diff --git a/include/limestone/api/rotation_task.h → src/limestone/rotation_task.h b/include/limestone/api/rotation_task.h → src/limestone/rotation_task.h
diff --git a/test/limestone/compaction/rotation_task_test.cpp b/test/limestone/compaction/rotation_task_test.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <limestone/api/rotation_task.h>
+
 #include <gtest/gtest.h>
 #include <limestone/api/datastore.h>
 #include "test_root.h"
-
+#include "rotation_task.h"
 namespace limestone::testing {
 
 constexpr const char* data_location = "/tmp/rotation_task_test/data_location";