Skip to content

mv calc and mdx packages #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stbischof merged 2 commits into from
May 17, 2025
Merged

mv calc and mdx packages #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fa2278
refactore move last parts of calc
stbischof May 17, 2025
61edf13
refactore move last parts of mdx
stbischof May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions mondrian/src/main/java/mondrian/calc/impl/package.html
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions mondrian/src/main/java/mondrian/mdx/package.html
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions mondrian/src/main/java/mondrian/olap/ExpCacheDescriptorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Id> identifiers;
Expand Down
7 changes: 3 additions & 4 deletions mondrian/src/main/java/mondrian/olap/ParameterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down Expand Up @@ -311,7 +310,7 @@ public Object evaluate(Evaluator evaluator) {
* @see ParameterCalc
*/
private static class MemberListParameterCalc
extends AbstractListCalc {
extends AbstractProfilingNestedTupleListCalc {

private final ParameterSlot slot;

Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/olap/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/olap/fun/FunUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
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;
import org.eclipse.daanse.olap.impl.IdentifierParser.Builder;
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;
Expand Down
3 changes: 1 addition & 2 deletions mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mondrian/src/main/java/mondrian/olap/fun/sort/Sorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/MeasureFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapCatalogReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions mondrian/src/main/java/mondrian/rolap/RolapDependencyTestingEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions mondrian/src/main/java/mondrian/rolap/RolapHierarchy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapNamedSetEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapNativeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions mondrian/src/main/java/mondrian/rolap/RolapProfilingEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions mondrian/src/main/java/mondrian/rolap/RolapResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@
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;
import org.eclipse.daanse.olap.function.core.FunctionParameterR;
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;
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/RolapSetEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion mondrian/src/main/java/mondrian/rolap/SqlConstraintUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
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;
import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
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;
Expand Down
Loading
Loading