odb: fixes

Signed-off-by: osamahammad21 <[email protected]>

Author: osamahammad21

src/odb/src/codeGenerator/schema/chip/dbMarkerCategory.json

@@ -21,11 +21,6 @@
       "name": "max_markers_",
       "type": "int",
       "default": "10000"
-    },
-    {
-      "name":"block_",
-      "type":"dbId<_dbBlock>",
-      "flags":["no-set", "no-get"]
     }
   ],
   "cpp_includes":["dbBlock.h"]

src/odb/src/db/dbBlock.cpp

@@ -1024,11 +1024,6 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
       && db->isLessThanSchema(db_schema_chip_marker_categories)) {
     _dbChip* chip = db->chip_tbl_->getPtr(block._chip);
     stream >> *chip->marker_categories_tbl_;
-    for (const auto& marker_category :
-         ((dbChip*) chip)->getMarkerCategories()) {
-      chip->marker_categories_map_[marker_category->getName()]
-          = marker_category->getId();
-    }
     dbHashTable<_dbMarkerCategory> tmp_hash;
     stream >> tmp_hash;
   }

src/odb/src/db/dbChip.cpp

@@ -245,6 +245,10 @@ dbIStream& operator>>(dbIStream& stream, _dbChip& obj)
   for (const auto& chip_region : chip->getChipRegions()) {
     obj.chip_region_map_[chip_region->getName()] = chip_region->getId();
   }
+  for (const auto& marker_category : ((dbChip*) &obj)->getMarkerCategories()) {
+    obj.marker_categories_map_[marker_category->getName()]
+        = marker_category->getId();
+  }
   // User Code End >>
   return stream;
 }

src/odb/src/db/dbMarkerCategory.cpp

@@ -40,9 +40,6 @@ bool _dbMarkerCategory::operator==(const _dbMarkerCategory& rhs) const
   if (max_markers_ != rhs.max_markers_) {
     return false;
   }
-  if (block_ != rhs.block_) {
-    return false;
-  }
   if (*marker_tbl_ != *rhs.marker_tbl_) {
     return false;
   }
@@ -84,7 +81,6 @@ dbIStream& operator>>(dbIStream& stream, _dbMarkerCategory& obj)
   stream >> obj.description_;
   stream >> obj.source_;
   stream >> obj.max_markers_;
-  stream >> obj.block_;
   stream >> *obj.marker_tbl_;
   stream >> *obj.categories_tbl_;
   stream >> obj.categories_hash_;
@@ -98,7 +94,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbMarkerCategory& obj)
   stream << obj.description_;
   stream << obj.source_;
   stream << obj.max_markers_;
-  stream << obj.block_;
   stream << *obj.marker_tbl_;
   stream << *obj.categories_tbl_;
   stream << obj.categories_hash_;
@@ -150,14 +145,11 @@ bool _dbMarkerCategory::isTopCategory() const
 
 _dbBlock* _dbMarkerCategory::getBlock() const
 {
-  if (!block_.isValid()) {
-    return nullptr;
-  }
   dbMarkerCategory* category = (dbMarkerCategory*) this;
   _dbMarkerCategory* top_category
       = (_dbMarkerCategory*) category->getTopCategory();
-  _dbChip* chip = (_dbChip*) top_category->getOwner();
-  return (_dbBlock*) chip->_block_tbl->getPtr(block_);
+  dbChip* chip = (dbChip*) top_category->getOwner();
+  return (_dbBlock*) chip->getBlock();
 }
 
 bool _dbMarkerCategory::hasMaxMarkerLimit() const
@@ -820,7 +812,6 @@ dbMarkerCategory* dbMarkerCategory::create(dbBlock* block, const char* name)
   if (category == nullptr) {
     return nullptr;
   }
-  ((_dbMarkerCategory*) category)->block_ = block->getImpl()->getId();
   for (auto cb : ((_dbBlock*) block)->_callbacks) {
     cb->inDbMarkerCategoryCreate(category);
   }
@@ -867,7 +858,6 @@ dbMarkerCategory* dbMarkerCategory::create(dbMarkerCategory* category,
   _dbMarkerCategory* _category = parent->categories_tbl_->create();
 
   _category->_name = safe_strdup(name);
-  _category->block_ = parent->block_;
 
   parent->categories_hash_.insert(_category);
 

src/odb/src/db/dbMarkerCategory.h

@@ -23,7 +23,6 @@ class dbOStream;
 class _dbDatabase;
 class _dbMarker;
 class _dbMarkerCategory;
-class _dbBlock;
 // User Code Begin Classes
 class _dbBlock;
 // User Code End Classes
@@ -60,7 +59,6 @@ class _dbMarkerCategory : public _dbObject
   std::string description_;
   std::string source_;
   int max_markers_;
-  dbId<_dbBlock> block_;
   dbTable<_dbMarker>* marker_tbl_;
   dbTable<_dbMarkerCategory>* categories_tbl_;
   dbHashTable<_dbMarkerCategory> categories_hash_;