Refactor Left and Right Tuples aligned with Super Cache improvements #5648 #5649
Conversation
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
-Improve NodeTypeEnums to contain more information (at no cost) and replace as many instanceof as possible.
mdproctor
force-pushed
the
refactortuple
branch
2 times, most recently
from
1965d97 to
e1007cc
Compare
mariofusco
reviewed
Jan 15, 2024
bom/drools-bom/pom.xml
Outdated
| @@ -228,6 +228,25 @@ | |||
| <scope>test</scope> | |||
| </dependency> | |||
|
|
|||
| <dependency> | |||
| <groupId>org.drools</groupId> | |||
| <artifactId>drools-sivparvismagna</artifactId> | |||
There was a problem hiding this comment.
What is this new module? I don't see it in your pull request (and the name is very cryptic). If this is a leftover can you please remove this?
There was a problem hiding this comment.
Oh that is a mistake, let me fix that :) didn't realis that was still in there.
mariofusco
reviewed
Jan 15, 2024
pom.xml
Outdated
| @@ -162,6 +162,7 @@ | |||
| <module>drools-io</module> | |||
| <module>drools-core</module> | |||
| <module>drools-base</module> | |||
| <!--module>drools-sicparvismagna</module--> | |||
mariofusco
reviewed
Jan 15, 2024
pom.xml
Outdated
| @@ -272,6 +273,7 @@ | |||
| <module>drools-ruleunits</module> | |||
| <module>drools-core</module> | |||
| <module>drools-base</module> | |||
| <module>drools-sivparvismagna</module> | |||
There was a problem hiding this comment.
Not existing new module, please remove.
mariofusco
reviewed
Jan 15, 2024
| @@ -0,0 +1,45 @@ | |||
| package org.drools.core.reteoo; | |||
mariofusco
reviewed
Jan 15, 2024
| @@ -45,7 +46,10 @@ public interface NodeMemories { | |||
| Memory peekNodeMemory( int memoryId ); | |||
|
|
|||
| default Memory peekNodeMemory(NetworkNode node) { | |||
| return node instanceof MemoryFactory ? peekNodeMemory(((MemoryFactory)node).getMemoryId()) : null; | |||
| if (!NodeTypeEnums.isMemoryFactory(node) ) { | |||
| System.out.println("pause"); | |||
mariofusco
reviewed
Jan 15, 2024
| public class SuperCacheFixer { | ||
| public static LeftTupleNode getLeftTupleNode(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) s).getType()) { |
There was a problem hiding this comment.
I thought this was needed, when working against interfaces - to avoid potential super cache issues?
mariofusco
reviewed
Jan 15, 2024
|
|
||
| public static RightTupleSink getRightTupleSink(RightTuple t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| } | ||
|
|
||
| public static LeftTupleSinkNode asLeftTupleSink(NetworkNode n) { | ||
| switch (((BaseNode) n).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| } | ||
|
|
||
| public static NetworkNode checkcast(NetworkNode n) { | ||
| switch (((BaseNode)n).getType()) { |
mariofusco
reviewed
Jan 15, 2024
|
|
||
| public static ObjectTypeNode getObjectTypeNode(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
|
|
||
| public static ObjectTypeNodeId getLeftInputOtnId(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
|
|
||
| public static ObjectTypeNodeId getRightInputOtnId(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| public static LeftTupleSource getLeftTupleSource(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| LeftTupleSource n; | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| throw new UnsupportedOperationException("Does not have a LeftTupleSource: " + s); | ||
| } | ||
|
|
||
| switch (n.getType()) { |
There was a problem hiding this comment.
Wouldn't be better to collapse these 2 subsequent switches into a single one?
mariofusco
reviewed
Jan 15, 2024
| throw new UnsupportedOperationException("Node does not have an ObjectSource: " + s); | ||
| } | ||
|
|
||
| switch (o.getType()) { |
There was a problem hiding this comment.
Wouldn't be better to collapse these 2 subsequent switches into a single one?
There was a problem hiding this comment.
That is not possible because we don't know the concrete type of getLeftTupleSource(), so it needs a second switch. However, this is only true if performance is improved via the concrete cast. If this cast adds no perf value, it can be removed.
mariofusco
reviewed
Jan 15, 2024
| public static ObjectSource getObjectSource(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| ObjectSource o; | ||
| switch (((BaseNode) s).getType()) { |
mariofusco
reviewed
Jan 15, 2024
|
|
||
| public static TerminalNode asTerminalNode(TupleImpl t) { | ||
| Sink s = t.getSink(); | ||
| switch (((BaseNode) t.getSink()).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| } | ||
|
|
||
| public static TerminalNode asTerminalNode(NetworkNode n) { | ||
| switch (((BaseNode)n).getType()) { |
mariofusco
reviewed
Jan 15, 2024
| public class BetaMemory<C> extends AbstractBaseLinkedListNode<Memory> | ||
| implements | ||
| SegmentNodeMemory { | ||
| public interface BetaMemory<C> { |
There was a problem hiding this comment.
Is it necessary to introduce this interface? Maybe I'm missing something but I see only one implementation.
There was a problem hiding this comment.
Sorry, this was related to some work I did initially. I can revert for now. I wanted to move stuff out of core and avoid bringing too much into -base.
mariofusco
requested changes
Jan 15, 2024
-Remove unecessary if statement with printout. -Removed incorrectly added maven module.
mariofusco
approved these changes
Jan 16, 2024
|
Benchmark result: |
tkobayas
approved these changes
Jan 16, 2024
|
type pollution report (omitting types count less than 10000)
== without PR == with PR (pr5649 "Added missing headers" commit) == with PR (pr5649 "minor semplifications" commit) |
== without PR == with PR (pr5649 "Added missing headers" commit) == with PR (pr5649 "minor semplifications" commit) |
rgdoliveira
pushed a commit
to rgdoliveira/drools
that referenced
this pull request
Jan 19, 2024
…pache#5648 (apache#5649) * -BetaConstraints no longer depends on ReteEvaluator. * -Trying to separate BetaMemory so BetaConstraints can go in -base. * -Refactoring Tuples around concrete classes. * -Centralise and improve super cache handling fix. -Improve NodeTypeEnums to contain more information (at no cost) and replace as many instanceof as possible. * -Move Super Cache helper methods into standalone class SuperCacheFixer. * -Remove RightTuple interface. * -Refactory creation to a Factory with switch for different implementations. * -Added missing headers. -Remove unecessary if statement with printout. -Removed incorrectly added maven module. * minor semplifications --------- Co-authored-by: mariofusco <[email protected]>
rgdoliveira
pushed a commit
to rgdoliveira/drools
that referenced
this pull request
Jan 19, 2024
…pache#5648 (apache#5649) * -BetaConstraints no longer depends on ReteEvaluator. * -Trying to separate BetaMemory so BetaConstraints can go in -base. * -Refactoring Tuples around concrete classes. * -Centralise and improve super cache handling fix. -Improve NodeTypeEnums to contain more information (at no cost) and replace as many instanceof as possible. * -Move Super Cache helper methods into standalone class SuperCacheFixer. * -Remove RightTuple interface. * -Refactory creation to a Factory with switch for different implementations. * -Added missing headers. -Remove unecessary if statement with printout. -Removed incorrectly added maven module. * minor semplifications --------- Co-authored-by: mariofusco <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
More detail in the opened issue #5648.
#5648