Skip to content

Commit d84e1e9

Browse files
stbischofstbischof
committed
first
Signed-off-by: Stefan Bischof <[email protected]>
1 parent 4977e93 commit d84e1e9

File tree

96 files changed

+190
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+190
-230
lines changed

‎mondrian/src/main/java/mondrian/calc/impl/AbstractIterCalc.java‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package mondrian.calc.impl;
1111

12-
import org.eclipse.daanse.olap.api.Evaluator;
1312
import org.eclipse.daanse.olap.api.calc.Calc;
1413
import org.eclipse.daanse.olap.api.calc.ResultStyle;
1514
import org.eclipse.daanse.olap.api.calc.todo.TupleIterable;
@@ -19,30 +18,29 @@
1918
import org.eclipse.daanse.olap.calc.base.AbstractProfilingNestedCalc;
2019

2120
/**
22-
* Abstract implementation of the {@link org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc} interface.
21+
* Abstract implementation of the
22+
* {@link org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc} interface.
2323
*
24-
* <p>The derived class must
25-
* implement the {@link #evaluateIterable(org.eclipse.daanse.olap.api.Evaluator)} method,
26-
* and the {@link #evaluate(org.eclipse.daanse.olap.api.Evaluator)} method will call it.
24+
* <p>
25+
* The derived class must implement the
26+
* {@link #evaluateIterable(org.eclipse.daanse.olap.api.Evaluator)} method, and
27+
* the {@link #evaluate(org.eclipse.daanse.olap.api.Evaluator)} method will call
28+
* it.
2729
*
2830
* @see mondrian.calc.impl.AbstractListCalc
2931
*
3032
* @author jhyde
3133
* @since Oct 24, 2008
3234
*/
33-
public abstract class AbstractIterCalc
34-
extends AbstractProfilingNestedCalc<Object>
35-
implements TupleIteratorCalc
36-
{
35+
public abstract class AbstractIterCalc extends AbstractProfilingNestedCalc<TupleIterable> implements TupleIteratorCalc {
3736
/**
38-
* Creates an abstract implementation of a compiled expression which returns
39-
* a {@link TupleIterable}.
37+
* Creates an abstract implementation of a compiled expression which returns a
38+
* {@link TupleIterable}.
4039
*
41-
* @param exp Expression which was compiled
42-
* @param calcs List of child compiled expressions (for dependency
43-
* analysis)
40+
* @param exp Expression which was compiled
41+
* @param calcs List of child compiled expressions (for dependency analysis)
4442
*/
45-
protected AbstractIterCalc( Type type, Calc<?>... calcs) {
43+
protected AbstractIterCalc(Type type, Calc<?>... calcs) {
4644
super(type, calcs);
4745
}
4846

@@ -51,11 +49,6 @@ public SetType getType() {
5149
return (SetType) super.getType();
5250
}
5351

54-
@Override
55-
public final Object evaluate(Evaluator evaluator) {
56-
return evaluateIterable(evaluator);
57-
}
58-
5952
@Override
6053
public ResultStyle getResultStyle() {
6154
return ResultStyle.ITERABLE;

‎mondrian/src/main/java/mondrian/calc/impl/AbstractListCalc.java‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@
2929
* @author jhyde
3030
* @since Sep 27, 2005
3131
*/
32-
public abstract class AbstractListCalc
33-
extends AbstractProfilingNestedCalc<Object>
34-
implements TupleListCalc {
32+
public abstract class AbstractListCalc extends AbstractProfilingNestedCalc<TupleList> implements TupleListCalc {
3533
private final boolean mutable;
3634

3735
/**
38-
* Creates an abstract implementation of a compiled expression which returns a mutable list of tuples.
36+
* Creates an abstract implementation of a compiled expression which returns a
37+
* mutable list of tuples.
3938
*
4039
* @param exp Expression which was compiled
4140
* @param calcs List of child compiled expressions (for dependency analysis)
4241
*/
43-
protected AbstractListCalc( Type type, Calc... calcs ) {
44-
this( type, calcs, true );
42+
protected AbstractListCalc(Type type, Calc... calcs) {
43+
this(type, calcs, true);
4544
}
4645

4746
/**
48-
* Creates an abstract implementation of a compiled expression which returns a list.
47+
* Creates an abstract implementation of a compiled expression which returns a
48+
* list.
4949
*
5050
* @param exp Expression which was compiled
5151
* @param calcs List of child compiled expressions (for dependency analysis)
5252
* @param mutable Whether the list is mutable
5353
*/
54-
protected AbstractListCalc( Type type, Calc[] calcs, boolean mutable ) {
55-
super( type, calcs );
54+
protected AbstractListCalc(Type type, Calc[] calcs, boolean mutable) {
55+
super(type, calcs);
5656
this.mutable = mutable;
5757
assert type instanceof SetType : "expecting a set: " + getType();
5858
}
@@ -62,23 +62,9 @@ public SetType getType() {
6262
return (SetType) super.getType();
6363
}
6464

65-
@Override
66-
public final Object evaluate( Evaluator evaluator ) {
67-
final TupleList tupleList = evaluateList( evaluator );
68-
assert tupleList != null : "null as empty tuple list is deprecated";
69-
return tupleList;
70-
}
71-
72-
@Override
73-
public TupleIterable evaluateIterable( Evaluator evaluator ) {
74-
return evaluateList( evaluator );
75-
}
76-
7765
@Override
7866
public ResultStyle getResultStyle() {
79-
return mutable
80-
? ResultStyle.MUTABLE_LIST
81-
: ResultStyle.LIST;
67+
return mutable ? ResultStyle.MUTABLE_LIST : ResultStyle.LIST;
8268
}
8369

8470
@Override

‎mondrian/src/main/java/mondrian/calc/impl/BetterExpCompiler.java‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.eclipse.daanse.olap.api.calc.MemberCalc;
2121
import org.eclipse.daanse.olap.api.calc.ResultStyle;
2222
import org.eclipse.daanse.olap.api.calc.TupleCalc;
23-
import org.eclipse.daanse.olap.api.calc.todo.TupleList;
2423
import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc;
2524
import org.eclipse.daanse.olap.api.query.component.Expression;
2625
import org.eclipse.daanse.olap.api.type.MemberType;
@@ -29,6 +28,7 @@
2928
import org.eclipse.daanse.olap.calc.base.type.member.UnknownToMemberCalc;
3029
import org.eclipse.daanse.olap.calc.base.type.tuple.MemberCalcToTupleCalc;
3130
import org.eclipse.daanse.olap.calc.base.type.tuple.UnknownToTupleCalc;
31+
import org.eclipse.daanse.olap.calc.base.type.tuplelist.CopyOfTupleListCalc;
3232

3333
import mondrian.olap.Util;
3434

@@ -88,26 +88,9 @@ public TupleListCalc compileList(Expression exp, boolean mutable) {
8888
// Wrap the expression in an expression which creates a mutable
8989
// copy.
9090

91-
//TODO: use org.eclipse.daanse.olap.calc.base.type.tuplelist.CopyOfTupleListCalc
92-
return new CopyListCalc(tupleListCalc);
91+
return new CopyOfTupleListCalc(tupleListCalc);
9392
}
9493
return tupleListCalc;
9594
}
9695

97-
//TODO: use org.eclipse.daanse.olap.calc.base.type.tuplelist.CopyOfTupleListCalc
98-
@Deprecated
99-
private static class CopyListCalc extends AbstractListCalc {
100-
private final TupleListCalc tupleListCalc;
101-
102-
public CopyListCalc(TupleListCalc tupleListCalc) {
103-
super( tupleListCalc.getType(), new Calc[] { tupleListCalc });
104-
this.tupleListCalc = tupleListCalc;
105-
}
106-
107-
@Override
108-
public TupleList evaluateList(Evaluator evaluator) {
109-
final TupleList list = tupleListCalc.evaluateList(evaluator);
110-
return list.copyList(-1);
111-
}
112-
}
11396
}

‎mondrian/src/main/java/mondrian/calc/impl/IterableListCalc.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import org.eclipse.daanse.olap.api.calc.todo.TupleList;
1818

1919
/**
20-
* Adapter that converts a {@link org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc} to a
20+
* Adapter that converts a
21+
* {@link org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc} to a
2122
* {@link org.eclipse.daanse.olap.api.calc.todo.TupleListCalc}.
2223
*
2324
* @author jhyde
@@ -32,15 +33,14 @@ public class IterableListCalc extends AbstractListCalc {
3233
* @param tupleIteratorCalc Calculation that returns an iterable.
3334
*/
3435
public IterableListCalc(TupleIteratorCalc tupleIteratorCalc) {
35-
super(tupleIteratorCalc.getType(), new Calc[] {tupleIteratorCalc});
36+
super(tupleIteratorCalc.getType(), new Calc[] { tupleIteratorCalc });
3637
this.tupleIteratorCalc = tupleIteratorCalc;
3738
}
3839

3940
@Override
40-
public TupleList evaluateList(Evaluator evaluator) {
41+
public TupleList evaluate(Evaluator evaluator) {
4142
// A TupleIterCalc is allowed to return a list. If so, save the copy.
42-
final TupleIterable iterable =
43-
tupleIteratorCalc.evaluateIterable(evaluator);
43+
final TupleIterable iterable = tupleIteratorCalc.evaluate(evaluator);
4444
if (iterable instanceof TupleList tupleList) {
4545
return tupleList;
4646
}

‎mondrian/src/main/java/mondrian/olap/ParameterImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public MemberListParameterCalc(ParameterSlot slot) {
326326
}
327327

328328
@Override
329-
public TupleList evaluateList(Evaluator evaluator) {
329+
public TupleList evaluate(Evaluator evaluator) {
330330
TupleList value = (TupleList) evaluator.getParameterValue(slot);
331331
if (!slot.isParameterSet()) {
332332
// save value if not set (setting the default value)

‎mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ MemberReader createMemberReader(Role role) {
989989
setType, new Calc[0])
990990
{
991991
@Override
992-
public TupleList evaluateList(
992+
public TupleList evaluate(
993993
Evaluator evaluator)
994994
{
995995
return

‎mondrian/src/main/java/mondrian/rolap/RolapResult.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public class RolapResult extends ResultBase {
305305
setType, new Calc[0])
306306
{
307307
@Override
308-
public TupleList evaluateList(
308+
public TupleList evaluate(
309309
Evaluator evaluator)
310310
{
311311
ArrayList<Member> children = new ArrayList<>();
@@ -355,7 +355,7 @@ public void unparse(Expression[] args, PrintWriter pw) {
355355
new Expression[0],
356356
returnType);
357357

358-
final TupleIterable iterable = ( (TupleIteratorCalc) calc ).evaluateIterable( evaluator );
358+
final TupleIterable iterable = ( (TupleIteratorCalc) calc ).evaluate( evaluator );
359359
TupleCursor cursor;
360360
if ( iterable instanceof TupleList list ) {
361361
cursor = list.tupleCursor();
@@ -1068,7 +1068,7 @@ private TupleIterable executeAxis( Evaluator evaluator, QueryAxis queryAxis, Cal
10681068
try {
10691069
evaluator.setNonEmpty( queryAxis.isNonEmpty() );
10701070
evaluator.setEvalAxes( true );
1071-
final TupleIterable iterable = ( (TupleIteratorCalc) axisCalc ).evaluateIterable( evaluator );
1071+
final TupleIterable iterable = ( (TupleIteratorCalc) axisCalc ).evaluate( evaluator );
10721072
if ( axisCalc.getClass().getName().indexOf( "OrderFunDef" ) != -1 ) {
10731073
queryAxis.setOrdered( true );
10741074
}

‎mondrian/src/main/java/mondrian/rolap/sql/CrossJoinArgFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ private CrossJoinArg[] expandNonNative(
962962
&& evaluator.getActiveNativeExpansions().add(exp))
963963
{
964964
TupleListCalc listCalc0 = compiler.compileList(exp);
965-
final TupleList tupleList = listCalc0.evaluateList(evaluator);
965+
final TupleList tupleList = listCalc0.evaluate(evaluator);
966966

967967
// Prevent the case when the second argument size is too large
968968
Util.checkCJResultLimit(tupleList.size());

‎mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/nested/AbstractProfilingNestedTupleListCalc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import org.eclipse.daanse.olap.api.calc.Calc;
1717
import org.eclipse.daanse.olap.api.calc.ResultStyle;
18-
import org.eclipse.daanse.olap.api.calc.TupleListCalc;
1918
import org.eclipse.daanse.olap.api.calc.todo.TupleList;
19+
import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc;
2020
import org.eclipse.daanse.olap.api.type.SetType;
2121
import org.eclipse.daanse.olap.api.type.Type;
2222
import org.eclipse.daanse.olap.calc.base.AbstractProfilingNestedCalc;

‎mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/CopyOfTupleListCalc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package org.eclipse.daanse.olap.calc.base.type.tuplelist;
1616

1717
import org.eclipse.daanse.olap.api.Evaluator;
18-
import org.eclipse.daanse.olap.api.calc.TupleListCalc;
1918
import org.eclipse.daanse.olap.api.calc.todo.TupleList;
19+
import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc;
2020
import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedTupleListCalc;
2121

2222
public class CopyOfTupleListCalc extends AbstractProfilingNestedTupleListCalc {

0 commit comments

Comments
 (0)