Merge pull request #1084 from kuzudb/memory-fix

fix memory sanitizer problem
kuzudb · Nov 30, 2022 · d508950 · d508950
2 parents bba4027 + 99ae8a3
commit d508950
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/src/include/binder/bound_statement.h b/src/include/binder/bound_statement.h
@@ -12,6 +12,8 @@ class BoundStatement {
 public:
     explicit BoundStatement(StatementType statementType) : statementType{statementType} {}
 
+    virtual ~BoundStatement() = default;
+
     inline StatementType getStatementType() const { return statementType; }
 
 private:

diff --git a/src/include/binder/query/updating_clause/bound_delete_clause.h b/src/include/binder/query/updating_clause/bound_delete_clause.h
@@ -26,7 +26,6 @@ class BoundDeleteNode {
 class BoundDeleteClause : public BoundUpdatingClause {
 public:
     BoundDeleteClause() : BoundUpdatingClause{ClauseType::DELETE} {};
-    ~BoundDeleteClause() override = default;
 
     inline void addDeleteNode(unique_ptr<BoundDeleteNode> deleteNode) {
         deleteNodes.push_back(std::move(deleteNode));

diff --git a/src/include/binder/query/updating_clause/bound_set_clause.h b/src/include/binder/query/updating_clause/bound_set_clause.h
@@ -9,7 +9,6 @@ class BoundSetClause : public BoundUpdatingClause {
 
 public:
     BoundSetClause() : BoundUpdatingClause{ClauseType::SET} {};
-    ~BoundSetClause() override = default;
 
     inline void addSetItem(expression_pair setItem) { setItems.push_back(std::move(setItem)); }
 

diff --git a/src/include/catalog/catalog_structs.h b/src/include/catalog/catalog_structs.h
@@ -26,6 +26,7 @@ struct PropertyNameDataType {
     }
     PropertyNameDataType(string name, DataType dataType)
         : name{std::move(name)}, dataType{std::move(dataType)} {};
+    virtual ~PropertyNameDataType() = default;
 
     string name;
     DataType dataType;
@@ -60,6 +61,8 @@ struct TableSchema {
     TableSchema(string tableName, table_id_t tableID, bool isNodeTable)
         : tableName{move(tableName)}, tableID{tableID}, isNodeTable{isNodeTable} {}
 
+    virtual ~TableSchema() = default;
+
     static inline bool isReservedPropertyName(const string& propertyName) {
         return propertyName == INTERNAL_ID_SUFFIX;
     }

diff --git a/src/include/parser/statement.h b/src/include/parser/statement.h
@@ -11,6 +11,8 @@ class Statement {
 public:
     explicit Statement(StatementType statementType) : statementType{statementType} {}
 
+    virtual ~Statement() = default;
+
     inline StatementType getStatementType() const { return statementType; }
 
 private:

diff --git a/src/include/storage/storage_structure/storage_structure.h b/src/include/storage/storage_structure/storage_structure.h
@@ -34,6 +34,8 @@ class StorageStructure {
         }
     }
 
+    virtual ~StorageStructure() = default;
+
     inline VersionedFileHandle* getFileHandle() { return &fileHandle; }
 
 protected:
@@ -63,7 +65,11 @@ class StorageStructure {
 class BaseColumnOrList : public StorageStructure {
 
 public:
-    DataTypeID getDataTypeId() const { return dataType.typeID; }
+    ~BaseColumnOrList() override {
+        if (isInMemory_) {
+            StorageStructureUtils::unpinEachPageOfFile(fileHandle, bufferManager);
+        }
+    }
 
     // Maps the position of element in page to its byte offset in page.
     // TODO(Everyone): we should slowly get rid of this function.
@@ -76,12 +82,6 @@ class BaseColumnOrList : public StorageStructure {
         DataType dataType, const size_t& elementSize, BufferManager& bufferManager,
         bool hasNULLBytes, bool isInMemory, WAL* wal);
 
-    virtual ~BaseColumnOrList() {
-        if (isInMemory_) {
-            StorageStructureUtils::unpinEachPageOfFile(fileHandle, bufferManager);
-        }
-    }
-
     void readBySequentialCopy(Transaction* transaction, const shared_ptr<ValueVector>& vector,
         PageElementCursor& cursor,
         const std::function<page_idx_t(page_idx_t)>& logicalToPhysicalPageMapper);

diff --git a/src/storage/store/nodes_statistics_and_deleted_ids.cpp b/src/storage/store/nodes_statistics_and_deleted_ids.cpp
@@ -41,8 +41,8 @@ node_offset_t NodeStatisticsAndDeletedIDs::addNode() {
     node_offset_t retVal = *nodeOffsetIter;
     iter->second.erase(nodeOffsetIter);
     if (iter->second.empty()) {
-        deletedNodeOffsetsPerMorsel.erase(iter);
         hasDeletedNodesPerMorsel[iter->first] = false;
+        deletedNodeOffsetsPerMorsel.erase(iter);
     }
     return retVal;
 }