Series of mechanical code beautifications to support Apache Cloudberry (

#119)

* Series of mechanical code beautifications to support Apache Cloudberry

* Add more

include/msgproto.h

@@ -3,6 +3,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#include <cstdint>
 
 const char DecryptRequest = 1;
 const char NoDecryptRequest = 0;

include/util.h

@@ -44,7 +44,7 @@ std::string make_yezzey_url(const std::string &prefix, int64_t modcounts,
 std::vector<int64_t> parseModcounts(const std::string &prefix,
                                     std::string name);
 
-std::string resolve_temp_relname(char *tempname);
+std::string resolve_temp_relname(const char *tempname);
 #endif
 
 EXTERNC void

include/virtual_tablespace.h

@@ -2,6 +2,7 @@
 #define YEZZEY_VIRTUAL_TABLESPACE
 
 #include "pg.h"
+#include "yezzey_meta.h"
 
 #ifdef __cplusplus
 #define EXTERNC extern "C"

include/yezzey_heap_api.h

@@ -8,11 +8,20 @@
 #define yezzey_systable_beginscan table_beginscan
 #define yezzey_beginscan table_beginscan
 #define yezzey_endscan table_endscan
+
+/* catalog */
+
+#define yezzey_beginscan_catalog table_beginscan_catalog
+
 #else
 #define yezzey_relation_open heap_open
 #define yezzey_systable_beginscan systable_beginscan
 #define yezzey_beginscan heap_beginscan
 #define yezzey_endscan heap_endscan
+
+/* catalog */
+#define yezzey_beginscan_catalog heap_beginscan_catalog 
+
 #endif
 
 #endif /* YEZZEY_HEAP_API_H */

include/yezzey_meta.h

@@ -1,15 +1,20 @@
 #pragma once
 
 #include "pg.h"
-#include "url.h"
 #include "virtual_index.h"
+#include "ygpver.h"
 
 #ifdef __cplusplus
 #define EXTERNC extern "C"
 #else
 #define EXTERNC
 #endif
 
+#if IsModernYezzey
+#define YEZZEY_AUX_NAMESPACE 8001
+#define YEZZEYTABLESPACE_OID 8555
+#endif
+
 EXTERNC void YezzeyUpdateMetadataRelations(
     Oid yandexoid /*yezzey auxiliary index oid*/, Oid reloid,
     Oid relfilenodeOid, int64_t blkno, int64_t offset_start,

smgr.c

@@ -1,18 +1,19 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
+// For GpIdentity
+#include "c.h"
+#include "cdb/cdbvars.h"
 
 #if PG_VERSION_NUM >= 130000
 #include "postmaster/interrupt.h"
 #endif
 
 #include "catalog/pg_tablespace.h"
 
-
-// For GpIdentity
-#include "c.h"
-#include "cdb/cdbvars.h"
+#if IsModernYezzey
+#include "access/aomd.h"
+#endif
 
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
@@ -29,9 +30,7 @@
 #include "utils/elog.h"
 #include "utils/snapmgr.h"
 
-#if IsModernYezzey
-#include "access/aomd.h"
-#endif
+#include "miscadmin.h"
 
 #include "storage.h"
 #include "proxy.h"

src/binary_upgrade.cpp

@@ -1,8 +1,15 @@
+
+/*
+* Yezzey.
+*/
+
+#include "pg.h"
+
 #include "binary_upgrade.h"
 #include "offload_policy.h"
-#include "pg.h"
 #include "virtual_index.h"
 #include "yezzey_heap_api.h"
+#include "yezzey_meta.h"
 
 void YezzeyBinaryUpgrade(void) {
   /**/

src/msgproto.cpp

@@ -1,4 +1,5 @@
 #include "msgproto.h"
+#include <cstdint>
 
 MsgBuilder::MsgBuilder() : length(UINT64_SZ), cursor(0), data() {}
 

src/offload_policy.cpp

@@ -2,10 +2,12 @@
  * file: src/offload_policy.cpp
  */
 
+
+#include "yezzey_heap_api.h"
 #include "offload_policy.h"
 #include "offload.h"
-#include "yezzey_heap_api.h"
 #include <unistd.h>
+#include "yezzey_meta.h"
 
 #include "offload_tablespace_map.h"
 

src/storage.cpp

@@ -20,10 +20,10 @@
 #include "offload_tablespace_map.h"
 #include "url.h"
 #include "virtual_index.h"
+#include "yezzey_heap_api.h"
 #include "yezzey_meta.h"
 #include "ygpver.h"
 #include "yproxy.h"
-#include <iostream>
 
 #define USE_YPX_LISTER = 1
 
@@ -283,7 +283,12 @@ bool ensureFileLocal(RelFileNode rnode, BackendId backend, ForkNumber forkNum,
                      BlockNumber blkno) {
   /* MDB-19689: do not consult catalog */
 
+#if IsModernYezzey
+  elog(yezzey_log_level, "ensuring %ld is local", rnode.relNode);
+#else
   elog(yezzey_log_level, "ensuring %d is local", rnode.relNode);
+#endif
+
   bool result = true;
 
   auto path = std::string(relpathbackend(rnode, backend, forkNum));
@@ -373,8 +378,9 @@ int offloadRelationSegment(Relation aorel, int segno, int64 modcount,
   return 0;
 }
 
-static Oid resolveTablespaceOidByName(std::string tablespacename) {
-
+static Oid
+resolveTablespaceOidByName(std::string tablespacename)
+{
   Relation rel;
   HeapScanDesc scan;
   HeapTuple tuple;
@@ -387,7 +393,7 @@ static Oid resolveTablespaceOidByName(std::string tablespacename) {
 
   ScanKeyInit(&entry[0], Anum_pg_tablespace_spcname, BTEqualStrategyNumber,
               F_NAMEEQ, CStringGetDatum(tablespacename.c_str()));
-  scan = heap_beginscan_catalog(rel, 1, entry);
+  scan = yezzey_beginscan_catalog(rel, 1, entry);
   tuple = heap_getnext(scan, ForwardScanDirection);
 
   if (!HeapTupleIsValid(tuple)) {

src/util.cpp

@@ -184,7 +184,7 @@ XLogRecPtr yezzeyGetXStorageInsertLsn(void) {
   return GetXLogWriteRecPtr();
 }
 
-std::string resolve_temp_relname(char *tempname) {
+std::string resolve_temp_relname(const char *tempname) {
   std::string name(tempname);
   if (strncmp(name.c_str(), "pg_temp_", 8) == 0) {
     int oid = atoi(name.substr(8, name.find('_', 8)).c_str());

src/virtual_index.cpp

@@ -1,8 +1,9 @@
 
 #include "virtual_index.h"
-
-#include "yezzey_heap_api.h"
 #include <algorithm>
+#include "yezzey_heap_api.h"
+
+#include "yezzey_meta.h"
 
 Oid YezzeyFindAuxIndex_internal(Oid reloid);
 

src/virtual_tablespace.cpp

@@ -1,4 +1,10 @@
+
+/*
+* Yezzey
+*/
+
 #include "virtual_tablespace.h"
+#include "yezzey_meta.h"
 
 /*
  * Execute ALTER TABLE SET TABLESPACE for cases where there is no tuple

yezzey.c

@@ -1344,5 +1344,9 @@ void _PG_init(void) {
   ExecutorStart_hook = yezzey_ExecuterStartHook;
   ExecutorEnd_hook = yezzey_ExecuterEndHook;
 
+#if IsModernYezzey
+  /* Support? */
+#else
   TrackDropObject_hook = yezzey_TrackObjDrop;
+#endif
 }