diff --git a/mondrian/src/main/java/mondrian/calc/impl/package.html b/mondrian/src/main/java/mondrian/calc/impl/package.html deleted file mode 100644 index 6cdf50bc42..0000000000 --- a/mondrian/src/main/java/mondrian/calc/impl/package.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - title - - -Provides implementation classes for compiled expressions. - - - diff --git a/mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java b/mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java deleted file mode 100644 index 59cec06cfe..0000000000 --- a/mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java +++ /dev/null @@ -1,30 +0,0 @@ -/* -* This software is subject to the terms of the Eclipse Public License v1.0 -* Agreement, available at the following URL: -* http://www.eclipse.org/legal/epl-v10.html. -* You must accept the terms of that agreement to use this software. -* -* Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. -*/ - -package mondrian.mdx; - -import java.io.PrintWriter; -import java.io.Writer; -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.daanse.olap.api.Parameter; - -/** - * PrintWriter used for unparsing queries. Remembers which parameters have - * been printed. The first time, they print themselves as "Parameter"; - * subsequent times as "ParamRef". - */ -public class QueryPrintWriter extends PrintWriter { - public final Set parameters = new HashSet<>(); - - public QueryPrintWriter(Writer writer) { - super(writer); - } -} diff --git a/mondrian/src/main/java/mondrian/mdx/package.html b/mondrian/src/main/java/mondrian/mdx/package.html deleted file mode 100644 index 3a1219e306..0000000000 --- a/mondrian/src/main/java/mondrian/mdx/package.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - title - - -Defines a parse tree for MDX expressions. - -

At present, many of the parse tree expression types -({@link mondrian.olap.Exp}, {@link mondrian.olap.Literal}, etc.) are -in the mondrian.olap package, but they will be migrated -in mondrian 1.3.

