Variuos fixups

src/offload_tablespace_map.cpp

@@ -161,10 +161,7 @@ void YezzeyRegisterRelationOriginTablespaceName(Oid i_reloid, Name i_spcname) {
 
     yezzey_endscan(scanoff);
     UnregisterSnapshot(snap);
-    elog(ERROR,
-         "failed to map relation %d to its origin tablespace: mapping already "
-         "exists",
-         i_reloid);
+    return;
   }
   yezzey_endscan(scanoff);
 

src/storage.cpp

@@ -11,24 +11,20 @@
 
 #include "pg.h"
 
+#include "utils/rel.h"
+
 #include "io.h"
 #include <iostream>
-
 #include "virtual_index.h"
-
 #include "storage_lister.h"
 #include "url.h"
 #include "yproxy.h"
-
 #include "yezzey_meta.h"
-
 #include "offload_tablespace_map.h"
-
 #include "cdb/cdbvars.h"
-
 #include "cdb/cdbappendonlyxlog.h"
-
 #include "ygpver.h"
+#include "gucs.h"
 
 #define USE_YPX_LISTER = 1
 
@@ -239,7 +235,6 @@ int loadSegmentFromExternalStorage(Relation rel, const std::string &nspname,
     elog(DEBUG1, "yezzey: complete %s offloading", dest_path.c_str());
   }
   return 0;
-  // return std::rename(tmp_path.c_str(), dest_path.c_str());
 }
 
 int loadRelationSegment(Relation aorel, Oid orig_relnode, int segno,

src/virtual_tablespace.cpp

@@ -90,28 +90,7 @@ void YezzeyATExecSetTableSpace(Relation aorel, Oid reloid,
 
   heap_close(pg_class, RowExclusiveLock);
 
-  // yezzey: do we need this?
-  // /* MPP-6929: metadata tracking */
-  // if ((Gp_role == GP_ROLE_DISPATCH) && MetaTrackValidKindNsp(rel->rd_rel))
-  // 	MetaTrackUpdObject(RelationRelationId,
-  // 					   RelationGetRelid(rel),
-  // 					   GetUserId(),
-  // 					   "ALTER", "SET TABLESPACE");
-
   /* Make sure the reltablespace change is visible */
   CommandCounterIncrement();
-
-  /* yezzey: do we need to move indexes? */
-  // /*
-  //  * MPP-7996 - bitmap index subobjects w/Alter Table Set tablespace
-  //  */
-  // if (OidIsValid(relbmrelid))
-  // {
-  // 	Assert(!relaosegrelid);
-  // 	ATExecSetTableSpace(relbmrelid, newTableSpace, lockmode);
-  // }
-  // if (OidIsValid(relbmidxid))
-  // 	ATExecSetTableSpace(relbmidxid, newTableSpace, lockmode);
-
   /* Clean up */
 }

yezzey--1.8--1.8.1.sql

@@ -59,7 +59,6 @@ END;
 $$
 LANGUAGE PLPGSQL;
 
-
 -- metadata migration
 
 DROP TABLE IF EXISTS yezzey.yezzey_expire_index;

yezzey.c

@@ -321,8 +321,9 @@ int yezzey_load_relation_internal(Oid reloid, const char *dest_path) {
   * Dropping yezzey virtual index for loaded relation allow to
   * remove extension dependecy on this object (relation)
   * empty all track info **
-  (void)emptyYezzeyIndex(YezzeyFindAuxIndex(reloid));
   */
+
+  (void)emptyYezzeyIndex(yandexoid, aorel->rd_node.relNode);
   /* cleanup */
 
   relation_close(aorel, NoLock);