Skip to content

Fix BaseRecord::erase / deletion #1841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ax3l merged 2 commits into from
Jan 17, 2026
Merged

Fix BaseRecord::erase / deletion #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26a3772
Modify test to fail
franzpoeschel Jan 16, 2026
ea80c9a
Fix deletion
franzpoeschel Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/IO/AbstractIOHandlerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,12 @@ std::future<void> AbstractIOHandlerImpl::flush()
auto &parameter = deref_dynamic_cast<Parameter<O::DELETE_PATH>>(
i.parameter.get());
writeToStderr(
"[", i.writable->parent, "->", i.writable, "] DELETE_PATH");
"[",
i.writable->parent,
"->",
i.writable,
"] DELETE_PATH: ",
parameter.path);
deletePath(i.writable, parameter);
break;
}
Expand All @@ -248,7 +253,8 @@ std::future<void> AbstractIOHandlerImpl::flush()
i.writable->parent,
"->",
i.writable,
"] DELETE_DATASET");
"] DELETE_DATASET: ",
parameter.name);
deleteDataset(i.writable, parameter);
break;
}
Expand Down
8 changes: 1 addition & 7 deletions src/backend/BaseRecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,20 +479,14 @@ auto BaseRecord<T_elem>::erase(key_type const &key) -> size_type
{
bool const keyScalar = (key == RecordComponent::SCALAR);
size_type res;
if (!keyScalar || (keyScalar && this->at(key).constant()))
if (!keyScalar)
res = Container<T_elem>::erase(key);
else
{
res = this->datasetDefined() ? 1 : 0;
eraseScalar();
}

if (keyScalar)
{
this->setWritten(false, Attributable::EnqueueAsynchronously::No);
this->writable().abstractFilePosition.reset();
this->get().m_datasetDefined = false;
}
return res;
}

Expand Down
79 changes: 46 additions & 33 deletions test/SerialIOTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,48 +2544,61 @@ TEST_CASE("patch_test", "[serial]")

inline void deletion_test(const std::string &backend)
{
Series o = Series("../samples/serial_deletion." + backend, Access::CREATE);
{
Series o =
Series("../samples/serial_deletion." + backend, Access::CREATE);

o.setAttribute(
"removed",
"this attribute will be removed after being written to disk");
o.flush();
o.setAttribute(
"removed",
"this attribute will be removed after being written to disk");
o.flush();

o.deleteAttribute("removed");
o.flush();
o.deleteAttribute("removed");
o.flush();

ParticleSpecies &e = o.iterations[1].particles["e"];
auto dset = Dataset(Datatype::DOUBLE, {1});
e["position"][RecordComponent::SCALAR].resetDataset(dset);
e["position"][RecordComponent::SCALAR].makeConstant(20.0);
e["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
e["positionOffset"][RecordComponent::SCALAR].makeConstant(22.0);
e.erase("deletion");
e.seriesFlush();
ParticleSpecies &e = o.iterations[1].particles["e"];
auto dset = Dataset(Datatype::DOUBLE, {1});
e["position"][RecordComponent::SCALAR].resetDataset(dset);
e["position"][RecordComponent::SCALAR].makeConstant(20.0);
e["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
e["positionOffset"][RecordComponent::SCALAR].makeConstant(22.0);
e.erase("deletion");
e.seriesFlush();

e["deletion_scalar"][RecordComponent::SCALAR].resetDataset(dset);
o.flush();
e["deletion_scalar"][RecordComponent::SCALAR].resetDataset(dset);
o.flush();

e["deletion_scalar"].erase(RecordComponent::SCALAR);
e.erase("deletion_scalar");
o.flush();
e["deletion_scalar"].erase(RecordComponent::SCALAR);
e.erase("deletion_scalar");
o.flush();

e["deletion_scalar_two"][RecordComponent::SCALAR].resetDataset(dset);
o.flush();
e["deletion_scalar_two"][RecordComponent::SCALAR].resetDataset(dset);
o.flush();

e["deletion_scalar_two"].erase(
e["deletion_scalar_two"].find(RecordComponent::SCALAR));
e.erase(e.find("deletion_scalar_two"));
o.flush();
e["deletion_scalar_two"].erase(
e["deletion_scalar_two"].find(RecordComponent::SCALAR));
e.erase(e.find("deletion_scalar_two"));
o.flush();

double value = 0.;
e["deletion_scalar_constant"][RecordComponent::SCALAR].resetDataset(dset);
e["deletion_scalar_constant"][RecordComponent::SCALAR].makeConstant(value);
o.flush();
double value = 0.;
e["deletion_scalar_constant"][RecordComponent::SCALAR].resetDataset(
dset);
e["deletion_scalar_constant"][RecordComponent::SCALAR].makeConstant(
value);
o.flush();

e["deletion_scalar_constant"].erase(RecordComponent::SCALAR);
e.erase("deletion_scalar_constant");
o.flush();
e["deletion_scalar_constant"].erase(RecordComponent::SCALAR);
e.erase("deletion_scalar_constant");
o.flush();
o.close();
}
{
Series i("../samples/serial_deletion." + backend, Access::READ_ONLY);
ParticleSpecies &e = i.snapshots()[1].particles["e"];
REQUIRE(!e.contains("deletion_scalar"));
REQUIRE(!e.contains("deletion_scalar_two"));
REQUIRE(!e.contains("deletion_scalar_constant"));
}
}

TEST_CASE("deletion_test", "[serial]")
Expand Down
Loading