- - - diff --git a/mondrian/src/main/java/mondrian/olap/ExpCacheDescriptorImpl.java b/mondrian/src/main/java/mondrian/olap/ExpCacheDescriptorImpl.java index 10efcde53f..760087182d 100644 --- a/mondrian/src/main/java/mondrian/olap/ExpCacheDescriptorImpl.java +++ b/mondrian/src/main/java/mondrian/olap/ExpCacheDescriptorImpl.java @@ -22,8 +22,7 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; - -import mondrian.calc.impl.BetterExpCompiler; +import org.eclipse.daanse.olap.calc.base.compiler.BetterExpCompiler; /** * Holds information necessary to add an expression to the expression result diff --git a/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java b/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java index 424197bcd7..ed6af36e64 100644 --- a/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java +++ b/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java @@ -12,8 +12,7 @@ import java.util.Set; import org.eclipse.daanse.olap.api.query.component.Id; - -import mondrian.mdx.MdxVisitorImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; public class IdentifierVisitor extends MdxVisitorImpl { private final Set identifiers; diff --git a/mondrian/src/main/java/mondrian/olap/ParameterImpl.java b/mondrian/src/main/java/mondrian/olap/ParameterImpl.java index 9a68fd3844..648157d255 100644 --- a/mondrian/src/main/java/mondrian/olap/ParameterImpl.java +++ b/mondrian/src/main/java/mondrian/olap/ParameterImpl.java @@ -29,9 +29,8 @@ import org.eclipse.daanse.olap.api.type.StringType; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; - -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; /** * Implementation of {@link Parameter}. @@ -311,7 +310,7 @@ public Object evaluate(Evaluator evaluator) { * @see ParameterCalc */ private static class MemberListParameterCalc - extends AbstractListCalc { + extends AbstractProfilingNestedTupleListCalc { private final ParameterSlot slot; diff --git a/mondrian/src/main/java/mondrian/olap/Util.java b/mondrian/src/main/java/mondrian/olap/Util.java index 51754e5c6b..a8c707db15 100644 --- a/mondrian/src/main/java/mondrian/olap/Util.java +++ b/mondrian/src/main/java/mondrian/olap/Util.java @@ -123,12 +123,12 @@ import org.eclipse.daanse.olap.query.component.LevelExpressionImpl; import org.eclipse.daanse.olap.query.component.MemberExpressionImpl; import org.eclipse.daanse.olap.query.component.NamedSetExpressionImpl; +import org.eclipse.daanse.olap.query.component.QueryPrintWriter; import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl; import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.mdx.QueryPrintWriter; import mondrian.olap.exceptions.MdxCantFindMemberException; import mondrian.olap.exceptions.MdxChildObjectNotFoundException; import mondrian.olap.exceptions.MemberNotFoundException; diff --git a/mondrian/src/main/java/mondrian/olap/fun/FunUtil.java b/mondrian/src/main/java/mondrian/olap/fun/FunUtil.java index 23902d7e98..1ab9881d7f 100644 --- a/mondrian/src/main/java/mondrian/olap/fun/FunUtil.java +++ b/mondrian/src/main/java/mondrian/olap/fun/FunUtil.java @@ -58,6 +58,7 @@ import org.eclipse.daanse.olap.api.type.ScalarType; import org.eclipse.daanse.olap.api.type.TupleType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.hierarchy.member.HierarchyCurrentMemberFunDef; import org.eclipse.daanse.olap.function.def.parentheses.ParenthesesFunDef; import org.eclipse.daanse.olap.function.def.set.SetFunDef; @@ -65,7 +66,6 @@ import org.eclipse.daanse.olap.query.component.HierarchyExpressionImpl; import org.eclipse.daanse.olap.util.type.TypeUtil; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.AbstractProperty; import mondrian.olap.ResultStyleException; import mondrian.olap.Util; diff --git a/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java b/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java index 0e5bb1ebe6..b3d56f0027 100644 --- a/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java +++ b/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java @@ -25,8 +25,7 @@ import org.eclipse.daanse.olap.api.query.component.ParameterExpression; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.Type; - -import mondrian.mdx.MdxVisitorImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; /** * Visitor which collects any non-measure base members encountered while diff --git a/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java b/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java index 36e0491a58..a0351e4d18 100644 --- a/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java +++ b/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java @@ -15,8 +15,7 @@ import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.MemberExpression; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; - -import mondrian.mdx.MdxVisitorImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; /** * Visitor class used to locate a resolved function call within an diff --git a/mondrian/src/main/java/mondrian/olap/fun/sort/Sorter.java b/mondrian/src/main/java/mondrian/olap/fun/sort/Sorter.java index 54d0751703..369ba61a9a 100644 --- a/mondrian/src/main/java/mondrian/olap/fun/sort/Sorter.java +++ b/mondrian/src/main/java/mondrian/olap/fun/sort/Sorter.java @@ -35,12 +35,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.ScalarType; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.member.memberorderkey.MemberOrderKeyCalc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; import mondrian.rolap.RolapHierarchy; diff --git a/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java b/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java index cf1d791da8..38e87dcc44 100644 --- a/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java +++ b/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java @@ -21,10 +21,10 @@ import org.eclipse.daanse.olap.api.query.component.Formula; import org.eclipse.daanse.olap.api.query.component.MemberExpression; import org.eclipse.daanse.olap.element.OlapMetaData; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; import org.eclipse.daanse.rolap.mapping.api.model.CalculatedMemberMapping; import org.eclipse.daanse.rolap.mapping.api.model.NamedSetMapping; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.Util; /** diff --git a/mondrian/src/main/java/mondrian/rolap/RolapCatalogReader.java b/mondrian/src/main/java/mondrian/rolap/RolapCatalogReader.java index 16a11b57b2..b05c9cedff 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapCatalogReader.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapCatalogReader.java @@ -54,12 +54,12 @@ import org.eclipse.daanse.olap.api.function.FunctionDefinition; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.type.StringType; +import org.eclipse.daanse.olap.calc.base.compiler.ElevatorSimplifyer; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; import org.eclipse.daanse.olap.query.component.NullLiteralImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.ElevatorSimplifyer; import mondrian.olap.NameResolverImpl; import mondrian.olap.ParameterImpl; import mondrian.olap.SystemProperty; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapCell.java b/mondrian/src/main/java/mondrian/rolap/RolapCell.java index 3405b6ea33..68ce9c1978 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapCell.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapCell.java @@ -56,10 +56,10 @@ import org.eclipse.daanse.olap.function.def.aggregate.AggregateFunDef; import org.eclipse.daanse.olap.function.def.set.SetFunDef; import org.eclipse.daanse.olap.impl.ScenarioImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl; import org.slf4j.Logger; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.ExecuteDurationUtil; import mondrian.olap.StandardProperty; import mondrian.olap.SystemWideProperties; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapConnection.java b/mondrian/src/main/java/mondrian/rolap/RolapConnection.java index 348ebc67d6..6ea93ec6be 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapConnection.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapConnection.java @@ -67,6 +67,7 @@ import org.eclipse.daanse.olap.api.result.Position; import org.eclipse.daanse.olap.api.result.Result; import org.eclipse.daanse.olap.api.result.Scenario; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.core.AbstractBasicContext; import org.eclipse.daanse.olap.impl.ScenarioImpl; import org.eclipse.daanse.olap.query.component.QueryImpl; @@ -76,7 +77,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.ConnectionBase; import mondrian.olap.ExecuteDurationUtil; import mondrian.olap.QueryCanceledException; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapDependencyTestingEvaluator.java b/mondrian/src/main/java/mondrian/rolap/RolapDependencyTestingEvaluator.java index 17267c522a..53008cfd66 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapDependencyTestingEvaluator.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapDependencyTestingEvaluator.java @@ -29,12 +29,12 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.type.SetType; +import org.eclipse.daanse.olap.calc.base.compiler.DelegatingExpCompiler; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedTupleIterableCalc; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedTupleListCalc; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.DelegatingExpCompiler; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.Util; /** diff --git a/mondrian/src/main/java/mondrian/rolap/RolapEvaluator.java b/mondrian/src/main/java/mondrian/rolap/RolapEvaluator.java index 9c067e4ced..21d57c33fc 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapEvaluator.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapEvaluator.java @@ -41,10 +41,10 @@ import org.eclipse.daanse.olap.api.function.FunctionMetaData; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.Query; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.DelegatingTupleList; import mondrian.olap.StandardProperty; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java b/mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java index 0c7a1cac9b..48df27a734 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java @@ -64,6 +64,8 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.constant.ConstantCalcs; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc; import org.eclipse.daanse.olap.element.OlapMetaData; import org.eclipse.daanse.olap.function.core.FunctionMetaDataR; @@ -90,8 +92,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.HierarchyBase; import mondrian.olap.InvalidHierarchyException; import mondrian.olap.StandardProperty; @@ -985,7 +985,7 @@ MemberReader createMemberReader(Role role) { null); SetType setType = new SetType(memberType1); TupleListCalc tupleListCalc = - new AbstractListCalc( + new AbstractProfilingNestedTupleListCalc( setType, new Calc[0]) { @Override diff --git a/mondrian/src/main/java/mondrian/rolap/RolapNamedSetEvaluator.java b/mondrian/src/main/java/mondrian/rolap/RolapNamedSetEvaluator.java index 2c541c635e..5713527261 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapNamedSetEvaluator.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapNamedSetEvaluator.java @@ -20,8 +20,8 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.element.NamedSet; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.Util; /** diff --git a/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java b/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java index a6c44754de..fc033f91c2 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java @@ -26,8 +26,8 @@ import org.eclipse.daanse.olap.api.function.FunctionDefinition; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.MemberExpression; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.Util; import mondrian.rolap.TupleReader.MemberBuilder; import mondrian.rolap.aggmatcher.AggStar; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapNativeSet.java b/mondrian/src/main/java/mondrian/rolap/RolapNativeSet.java index 58f5a3fc39..c9290ed016 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapNativeSet.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapNativeSet.java @@ -29,10 +29,10 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.DelegatingTupleList; import mondrian.olap.DelegatingCatalogReader; import mondrian.olap.ResultStyleException; import mondrian.olap.Util; diff --git a/mondrian/src/main/java/mondrian/rolap/RolapProfilingEvaluator.java b/mondrian/src/main/java/mondrian/rolap/RolapProfilingEvaluator.java index 03aaa3f185..406a4ded02 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapProfilingEvaluator.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapProfilingEvaluator.java @@ -16,8 +16,7 @@ import org.eclipse.daanse.olap.api.calc.profile.ProfilingCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; - -import mondrian.calc.impl.DelegatingExpCompiler; +import org.eclipse.daanse.olap.calc.base.compiler.DelegatingExpCompiler; /** * Evaluator that collects profiling information as it evaluates expressions. diff --git a/mondrian/src/main/java/mondrian/rolap/RolapResult.java b/mondrian/src/main/java/mondrian/rolap/RolapResult.java index 8f321a12db..2fb9dcbf1e 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapResult.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapResult.java @@ -67,6 +67,9 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.calc.base.cache.CacheCalc; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ListTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc; import org.eclipse.daanse.olap.core.AbstractBasicContext; import org.eclipse.daanse.olap.function.core.FunctionMetaDataR; @@ -74,16 +77,13 @@ import org.eclipse.daanse.olap.function.def.aggregate.AbstractAggregateFunDef; import org.eclipse.daanse.olap.function.def.aggregate.AggregateCalc; import org.eclipse.daanse.olap.function.def.visualtotals.VisualTotalMember; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl; import org.eclipse.daanse.olap.util.type.TypeWrapperExp; import org.eclipse.daanse.rolap.aggregator.DistinctCountAggregator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.ListTupleList; -import mondrian.calc.impl.TupleCollections; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.ExpCacheDescriptorImpl; import mondrian.olap.MemberBase; import mondrian.olap.ResourceLimitExceededException; @@ -301,7 +301,7 @@ public class RolapResult extends ResultBase { null); SetType setType = new SetType(memberType1); org.eclipse.daanse.olap.api.calc.todo.TupleListCalc tupleListCalc = - new mondrian.calc.impl.AbstractListCalc( + new org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc( setType, new Calc[0]) { @Override @@ -321,7 +321,7 @@ public TupleList evaluate( } } - return new mondrian.calc.impl.UnaryTupleList(children); + return new org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList(children); } @Override diff --git a/mondrian/src/main/java/mondrian/rolap/RolapSetEvaluator.java b/mondrian/src/main/java/mondrian/rolap/RolapSetEvaluator.java index c1c795abe7..ad90505b60 100644 --- a/mondrian/src/main/java/mondrian/rolap/RolapSetEvaluator.java +++ b/mondrian/src/main/java/mondrian/rolap/RolapSetEvaluator.java @@ -22,8 +22,8 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.Util; /** diff --git a/mondrian/src/main/java/mondrian/rolap/SqlConstraintUtils.java b/mondrian/src/main/java/mondrian/rolap/SqlConstraintUtils.java index b78fceed0a..f9caea9235 100755 --- a/mondrian/src/main/java/mondrian/rolap/SqlConstraintUtils.java +++ b/mondrian/src/main/java/mondrian/rolap/SqlConstraintUtils.java @@ -43,6 +43,7 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.MemberExpression; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.aggregate.AggregateFunDef; import org.eclipse.daanse.olap.function.def.member.validmeasure.ValidMeasureFunDef; import org.eclipse.daanse.olap.function.def.parentheses.ParenthesesFunDef; @@ -50,7 +51,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; import mondrian.olap.fun.MemberExtractingVisitor; diff --git a/mondrian/src/main/java/mondrian/rolap/SqlTupleReader.java b/mondrian/src/main/java/mondrian/rolap/SqlTupleReader.java index 516b6dfc8d..f60c7073da 100644 --- a/mondrian/src/main/java/mondrian/rolap/SqlTupleReader.java +++ b/mondrian/src/main/java/mondrian/rolap/SqlTupleReader.java @@ -42,14 +42,14 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.monitor.event.SqlStatementEvent; import org.eclipse.daanse.olap.api.query.component.Query; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ListTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.ArrayTupleList; -import mondrian.calc.impl.ListTupleList; -import mondrian.calc.impl.TupleCollections; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.ExecuteDurationUtil; import mondrian.olap.ResourceLimitExceededException; import mondrian.olap.SystemWideProperties; diff --git a/mondrian/src/main/java/mondrian/util/IdentifierParser.java b/mondrian/src/main/java/mondrian/util/IdentifierParser.java index 023a236729..774ca27682 100644 --- a/mondrian/src/main/java/mondrian/util/IdentifierParser.java +++ b/mondrian/src/main/java/mondrian/util/IdentifierParser.java @@ -28,8 +28,8 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.element.OlapElement; import org.eclipse.daanse.olap.api.exception.OlapRuntimeException; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; -import mondrian.calc.impl.ArrayTupleList; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; import mondrian.olap.fun.FunUtil; diff --git a/mondrian/src/main/java/mondrian/calc/impl/AbstractExpCompiler.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/AbstractExpCompiler.java similarity index 94% rename from mondrian/src/main/java/mondrian/calc/impl/AbstractExpCompiler.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/AbstractExpCompiler.java index 8d909d34b8..1a15200540 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/AbstractExpCompiler.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/AbstractExpCompiler.java @@ -5,16 +5,28 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ +package org.eclipse.daanse.olap.calc.base.compiler; -package mondrian.calc.impl; - -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import org.eclipse.daanse.mdx.model.api.expression.operation.CastOperationAtom; import org.eclipse.daanse.olap.api.Evaluator; @@ -62,7 +74,6 @@ import org.eclipse.daanse.olap.calc.base.constant.ConstantHierarchyCalc; import org.eclipse.daanse.olap.calc.base.constant.ConstantIntegerCalc; import org.eclipse.daanse.olap.calc.base.constant.ConstantStringCalc; -import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedDoubleCalc; import org.eclipse.daanse.olap.calc.base.type.booleanx.DoubleToBooleanCalc; import org.eclipse.daanse.olap.calc.base.type.booleanx.IntgegerToBooleanCalc; import org.eclipse.daanse.olap.calc.base.type.booleanx.UnknownToBooleanCalc; @@ -70,12 +81,16 @@ import org.eclipse.daanse.olap.calc.base.type.dimension.DimensionOfHierarchyCalc; import org.eclipse.daanse.olap.calc.base.type.dimension.UnknownToDimensionCalc; import org.eclipse.daanse.olap.calc.base.type.doublex.IntegerToDoubleCalc; +import org.eclipse.daanse.olap.calc.base.type.doublex.UnknownToDoubleCalc; import org.eclipse.daanse.olap.calc.base.type.hierarchy.DimensionDefaultHierarchyCalc; import org.eclipse.daanse.olap.calc.base.type.integer.DoubleToIntegerCalc; import org.eclipse.daanse.olap.calc.base.type.integer.UnknownToIntegerCalc; import org.eclipse.daanse.olap.calc.base.type.level.UnknownToLevelCalc; import org.eclipse.daanse.olap.calc.base.type.member.UnknownToMemberCalc; import org.eclipse.daanse.olap.calc.base.type.string.UnknownToStringCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.IterableListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.MemberValueCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleValueCalc; import org.eclipse.daanse.olap.calc.base.util.DimensionUtil; import org.eclipse.daanse.olap.function.def.hierarchy.level.LevelHirarchyCalc; import org.eclipse.daanse.olap.function.def.hierarchy.member.HierarchyCurrentMemberCalc; @@ -189,7 +204,7 @@ public Calc compileAs( if (substitutions > 0) { - final TupleIteratorCalc tupleIteratorCalc = (TupleIteratorCalc) calc; + final TupleIteratorCalc tupleIteratorCalc = (TupleIteratorCalc) calc; if (tupleIteratorCalc == null) { resultStyles = Collections.singletonList(ResultStyle.ITERABLE); @@ -414,7 +429,7 @@ public TupleListCalc compileList(Expression exp, boolean mutable) { // 'calc instanceof TupleIteratorCalc' because some generic calcs implement both // TupleListCalc and TupleIteratorCalc. if (!(calc instanceof TupleListCalc)) { - return toList((TupleIteratorCalc) calc); + return toList((TupleIteratorCalc) calc); } // A set can only be implemented as a list or an iterable. throw Util.newInternal("Cannot convert calc to list: " + calc); @@ -426,16 +441,16 @@ public TupleListCalc compileList(Expression exp, boolean mutable) { * @param calc Calc * @return List calculation. */ - public TupleListCalc toList(TupleIteratorCalc calc) { + public TupleListCalc toList(TupleIteratorCalc calc) { return new IterableListCalc(calc); } @Override - public TupleIteratorCalc compileIter(Expression exp) { - TupleIteratorCalc calc = - (TupleIteratorCalc) compileAs(exp, null, ResultStyle.ITERABLE_ONLY); + public TupleIteratorCalc compileIter(Expression exp) { + TupleIteratorCalc calc = + (TupleIteratorCalc) compileAs(exp, null, ResultStyle.ITERABLE_ONLY); if (calc == null) { - calc = (TupleIteratorCalc) compileAs(exp, null, ResultStyle.ANY_ONLY); + calc = (TupleIteratorCalc) compileAs(exp, null, ResultStyle.ANY_ONLY); assert calc != null; } return calc; @@ -604,61 +619,6 @@ public List getAcceptableResultStyles() { return resultStyles; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public class UnknownToDoubleCalc extends AbstractProfilingNestedDoubleCalc { - - public UnknownToDoubleCalc(Type type, Calc calc) { - super(type, new Calc[] { calc }); - } - - @Override - public Double evaluate(Evaluator evaluator) { - - Object o = getFirstChildCalc().evaluate(evaluator); - if (o == null) { - return FunUtil.DOUBLE_NULL; - // null; - // TODO: !!! JUST REFACTORING 0 must be null - } else if(Objects.equals(o, FunUtil.DOUBLE_NULL)){ - return FunUtil.DOUBLE_NULL; - }else if (o instanceof Double d) { - return d; - } else if (o instanceof Number n) { - return n.doubleValue(); - } - throw evaluator.newEvalException(null, "wrtong typed, was: " + o); - } - } - - /** * Implementation of {@link ParameterSlot}. */ diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BaseExpressionCompilerFactory.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BaseExpressionCompilerFactory.java index b90ce3367f..86edc9e964 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BaseExpressionCompilerFactory.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BaseExpressionCompilerFactory.java @@ -26,8 +26,6 @@ import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.ServiceScope; -import mondrian.calc.impl.BetterExpCompiler; - @Component(scope = ServiceScope.SINGLETON, configurationPid = BaseExpressionCompilerFactory.PID, service = ExpressionCompilerFactory.class) public class BaseExpressionCompilerFactory implements ExpressionCompilerFactory { public static final String PID = "org.eclipse.daanse.olap.calc.base.compiler.BaseExpressionCompilerFactory"; diff --git a/mondrian/src/main/java/mondrian/calc/impl/BetterExpCompiler.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BetterExpCompiler.java similarity index 79% rename from mondrian/src/main/java/mondrian/calc/impl/BetterExpCompiler.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BetterExpCompiler.java index 6d0e7f3cf3..7124afda60 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/BetterExpCompiler.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/BetterExpCompiler.java @@ -1,3 +1,27 @@ +/* + * This software is subject to the terms of the Eclipse Public License v1.0 + * Agreement, available at the following URL: + * http://www.eclipse.org/legal/epl-v10.html. + * You must accept the terms of that agreement to use this software. + * + * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * Sergei Semenkov (2001) + * SmartCity Jena - initial + */ /* * This software is subject to the terms of the Eclipse Public License v1.0 * Agreement, available at the following URL: @@ -5,11 +29,10 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara. - * Copyright (C) 2021 Sergei Semenkov * All rights reserved. */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.compiler; import java.util.List; diff --git a/mondrian/src/main/java/mondrian/calc/impl/DelegatingExpCompiler.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/DelegatingExpCompiler.java similarity index 93% rename from mondrian/src/main/java/mondrian/calc/impl/DelegatingExpCompiler.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/DelegatingExpCompiler.java index 90735e7d94..74a0cc8c32 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/DelegatingExpCompiler.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/DelegatingExpCompiler.java @@ -5,9 +5,23 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ - -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.compiler; import java.io.PrintWriter; import java.util.List; @@ -206,7 +220,7 @@ private Expression wrap(Expression e) { } /** - * See {@link mondrian.calc.impl.DelegatingExpCompiler#wrap}. + * See {@link org.eclipse.daanse.olap.calc.base.compiler.DelegatingExpCompiler#wrap}. */ private static class WrapExpressionImpl extends AbstractQueryPart implements Expression, WrapExpression { private final Expression e; diff --git a/mondrian/src/main/java/mondrian/calc/impl/ElevatorSimplifyer.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/ElevatorSimplifyer.java similarity index 67% rename from mondrian/src/main/java/mondrian/calc/impl/ElevatorSimplifyer.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/ElevatorSimplifyer.java index 570952bd9a..afcfd8cb8f 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/ElevatorSimplifyer.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/compiler/ElevatorSimplifyer.java @@ -1,4 +1,27 @@ -package mondrian.calc.impl; +/* + * This software is subject to the terms of the Eclipse Public License v1.0 + * Agreement, available at the following URL: + * http://www.eclipse.org/legal/epl-v10.html. + * You must accept the terms of that agreement to use this software. + * + * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial + */ +package org.eclipse.daanse.olap.calc.base.compiler; import java.util.List; diff --git a/mondrian/src/main/java/mondrian/calc/impl/AbstractEndToEndTupleList.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractEndToEndTupleList.java similarity index 90% rename from mondrian/src/main/java/mondrian/calc/impl/AbstractEndToEndTupleList.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractEndToEndTupleList.java index 79051a1894..24eda8b68c 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/AbstractEndToEndTupleList.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractEndToEndTupleList.java @@ -5,9 +5,23 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ - -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import java.util.AbstractList; import java.util.Collection; diff --git a/mondrian/src/main/java/mondrian/calc/impl/AbstractIterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleIteratorCalc.java similarity index 66% rename from mondrian/src/main/java/mondrian/calc/impl/AbstractIterCalc.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleIteratorCalc.java index 1dd4931064..2a2b349c93 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/AbstractIterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleIteratorCalc.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import org.eclipse.daanse.olap.api.calc.Calc; import org.eclipse.daanse.olap.api.calc.ResultStyle; @@ -27,12 +42,12 @@ * the {@link #evaluate(org.eclipse.daanse.olap.api.Evaluator)} method will call * it. * - * @see mondrian.calc.impl.AbstractListCalc + * @see org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc * * @author jhyde * @since Oct 24, 2008 */ -public abstract class AbstractIterCalc extends AbstractProfilingNestedCalc implements TupleIteratorCalc { +public abstract class AbstractProfilingNestedTupleIteratorCalc extends AbstractProfilingNestedCalc implements TupleIteratorCalc { /** * Creates an abstract implementation of a compiled expression which returns a * {@link TupleIterable}. @@ -40,7 +55,7 @@ public abstract class AbstractIterCalc extends AbstractProfilingNestedCalc... calcs) { + protected AbstractProfilingNestedTupleIteratorCalc(Type type, Calc... calcs) { super(type, calcs); } diff --git a/mondrian/src/main/java/mondrian/calc/impl/AbstractListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleListCalc.java similarity index 70% rename from mondrian/src/main/java/mondrian/calc/impl/AbstractListCalc.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleListCalc.java index 52313abef6..23fe4aebab 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/AbstractListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/AbstractProfilingNestedTupleListCalc.java @@ -4,15 +4,27 @@ * http://www.eclipse.org/legal/epl-v10.html. * You must accept the terms of that agreement to use this software. * - * Copyright (c) 2002-2020 Hitachi Vantara.. All rights reserved. + * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ +package org.eclipse.daanse.olap.calc.base.type.tuplebase; -package mondrian.calc.impl; - -import org.eclipse.daanse.olap.api.Evaluator; import org.eclipse.daanse.olap.api.calc.Calc; import org.eclipse.daanse.olap.api.calc.ResultStyle; -import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.SetType; @@ -29,7 +41,7 @@ * @author jhyde * @since Sep 27, 2005 */ -public abstract class AbstractListCalc extends AbstractProfilingNestedCalc implements TupleListCalc { +public abstract class AbstractProfilingNestedTupleListCalc extends AbstractProfilingNestedCalc implements TupleListCalc { private final boolean mutable; /** @@ -39,7 +51,7 @@ public abstract class AbstractListCalc extends AbstractProfilingNestedCalc tupleIteratorCalc; /** diff --git a/mondrian/src/main/java/mondrian/calc/impl/ListTupleList.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/ListTupleList.java similarity index 88% rename from mondrian/src/main/java/mondrian/calc/impl/ListTupleList.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/ListTupleList.java index 27dea38ac2..bcc1ca3293 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/ListTupleList.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/ListTupleList.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import java.util.AbstractList; import java.util.ArrayList; @@ -18,8 +33,6 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; -import mondrian.olap.Util; - /** * Implementation of {@link org.eclipse.daanse.olap.api.calc.todo.TupleList} that stores tuples * end-to-end in a backing list. diff --git a/mondrian/src/main/java/mondrian/calc/impl/MemberArrayValueCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberArrayValueCalc.java similarity index 88% rename from mondrian/src/main/java/mondrian/calc/impl/MemberArrayValueCalc.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberArrayValueCalc.java index de5ea806d0..25117273f5 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/MemberArrayValueCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberArrayValueCalc.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import org.eclipse.daanse.olap.api.Evaluator; import org.eclipse.daanse.olap.api.calc.Calc; diff --git a/mondrian/src/main/java/mondrian/calc/impl/MemberValueCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberValueCalc.java similarity index 88% rename from mondrian/src/main/java/mondrian/calc/impl/MemberValueCalc.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberValueCalc.java index c5f26aa00f..2ede9d113a 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/MemberValueCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/MemberValueCalc.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import org.eclipse.daanse.olap.api.Evaluator; import org.eclipse.daanse.olap.api.calc.Calc; @@ -28,7 +43,7 @@ *

The evaluator's context is preserved. * *

Note that a MemberValueCalc with 0 member expressions is equivalent to a - * {@link org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc}; see also {@link mondrian.calc.impl.TupleValueCalc}. + * {@link org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc}; see also {@link org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleValueCalc}. * * @author jhyde * @since Sep 27, 2005 diff --git a/mondrian/src/main/java/mondrian/calc/impl/TupleCollections.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleCollections.java similarity index 97% rename from mondrian/src/main/java/mondrian/calc/impl/TupleCollections.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleCollections.java index 79568be60b..8f6cb32509 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/TupleCollections.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleCollections.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import java.util.AbstractList; import java.util.ArrayList; diff --git a/mondrian/src/main/java/mondrian/calc/impl/TupleValueCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleValueCalc.java similarity index 87% rename from mondrian/src/main/java/mondrian/calc/impl/TupleValueCalc.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleValueCalc.java index dc6a6a1684..4910be6723 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/TupleValueCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/TupleValueCalc.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import org.eclipse.daanse.olap.api.Evaluator; import org.eclipse.daanse.olap.api.calc.Calc; @@ -27,7 +42,7 @@ *

The evaluator's context is preserved. * * @see org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc - * @see mondrian.calc.impl.MemberValueCalc + * @see org.eclipse.daanse.olap.calc.base.type.tuplebase.MemberValueCalc * * @author jhyde * @since Sep 27, 2005 diff --git a/mondrian/src/main/java/mondrian/calc/impl/UnaryTupleList.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/UnaryTupleList.java similarity index 93% rename from mondrian/src/main/java/mondrian/calc/impl/UnaryTupleList.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/UnaryTupleList.java index fa73f68abd..71e185a7b1 100644 --- a/mondrian/src/main/java/mondrian/calc/impl/UnaryTupleList.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/UnaryTupleList.java @@ -5,9 +5,24 @@ * You must accept the terms of that agreement to use this software. * * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial */ -package mondrian.calc.impl; +package org.eclipse.daanse.olap.calc.base.type.tuplebase; import java.util.AbstractList; import java.util.ArrayList; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/package-info.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/package-info.java new file mode 100644 index 0000000000..8b40cf0345 --- /dev/null +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplebase/package-info.java @@ -0,0 +1,17 @@ +/* +* Copyright (c) 2023 Contributors to the Eclipse Foundation. +* +* This program and the accompanying materials are made +* available under the terms of the Eclipse Public License 2.0 +* which is available at https://www.eclipse.org/legal/epl-2.0/ +* +* SPDX-License-Identifier: EPL-2.0 +* +* Contributors: +* SmartCity Jena - initial +* Stefan Bischof (bipolis.org) - initial +*/ +//TODO: RM EXPORT +@org.osgi.annotation.bundle.Export +@org.osgi.annotation.versioning.Version("0.0.1") +package org.eclipse.daanse.olap.calc.base.type.tuplebase; \ No newline at end of file diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/TupleIteratableToTupleListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/TupleIteratableToTupleListCalc.java index 63fad9ceeb..ab73426d25 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/TupleIteratableToTupleListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/TupleIteratableToTupleListCalc.java @@ -7,8 +7,7 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedTupleListCalc; - -import mondrian.calc.impl.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; public class TupleIteratableToTupleListCalc extends AbstractProfilingNestedTupleListCalc { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/package-info.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/package-info.java new file mode 100644 index 0000000000..9bfbaf4abe --- /dev/null +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/type/tuplelist/package-info.java @@ -0,0 +1,17 @@ +/* +* Copyright (c) 2023 Contributors to the Eclipse Foundation. +* +* This program and the accompanying materials are made +* available under the terms of the Eclipse Public License 2.0 +* which is available at https://www.eclipse.org/legal/epl-2.0/ +* +* SPDX-License-Identifier: EPL-2.0 +* +* Contributors: +* SmartCity Jena - initial +* Stefan Bischof (bipolis.org) - initial +*/ +//TODO: RM EXPORT +@org.osgi.annotation.bundle.Export +@org.osgi.annotation.versioning.Version("0.0.1") +package org.eclipse.daanse.olap.calc.base.type.tuplelist; \ No newline at end of file diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/value/CurrentValueUnknownCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/value/CurrentValueUnknownCalc.java index 662c98f173..bf3fff0395 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/value/CurrentValueUnknownCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/calc/base/value/CurrentValueUnknownCalc.java @@ -34,7 +34,7 @@ * Expression which yields the value of the current member in the current * dimensional context. * - * @see mondrian.calc.impl.MemberValueCalc + * @see org.eclipse.daanse.olap.calc.base.type.tuplebase.MemberValueCalc * * @author jhyde * @since Sep 27, 2005 diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AbstractAggregateFunDef.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AbstractAggregateFunDef.java index a0eecad94f..2c081a6473 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AbstractAggregateFunDef.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AbstractAggregateFunDef.java @@ -28,12 +28,12 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.function.FunctionMetaData; import org.eclipse.daanse.olap.api.query.component.Expression; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.AbstractFunctionDefinition; import org.eclipse.daanse.olap.function.def.cache.CacheFunDef; import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.ResourceLimitExceededException; import mondrian.olap.SystemWideProperties; import mondrian.olap.fun.FunUtil; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AggregateCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AggregateCalc.java index 95e28a1299..4f0c716830 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AggregateCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/AggregateCalc.java @@ -37,13 +37,13 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; import org.eclipse.daanse.rolap.aggregator.AbstractAggregator; import org.eclipse.daanse.rolap.aggregator.AvgAggregator; import org.eclipse.daanse.rolap.aggregator.DistinctCountAggregator; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.StandardProperty; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/children/AggregateChildrenCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/children/AggregateChildrenCalc.java index 671181c2bb..0582854803 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/children/AggregateChildrenCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/aggregate/children/AggregateChildrenCalc.java @@ -24,9 +24,9 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.StandardProperty; import mondrian.olap.fun.FunUtil; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/as/AsAliasCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/as/AsAliasCalc.java index 822b8c401b..1b1a4a909f 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/as/AsAliasCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/as/AsAliasCalc.java @@ -27,11 +27,10 @@ import org.eclipse.daanse.olap.api.calc.Calc; import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; import org.eclipse.daanse.olap.query.component.QueryImpl.ScopedNamedSet; -import mondrian.calc.impl.AbstractIterCalc; - -public class AsAliasCalc extends AbstractIterCalc { +public class AsAliasCalc extends AbstractProfilingNestedTupleIteratorCalc { private ScopedNamedSet scopedNamedSet; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/cache/CacheGenericListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/cache/CacheGenericListCalc.java index d4a88e14a1..0101f96821 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/cache/CacheGenericListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/cache/CacheGenericListCalc.java @@ -22,8 +22,7 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedTupleListCalc; - -import mondrian.calc.impl.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; public class CacheGenericListCalc extends AbstractProfilingNestedTupleListCalc { private final ExpCacheDescriptor cacheDescriptor; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/BaseListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/BaseListCalc.java index 199caed459..6fc4128d8e 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/BaseListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/BaseListCalc.java @@ -21,12 +21,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.Util; -public abstract class BaseListCalc extends AbstractListCalc { +public abstract class BaseListCalc extends AbstractProfilingNestedTupleListCalc { ResolvedFunCall call; private int ctag; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDef.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDef.java index 24f3e1236d..97fdc01337 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDef.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinFunDef.java @@ -44,6 +44,8 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.api.type.TupleType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ListTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.AbstractFunctionDefinition; import org.eclipse.daanse.olap.function.def.set.SetListCalc; import org.eclipse.daanse.olap.function.def.set.ExprIterCalc; @@ -51,8 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import mondrian.calc.impl.ListTupleList; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.ResultStyleException; import mondrian.olap.Util; import mondrian.olap.fun.FunUtil; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinIterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinIterCalc.java index a65c47cece..6da74a090e 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinIterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinIterCalc.java @@ -27,15 +27,15 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleCursor; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleIterable; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractIterCalc; -import mondrian.calc.impl.AbstractTupleCursor; -import mondrian.calc.impl.AbstractTupleIterable; -import mondrian.calc.impl.TupleCollections; import mondrian.server.LocusImpl; import mondrian.util.CancellationChecker; -public class CrossJoinIterCalc extends AbstractIterCalc { +public class CrossJoinIterCalc extends AbstractProfilingNestedTupleIteratorCalc { private ResolvedFunCall call; private int ctag; public CrossJoinIterCalc( ResolvedFunCall call, Calc[] calcs, int ctag ) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/ImmutableListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/ImmutableListCalc.java index 311244f385..d022057db7 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/ImmutableListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/ImmutableListCalc.java @@ -21,8 +21,8 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; -import mondrian.calc.impl.DelegatingTupleList; import mondrian.olap.Util; import mondrian.util.CartesianProductList; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java index 298ac7cfda..8438fe4679 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java @@ -23,8 +23,8 @@ import org.eclipse.daanse.olap.api.query.component.ParameterExpression; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.fun.ResolvedFunCallFinder; /** diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MutableListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MutableListCalc.java index 09ec70fc38..d4fd14294a 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MutableListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MutableListCalc.java @@ -20,8 +20,7 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; - -import mondrian.calc.impl.ListTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ListTupleList; public class MutableListCalc extends BaseListCalc { public MutableListCalc( ResolvedFunCall call, Calc[] calcs, int ctag ) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsByDepthCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsByDepthCalc.java index 4d191fb321..16eff161e4 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsByDepthCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsByDepthCalc.java @@ -23,12 +23,12 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.sort.Sorter; -public class DescendantsByDepthCalc extends AbstractListCalc { +public class DescendantsByDepthCalc extends AbstractProfilingNestedTupleListCalc { private Flag flag; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsCalc.java index 790ecf1fce..ddfc900cbf 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsCalc.java @@ -25,12 +25,12 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.sort.Sorter; -public class DescendantsCalc extends AbstractListCalc{ +public class DescendantsCalc extends AbstractProfilingNestedTupleListCalc{ private final Flag flag; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsLeavesByDepthCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsLeavesByDepthCalc.java index 41073f876b..5ffc3d58ee 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsLeavesByDepthCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/descendants/DescendantsLeavesByDepthCalc.java @@ -23,13 +23,13 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.Util; import mondrian.olap.fun.sort.Sorter; -public class DescendantsLeavesByDepthCalc extends AbstractListCalc { +public class DescendantsLeavesByDepthCalc extends AbstractProfilingNestedTupleListCalc { public DescendantsLeavesByDepthCalc(Type type, MemberCalc memberCalc, IntegerCalc depthCalc) { super(type, memberCalc, depthCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelCalc.java index 3c8ec70c43..7ad5af2538 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelCalc.java @@ -26,12 +26,12 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; -public class DrilldownLevelCalc extends AbstractListCalc{ +public class DrilldownLevelCalc extends AbstractProfilingNestedTupleListCalc{ private final boolean includeCalcMembers; public DrilldownLevelCalc(Type type, TupleListCalc tupleListCalc, LevelCalc levelCalc, final boolean includeCalcMembers) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelWithIndexCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelWithIndexCalc.java index 0f0cd0900b..e60a23cc33 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelWithIndexCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownlevel/DrilldownLevelWithIndexCalc.java @@ -23,11 +23,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class DrilldownLevelWithIndexCalc extends AbstractListCalc { +public class DrilldownLevelWithIndexCalc extends AbstractProfilingNestedTupleListCalc { private final int arity; private final boolean includeCalcMembers; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownleveltopbottom/DrilldownLevelTopBottomCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownleveltopbottom/DrilldownLevelTopBottomCalc.java index 81a3b28fba..79a0194fd5 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownleveltopbottom/DrilldownLevelTopBottomCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownleveltopbottom/DrilldownLevelTopBottomCalc.java @@ -31,14 +31,14 @@ import org.eclipse.daanse.olap.api.function.FunctionMetaData; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; import mondrian.olap.fun.sort.Sorter; -public class DrilldownLevelTopBottomCalc extends AbstractListCalc { +public class DrilldownLevelTopBottomCalc extends AbstractProfilingNestedTupleListCalc { private final boolean top; private final ResolvedFunCall call; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownmember/DrilldownMemberCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownmember/DrilldownMemberCalc.java index 0a769087dd..b00f4c9275 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownmember/DrilldownMemberCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/drilldownmember/DrilldownMemberCalc.java @@ -22,11 +22,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class DrilldownMemberCalc extends AbstractListCalc { +public class DrilldownMemberCalc extends AbstractProfilingNestedTupleListCalc { private final boolean recursive; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/except/ExceptCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/except/ExceptCalc.java index a30a383bed..3faa811b31 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/except/ExceptCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/except/ExceptCalc.java @@ -22,11 +22,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.ArrayTupleList; - -public class ExceptCalc extends AbstractListCalc { +public class ExceptCalc extends AbstractProfilingNestedTupleListCalc { public ExceptCalc(Type type, TupleListCalc listCalc0, TupleListCalc listCalc1) { super(type, listCalc0, listCalc1); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/exists/ExistsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/exists/ExistsCalc.java index a049241b80..afb612bb2a 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/exists/ExistsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/exists/ExistsCalc.java @@ -22,12 +22,12 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; -public class ExistsCalc extends AbstractListCalc { +public class ExistsCalc extends AbstractProfilingNestedTupleListCalc { public ExistsCalc(Type type, TupleListCalc listCalc1, TupleListCalc listCalc2) { super(type, listCalc1, listCalc2); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/generate/GenerateListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/generate/GenerateListCalc.java index a72d91271c..501ea3a8b6 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/generate/GenerateListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/generate/GenerateListCalc.java @@ -27,14 +27,14 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.server.LocusImpl; import mondrian.util.CancellationChecker; -public class GenerateListCalc extends AbstractListCalc { +public class GenerateListCalc extends AbstractProfilingNestedTupleListCalc { private final int arityOut; private final boolean all; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/HeadCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/HeadCalc.java index 40520ee48a..114223ab1e 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/HeadCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/HeadCalc.java @@ -18,11 +18,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class HeadCalc extends AbstractListCalc { +public class HeadCalc extends AbstractProfilingNestedTupleListCalc { public HeadCalc(Type type, TupleListCalc tupleListCalc, IntegerCalc integerCalc) { super(type, tupleListCalc, integerCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/TailCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/TailCalc.java index 204e86af56..2d56fcf220 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/TailCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/headtail/TailCalc.java @@ -18,11 +18,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class TailCalc extends AbstractListCalc { +public class TailCalc extends AbstractProfilingNestedTupleListCalc { public TailCalc(Type type, TupleListCalc tupleListCalc, IntegerCalc integerCalc) { super(type, tupleListCalc, integerCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/hierarchize/HierarchizeCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/hierarchize/HierarchizeCalc.java index 99565780ea..15593657ae 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/hierarchize/HierarchizeCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/hierarchize/HierarchizeCalc.java @@ -17,11 +17,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.sort.Sorter; -public class HierarchizeCalc extends AbstractListCalc{ +public class HierarchizeCalc extends AbstractProfilingNestedTupleListCalc{ private boolean post; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/intersect/IntersectCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/intersect/IntersectCalc.java index cac06b0d85..6eef755f62 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/intersect/IntersectCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/intersect/IntersectCalc.java @@ -23,12 +23,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.visualtotals.VisualTotalMember; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class IntersectCalc extends AbstractListCalc { +public class IntersectCalc extends AbstractProfilingNestedTupleListCalc { private final boolean all; private final int arity; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/lastperiods/LastPeriodsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/lastperiods/LastPeriodsCalc.java index e6147ad94a..85f265e743 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/lastperiods/LastPeriodsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/lastperiods/LastPeriodsCalc.java @@ -23,11 +23,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; - -public class LastPeriodsCalc extends AbstractListCalc { +public class LastPeriodsCalc extends AbstractProfilingNestedTupleListCalc { public LastPeriodsCalc(Type type, MemberCalc memberCalc, IntegerCalc indexValueCalc) { super(type, memberCalc, indexValueCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalc.java index 40f698a934..e62288b3c2 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalc.java @@ -22,12 +22,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; -public class AncestorsCalc extends AbstractListCalc { +public class AncestorsCalc extends AbstractProfilingNestedTupleListCalc { protected AncestorsCalc(Type type, final MemberCalc memberCalc, final IntegerCalc distanceCalc) { super(type, memberCalc, distanceCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalcForLevelType.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalcForLevelType.java index d53e3d8172..ff5b0754b3 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalcForLevelType.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsCalcForLevelType.java @@ -23,12 +23,12 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; -public class AncestorsCalcForLevelType extends AbstractListCalc{ +public class AncestorsCalcForLevelType extends AbstractProfilingNestedTupleListCalc{ protected AncestorsCalcForLevelType(Type type, final MemberCalc memberCalc, final LevelCalc levelCalc ) { super(type, memberCalc, levelCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsFunDef.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsFunDef.java index e52e4e5a73..fd79313107 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsFunDef.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/member/AncestorsFunDef.java @@ -28,9 +28,9 @@ import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.LevelType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.AbstractFunctionDefinition; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; public class AncestorsFunDef extends AbstractFunctionDefinition { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java index 49bf9a10ce..f56bf315fc 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java @@ -27,10 +27,9 @@ import org.eclipse.daanse.olap.api.query.component.Query; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.query.component.FormulaImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl; -import mondrian.mdx.MdxVisitorImpl; - public class AddFormulasVisitor extends MdxVisitorImpl { private final Query query; private final Collection levels; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/CrossJoinAnalyzer.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/CrossJoinAnalyzer.java index 74d551f595..00f8b9b3b0 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/CrossJoinAnalyzer.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/CrossJoinAnalyzer.java @@ -25,9 +25,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.ResourceLimitExceededException; import mondrian.olap.Util; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java index 07d3847e7a..b6809f6571 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java @@ -24,8 +24,7 @@ import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.function.def.set.level.LevelMembersFunDef; import org.eclipse.daanse.olap.query.component.LevelExpressionImpl; - -import mondrian.mdx.MdxVisitorImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; public class FindLevelsVisitor extends MdxVisitorImpl { private final SubstitutionMap substitutionMap; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/NativeListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/NativeListCalc.java index a14f02be45..1878bf540f 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/NativeListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/NativeListCalc.java @@ -30,11 +30,11 @@ import org.eclipse.daanse.olap.api.query.component.NamedSetExpression; import org.eclipse.daanse.olap.api.query.component.Query; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.Util; -public class NativeListCalc extends AbstractListCalc { +public class NativeListCalc extends AbstractProfilingNestedTupleListCalc { private final SubstitutionMap substitutionMap; private final TupleListCalc simpleCalc; private final ExpressionCompiler compiler; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java index 9795f5fafd..6140e35782 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java @@ -18,8 +18,7 @@ import org.eclipse.daanse.olap.api.query.component.NamedSetExpression; import org.eclipse.daanse.olap.api.query.component.Query; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; - -import mondrian.mdx.MdxVisitorImpl; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; public class TransformFromFormulasVisitor extends MdxVisitorImpl { private final Query query; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java index c2e865041f..23c1c13eb7 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java @@ -28,9 +28,9 @@ import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.function.def.set.SetFunDef; import org.eclipse.daanse.olap.function.def.set.level.LevelMembersFunDef; +import org.eclipse.daanse.olap.query.component.MdxVisitorImpl; import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.Util; public class TransformToFormulasVisitor extends MdxVisitorImpl { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonempty/NonEmptyCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonempty/NonEmptyCalc.java index 74cf70afdb..650c97bf7b 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonempty/NonEmptyCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonempty/NonEmptyCalc.java @@ -22,12 +22,11 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class NonEmptyCalc extends AbstractListCalc { +public class NonEmptyCalc extends AbstractProfilingNestedTupleListCalc { public NonEmptyCalc( Type type, diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinCalc.java index d40dad7c6e..8a72f4b7a5 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonemptycrossjoin/NonEmptyCrossJoinCalc.java @@ -24,12 +24,12 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; -import mondrian.calc.impl.AbstractListCalc; import mondrian.rolap.RolapEvaluator; -public class NonEmptyCrossJoinCalc extends AbstractListCalc{ +public class NonEmptyCrossJoinCalc extends AbstractProfilingNestedTupleListCalc{ private ResolvedFunCall call; private int ctag; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonstandard/CachedExistsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonstandard/CachedExistsCalc.java index 90df7971bc..8a3e97351c 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonstandard/CachedExistsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nonstandard/CachedExistsCalc.java @@ -28,11 +28,10 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.api.type.TupleType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class CachedExistsCalc extends AbstractListCalc { +public class CachedExistsCalc extends AbstractProfilingNestedTupleListCalc { private static final String TIMING_NAME = CachedExistsFunDef.class.getSimpleName(); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderCurrentMemberCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderCurrentMemberCalc.java index 378ffa497e..0026ea8afd 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderCurrentMemberCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderCurrentMemberCalc.java @@ -27,17 +27,17 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; import org.eclipse.daanse.olap.function.def.member.memberorderkey.MemberOrderKeyCalc; import org.eclipse.daanse.olap.function.def.order.OrderFunDef.CalcWithDual; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.sort.SortKeySpec; import mondrian.olap.fun.sort.Sorter; import mondrian.olap.fun.sort.Sorter.SorterFlag; -public class OrderCurrentMemberCalc extends AbstractListCalc implements CalcWithDual { +public class OrderCurrentMemberCalc extends AbstractProfilingNestedTupleListCalc implements CalcWithDual { private final TupleIteratorCalc tupleIteratorCalc; private final Calc sortKeyCalc; private final List keySpecList; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderFunDef.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderFunDef.java index 470024ffc2..56e9babbb9 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderFunDef.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/order/OrderFunDef.java @@ -30,13 +30,13 @@ import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.calc.base.AbstractProfilingNestedCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.MemberArrayValueCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.MemberValueCalc; import org.eclipse.daanse.olap.calc.base.value.CurrentValueUnknownCalc; import org.eclipse.daanse.olap.function.core.FunctionMetaDataR; import org.eclipse.daanse.olap.function.core.FunctionParameterR; import org.eclipse.daanse.olap.function.def.AbstractFunctionDefinition; -import mondrian.calc.impl.MemberArrayValueCalc; -import mondrian.calc.impl.MemberValueCalc; import mondrian.olap.fun.FunUtil; import mondrian.olap.fun.sort.SortKeySpec; import mondrian.olap.fun.sort.Sorter.SorterFlag; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/PeriodsToDateCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/PeriodsToDateCalc.java index 79d92369c0..9d3d1440bb 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/PeriodsToDateCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/PeriodsToDateCalc.java @@ -21,13 +21,13 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; import mondrian.rolap.RolapHierarchy; -public class PeriodsToDateCalc extends AbstractListCalc { +public class PeriodsToDateCalc extends AbstractProfilingNestedTupleListCalc { private static final String TIMING_NAME = PeriodsToDateFunDef.class.getSimpleName(); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithMemberCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithMemberCalc.java index 817042f03b..dc4a9a2971 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithMemberCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithMemberCalc.java @@ -19,12 +19,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; -class XtdWithMemberCalc extends AbstractListCalc { +class XtdWithMemberCalc extends AbstractProfilingNestedTupleListCalc { private static final String TIMING_NAME = XtdWithMemberCalc.class.getSimpleName(); private final Level level; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithoutMemberCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithoutMemberCalc.java index bcbbd2212a..60638f11dd 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithoutMemberCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/periodstodate/xtd/XtdWithoutMemberCalc.java @@ -6,9 +6,9 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; /* @@ -24,7 +24,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -public class XtdWithoutMemberCalc extends AbstractListCalc { +public class XtdWithoutMemberCalc extends AbstractProfilingNestedTupleListCalc { private static final String TIMING_NAME = XtdWithoutMemberCalc.class.getSimpleName(); private final Level level; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/EmptyListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/EmptyListCalc.java index 519d645067..6bacbd7c94 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/EmptyListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/EmptyListCalc.java @@ -17,14 +17,13 @@ import org.eclipse.daanse.olap.api.calc.Calc; import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; - -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; /** * Compiled expression that returns an empty list of members or tuples. */ -public class EmptyListCalc extends AbstractListCalc { +public class EmptyListCalc extends AbstractProfilingNestedTupleListCalc { private final TupleList list; /** diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ExprIterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ExprIterCalc.java index e6b99a89b2..f1663b286e 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ExprIterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ExprIterCalc.java @@ -27,18 +27,17 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.type.Type; - -import mondrian.calc.impl.AbstractIterCalc; -import mondrian.calc.impl.AbstractTupleCursor; -import mondrian.calc.impl.AbstractTupleIterable; -import mondrian.calc.impl.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleCursor; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleIterable; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; /** * Compiled expression that evaluates one or more expressions, each of which * yields a tuple or a set of tuples, and returns the result as a tuple * iterator. */ -public class ExprIterCalc extends AbstractIterCalc { +public class ExprIterCalc extends AbstractProfilingNestedTupleIteratorCalc { private final TupleIteratorCalc[] tupleIteratorCalcs; public ExprIterCalc( diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetCalc.java index 76922f736b..55ea8fea08 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetCalc.java @@ -20,11 +20,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ListTupleList; -import mondrian.calc.impl.AbstractIterCalc; -import mondrian.calc.impl.ListTupleList; - -public class SetCalc extends AbstractIterCalc{ +public class SetCalc extends AbstractProfilingNestedTupleIteratorCalc{ protected SetCalc(Type type, final TupleCalc tupleCalc) { super(type, tupleCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetIterableCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetIterableCalc.java index eb8b79d90b..bad1c4b70d 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetIterableCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetIterableCalc.java @@ -18,10 +18,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; -import mondrian.calc.impl.AbstractIterCalc; - -public class SetIterableCalc extends AbstractIterCalc{ +public class SetIterableCalc extends AbstractProfilingNestedTupleIteratorCalc{ private final TupleIteratorCalc tupleIteratorCalc; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetListCalc.java index 88a67b527b..55a175e632 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetListCalc.java @@ -31,9 +31,9 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedVoidCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; /** @@ -47,7 +47,7 @@ * *

Also, does not process high-cardinality dimensions specially. */ -public class SetListCalc extends AbstractListCalc { +public class SetListCalc extends AbstractProfilingNestedTupleListCalc { private TupleList result; private final VoidCalc[] voidCalcs; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMemberCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMemberCalc.java index bb9e079898..2f3362ba0c 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMemberCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMemberCalc.java @@ -20,12 +20,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleIterable; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractIterCalc; -import mondrian.calc.impl.TupleCollections; -import mondrian.calc.impl.UnaryTupleList; - -public class SetMemberCalc extends AbstractIterCalc { +public class SetMemberCalc extends AbstractProfilingNestedTupleIteratorCalc { public SetMemberCalc(Type type, MemberCalc memberCalc) { super(type, memberCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMutableCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMutableCalc.java index 6fc68e5aa1..0e3bc2aa2f 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMutableCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/SetMutableCalc.java @@ -22,10 +22,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; -import mondrian.calc.impl.AbstractIterCalc; - -public class SetMutableCalc extends AbstractIterCalc { +public class SetMutableCalc extends AbstractProfilingNestedTupleIteratorCalc { private final TupleListCalc tupleListCalc; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java index 9f26014c96..962d8a4ec5 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java @@ -26,12 +26,12 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.MondrianEvaluationException; -public class AddCalculatedMembersCalc extends AbstractListCalc { +public class AddCalculatedMembersCalc extends AbstractProfilingNestedTupleListCalc { protected AddCalculatedMembersCalc(Type type, final TupleListCalc tupleListCalc) { super(type, tupleListCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ascendants/AscendantsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ascendants/AscendantsCalc.java index b888465d15..469756df89 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ascendants/AscendantsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/ascendants/AscendantsCalc.java @@ -23,11 +23,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; - -public class AscendantsCalc extends AbstractListCalc { +public class AscendantsCalc extends AbstractProfilingNestedTupleListCalc { protected AscendantsCalc(Type type, final MemberCalc memberCalc) { super(type, memberCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/children/ChildrenCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/children/ChildrenCalc.java index a05b7e681d..22406abf8b 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/children/ChildrenCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/children/ChildrenCalc.java @@ -19,12 +19,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; -public class ChildrenCalc extends AbstractListCalc { +public class ChildrenCalc extends AbstractProfilingNestedTupleListCalc { protected ChildrenCalc(Type type, final MemberCalc memberCalc) { super(type, new Calc[] { memberCalc }, false); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/distinct/DistinctCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/distinct/DistinctCalc.java index 3c0d2d6956..b4ea24d0e0 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/distinct/DistinctCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/distinct/DistinctCalc.java @@ -23,10 +23,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; - -public class DistinctCalc extends AbstractListCalc { +public class DistinctCalc extends AbstractProfilingNestedTupleListCalc { private final TupleListCalc tupleListCalc; public DistinctCalc(ResolvedFunCall call, TupleListCalc tupleListCalc) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/existing/ExistingCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/existing/ExistingCalc.java index 4de90dfaa1..2e1b5e39d1 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/existing/ExistingCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/existing/ExistingCalc.java @@ -24,12 +24,12 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; -public class ExistingCalc extends AbstractListCalc { +public class ExistingCalc extends AbstractProfilingNestedTupleListCalc { private Type myType; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/extract/ExtractCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/extract/ExtractCalc.java index 2bf83627d7..eea0097893 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/extract/ExtractCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/extract/ExtractCalc.java @@ -22,11 +22,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class ExtractCalc extends AbstractListCalc{ +public class ExtractCalc extends AbstractProfilingNestedTupleListCalc{ private int outArity; private int[] extractedOrdinals; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseIterFilterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseIterFilterCalc.java index 47cdc41021..3837f44363 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseIterFilterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseIterFilterCalc.java @@ -21,11 +21,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractIterCalc; - -public abstract class BaseIterFilterCalc extends AbstractIterCalc { +public abstract class BaseIterFilterCalc extends AbstractProfilingNestedTupleIteratorCalc { private ResolvedFunCall call; protected BaseIterFilterCalc(ResolvedFunCall call, Calc[] calcs) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseListFilterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseListFilterCalc.java index 46350d5ea0..c433732001 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseListFilterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/BaseListFilterCalc.java @@ -21,11 +21,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; - -public abstract class BaseListFilterCalc extends AbstractListCalc { +public abstract class BaseListFilterCalc extends AbstractProfilingNestedTupleListCalc { private ResolvedFunCall call; protected BaseListFilterCalc(ResolvedFunCall call, Calc[] calcs) { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/IterIterFilterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/IterIterFilterCalc.java index 7e7fccce43..f650db27fe 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/IterIterFilterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/IterIterFilterCalc.java @@ -24,9 +24,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleIteratorCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleCursor; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleIterable; -import mondrian.calc.impl.AbstractTupleCursor; -import mondrian.calc.impl.AbstractTupleIterable; import mondrian.server.LocusImpl; import mondrian.util.CancellationChecker; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/MutableIterFilterCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/MutableIterFilterCalc.java index 630b8a9ac4..5dc331a915 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/MutableIterFilterCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/filter/MutableIterFilterCalc.java @@ -22,8 +22,8 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.TupleCollections; import mondrian.util.CancellationChecker; public class MutableIterFilterCalc extends BaseIterFilterCalc { diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersCalc.java index 9fde92d9f4..3d471431fe 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/hierarchy/AllMembersCalc.java @@ -18,11 +18,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class AllMembersCalc extends AbstractListCalc { +public class AllMembersCalc extends AbstractProfilingNestedTupleListCalc { protected AllMembersCalc(Type type, final HierarchyCalc hierarchyCalc) { super(type, hierarchyCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/AllMembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/AllMembersCalc.java index e579d5bcf1..006a8476e4 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/AllMembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/AllMembersCalc.java @@ -18,11 +18,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class AllMembersCalc extends AbstractListCalc { +public class AllMembersCalc extends AbstractProfilingNestedTupleListCalc { protected AllMembersCalc(Type type, final LevelCalc levelCalc) { super(type, levelCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/LevelMembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/LevelMembersCalc.java index b19a576565..e666bd5d45 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/LevelMembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/level/LevelMembersCalc.java @@ -18,11 +18,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class LevelMembersCalc extends AbstractListCalc { +public class LevelMembersCalc extends AbstractProfilingNestedTupleListCalc { protected LevelMembersCalc(Type type, final LevelCalc levelCalc) { super(type, levelCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/members/MembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/members/MembersCalc.java index 3375a9a4e2..e53a1d7586 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/members/MembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/members/MembersCalc.java @@ -18,11 +18,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class MembersCalc extends AbstractListCalc { +public class MembersCalc extends AbstractProfilingNestedTupleListCalc { protected MembersCalc(Type type, final HierarchyCalc hierarchyCalc) { super(type, hierarchyCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/range/RangeCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/range/RangeCalc.java index 752deb17de..92fdac1fe4 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/range/RangeCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/range/RangeCalc.java @@ -18,13 +18,13 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.FunUtil; -public class RangeCalc extends AbstractListCalc { +public class RangeCalc extends AbstractProfilingNestedTupleListCalc { protected RangeCalc(Type type, MemberCalc... calcs) { super(type, calcs); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/siblings/SiblingsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/siblings/SiblingsCalc.java index 2927f2abde..b8d1222281 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/siblings/SiblingsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/siblings/SiblingsCalc.java @@ -22,11 +22,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; - -public class SiblingsCalc extends AbstractListCalc { +public class SiblingsCalc extends AbstractProfilingNestedTupleListCalc { protected SiblingsCalc(Type type, final MemberCalc memberCalc) { super(type, memberCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/stripcalculatedmembers/StripCalculatedMembersCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/stripcalculatedmembers/StripCalculatedMembersCalc.java index 51c61c555c..1228883178 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/stripcalculatedmembers/StripCalculatedMembersCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/set/stripcalculatedmembers/StripCalculatedMembersCalc.java @@ -17,11 +17,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class StripCalculatedMembersCalc extends AbstractListCalc { +public class StripCalculatedMembersCalc extends AbstractProfilingNestedTupleListCalc { protected StripCalculatedMembersCalc(Type type, final TupleListCalc tupleListCalc) { super(type, tupleListCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyCalc.java index 4de9270518..b0045dedf0 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyCalc.java @@ -18,13 +18,13 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.exceptions.EmptyExpressionWasSpecifiedException; import mondrian.olap.fun.FunUtil; -public class StrToSetHierarchyCalc extends AbstractListCalc { +public class StrToSetHierarchyCalc extends AbstractProfilingNestedTupleListCalc { private Hierarchy hierarchy; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyListCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyListCalc.java index 45d52e9259..8f88bde6ad 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyListCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/strtoset/StrToSetHierarchyListCalc.java @@ -20,12 +20,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.exceptions.EmptyExpressionWasSpecifiedException; import mondrian.olap.fun.FunUtil; -public class StrToSetHierarchyListCalc extends AbstractListCalc { +public class StrToSetHierarchyListCalc extends AbstractProfilingNestedTupleListCalc { private List hierarchyList; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/subset/SubsetCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/subset/SubsetCalc.java index 8beff4e596..6030a4454b 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/subset/SubsetCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/subset/SubsetCalc.java @@ -18,11 +18,10 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; - -public class SubsetCalc extends AbstractListCalc{ +public class SubsetCalc extends AbstractProfilingNestedTupleListCalc{ public SubsetCalc(Type type, TupleListCalc tupleListCalc, IntegerCalc startCalc, IntegerCalc countCalc) { super(type, tupleListCalc, startCalc, countCalc); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/toggledrillstate/ToggleDrillStateCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/toggledrillstate/ToggleDrillStateCalc.java index 3b362e0973..64c0e1445f 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/toggledrillstate/ToggleDrillStateCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/toggledrillstate/ToggleDrillStateCalc.java @@ -22,11 +22,11 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.fun.FunUtil; -public class ToggleDrillStateCalc extends AbstractListCalc{ +public class ToggleDrillStateCalc extends AbstractProfilingNestedTupleListCalc{ public ToggleDrillStateCalc(Type type, TupleListCalc listCalc0, TupleListCalc listCalc1) { super(type, listCalc0, listCalc1); diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottomcount/TopBottomCountCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottomcount/TopBottomCountCalc.java index 7ea2cab8f4..8b01a072f7 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottomcount/TopBottomCountCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottomcount/TopBottomCountCalc.java @@ -28,15 +28,15 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.TupleCollections; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.sort.Sorter; -public class TopBottomCountCalc extends AbstractListCalc { +public class TopBottomCountCalc extends AbstractProfilingNestedTupleListCalc { private ResolvedFunCall call; private boolean top; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottompercentsum/TopBottomPercentSumCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottompercentsum/TopBottomPercentSumCalc.java index 3f008e897f..4d1d362939 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottompercentsum/TopBottomPercentSumCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/topbottompercentsum/TopBottomPercentSumCalc.java @@ -24,14 +24,14 @@ import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; import org.eclipse.daanse.olap.calc.base.util.HirarchyDependsChecker; -import mondrian.calc.impl.AbstractListCalc; import mondrian.olap.Util; import mondrian.olap.fun.FunUtil; import mondrian.olap.fun.sort.Sorter; -public class TopBottomPercentSumCalc extends AbstractListCalc { +public class TopBottomPercentSumCalc extends AbstractProfilingNestedTupleListCalc { private boolean top; private boolean percent; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/union/UnionCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/union/UnionCalc.java index dc76b19892..f5c0bbc4ca 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/union/UnionCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/union/UnionCalc.java @@ -22,12 +22,12 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleListCalc; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.FunUtil; -public class UnionCalc extends AbstractListCalc { +public class UnionCalc extends AbstractProfilingNestedTupleListCalc { private final boolean all; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/visualtotals/VisualTotalsCalc.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/visualtotals/VisualTotalsCalc.java index b701dfb871..0f6f343a46 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/visualtotals/VisualTotalsCalc.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/visualtotals/VisualTotalsCalc.java @@ -27,13 +27,12 @@ import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.query.component.MemberExpressionImpl; import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl; -import mondrian.calc.impl.AbstractListCalc; -import mondrian.calc.impl.UnaryTupleList; - -public class VisualTotalsCalc extends AbstractListCalc { +public class VisualTotalsCalc extends AbstractProfilingNestedTupleListCalc { private final TupleListCalc tupleListCalc; private final StringCalc stringCalc; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java index d9abb8df0f..16ac5febf0 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java @@ -45,7 +45,6 @@ import org.eclipse.daanse.olap.element.OlapMetaData; import org.eclipse.daanse.olap.util.type.TypeUtil; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.AbstractQueryPart; import mondrian.olap.SetBase; import mondrian.olap.StandardProperty; diff --git a/mondrian/src/main/java/mondrian/mdx/MdxVisitorImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/MdxVisitorImpl.java similarity index 53% rename from mondrian/src/main/java/mondrian/mdx/MdxVisitorImpl.java rename to mondrian/src/main/java/org/eclipse/daanse/olap/query/component/MdxVisitorImpl.java index 07f29a76c3..a0b3d67877 100644 --- a/mondrian/src/main/java/mondrian/mdx/MdxVisitorImpl.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/MdxVisitorImpl.java @@ -1,13 +1,27 @@ /* -* This software is subject to the terms of the Eclipse Public License v1.0 -* Agreement, available at the following URL: -* http://www.eclipse.org/legal/epl-v10.html. -* You must accept the terms of that agreement to use this software. -* -* Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. -*/ - -package mondrian.mdx; + * This software is subject to the terms of the Eclipse Public License v1.0 + * Agreement, available at the following URL: + * http://www.eclipse.org/legal/epl-v10.html. + * You must accept the terms of that agreement to use this software. + * + * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial + */ +package org.eclipse.daanse.olap.query.component; import org.eclipse.daanse.olap.api.query.component.DimensionExpression; import org.eclipse.daanse.olap.api.query.component.Expression; @@ -26,19 +40,22 @@ import org.eclipse.daanse.olap.api.query.component.visit.QueryComponentVisitor; /** - * Default implementation of the visitor interface, {@link QueryComponentVisitor}. + * Default implementation of the visitor interface, + * {@link QueryComponentVisitor}. * - *

The method implementations just ask the child nodes to + *

+ * The method implementations just ask the child nodes to * {@link Expression#accept(QueryComponentVisitor)} this visitor. * * @author jhyde * @since Jul 21, 2006 */ public class MdxVisitorImpl implements QueryComponentVisitor { + private boolean shouldVisitChildren = true; @Override - public boolean visitChildren() { + public boolean visitChildren() { boolean returnValue = shouldVisitChildren; turnOnVisitChildren(); return returnValue; @@ -53,73 +70,67 @@ public void turnOffVisitChildren() { } @Override - public Object visitQuery(Query query) { + public Object visitQuery(Query query) { return null; } @Override - public Object visitQueryAxis(QueryAxis queryAxis) { + public Object visitQueryAxis(QueryAxis queryAxis) { return null; } @Override - public Object visitFormula(Formula formula) { + public Object visitFormula(Formula formula) { return null; } @Override - public Object visitUnresolvedFunCall(UnresolvedFunCall call) { + public Object visitUnresolvedFunCall(UnresolvedFunCall call) { return null; } @Override - public Object visitResolvedFunCall(ResolvedFunCall call) { + public Object visitResolvedFunCall(ResolvedFunCall call) { return null; } @Override - public Object visitId(Id id) { + public Object visitId(Id id) { return null; } @Override - public Object visitParameterExpression(ParameterExpression parameterExpr) { + public Object visitParameterExpression(ParameterExpression parameterExpr) { return null; } @Override - public Object visitDimensionExpression(DimensionExpression dimensionExpr) { - // do nothing + public Object visitDimensionExpression(DimensionExpression dimensionExpr) { return null; } @Override - public Object visitHierarchyExpression(HierarchyExpression hierarchyExpr) { - // do nothing + public Object visitHierarchyExpression(HierarchyExpression hierarchyExpr) { return null; } @Override - public Object visitLevelExpression(LevelExpression levelExpr) { - // do nothing + public Object visitLevelExpression(LevelExpression levelExpr) { return null; } @Override - public Object visitMemberExpression(MemberExpression memberExpr) { - // do nothing + public Object visitMemberExpression(MemberExpression memberExpr) { return null; } @Override - public Object visitNamedSetExpression(NamedSetExpression namedSetExpr) { - // do nothing + public Object visitNamedSetExpression(NamedSetExpression namedSetExpr) { return null; } @Override - public Object visitLiteral(Literal literal) { - // do nothing + public Object visitLiteral(Literal literal) { return null; } diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java index 93e83957da..1230c598d8 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java @@ -24,9 +24,9 @@ import org.eclipse.daanse.olap.api.query.component.NamedSetExpression; import org.eclipse.daanse.olap.api.query.component.visit.QueryComponentVisitor; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleIteratorCalc; import org.eclipse.daanse.olap.query.component.expression.AbstractExpression; -import mondrian.calc.impl.AbstractIterCalc; import mondrian.olap.Util; /** @@ -106,7 +106,7 @@ public Calc accept(ExpressionCompiler compiler) { return null; } - return new AbstractIterCalc(getType(), + return new AbstractProfilingNestedTupleIteratorCalc(getType(), new Calc[]{/* todo: compile namedSet.getExp() */}) { @Override diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java index f0752234c3..2933a8da83 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java @@ -27,7 +27,6 @@ import org.eclipse.daanse.olap.query.component.expression.AbstractExpression; import org.eclipse.daanse.olap.util.type.TypeUtil; -import mondrian.mdx.QueryPrintWriter; import mondrian.olap.Util; /** diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java index 2133b004e4..e1c053a626 100644 --- a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java @@ -93,7 +93,6 @@ import org.eclipse.daanse.olap.impl.IdentifierParser; import org.eclipse.daanse.olap.util.type.TypeUtil; -import mondrian.mdx.MdxVisitorImpl; import mondrian.olap.AbstractQueryPart; import mondrian.olap.DelegatingCatalogReader; import mondrian.olap.ExecuteDurationUtil; diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryPrintWriter.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryPrintWriter.java new file mode 100644 index 0000000000..8142a9dc7d --- /dev/null +++ b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryPrintWriter.java @@ -0,0 +1,44 @@ +/* + * This software is subject to the terms of the Eclipse Public License v1.0 + * Agreement, available at the following URL: + * http://www.eclipse.org/legal/epl-v10.html. + * You must accept the terms of that agreement to use this software. + * + * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. + * + * ---- All changes after Fork in 2023 ------------------------ + * + * Project: Eclipse daanse + * + * Copyright (c) 2023 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors after Fork in 2023: + * SmartCity Jena - initial + */ +package org.eclipse.daanse.olap.query.component; + +import java.io.PrintWriter; +import java.io.Writer; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.daanse.olap.api.Parameter; + +/** + * PrintWriter used for unparsing queries. Remembers which parameters have been + * printed. The first time, they print themselves as "Parameter"; subsequent + * times as "ParamRef". + */ +public class QueryPrintWriter extends PrintWriter { + public final Set parameters = new HashSet<>(); + + public QueryPrintWriter(Writer writer) { + super(writer); + } +} diff --git a/mondrian/src/test/java/mondrian/calc/impl/ArrayTupleListTest.java b/mondrian/src/test/java/mondrian/calc/impl/ArrayTupleListTest.java index d79780a1f2..d50042148e 100644 --- a/mondrian/src/test/java/mondrian/calc/impl/ArrayTupleListTest.java +++ b/mondrian/src/test/java/mondrian/calc/impl/ArrayTupleListTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.mock; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java b/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java index d3d4621967..d5261c1c7b 100644 --- a/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java +++ b/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java @@ -48,6 +48,8 @@ import org.eclipse.daanse.olap.api.type.SetType; import org.eclipse.daanse.olap.api.type.TupleType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.core.FunctionParameterR; import org.eclipse.daanse.olap.function.def.crossjoin.BaseListCalc; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; @@ -65,8 +67,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.ArrayTupleList; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; import mondrian.rolap.RolapConnection; diff --git a/mondrian/src/test/java/mondrian/olap/fun/ResultStyleCompiler.java b/mondrian/src/test/java/mondrian/olap/fun/ResultStyleCompiler.java index 394c9b12bf..5e5e1b327f 100644 --- a/mondrian/src/test/java/mondrian/olap/fun/ResultStyleCompiler.java +++ b/mondrian/src/test/java/mondrian/olap/fun/ResultStyleCompiler.java @@ -23,8 +23,7 @@ import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.type.Type; import org.eclipse.daanse.olap.calc.base.AbstractProfilingCalc; - -import mondrian.calc.impl.DelegatingExpCompiler; +import org.eclipse.daanse.olap.calc.base.compiler.DelegatingExpCompiler; /** * The ResultStyleCompiler can be used to assure that diff --git a/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java b/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java index d82c575d98..3330c82b2d 100644 --- a/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java +++ b/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java @@ -27,6 +27,8 @@ import org.eclipse.daanse.olap.api.function.FunctionDefinition; import org.eclipse.daanse.olap.api.query.component.Expression; import org.eclipse.daanse.olap.api.type.SetType; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; import org.eclipse.daanse.olap.function.def.crossjoin.ImmutableListCalc; import org.eclipse.daanse.olap.function.def.union.UnionCalc; @@ -38,8 +40,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.ArrayTupleList; -import mondrian.calc.impl.UnaryTupleList; import mondrian.rolap.RolapMemberBase; /** diff --git a/mondrian/src/test/java/mondrian/olap/fun/sort/SorterTest.java b/mondrian/src/test/java/mondrian/olap/fun/sort/SorterTest.java index 57a3613b88..4afdfad43a 100644 --- a/mondrian/src/test/java/mondrian/olap/fun/sort/SorterTest.java +++ b/mondrian/src/test/java/mondrian/olap/fun/sort/SorterTest.java @@ -37,6 +37,7 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Hierarchy; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.eclipse.daanse.olap.function.def.member.memberorderkey.MemberOrderKeyCalc; import org.eclipse.daanse.olap.query.component.QueryImpl; import org.junit.jupiter.api.BeforeEach; @@ -46,7 +47,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import mondrian.calc.impl.TupleCollections; import mondrian.rolap.RolapConnection; import mondrian.server.ExecutionImpl; diff --git a/mondrian/src/test/java/mondrian/rolap/CancellationTest.java b/mondrian/src/test/java/mondrian/rolap/CancellationTest.java index 670b968980..e114f2c9fb 100644 --- a/mondrian/src/test/java/mondrian/rolap/CancellationTest.java +++ b/mondrian/src/test/java/mondrian/rolap/CancellationTest.java @@ -25,6 +25,7 @@ import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall; import org.eclipse.daanse.olap.api.result.Position; import org.eclipse.daanse.olap.api.result.Result; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +35,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.SystemWideProperties; import mondrian.olap.fun.CrossJoinTest; import mondrian.server.ExecutionImpl; diff --git a/mondrian/src/test/java/mondrian/rolap/ModulosTest.java b/mondrian/src/test/java/mondrian/rolap/ModulosTest.java index 4701af1c19..5f0c3f2868 100644 --- a/mondrian/src/test/java/mondrian/rolap/ModulosTest.java +++ b/mondrian/src/test/java/mondrian/rolap/ModulosTest.java @@ -17,10 +17,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.result.Axis; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.junit.jupiter.api.Test; -import mondrian.calc.impl.UnaryTupleList; - /** * Test that the implementations of the Modulos interface are correct. * diff --git a/mondrian/src/test/java/mondrian/rolap/RolapAxisTest.java b/mondrian/src/test/java/mondrian/rolap/RolapAxisTest.java index 197d2548a1..8afefba720 100644 --- a/mondrian/src/test/java/mondrian/rolap/RolapAxisTest.java +++ b/mondrian/src/test/java/mondrian/rolap/RolapAxisTest.java @@ -17,9 +17,9 @@ import org.eclipse.daanse.olap.api.calc.todo.TupleList; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.result.Position; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; import org.junit.jupiter.api.Test; -import mondrian.calc.impl.TupleCollections; import mondrian.olap.fun.TestMember; /** diff --git a/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java b/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java index 6377b88300..f196c7fda8 100644 --- a/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java +++ b/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java @@ -33,6 +33,7 @@ import org.eclipse.daanse.olap.api.element.Cube; import org.eclipse.daanse.olap.api.element.Dimension; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.query.component.IdImpl; import org.eclipse.daanse.rolap.mapping.pojo.CalculatedMemberMappingImpl; import org.junit.jupiter.api.AfterEach; @@ -43,7 +44,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; diff --git a/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java b/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java index ecb8da3c52..ec473cf0b8 100644 --- a/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java +++ b/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java @@ -54,6 +54,8 @@ import org.eclipse.daanse.olap.api.type.NullType; import org.eclipse.daanse.olap.api.type.TupleType; import org.eclipse.daanse.olap.api.type.Type; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractTupleCursor; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.aggregate.AggregateFunDef; import org.eclipse.daanse.olap.function.def.parentheses.ParenthesesFunDef; import org.eclipse.daanse.olap.query.component.MemberExpressionImpl; @@ -65,8 +67,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.AbstractTupleCursor; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.fun.CrossJoinTest.NullFunDef; import mondrian.olap.fun.TestMember; import mondrian.rolap.aggmatcher.AggStar; diff --git a/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java b/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java index c26ac12df2..a8e139e06f 100644 --- a/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java +++ b/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java @@ -41,6 +41,8 @@ import org.eclipse.daanse.olap.api.element.Cube; import org.eclipse.daanse.olap.api.element.Member; import org.eclipse.daanse.olap.api.result.Result; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.function.def.aggregate.AggregateCalc; import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef; import org.eclipse.daanse.olap.query.component.IdImpl; @@ -92,8 +94,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.ArrayTupleList; -import mondrian.calc.impl.UnaryTupleList; import mondrian.enums.DatabaseProduct; import mondrian.olap.ResultBase; import mondrian.olap.SystemWideProperties; diff --git a/mondrian/src/test/java/mondrian/test/TupleListTest.java b/mondrian/src/test/java/mondrian/test/TupleListTest.java index 04f2a7744c..5b925d7b65 100644 --- a/mondrian/src/test/java/mondrian/test/TupleListTest.java +++ b/mondrian/src/test/java/mondrian/test/TupleListTest.java @@ -29,6 +29,10 @@ import org.eclipse.daanse.olap.api.CatalogReader; import org.eclipse.daanse.olap.api.element.Cube; import org.eclipse.daanse.olap.api.element.Member; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.DelegatingTupleList; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.api.element.Catalog; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -36,10 +40,6 @@ import org.opencube.junit5.dataloader.FastFoodmardDataLoader; import org.opencube.junit5.propupdator.AppandFoodMartCatalog; -import mondrian.calc.impl.ArrayTupleList; -import mondrian.calc.impl.DelegatingTupleList; -import mondrian.calc.impl.TupleCollections; -import mondrian.calc.impl.UnaryTupleList; import mondrian.olap.Util; import mondrian.rolap.RolapConnection; import mondrian.server.LocusImpl; diff --git a/mondrian/src/test/java/org/opencube/junit5/TestUtil.java b/mondrian/src/test/java/org/opencube/junit5/TestUtil.java index eb697724da..253b020edc 100644 --- a/mondrian/src/test/java/org/opencube/junit5/TestUtil.java +++ b/mondrian/src/test/java/org/opencube/junit5/TestUtil.java @@ -73,6 +73,7 @@ import org.eclipse.daanse.olap.api.result.Position; import org.eclipse.daanse.olap.api.result.Result; import org.eclipse.daanse.olap.calc.base.profile.SimpleCalculationProfileWriter; +import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList; import org.eclipse.daanse.olap.impl.CoordinateIterator; import org.eclipse.daanse.olap.impl.TraditionalCellSetFormatter; import org.eclipse.daanse.olap.query.component.IdImpl; @@ -82,7 +83,6 @@ import org.opencube.junit5.context.TestContext; import org.opencube.junit5.context.TestContextImpl; -import mondrian.calc.impl.UnaryTupleList; import mondrian.enums.DatabaseProduct; import mondrian.olap.SystemWideProperties; import mondrian.olap.Util; diff --git a/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java b/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java index 3f6e3274d6..e040ec851e 100644 --- a/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java +++ b/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java @@ -393,7 +393,7 @@ private StatementResponse executeUpdate(Connection connection, StatementRequest for (UpdateClause updateClause : update.getUpdateClauses()) { if (updateClause instanceof UpdateClause updateClauseImpl) { StringWriter sw = new StringWriter(); - PrintWriter pw = new mondrian.mdx.QueryPrintWriter(sw); + PrintWriter pw = new org.eclipse.daanse.olap.query.component.QueryPrintWriter(sw); updateClause.getTupleExp().unparse(pw); String tupleString = sw.toString(); @@ -412,7 +412,7 @@ private StatementResponse executeUpdate(Connection connection, StatementRequest // Cell writeBackCell = cellSet.getCell(Arrays.asList(0)); sw = new StringWriter(); - pw = new mondrian.mdx.QueryPrintWriter(sw); + pw = new org.eclipse.daanse.olap.query.component.QueryPrintWriter(sw); updateClause.getValueExp().unparse(pw); String valueString = sw.toString();