PersistenceObjectStrategy option #5418
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package org.drools.reliability.core; | ||
|
|
||
| import org.drools.core.common.Storage; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| public class SerializableStoredRefObject extends SerializableStoredObject { | ||
|
|
||
| private final Map<String, Long> referencedObjects; | ||
|
|
||
| public SerializableStoredRefObject(Object object, boolean propagated) { | ||
| super(object, propagated); | ||
| referencedObjects=new HashMap<>(); | ||
| } | ||
|
|
||
| public void addReferencedObject(String fieldName, Long refObjectKey){ | ||
| this.referencedObjects.put(fieldName, refObjectKey); | ||
| } | ||
|
|
||
| public StoredObject updateReferencedObjects(Storage<Long, StoredObject> storage){ | ||
| this.referencedObjects.keySet().forEach(fieldName -> { | ||
| Optional<Field> refField = Arrays.stream(object.getClass().getDeclaredFields()) | ||
| .filter(f -> f.getName().equals(fieldName)).findFirst(); | ||
| if (refField.isPresent()){ | ||
| refField.get().setAccessible(true); | ||
| try { | ||
| refField.get().set(this.object, storage.get(this.referencedObjects.get(refField.get().getName())).getObject()); | ||
| } catch (IllegalAccessException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| }); | ||
| return this; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package org.drools.reliability.core; | ||
|
There was a problem hiding this comment. thank you @tkobayas, copyright header added. |
||
|
|
||
| import org.drools.core.common.InternalFactHandle; | ||
| import org.drools.core.common.Storage; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class SimpleSerializationReliableRefObjectStore extends SimpleSerializationReliableObjectStore { | ||
|
|
||
| public SimpleSerializationReliableRefObjectStore(Storage<Long, StoredObject> storage) { | ||
| super(storage); | ||
| this.storage = storage.size()>0 ? updateObjectReferences(storage) : storage; | ||
| } | ||
|
|
||
| private Storage<Long, StoredObject> updateObjectReferences(Storage<Long, StoredObject> storage){ | ||
| Storage<Long, StoredObject> updateStorage = storage; | ||
|
|
||
| for (Long key: storage.keySet()){ | ||
| updateStorage.put(key, ((SerializableStoredRefObject) storage.get(key)).updateReferencedObjects(storage)); | ||
| } | ||
| return updateStorage; | ||
| } | ||
|
|
||
| @Override | ||
| public void putIntoPersistedStorage(InternalFactHandle handle, boolean propagated) { | ||
| Object object = handle.getObject(); | ||
| StoredObject storedObject = factHandleToStoredObject(handle, reInitPropagated || propagated, object); | ||
| storage.put(getHandleForObject(object).getId(), setReferencedObjects(storedObject)); | ||
| } | ||
|
|
||
| @Override | ||
| protected StoredObject createStoredObject(boolean propagated, Object object) { | ||
| return new SerializableStoredRefObject(object, propagated); | ||
| } | ||
|
|
||
| private void updateReferencedObjects(StoredObject object){ | ||
| List<Field> referencedObjects = getReferencedObjects(object.getObject()); | ||
| if (referencedObjects.size()>0) { | ||
|
|
||
| } | ||
| } | ||
|
There was a problem hiding this comment. This method is not used, so should be removed? Please check SonarCloud suggestions in this PR (sometimes there are unacceptable suggestions, though). Also you can add SonarLint plugin in your local IDE to notice such suggestions earlier. There was a problem hiding this comment. Yes I noticed that is not used, it seems that its implementation is not complete that's why I left it there to see what else is missing. However, I can remove it and add it back if needed. |
||
|
|
||
| private StoredObject setReferencedObjects(StoredObject object){ | ||
| List<Field> referencedObjects = getReferencedObjects(object.getObject()); | ||
| if (referencedObjects.size()>0) { | ||
| // for each referenced object in sObject | ||
| // lookup in storage, find the object of reference, get its fact handle id | ||
| // save this association in the StoredObject | ||
| referencedObjects.forEach(field -> { | ||
| field.setAccessible(true); | ||
| Object fieldObject = null; | ||
| try { | ||
| fieldObject = field.get(object.getObject()); | ||
| } catch (IllegalAccessException e) { | ||
| e.printStackTrace(); | ||
|
There was a problem hiding this comment. Repropagate this exception as a runtime one instead of simply printing the stack trace and swallow it. There was a problem hiding this comment. thanks @mariofusco, I will change this to throw a ReliabilityRuntimeException |
||
| } | ||
| Long objectKey = fromObjectToFactHandleId(fieldObject); | ||
| if (objectKey!=null){ | ||
| ((SerializableStoredRefObject) object).addReferencedObject(field.getName(), objectKey);} | ||
| }); | ||
| } | ||
| return object; | ||
| } | ||
|
|
||
| private Long fromObjectToFactHandleId(Object object){ | ||
| for (Long key : this.storage.keySet()){ | ||
| if (( (SerializableStoredRefObject) storage.get(key)).getObject()==object){ | ||
| return key; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private List<Field> getReferencedObjects(Object object){ | ||
| Field[] fields = object.getClass().getDeclaredFields(); | ||
|
|
||
| List<Field> nonPrimitiveFields = Arrays.stream(fields) | ||
| .filter(field -> !field.getType().isPrimitive()) | ||
| .filter(field -> !field.getType().equals(String.class)) | ||
|
There was a problem hiding this comment. Instead of filtering on the type of the field probably here it should keep only the fields having a value that is also an object inserted in the session, or in other words an object that is also present in the objects store (not sure how easy would be to check this though). There was a problem hiding this comment. yes, good idea, thanks @mariofusco |
||
| .collect(Collectors.toList()); | ||
| return nonPrimitiveFields; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package org.drools.reliability.test; | ||
|
There was a problem hiding this comment. thank you @tkobayas, copyright header added. |
||
|
|
||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
| import org.kie.api.runtime.conf.PersistedSessionOption; | ||
| import org.kie.api.runtime.rule.FactHandle; | ||
| import org.test.domain.fireandalarm.Alarm; | ||
| import org.test.domain.fireandalarm.Fire; | ||
| import org.test.domain.fireandalarm.Room; | ||
| import org.test.domain.fireandalarm.Sprinkler; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class ReliabilityFireAndAlarmTest extends ReliabilityTestBasics{ | ||
| private static final String FIRE_AND_ALARM = | ||
| "import " + Alarm.class.getCanonicalName() + ";" + | ||
| "import " + Fire.class.getCanonicalName() + ";" + | ||
| "import " + Sprinkler.class.getCanonicalName() + ";" + | ||
| "import " + Room.class.getCanonicalName() + ";" + | ||
| "global java.util.List results;" + | ||
| "rule 'When there is a fire turn on the sprinkler' when\n" + | ||
| " Fire($room : room) \n" + | ||
| " $sprinkler: Sprinkler( room == $room, on == false ) \n" + | ||
| "then\n" + | ||
| " modify($sprinkler) { setOn(true); } \n" + | ||
| " System.out.println(\"Turn on the sprinkler for room\" + $room.getName()); \n" + | ||
| "end\n" + | ||
| "rule 'Raise the alarm when we have one or more firs' when\n" + | ||
| " exists Fire() \n" + | ||
| "then\n" + | ||
| " insert( new Alarm() );\n" + | ||
| " System.out.println(\"Raise the alarm\");\n" + | ||
| "end\n"+ | ||
| "rule 'Cancel the alarm when all the fires have gone' when \n" + | ||
| " not Fire() \n" + | ||
| " $alarm : Alarm() \n" + | ||
| "then\n" + | ||
| " delete ( $alarm ); \n" + | ||
| " System.out.println(\"Cancel the alarm\"); \n" + | ||
| "end\n" + | ||
| "rule 'Status output when things are ok' when\n" + | ||
| " not Alarm() \n" + | ||
| " not Sprinkler ( on == true ) \n" + | ||
| "then \n" + | ||
| " System.out.println(\"Everything is ok\"); \n" + | ||
| "end"; | ||
|
|
||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("strategyProviderStoresOnlyWithExplicitSafepoints") | ||
| void testNoFailover(PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy){ | ||
| createSession(FIRE_AND_ALARM, persistenceStrategy, safepointStrategy); | ||
|
|
||
| // phase 1 | ||
| Room room1 = new Room("Room 1"); | ||
| insert(room1); | ||
| FactHandle fireFact1 = insert(new Fire(room1)); | ||
| fireAllRules(); | ||
|
|
||
| // phase 2 | ||
| Sprinkler sprinkler1 = new Sprinkler(room1); | ||
| insert(sprinkler1); | ||
| fireAllRules(); | ||
|
|
||
| assertThat(sprinkler1.isOn()).isTrue(); | ||
|
|
||
| // phase 3 | ||
| delete(fireFact1); | ||
| fireAllRules(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("strategyProviderStoresOnlyWithExplicitSafepoints") | ||
| void testInsertFailover_ShouldFireRules(PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy){ | ||
| createSession(FIRE_AND_ALARM, persistenceStrategy, safepointStrategy, PersistedSessionOption.PersistenceObjectsStrategy.OBJECT_REFERENCES); | ||
|
|
||
| Room room1 = new Room("Room 1"); | ||
| insert(room1); | ||
| insert(new Fire(room1)); | ||
| insert(new Sprinkler(room1)); | ||
|
|
||
| failover(); | ||
| restoreSession(FIRE_AND_ALARM, persistenceStrategy,safepointStrategy,PersistedSessionOption.PersistenceObjectsStrategy.OBJECT_REFERENCES); | ||
|
|
||
| assertThat(fireAllRules()).isEqualTo(2); | ||
|
There was a problem hiding this comment. asserting only fire count is not good enough. Possible additional assertions:
There was a problem hiding this comment. Yes, I agree, this is a very basic test, I will improve it and add more tests as needed. |
||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing Copyright header
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you @tkobayas, copyright header added.