Move walfile up one level

jesperpedersen · Sep 23, 2024 · 61e9466 · 61e9466
1 parent eddcb19
commit 61e9466
Show file tree

Hide file tree

Showing 52 changed files with 231 additions and 174 deletions.
diff --git a/src/include/wal/walfile/rm_storage.h b/src/include/wal/walfile/rm_storage.h
diff --git a/src/include/wal/walfile/pg_control.h → src/include/walfile/pg_control.h b/src/include/wal/walfile/pg_control.h → src/include/walfile/pg_control.h
@@ -29,8 +29,8 @@
 #ifndef PGMONETA_PG_CONTROL_H
 #define PGMONETA_PG_CONTROL_H
 
-#include <wal/walfile/transaction.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/transaction.h>
+#include <walfile/wal_reader.h>
 
 #include <stdint.h>
 #include <stdbool.h>

diff --git a/src/include/wal/walfile/relpath.h → src/include/walfile/relpath.h b/src/include/wal/walfile/relpath.h → src/include/walfile/relpath.h
@@ -29,7 +29,7 @@
 #ifndef PGMONETA_RELPATH_H
 #define PGMONETA_RELPATH_H
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 typedef int backend_id;        /* unique currently active backend identifier */
 

diff --git a/src/include/wal/walfile/rm.h → src/include/walfile/rm.h b/src/include/wal/walfile/rm.h → src/include/walfile/rm.h
diff --git a/src/include/wal/walfile/rm_brin.h → src/include/walfile/rm_brin.h b/src/include/wal/walfile/rm_brin.h → src/include/walfile/rm_brin.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 // WAL record definitions for BRIN's WAL operations
 #define XLOG_BRIN_CREATE_INDEX      0x00

diff --git a/src/include/wal/walfile/rm_btree.h → src/include/walfile/rm_btree.h b/src/include/wal/walfile/rm_btree.h → src/include/walfile/rm_btree.h
@@ -33,9 +33,9 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/transaction.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/transaction.h>
+#include <walfile/wal_reader.h>
 
 #include <stdint.h>
 

diff --git a/src/include/wal/walfile/rm_clog.h → src/include/walfile/rm_clog.h b/src/include/wal/walfile/rm_clog.h → src/include/walfile/rm_clog.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define TRANSACTION_STATUS_IN_PROGRESS    0x00    /**< Transaction is in progress */
 #define TRANSACTION_STATUS_COMMITTED      0x01    /**< Transaction has been committed */

diff --git a/src/include/wal/walfile/rm_commit_ts.h → src/include/walfile/rm_commit_ts.h b/src/include/wal/walfile/rm_commit_ts.h → src/include/walfile/rm_commit_ts.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 /* XLOG stuff */
 #define COMMIT_TS_ZEROPAGE      0x00

diff --git a/src/include/wal/walfile/rm_database.h → src/include/walfile/rm_database.h b/src/include/wal/walfile/rm_database.h → src/include/walfile/rm_database.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 // #define variables
 #define XLOG_DBASE_CREATE                    0x00     /**< Create database log type */

diff --git a/src/include/wal/walfile/rm_generic.h → src/include/walfile/rm_generic.h b/src/include/wal/walfile/rm_generic.h → src/include/walfile/rm_generic.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 typedef char* pointer;
 

diff --git a/src/include/wal/walfile/rm_gin.h → src/include/walfile/rm_gin.h b/src/include/wal/walfile/rm_gin.h → src/include/walfile/rm_gin.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 #include <stdint.h>
 

diff --git a/src/include/wal/walfile/rm_gist.h → src/include/walfile/rm_gist.h b/src/include/wal/walfile/rm_gist.h → src/include/walfile/rm_gist.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 typedef xlog_rec_ptr gist_nsn;
 

diff --git a/src/include/wal/walfile/rm_hash.h → src/include/walfile/rm_hash.h b/src/include/wal/walfile/rm_hash.h → src/include/walfile/rm_hash.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 typedef oid reg_procedure;
 

diff --git a/src/include/wal/walfile/rm_heap.h → src/include/walfile/rm_heap.h b/src/include/wal/walfile/rm_heap.h → src/include/walfile/rm_heap.h
@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 #include <stdint.h>
 

diff --git a/src/include/wal/walfile/rm_logicalmsg.h → src/include/walfile/rm_logicalmsg.h b/src/include/wal/walfile/rm_logicalmsg.h → src/include/walfile/rm_logicalmsg.h
@@ -29,7 +29,7 @@
 #ifndef PGMONETA_RM_LOGICALMSG_H
 #define PGMONETA_RM_LOGICALMSG_H
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define XLOG_LOGICAL_MESSAGE  0x00
 

diff --git a/src/include/wal/walfile/rm_mxact.h → src/include/walfile/rm_mxact.h b/src/include/wal/walfile/rm_mxact.h → src/include/walfile/rm_mxact.h
@@ -29,7 +29,7 @@
 #ifndef PGMONETA_RM_MXACT_H
 #define PGMONETA_RM_MXACT_H
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define XLOG_MULTIXACT_ZERO_OFF_PAGE  0x00
 #define XLOG_MULTIXACT_ZERO_MEM_PAGE  0x10

diff --git a/src/include/wal/walfile/rm_relmap.h → src/include/walfile/rm_relmap.h b/src/include/wal/walfile/rm_relmap.h → src/include/walfile/rm_relmap.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define XLOG_RELMAP_UPDATE    0x00 /**< XLOG opcode for relation map update. */
 

