Skip to content

Commit

Permalink
AbstractTuple => Tuple for better diff
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucamolteni
lucamolteni committed Aug 8, 2023
1 parent f8b6f53 commit bd8267a
Show file tree
Hide file tree
Showing 128 changed files with 1,403 additions and 1,413 deletions.
10 changes: 5 additions & 5 deletions drools-core/src/main/java/org/drools/core/base/AbstractQueryViewListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import org.drools.core.common.ReteEvaluator;
import org.drools.base.definitions.rule.impl.RuleImpl;
import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.LeftTuple;
import org.drools.core.reteoo.LeftTupleNode;
import org.drools.core.reteoo.QueryTerminalNode;
import org.kie.api.runtime.rule.FactHandle;
Expand All @@ -24,9 +24,9 @@ public List<? extends Object> getResults() {

public abstract FactHandle getHandle(FactHandle originalHandle);

public void rowAdded(RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteEvaluator) {
public void rowAdded(RuleImpl rule, LeftTuple tuple, ReteEvaluator reteEvaluator) {
FactHandle[] handles = new FactHandle[((LeftTupleNode)tuple.getTupleSink()).getObjectCount()];
AbstractLeftTuple entry = (AbstractLeftTuple) tuple.skipEmptyHandles();
LeftTuple entry = (LeftTuple) tuple.skipEmptyHandles();

// Add all the FactHandles
int i = handles.length-1;
Expand All @@ -40,10 +40,10 @@ public void rowAdded(RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteE
this.results.add( new QueryRowWithSubruleIndex(handles, node.getSubruleIndex()) );
}

public void rowRemoved( RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteEvaluator ) {
public void rowRemoved(RuleImpl rule, LeftTuple tuple, ReteEvaluator reteEvaluator ) {
}

public void rowUpdated( RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteEvaluator ) {
public void rowUpdated(RuleImpl rule, LeftTuple tuple, ReteEvaluator reteEvaluator ) {
}

}
8 changes: 4 additions & 4 deletions drools-core/src/main/java/org/drools/core/base/DroolsQueryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.drools.core.common.TupleSets;
import org.drools.core.common.WorkingMemoryAction;
import org.drools.core.phreak.StackEntry;
import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.LeftTuple;
import org.drools.core.reteoo.LeftTupleSink;
import org.drools.core.reteoo.PathMemory;
import org.drools.core.reteoo.QueryElementNode.QueryElementNodeMemory;
Expand All @@ -45,7 +45,7 @@ public final class DroolsQueryImpl extends ArrayElements implements DroolsQuery{

private WorkingMemoryAction action;

private final TupleSets<AbstractLeftTuple> resultLeftTuples;
private final TupleSets<LeftTuple> resultLeftTuples;

private QueryElementNodeMemory qmem;

Expand All @@ -65,7 +65,7 @@ public DroolsQueryImpl(final String name,
final boolean open,
final StackEntry stackEntry,
final List<PathMemory> pmems,
final TupleSets<AbstractLeftTuple> resultLeftTuples,
final TupleSets<LeftTuple> resultLeftTuples,
final QueryElementNodeMemory qmem,
final LeftTupleSink sink) {
setParameters(params);
Expand Down Expand Up @@ -101,7 +101,7 @@ public Variable[] getVariables() {
return this.vars;
}

public TupleSets<AbstractLeftTuple> getResultLeftTupleSets() {
public TupleSets<LeftTuple> getResultLeftTupleSets() {
return resultLeftTuples;
}

Expand Down
8 changes: 4 additions & 4 deletions drools-core/src/main/java/org/drools/core/base/InternalViewChangedEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@

import org.drools.core.common.ReteEvaluator;
import org.drools.base.definitions.rule.impl.RuleImpl;
import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.LeftTuple;

public interface InternalViewChangedEventListener {
void rowAdded(RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteEvaluator);
void rowAdded(RuleImpl rule, LeftTuple tuple, ReteEvaluator reteEvaluator);

void rowRemoved(RuleImpl rule, AbstractLeftTuple tuple, ReteEvaluator reteEvaluator);
void rowRemoved(RuleImpl rule, LeftTuple tuple, ReteEvaluator reteEvaluator);

void rowUpdated(RuleImpl rule, AbstractLeftTuple leftTuple, ReteEvaluator reteEvaluator);
void rowUpdated(RuleImpl rule, LeftTuple leftTuple, ReteEvaluator reteEvaluator);

List<? extends Object> getResults();
}
4 changes: 2 additions & 2 deletions drools-core/src/main/java/org/drools/core/base/accumulators/CollectAccumulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.drools.core.base.accumulators;

import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.LeftTuple;
import org.drools.base.rule.Collect;
import org.drools.base.rule.Declaration;
import org.drools.base.rule.accessor.Accumulator;
Expand Down Expand Up @@ -89,7 +89,7 @@ public Object accumulate(Object workingMemoryContext,
Declaration[] declarations,
Declaration[] innerDeclarations,
ValueResolver valueResolver) {
Object value = this.unwrapHandle ? ((AbstractLeftTuple) handle.getObject()).getFactHandle().getObject() : handle.getObject();
Object value = this.unwrapHandle ? ((LeftTuple) handle.getObject()).getFactHandle().getObject() : handle.getObject();
((Collection) context).add( value );
return value;
}
Expand Down
89 changes: 44 additions & 45 deletions drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import org.drools.base.rule.EntryPointId;
import org.drools.core.WorkingMemoryEntryPoint;
import org.drools.core.impl.InternalRuleBase;
import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.AbstractLeftTuple;
import org.drools.core.reteoo.LeftTuple;
import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.RightTuple;
import org.drools.core.reteoo.Tuple;
Expand Down Expand Up @@ -358,19 +357,19 @@ protected void setLinkedTuples(InternalRuleBase kbase) {
new SingleLinkedTuples();
}

public void addFirstLeftTuple( AbstractLeftTuple leftTuple ) {
public void addFirstLeftTuple( LeftTuple leftTuple ) {
linkedTuples.addFirstLeftTuple( leftTuple );
}

public void addLastLeftTuple( AbstractLeftTuple leftTuple ) {
public void addLastLeftTuple( LeftTuple leftTuple ) {
linkedTuples.addLastLeftTuple( leftTuple );
}

public void addTupleInPosition( Tuple tuple ) {
linkedTuples.addTupleInPosition( tuple );
}

public void removeLeftTuple( AbstractLeftTuple leftTuple ) {
public void removeLeftTuple( LeftTuple leftTuple ) {
linkedTuples.removeLeftTuple( leftTuple );
}

Expand Down Expand Up @@ -453,8 +452,8 @@ public static class SingleLinkedTuples implements LinkedTuples {
private RightTuple firstRightTuple;
private RightTuple lastRightTuple;

private AbstractLeftTuple firstLeftTuple;
private AbstractLeftTuple lastLeftTuple;
private LeftTuple firstLeftTuple;
private LeftTuple lastLeftTuple;

public SingleLinkedTuples clone() {
SingleLinkedTuples clone = new SingleLinkedTuples();
Expand All @@ -476,8 +475,8 @@ public boolean hasTuples() {
}

@Override
public void addFirstLeftTuple( AbstractLeftTuple leftTuple ) {
AbstractLeftTuple previous = firstLeftTuple;
public void addFirstLeftTuple( LeftTuple leftTuple ) {
LeftTuple previous = firstLeftTuple;
leftTuple.setHandlePrevious( null );
if ( previous == null ) {
// no other LeftTuples, just add.
Expand All @@ -492,8 +491,8 @@ public void addFirstLeftTuple( AbstractLeftTuple leftTuple ) {
}

@Override
public void addLastLeftTuple( AbstractLeftTuple leftTuple ) {
AbstractLeftTuple previous = lastLeftTuple;
public void addLastLeftTuple( LeftTuple leftTuple ) {
LeftTuple previous = lastLeftTuple;
if ( previous == null ) {
// no other LeftTuples, just add.
leftTuple.setHandlePrevious( null );
Expand All @@ -509,7 +508,7 @@ public void addLastLeftTuple( AbstractLeftTuple leftTuple ) {

@Override
public void addTupleInPosition( Tuple tuple ) {
boolean left = tuple instanceof AbstractLeftTuple;
boolean left = tuple instanceof LeftTuple;
ObjectTypeNode.Id otnId = tuple.getInputOtnId();
if (otnId == null) { // can happen only in tests
addLastTuple( tuple, left );
Expand Down Expand Up @@ -551,32 +550,32 @@ public void addTupleInPosition( Tuple tuple ) {

private void addLastTuple(Tuple tuple, boolean left) {
if (left) {
addLastLeftTuple( ( (AbstractLeftTuple) tuple ) );
addLastLeftTuple( ( (LeftTuple) tuple ) );
} else {
addLastRightTuple( ( (RightTuple) tuple ) );
}
}

private void setFirstTuple(Tuple tuple, boolean left) {
if (left) {
firstLeftTuple = ( (AbstractLeftTuple) tuple );
firstLeftTuple = ( (LeftTuple) tuple );
} else {
firstRightTuple = ( (RightTuple) tuple );
}
}

private void setLastTuple(Tuple tuple, boolean left) {
if (left) {
lastLeftTuple = ( (AbstractLeftTuple) tuple );
lastLeftTuple = ( (LeftTuple) tuple );
} else {
lastRightTuple = ( (RightTuple) tuple );
}
}

@Override
public void removeLeftTuple( AbstractLeftTuple leftTuple ) {
AbstractLeftTuple previous = leftTuple.getHandlePrevious();
AbstractLeftTuple next = leftTuple.getHandleNext();
public void removeLeftTuple( LeftTuple leftTuple ) {
LeftTuple previous = leftTuple.getHandlePrevious();
LeftTuple next = leftTuple.getHandleNext();

if ( previous != null && next != null ) {
// remove from middle
Expand Down Expand Up @@ -676,31 +675,31 @@ public void forEachRightTuple(Consumer<RightTuple> rightTupleConsumer) {
}

@Override
public void forEachLeftTuple(Consumer<AbstractLeftTuple> leftTupleConsumer) {
for ( AbstractLeftTuple leftTuple = firstLeftTuple; leftTuple != null; ) {
AbstractLeftTuple nextLeftTuple = leftTuple.getHandleNext();
leftTupleConsumer.accept( (AbstractLeftTuple) leftTuple );
public void forEachLeftTuple(Consumer<LeftTuple> leftTupleConsumer) {
for ( LeftTuple leftTuple = firstLeftTuple; leftTuple != null; ) {
LeftTuple nextLeftTuple = leftTuple.getHandleNext();
leftTupleConsumer.accept( leftTuple );
leftTuple = nextLeftTuple;
}
}

public AbstractLeftTuple findFirstLeftTuple(Predicate<AbstractLeftTuple> lefttTuplePredicate ) {
for ( AbstractLeftTuple leftTuple = firstLeftTuple; leftTuple != null; ) {
AbstractLeftTuple nextLeftTuple = leftTuple.getHandleNext();
if (lefttTuplePredicate.test( (AbstractLeftTuple) leftTuple )) {
return (AbstractLeftTuple) leftTuple;
public LeftTuple findFirstLeftTuple(Predicate<LeftTuple> lefttTuplePredicate ) {
for ( LeftTuple leftTuple = firstLeftTuple; leftTuple != null; ) {
LeftTuple nextLeftTuple = leftTuple.getHandleNext();
if (lefttTuplePredicate.test( leftTuple )) {
return leftTuple;
}
leftTuple = nextLeftTuple;
}
return null;
}

@Override
public AbstractLeftTuple getFirstLeftTuple(int partition) {
public LeftTuple getFirstLeftTuple(int partition) {
return getFirstLeftTuple();
}

AbstractLeftTuple getFirstLeftTuple() {
LeftTuple getFirstLeftTuple() {
return firstLeftTuple;
}

Expand Down Expand Up @@ -768,12 +767,12 @@ private LinkedTuples getOrCreatePartitionedTuple(Tuple tuple) {
}

@Override
public void addFirstLeftTuple( AbstractLeftTuple leftTuple ) {
public void addFirstLeftTuple( LeftTuple leftTuple ) {
getOrCreatePartitionedTuple(leftTuple).addFirstLeftTuple( leftTuple );
}

@Override
public void addLastLeftTuple( AbstractLeftTuple leftTuple ) {
public void addLastLeftTuple( LeftTuple leftTuple ) {
getOrCreatePartitionedTuple(leftTuple).addLastLeftTuple( leftTuple );
}

Expand All @@ -783,7 +782,7 @@ public void addTupleInPosition( Tuple tuple ) {
}

@Override
public void removeLeftTuple( AbstractLeftTuple leftTuple ) {
public void removeLeftTuple( LeftTuple leftTuple ) {
getPartitionedTuple(leftTuple).removeLeftTuple( leftTuple );
}

Expand Down Expand Up @@ -838,18 +837,18 @@ public void forEachRightTuple( int partition, Consumer<RightTuple> rightTupleCon
}

@Override
public void forEachLeftTuple( Consumer<AbstractLeftTuple> leftTupleConsumer ) {
public void forEachLeftTuple( Consumer<LeftTuple> leftTupleConsumer ) {
for (int i = 0; i < partitionedTuples.length; i++) {
forEachLeftTuple( i, leftTupleConsumer );
}
}

public void forEachLeftTuple( int partition, Consumer<AbstractLeftTuple> leftTupleConsumer ) {
public void forEachLeftTuple( int partition, Consumer<LeftTuple> leftTupleConsumer ) {
getPartitionedTuple(partition).forEachLeftTuple( leftTupleConsumer );
}

@Override
public AbstractLeftTuple findFirstLeftTuple( Predicate<AbstractLeftTuple> lefttTuplePredicate ) {
public LeftTuple findFirstLeftTuple(Predicate<LeftTuple> lefttTuplePredicate ) {
return Stream.of( partitionedTuples )
.map( t -> t.findFirstLeftTuple( lefttTuplePredicate ) )
.filter( Objects::nonNull )
Expand All @@ -858,7 +857,7 @@ public AbstractLeftTuple findFirstLeftTuple( Predicate<AbstractLeftTuple> lefttT
}

@Override
public AbstractLeftTuple getFirstLeftTuple(int partition) {
public LeftTuple getFirstLeftTuple(int partition) {
return ((SingleLinkedTuples) partitionedTuples[partition]).getFirstLeftTuple();
}

Expand Down Expand Up @@ -888,12 +887,12 @@ public boolean hasTuples() {
}

@Override
public void addFirstLeftTuple(AbstractLeftTuple leftTuple) {
public void addFirstLeftTuple(LeftTuple leftTuple) {
throw new UnsupportedOperationException();
}

@Override
public void addLastLeftTuple(AbstractLeftTuple leftTuple) {
public void addLastLeftTuple(LeftTuple leftTuple) {
throw new UnsupportedOperationException();
}

Expand All @@ -903,7 +902,7 @@ public void addTupleInPosition(Tuple tuple) {
}

@Override
public void removeLeftTuple(AbstractLeftTuple leftTuple) {
public void removeLeftTuple(LeftTuple leftTuple) {
throw new UnsupportedOperationException();
}

Expand Down Expand Up @@ -932,15 +931,15 @@ public void clearRightTuples() { }
public void forEachRightTuple(Consumer<RightTuple> rightTupleConsumer) { }

@Override
public void forEachLeftTuple(Consumer<AbstractLeftTuple> leftTupleConsumer) { }
public void forEachLeftTuple(Consumer<LeftTuple> leftTupleConsumer) { }

@Override
public AbstractLeftTuple findFirstLeftTuple(Predicate<AbstractLeftTuple> leftTuplePredicate) {
public LeftTuple findFirstLeftTuple(Predicate<LeftTuple> leftTuplePredicate) {
return null;
}

@Override
public AbstractLeftTuple getFirstLeftTuple(int partition) {
public LeftTuple getFirstLeftTuple(int partition) {
return null;
}

Expand All @@ -956,17 +955,17 @@ public void forEachRightTuple(Consumer<RightTuple> rightTupleConsumer) {
}

@Override
public void forEachLeftTuple(Consumer<AbstractLeftTuple> leftTupleConsumer) {
public void forEachLeftTuple(Consumer<LeftTuple> leftTupleConsumer) {
linkedTuples.forEachLeftTuple( leftTupleConsumer );
}

@Override
public AbstractLeftTuple findFirstLeftTuple(Predicate<AbstractLeftTuple> lefttTuplePredicate ) {
public LeftTuple findFirstLeftTuple(Predicate<LeftTuple> lefttTuplePredicate ) {
return linkedTuples.findFirstLeftTuple( lefttTuplePredicate );
}

@Override
public AbstractLeftTuple getFirstLeftTuple() {
public LeftTuple getFirstLeftTuple() {
if (linkedTuples instanceof SingleLinkedTuples) {
return ( (SingleLinkedTuples) linkedTuples ).getFirstLeftTuple();
}
Expand Down
Loading

0 comments on commit bd8267a

Please sign in to comment.