Skip to content
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

Jump to bottom

Make ModelObject threadsafe on create and getObjectPropertyValue #170

Merged
merged 2 commits into from
Apr 24, 2023
Merged

Make ModelObject threadsafe on create and getObjectPropertyValue #170

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
fb8fc86
Make ModelObject threadsafe on create and getObjectPropertyValue
goneall Apr 23, 2023
098cdcc
Make ModelCopyManager threadsafe
goneall Apr 23, 2023
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
31 changes: 23 additions & 8 deletions src/main/java/org/spdx/library/ModelCopyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.spdx.library.model.SimpleUriValue;
import org.spdx.library.model.TypedValue;
import org.spdx.storage.IModelStore;
import org.spdx.storage.IModelStore.IModelStoreLock;
import org.spdx.storage.IModelStore.IdType;

/**
Expand Down Expand Up @@ -196,10 +197,17 @@ public void copy(IModelStore toStore, String toDocumentUri, String toId,
*/
private void copyIndividualProperty(IModelStore toStore, String toDocumentUri, String toId, IModelStore fromStore,
String fromDocumentUri, String fromId, String propName, boolean excludeLicenseDetails) throws InvalidSPDXAnalysisException {
if (fromStore.isCollectionProperty(fromDocumentUri, fromId, propName)) {
throw new InvalidSPDXAnalysisException("Property "+propName+" is a collection type");
}
Optional<Object> result = fromStore.getValue(fromDocumentUri, fromId, propName);
IModelStoreLock fromStoreLock = fromStore.enterCriticalSection(fromDocumentUri, false);
//Note: we use a write lock since the RDF store may end up creating a property to check if it is a collection
Optional<Object> result = Optional.empty();
try {
if (fromStore.isCollectionProperty(fromDocumentUri, fromId, propName)) {
throw new InvalidSPDXAnalysisException("Property "+propName+" is a collection type");
}
result = fromStore.getValue(fromDocumentUri, fromId, propName);
} finally {
fromStoreLock.unlock();
}
if (result.isPresent()) {
if (result.get() instanceof IndividualUriValue) {
toStore.setValue(toDocumentUri, toId, propName, new SimpleUriValue((IndividualUriValue)result.get()));
Expand Down Expand Up @@ -232,10 +240,17 @@ private void copyIndividualProperty(IModelStore toStore, String toDocumentUri, S
*/
private void copyCollectionProperty(IModelStore toStore, String toDocumentUri, String toId, IModelStore fromStore,
String fromDocumentUri, String fromId, String propName, boolean excludeLicenseDetails) throws InvalidSPDXAnalysisException {
if (!fromStore.isCollectionProperty(fromDocumentUri, fromId, propName)) {
throw new InvalidSPDXAnalysisException("Property "+propName+" is not a collection type");
}
Iterator<Object> fromListIter = fromStore.listValues(fromDocumentUri, fromId, propName);
IModelStoreLock fromStoreLock = fromStore.enterCriticalSection(fromDocumentUri, false);
//Note: we use a write lock since the RDF store may end up creating a property to check if it is a collection
Iterator<Object> fromListIter = null;
try {
if (!fromStore.isCollectionProperty(fromDocumentUri, fromId, propName)) {
throw new InvalidSPDXAnalysisException("Property "+propName+" is not a collection type");
}
fromListIter = fromStore.listValues(fromDocumentUri, fromId, propName);
} finally {
fromStoreLock.unlock();
}
while (fromListIter.hasNext()) {
Object listItem = fromListIter.next();
Object toStoreItem;
Expand Down
30 changes: 22 additions & 8 deletions src/main/java/org/spdx/library/model/ModelObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,15 @@ public ModelObject(IModelStore modelStore, String documentUri, String id, @Nulla
}
} else {
if (create) {
modelStore.create(documentUri, id, getType());
IModelStoreLock lock = enterCriticalSection(false);
// re-check since previous check was done outside of the lock
try {
if (!modelStore.exists(documentUri, id)) {
modelStore.create(documentUri, id, getType());
}
} finally {
lock.unlock();
}
} else {
throw new SpdxIdNotFoundException(id+" does not exist in document "+documentUri);
}
Expand Down Expand Up @@ -337,13 +345,19 @@ protected Optional<Object> getObjectPropertyValue(String propertyName) throws In
*/
protected static Optional<Object> getObjectPropertyValue(IModelStore stModelStore, String stDocumentUri,
String stId, String propertyName, ModelCopyManager copyManager) throws InvalidSPDXAnalysisException {
if (!stModelStore.exists(stDocumentUri, stId)) {
return Optional.empty();
} else if (stModelStore.isCollectionProperty(stDocumentUri, stId, propertyName)) {
return Optional.of(new ModelCollection<>(stModelStore, stDocumentUri, stId, propertyName, copyManager, null));
} else {
return ModelStorageClassConverter.optionalStoredObjectToModelObject(stModelStore.getValue(stDocumentUri, stId, propertyName),
stDocumentUri, stModelStore, copyManager);
IModelStoreLock lock = stModelStore.enterCriticalSection(stDocumentUri, false);
// NOTE: we use a write lock since the ModelStorageClassConverter may end up creating objects in the store
try {
if (!stModelStore.exists(stDocumentUri, stId)) {
return Optional.empty();
} else if (stModelStore.isCollectionProperty(stDocumentUri, stId, propertyName)) {
return Optional.of(new ModelCollection<>(stModelStore, stDocumentUri, stId, propertyName, copyManager, null));
} else {
return ModelStorageClassConverter.optionalStoredObjectToModelObject(stModelStore.getValue(stDocumentUri, stId, propertyName),
stDocumentUri, stModelStore, copyManager);
}
} finally {
lock.unlock();
}
}

Expand Down