Skip to content
Snippets Groups Projects
Commit 22b4ef81 authored by Cyrille Berger's avatar Cyrille Berger
Browse files

focus node might outlive the datasets object, make sure they own the connection object

parent a1e1702f
No related branches found
No related tags found
No related merge requests found
Pipeline #120380 passed
......@@ -336,7 +336,8 @@ knowCore::ReturnValue<Dataset> Datasets::dataset(const knowCore::Uri& _datasetUr
ds.d->definition = ds_def;
ds.d->connection = d->connection;
KNOWCORE_RETURN_VALUE_TRY(declaration, dataset_declaration_registry.byConstantField(knowCore::Uris::askcore_dataset::dataset, knowCore::Uris::askcore_dataset::dataset_type, knowRDF::Literal::fromValue(ds.d->definition->type)));
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [this, ds_def]() { return ds_def->triplestores(d->connection); }, ds.d->definition->uri, declaration);
kDB::Repository::Connection connection = d->connection;
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [connection, ds_def]() { return ds_def->triplestores(connection); }, ds.d->definition->uri, declaration);
return kCrvSuccess(ds);
}
......@@ -362,7 +363,8 @@ QList<Dataset> Datasets::all() const
}
ds.d->definition = ds_def;
kDB::Repository::RDF::FocusNodeDeclaration declaration = dataset_declaration_registry.byConstantField(knowCore::Uris::askcore_dataset::dataset, knowCore::Uris::askcore_dataset::dataset_type, knowRDF::Literal::fromValue(ds.d->definition->type)).expectSuccess(); // TODO kDB 5.0 this function should return a ReturnValue<QList...>
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [this, ds_def]() { return ds_def->triplestores(d->connection); }, ds.d->definition->uri, declaration);
kDB::Repository::Connection connection = d->connection;
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [connection, ds_def]() { return ds_def->triplestores(connection); }, ds.d->definition->uri, declaration);
dss.append(ds);
}
} else {
......@@ -479,7 +481,8 @@ knowCore::ReturnValue<QList<Dataset>> Datasets::datasets(const QList<QPair<knowC
ds.d->definition = ds_def;
ds.d->connection = d->connection;
KNOWCORE_RETURN_VALUE_TRY(declaration, dataset_declaration_registry.byConstantField(knowCore::Uris::askcore_dataset::dataset, knowCore::Uris::askcore_dataset::dataset_type, knowRDF::Literal::fromValue(ds.d->definition->type)));
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [this, ds_def]() { return ds_def->triplestores(d->connection); }, ds.d->definition->uri, declaration);
kDB::Repository::Connection connection = d->connection;
ds.d->object = kDB::Repository::RDF::FocusNode(d->connection, knowCore::Uris::askcore_graphs::all_datasets, [connection, ds_def]() { return ds_def->triplestores(connection); }, ds.d->definition->uri, declaration);
dss.append(ds);
}
......
......@@ -418,7 +418,10 @@ knowCore::ReturnVoid Connection::Private::loadExtensions()
void Connection::increaseSelfPCount()
{
if(d) ++d->self_p_count;
if(d)
{
++d->self_p_count;
}
}
void Connection::decreaseSelfPCount()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment