Skip to content

Disallow entities from being both bulk saved and bulk deleted. #2

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

Open
Evanosity wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Disallow entities from being both bulk saved and bulk deleted. #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
414c4de
Disallow entities from being both bulk saved and bulk deleted.
Evanosity Jan 1, 2021
9485637
Change entitiesToBulkPut to a HashMap<Key, CE>
Evanosity Jan 1, 2021
0fcdfcd
Cleaner implementation
Evanosity Jan 2, 2021
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
28 changes: 18 additions & 10 deletions src/main/java/com/universeprojects/cacheddatastore/CachedDatastoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class CachedDatastoreService
boolean cacheEnabled = true;
boolean queryModelCacheEnabled = false;

Set<CachedEntity> entitiesToBulkPut = new HashSet<CachedEntity>();
Map<Key, CachedEntity> entitiesToBulkPut = new HashMap<>();
Set<Key> entitiesToBulkDelete = new HashSet<Key>();
boolean bulkPutMode = false;

Expand Down Expand Up @@ -423,20 +423,20 @@ public void commitBulkWrite()
// Notify of the put
if (isPutEventHandlerEnabled())
{
List<CachedEntity> list = new ArrayList<>(entitiesToBulkPut);
List<CachedEntity> list = new ArrayList<>(entitiesToBulkPut.values());
for(int i = list.size()-1; i>=0; i--)
{
CachedEntity entity = list.get(i);
if (putEventHandler(entity)==false)
entitiesToBulkPut.remove(entity);
entitiesToBulkPut.remove(entity.getKey());
}
}


// Look for any incomplete keys and add them to the pile we need to complete before proceeding
Map<String, List<CachedEntity>> incompleteKeyEntities = new HashMap<String, List<CachedEntity>>();
if (entitiesToBulkPut.isEmpty()==false)
for(CachedEntity e:entitiesToBulkPut)
for(CachedEntity e : entitiesToBulkPut.values())
if (e.getKey().isComplete()==false)
{
List<CachedEntity> list = incompleteKeyEntities.get(e.getKind());
Expand Down Expand Up @@ -477,7 +477,7 @@ public void commitBulkWrite()
for(Key oldKey:keySet)
{
Key newKey = oldKeyToNewKeyMap.get(oldKey);
for(CachedEntity e:entitiesToBulkPut)
for(CachedEntity e:entitiesToBulkPut.values())
{
e.updateStoredKey(oldKey, newKey);
}
Expand All @@ -490,7 +490,7 @@ public void commitBulkWrite()
if (entitiesToBulkDelete.isEmpty()==false)
delete(entitiesToBulkDelete);
if (entitiesToBulkPut.isEmpty()==false)
put(entitiesToBulkPut);
put(entitiesToBulkPut.values());

entitiesToBulkPut.clear();
}
Expand Down Expand Up @@ -592,8 +592,10 @@ public void put(Collection<CachedEntity> entities)
{
if (bulkPutMode)
{
entitiesToBulkPut.removeAll(entities);
entitiesToBulkPut.addAll(entities);
List<Key> keys = new ArrayList<>();
for(CachedEntity ce : entities)
entitiesToBulkPut.put(ce.getKey(), ce);

return;
}

Expand Down Expand Up @@ -655,8 +657,8 @@ public void put(CachedEntity entity)
{
if (bulkPutMode)
{
entitiesToBulkPut.remove(entity);
entitiesToBulkPut.add(entity);
entitiesToBulkPut.remove(entity.getKey());
entitiesToBulkPut.put(entity.getKey(), entity);
return;
}

Expand Down Expand Up @@ -1425,6 +1427,9 @@ public void delete(Collection<Key> keys)
{
entitiesToBulkDelete.removeAll(keys);
entitiesToBulkDelete.addAll(keys);

entitiesToBulkPut.keySet().removeAll(keys);

return;
}

Expand All @@ -1451,6 +1456,9 @@ public void delete(Key entityKey)
{
entitiesToBulkDelete.remove(entityKey);
entitiesToBulkDelete.add(entityKey);

entitiesToBulkPut.remove(entityKey);

return;
}

Expand Down