diff --git a/src/include/wal/walfile/rm_replorigin.h → src/include/walfile/rm_replorigin.h b/src/include/wal/walfile/rm_replorigin.h → src/include/walfile/rm_replorigin.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define INVALID_REP_ORIGIN_ID 0            /**< Invalid replication origin ID. */
 #define XLOG_REPLORIGIN_SET   0x00         /**< XLOG opcode for setting a replication origin. */

diff --git a/src/include/wal/walfile/rm_seq.h → src/include/walfile/rm_seq.h b/src/include/wal/walfile/rm_seq.h → src/include/walfile/rm_seq.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define XLOG_SEQ_LOG  0x00 /**< XLOG opcode for sequence log operation. */
 

diff --git a/src/include/wal/walfile/rm_spgist.h → src/include/walfile/rm_spgist.h b/src/include/wal/walfile/rm_spgist.h → src/include/walfile/rm_spgist.h
@@ -1,3 +1,31 @@
+/*
+ * Copyright (C) 2024 The pgmoneta community
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef PGMONETA_RM_SPGIST_H
 #define PGMONETA_RM_SPGIST_H
 
@@ -6,8 +34,8 @@ extern "C" {
 #endif
 
 /* Include pgmoneta-related headers */
-#include <wal/walfile/rm.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/wal_reader.h>
 
 /* Define macros */
 #define XLOG_SPGIST_ADD_LEAF         0x10 /**< XLOG opcode for adding a leaf node in SPGiST. */

diff --git a/src/include/wal/walfile/rm_standby.h → src/include/walfile/rm_standby.h b/src/include/wal/walfile/rm_standby.h → src/include/walfile/rm_standby.h
@@ -33,9 +33,9 @@
 extern "C" {
 #endif
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/sinval.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/sinval.h>
+#include <walfile/wal_reader.h>
 
 #include <stdbool.h>
 

diff --git a/src/include/walfile/rm_storage.h b/src/include/walfile/rm_storage.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2024 The pgmoneta community
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PGMONETA_RM_STORAGE_H
+#define PGMONETA_RM_STORAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <walfile/wal_reader.h>
+
+#define XLOG_SMGR_CREATE   0x10   /**< XLOG opcode for creating a storage manager file. */
+#define XLOG_SMGR_TRUNCATE 0x20   /**< XLOG opcode for truncating a storage manager file. */
+
+/**
+ * @struct xl_smgr_create
+ * @brief Represents a storage manager create operation in XLOG.
+ *
+ * Contains the relation file node and fork number for the created storage manager file.
+ */
+struct xl_smgr_create
+{
+    struct rel_file_node rnode;  /**< Relation file node information. */
+    enum fork_number forkNum;    /**< Fork number for the created file. */
+};
+
+/**
+ * @struct xl_smgr_truncate
+ * @brief Represents a storage manager truncate operation in XLOG.
+ *
+ * Contains the block number, relation file node, and flags indicating which components are truncated.
+ */
+struct xl_smgr_truncate
+{
+    block_number blkno;          /**< Block number from where the truncation starts. */
+    struct rel_file_node rnode;  /**< Relation file node information. */
+    int flags;                   /**< Flags indicating which components are truncated. */
+};
+
+/**
+ * @brief Describes a storage manager operation from a decoded XLOG record.
+ *
+ * @param buf The buffer to store the description.
+ * @param record The decoded XLOG record containing the storage manager operation.
+ * @return A pointer to the buffer containing the description.
+ */
+char*
+pgmoneta_wal_storage_desc(char* buf, struct decoded_xlog_record* record);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PGMONETA_RM_STORAGE_H
diff --git a/src/include/wal/walfile/rm_tablespace.h → src/include/walfile/rm_tablespace.h b/src/include/wal/walfile/rm_tablespace.h → src/include/walfile/rm_tablespace.h
@@ -29,7 +29,7 @@
 #ifndef PGMONETA_RM_TABLESPACE_H
 #define PGMONETA_RM_TABLESPACE_H
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 /* XLOG stuff */
 #define XLOG_TBLSPC_CREATE    0x00       /**< XLOG opcode for creating a tablespace. */

diff --git a/src/include/wal/walfile/rm_xact.h → src/include/walfile/rm_xact.h b/src/include/wal/walfile/rm_xact.h → src/include/walfile/rm_xact.h
@@ -29,10 +29,10 @@
 #ifndef PGMONETA_RM_XACT_H
 #define PGMONETA_RM_XACT_H
 
-#include <wal/walfile/rm.h>
-#include <wal/walfile/rm_xlog.h>
-#include <wal/walfile/sinval.h>
-#include <wal/walfile/wal_reader.h>
+#include <walfile/rm.h>
+#include <walfile/rm_xlog.h>
+#include <walfile/sinval.h>
+#include <walfile/wal_reader.h>
 
 #define GIDSIZE                                     200  /**< Maximum size of Global Transaction ID (including '\0'). */
 #define XLOG_XACT_OPMASK                            0x70 /**< Mask for filtering opcodes out of xl_info. */

diff --git a/src/include/wal/walfile/rm_xlog.h → src/include/walfile/rm_xlog.h b/src/include/wal/walfile/rm_xlog.h → src/include/walfile/rm_xlog.h
@@ -29,7 +29,7 @@
 #ifndef PGMONETA_RM_XLOG_H
 #define PGMONETA_RM_XLOG_H
 
-#include <wal/walfile/wal_reader.h>
+#include <walfile/wal_reader.h>
 
 #define MAXFNAMELEN                  64
 #define MAXDATELEN                   128