diff --git a/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java b/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java index d92b8a5..0e2c8d2 100644 --- a/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java +++ b/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java @@ -34,7 +34,7 @@ public interface Execution { void cancelSqlStatements(); - Statement getMondrianStatement(); + Statement getDaanseStatement(); void setOutOfMemory(String string); diff --git a/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java b/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java index 1c45887..b560ed2 100644 --- a/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java +++ b/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java @@ -21,7 +21,7 @@ public interface IAggregationManager { void shutdown(); - ISegmentCacheManager getCacheMgr(Connection mondrianConnection); + ISegmentCacheManager getCacheMgr(Connection connection); CacheControl getCacheControl(Connection rolapConnection, PrintWriter pw); diff --git a/api/src/main/java/org/eclipse/daanse/olap/api/Statement.java b/api/src/main/java/org/eclipse/daanse/olap/api/Statement.java index f580122..d2f3d3e 100644 --- a/api/src/main/java/org/eclipse/daanse/olap/api/Statement.java +++ b/api/src/main/java/org/eclipse/daanse/olap/api/Statement.java @@ -74,7 +74,7 @@ public interface Statement { * * @return connection */ - Connection getMondrianConnection(); + Connection getDaanseConnection(); void setQuery(Query query); diff --git a/api/src/main/java/org/eclipse/daanse/olap/api/result/IMondrianOlap4jProperty.java b/api/src/main/java/org/eclipse/daanse/olap/api/result/IDaanseOlap4jProperty.java similarity index 90% rename from api/src/main/java/org/eclipse/daanse/olap/api/result/IMondrianOlap4jProperty.java rename to api/src/main/java/org/eclipse/daanse/olap/api/result/IDaanseOlap4jProperty.java index 37f6c30..4b0d018 100644 --- a/api/src/main/java/org/eclipse/daanse/olap/api/result/IMondrianOlap4jProperty.java +++ b/api/src/main/java/org/eclipse/daanse/olap/api/result/IDaanseOlap4jProperty.java @@ -15,7 +15,7 @@ import org.eclipse.daanse.olap.api.element.Level; -public interface IMondrianOlap4jProperty extends Property{ +public interface IDaanseOlap4jProperty extends Property{ /** * @return Level */ diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/MondrianPropertiesBase.java b/common/src/main/java/org/eclipse/daanse/olap/common/DaansePropertiesBase.java similarity index 95% rename from common/src/main/java/org/eclipse/daanse/olap/common/MondrianPropertiesBase.java rename to common/src/main/java/org/eclipse/daanse/olap/common/DaansePropertiesBase.java index a84257b..bf6d339 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/common/MondrianPropertiesBase.java +++ b/common/src/main/java/org/eclipse/daanse/olap/common/DaansePropertiesBase.java @@ -75,17 +75,17 @@ * @author jhyde * @since 22 December, 2002 */ -public abstract class MondrianPropertiesBase extends Properties { +public abstract class DaansePropertiesBase extends Properties { private final transient PropertySource propertySource; private int populateCount; private static final Logger LOGGER = - LoggerFactory.getLogger(MondrianPropertiesBase.class); + LoggerFactory.getLogger(DaansePropertiesBase.class); - protected static final String MONDRIAN_DOT_PROPERTIES = "mondrian.properties"; + protected static final String MONDRIAN_DOT_PROPERTIES = "daanse.properties"; - protected MondrianPropertiesBase(PropertySource propertySource) { + protected DaansePropertiesBase(PropertySource propertySource) { this.propertySource = propertySource; } @@ -254,7 +254,7 @@ public void populate() { } else { // Then try load it from classloader url = - MondrianPropertiesBase.class.getClassLoader().getResource( + DaansePropertiesBase.class.getClassLoader().getResource( MONDRIAN_DOT_PROPERTIES); } @@ -262,7 +262,7 @@ public void populate() { load(new UrlPropertySource(url)); } else { LOGGER.warn( - "mondrian.properties can't be found under '{}' or classloader", + "daanse.properties can't be found under '{}' or classloader", new File(".").getAbsolutePath()); } @@ -273,7 +273,7 @@ public void populate() { { String key = (String) keys.nextElement(); String value = System.getProperty(key); - if (key.startsWith("mondrian.")) { + if (key.startsWith("daanse.")) { // NOTE: the super allows us to bybase calling triggers // Is this the correct behavior? if (LOGGER.isDebugEnabled()) { diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/ResultBase.java b/common/src/main/java/org/eclipse/daanse/olap/common/ResultBase.java index 5ce9b43..9d91118 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/common/ResultBase.java +++ b/common/src/main/java/org/eclipse/daanse/olap/common/ResultBase.java @@ -56,7 +56,7 @@ public abstract class ResultBase implements Result { protected ResultBase(Execution execution, Axis[] axes) { this.execution = execution; - this.statement = execution.getMondrianStatement(); + this.statement = execution.getDaanseStatement(); this.query = statement.getQuery(); assert query != null; this.axes = diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/SystemWideProperties.java b/common/src/main/java/org/eclipse/daanse/olap/common/SystemWideProperties.java index a5849ca..1f9325e 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/common/SystemWideProperties.java +++ b/common/src/main/java/org/eclipse/daanse/olap/common/SystemWideProperties.java @@ -23,7 +23,7 @@ * properties using the inherited {@link java.util.Properties#getProperty(String)} * method, we recommend that you use methods in this class. */ -public class SystemWideProperties extends MondrianPropertiesBase { +public class SystemWideProperties extends DaansePropertiesBase { /** * Properties, drawn from {@link System#getProperties}, * plus the contents of "mondrian.properties" if it @@ -42,29 +42,29 @@ private SystemWideProperties() { public void populateInitial() { CaseSensitive = - this.getBoolean("mondrian.olap.case.sensitive", false); + this.getBoolean("daanse.olap.case.sensitive", false); CaseSensitiveMdxInstr = - this.getBoolean("mondrian.olap.case.sensitive.CaseSensitiveMdxInstr", false); + this.getBoolean("daanse.olap.case.sensitive.CaseSensitiveMdxInstr", false); CompareSiblingsByOrderKey = - this.getBoolean("mondrian.rolap.compareSiblingsByOrderKey", false); + this.getBoolean("daanse.rolap.compareSiblingsByOrderKey", false); EnableExpCache = - this.getBoolean("mondrian.expCache.enable", true); + this.getBoolean("daanse.expCache.enable", true); EnableNativeNonEmpty = - this.getBoolean("mondrian.native.nonempty.enable", true); + this.getBoolean("daanse.native.nonempty.enable", true); EnableNonEmptyOnAllAxis = - this.getBoolean("mondrian.rolap.nonempty", false); + this.getBoolean("daanse.rolap.nonempty", false); EnableRolapCubeMemberCache = - this.getBoolean("mondrian.rolap.EnableRolapCubeMemberCache", true); + this.getBoolean("daanse.rolap.EnableRolapCubeMemberCache", true); EnableTriggers = - this.getBoolean("mondrian.olap.triggers.enable", true); + this.getBoolean("daanse.olap.triggers.enable", true); FilterChildlessSnowflakeMembers = - this.getBoolean("mondrian.rolap.FilterChildlessSnowflakeMembers", true); + this.getBoolean("daanse.rolap.FilterChildlessSnowflakeMembers", true); MaxConstraints = - this.getInteger("mondrian.rolap.maxConstraints", 1000); + this.getInteger("daanse.rolap.maxConstraints", 1000); NullMemberRepresentation = - getProperty("mondrian.olap.NullMemberRepresentation", "#null"); + getProperty("daanse.olap.NullMemberRepresentation", "#null"); ResultLimit = - this.getInteger("mondrian.result.limit", 0); + this.getInteger("daanse.result.limit", 0); } @@ -87,7 +87,7 @@ public static SystemWideProperties instance() { * case-sensitive matching when looking up identifiers. The default is * false. */ - @PropertyAnnotation(path = "mondrian.olap.case.sensitive") + @PropertyAnnotation(path = "daanse.olap.case.sensitive") public transient Boolean CaseSensitive; @@ -97,7 +97,7 @@ public static SystemWideProperties instance() { * Default value is false. * */ - @PropertyAnnotation(path = "mondrian.olap.case.sensitive.CaseSensitiveMdxInstr") + @PropertyAnnotation(path = "daanse.olap.case.sensitive.CaseSensitiveMdxInstr") public transient Boolean CaseSensitiveMdxInstr; @@ -106,7 +106,7 @@ public static SystemWideProperties instance() { * compared according to order key value fetched from their ordinal * expression. The default is false (only database ORDER BY is used). */ - @PropertyAnnotation(path = "mondrian.rolap.compareSiblingsByOrderKey") + @PropertyAnnotation(path = "daanse.rolap.compareSiblingsByOrderKey") public transient Boolean CompareSiblingsByOrderKey; @@ -117,14 +117,14 @@ public static SystemWideProperties instance() { * Order([Product].MEMBERS, [Measures].[Unit Sales])) would perform * many redundant sorts. The default is true. */ - @PropertyAnnotation(path = "mondrian.expCache.enable") + @PropertyAnnotation(path = "daanse.expCache.enable") public transient Boolean EnableExpCache; /** * If enabled some NON EMPTY set operations like member.children, * level.members and member descendants will be computed in SQL. */ - @PropertyAnnotation(path = "mondrian.native.nonempty.enable") + @PropertyAnnotation(path = "daanse.native.nonempty.enable") public transient Boolean EnableNativeNonEmpty; /** * Boolean property that controls whether each query axis implicit has the @@ -146,7 +146,7 @@ public static SystemWideProperties instance() { * construct, and we may obsolete this cache and this * property. */ - @PropertyAnnotation(path = "mondrian.rolap.EnableRolapCubeMemberCache") + @PropertyAnnotation(path = "daanse.rolap.EnableRolapCubeMemberCache") public transient Boolean EnableRolapCubeMemberCache; @@ -159,7 +159,7 @@ public static SystemWideProperties instance() { * MondrianProperties.instance().populate(null) or * MondrianProperties.instance().QueryLimit.set(50). */ - @PropertyAnnotation(path = "mondrian.olap.triggers.enable") + @PropertyAnnotation(path = "daanse.olap.triggers.enable") public transient Boolean EnableTriggers; @@ -180,7 +180,7 @@ public static SystemWideProperties instance() { * table, during your ETL process, and to set this property to * {@code false}. */ - @PropertyAnnotation(path = "mondrian.rolap.FilterChildlessSnowflakeMembers") + @PropertyAnnotation(path = "daanse.rolap.FilterChildlessSnowflakeMembers") public transient Boolean FilterChildlessSnowflakeMembers; /** @@ -197,7 +197,7 @@ public static SystemWideProperties instance() { * Other: 10,000 * */ - @PropertyAnnotation(path = "mondrian.rolap.maxConstraints") + @PropertyAnnotation(path = "daanse.rolap.maxConstraints") public transient Integer MaxConstraints; @@ -216,7 +216,7 @@ public static SystemWideProperties instance() { * Integer property that, if set to a value greater than zero, limits the * maximum size of a result set. */ - @PropertyAnnotation(path = "mondrian.result.limit") + @PropertyAnnotation(path = "daanse.result.limit") public transient Integer ResultLimit; } diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/Util.java b/common/src/main/java/org/eclipse/daanse/olap/common/Util.java index 4e4cbae..fd691e3 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/common/Util.java +++ b/common/src/main/java/org/eclipse/daanse/olap/common/Util.java @@ -167,7 +167,7 @@ public class Util { private static final Logger LOGGER = LoggerFactory.getLogger(Util.class); public static final Logger PROFILE_LOGGER = - LoggerFactory.getLogger("mondrian.profile"); + LoggerFactory.getLogger("daanse.profile"); /** * Special value which indicates that a {@code double} computation has returned the MDX null value. See {@link @@ -2501,7 +2501,7 @@ public static String convertOlap4jConnectStringToNativeMondrian( { if (url.startsWith("jdbc:mondrian:")) { return "Provider=Mondrian; " - + url.substring("jdbc:mondrian:".length()); + + url.substring("jdbc:daanse:".length()); } return null; } diff --git a/common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java b/common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java index 733b1e5..059a27d 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java +++ b/common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java @@ -176,7 +176,7 @@ public synchronized void addStatement(Statement statement) { connections.size()); } statements.add( statement); - final Connection connection = statement.getMondrianConnection(); + final Connection connection = statement.getDaanseConnection(); MdxStatementStartEvent mdxStatementStartEvent = new MdxStatementStartEvent(new MdxStatementEventCommon( new ConnectionEventCommon( @@ -198,7 +198,7 @@ public synchronized void removeStatement(Statement statement) { throw new OlapRuntimeException("Server already shutdown."); } statements.remove(statement); - final Connection connection = statement.getMondrianConnection(); + final Connection connection = statement.getDaanseConnection(); MdxStatementEndEvent mdxStatementEndEvent = new MdxStatementEndEvent( @@ -223,7 +223,7 @@ public EventBus getMonitor() { @Override public List getStatements(org.eclipse.daanse.olap.api.connection.Connection connection) { - return statements.stream().filter(stmnt -> stmnt.getMondrianConnection().equals(connection)) + return statements.stream().filter(stmnt -> stmnt.getDaanseConnection().equals(connection)) .toList(); } diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java index 8d1a056..49f999d 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java +++ b/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java @@ -43,7 +43,6 @@ import org.eclipse.daanse.olap.common.StandardProperty; import org.eclipse.daanse.olap.fun.FunUtil; -//import mondrian.util.Bug; /** * MemberBase is a partial implementation of {@link Member}. * diff --git a/common/src/main/java/org/eclipse/daanse/olap/fun/MondrianEvaluationException.java b/common/src/main/java/org/eclipse/daanse/olap/fun/DaanseEvaluationException.java similarity index 85% rename from common/src/main/java/org/eclipse/daanse/olap/fun/MondrianEvaluationException.java rename to common/src/main/java/org/eclipse/daanse/olap/fun/DaanseEvaluationException.java index e5bad54..ebff3b5 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/fun/MondrianEvaluationException.java +++ b/common/src/main/java/org/eclipse/daanse/olap/fun/DaanseEvaluationException.java @@ -32,10 +32,10 @@ * * @author jhyde, 14 June, 2002 */ -public class MondrianEvaluationException extends RuntimeException { - public MondrianEvaluationException() { +public class DaanseEvaluationException extends RuntimeException { + public DaanseEvaluationException() { } - public MondrianEvaluationException(String s) { + public DaanseEvaluationException(String s) { super(s); } } diff --git a/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java b/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java index a256f75..2c36c47 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java +++ b/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java @@ -132,7 +132,7 @@ public class FunUtil extends Util { public static RuntimeException newEvalException( FunctionMetaData functionMetaData , String message ) { - return new MondrianEvaluationException( message ); + return new DaanseEvaluationException( message ); } /** @@ -142,7 +142,7 @@ public static RuntimeException newEvalException( * @return Exception that can be used as a cell result */ public static RuntimeException newEvalException( Throwable throwable ) { - return new MondrianEvaluationException( + return new DaanseEvaluationException( new StringBuilder(throwable.getClass().getName()).append(": ").append(throwable.getMessage()).toString() ); } @@ -156,7 +156,7 @@ public static RuntimeException newEvalException( Throwable throwable ) { public static RuntimeException newEvalException( String message, Throwable throwable ) { - return new MondrianEvaluationException( + return new DaanseEvaluationException( new StringBuilder(message) .append(": ").append(Util.getErrorMessage( throwable )).toString() ); } @@ -273,7 +273,7 @@ public static > E getLiteralArg( /** * Throws an error if the expressions don't have the same hierarchy. * - * @throws MondrianEvaluationException if expressions don't have the same hierarchy + * @throws DaanseEvaluationException if expressions don't have the same hierarchy */ public static void checkCompatible( Expression left, Expression right, FunctionDefinition funDef ) { final Type leftType = TypeUtil.stripSetType( left.getType() ); diff --git a/common/src/main/java/org/eclipse/daanse/olap/function/def/properties/PropertiesCalc.java b/common/src/main/java/org/eclipse/daanse/olap/function/def/properties/PropertiesCalc.java index 89e6c08..0a13a7c 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/function/def/properties/PropertiesCalc.java +++ b/common/src/main/java/org/eclipse/daanse/olap/function/def/properties/PropertiesCalc.java @@ -22,7 +22,7 @@ import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc; import org.eclipse.daanse.olap.common.SystemWideProperties; import org.eclipse.daanse.olap.common.Util; -import org.eclipse.daanse.olap.fun.MondrianEvaluationException; +import org.eclipse.daanse.olap.fun.DaanseEvaluationException; public class PropertiesCalc extends AbstractProfilingNestedUnknownCalc { @@ -47,7 +47,7 @@ private static Object properties(Member member, String s) { Object o = member.getPropertyValue(s, matchCase); if (o == null) { if (!Util.isValidProperty(s, member.getLevel())) { - throw new MondrianEvaluationException(new StringBuilder("Property '").append(s) + throw new DaanseEvaluationException(new StringBuilder("Property '").append(s) .append("' is not valid for member '").append(member).append("'").toString()); } } diff --git a/common/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java b/common/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java index 418bdc0..6dcc744 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java +++ b/common/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java @@ -29,7 +29,7 @@ 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 org.eclipse.daanse.olap.fun.MondrianEvaluationException; +import org.eclipse.daanse.olap.fun.DaanseEvaluationException; import org.eclipse.daanse.olap.function.def.drilldownlevel.DrilldownLevelCalc; import org.eclipse.daanse.olap.function.def.drilldownmember.DrilldownMemberCalc; import org.eclipse.daanse.olap.function.def.set.level.LevelMembersCalc; @@ -81,7 +81,7 @@ private List addCalculatedMembers(List memberList, Evaluator eva if (hierarchy == null) { hierarchy = member.getHierarchy(); } else if (hierarchy != member.getHierarchy()) { - throw new MondrianEvaluationException( + throw new DaanseEvaluationException( new StringBuilder("Only members from the same hierarchy are allowed in the ") .append("AddCalculatedMembers set: ").append(hierarchy).append(" vs ") .append(member.getHierarchy()).toString()); diff --git a/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java b/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java index 6c62beb..fbded25 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java @@ -21,11 +21,11 @@ import org.eclipse.daanse.olap.api.element.Level; import org.eclipse.daanse.olap.api.result.Datatype; -import org.eclipse.daanse.olap.api.result.IMondrianOlap4jProperty; +import org.eclipse.daanse.olap.api.result.IDaanseOlap4jProperty; import org.eclipse.daanse.olap.api.result.Property; import org.eclipse.daanse.olap.common.StandardProperty; -public class PropertyImpl implements IMondrianOlap4jProperty { +public class PropertyImpl implements IDaanseOlap4jProperty { /** * Map of member properties that are built into Mondrian but are not in the diff --git a/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java b/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java index 8a0c4e1..8de5aee 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java @@ -98,7 +98,7 @@ public ResultSet executeQuery( connection.parseStatement(mdx); } catch (OlapRuntimeException e) { throw new RuntimeException( - "mondrian gave exception while parsing query", e); + "daanse gave exception while parsing query", e); } return executeQuery(parseTree, tabFields, rowCountSlot); } @@ -199,7 +199,7 @@ private CellSet executeOlapQueryInternal(Query query) { e.getMessage(), e); } catch (OlapRuntimeException e) { throw new RuntimeException( - "mondrian gave exception while executing query", e); + "daanse gave exception while executing query", e); } return openCellSet; } @@ -225,7 +225,7 @@ public Query execute() }); } catch (OlapRuntimeException e) { throw new RuntimeException( - "mondrian gave exception while parsing query", e); + "daanse gave exception while parsing query", e); } } @@ -249,7 +249,7 @@ public void close() { } @Override - public Connection getMondrianConnection() { + public Connection getDaanseConnection() { return connection; } } diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java index cdb6a52..3970e95 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java @@ -458,7 +458,7 @@ public Validator createValidator( Map resolvedIdentifiers) { return createValidator( - statement.getMondrianConnection().getContext().getFunctionService(), + statement.getDaanseConnection().getContext().getFunctionService(), false, resolvedIdentifiers); } @@ -497,7 +497,7 @@ public Validator createValidator( } public Connection getConnection() { - return statement.getMondrianConnection(); + return statement.getDaanseConnection(); } /** @@ -1489,7 +1489,7 @@ private ExpressionCompiler createCompiler( List resultStyleList) { - ExpressionCompilerFactory factory = statement.getMondrianConnection().getContext() + ExpressionCompilerFactory factory = statement.getDaanseConnection().getContext() .getExpressionCompilerFactory(); ExpressionCompiler compiler = factory.createExpressionCompiler(evaluator, validator, resultStyleList); diff --git a/common/src/main/java/org/eclipse/daanse/olap/server/ExecutionImpl.java b/common/src/main/java/org/eclipse/daanse/olap/server/ExecutionImpl.java index 6afb238..d41fc0d 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/server/ExecutionImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/server/ExecutionImpl.java @@ -153,7 +153,7 @@ private String getMdx() { } public void tracePhase( int hitCount, int missCount, int pendingCount ) { - final Connection connection = statement.getMondrianConnection(); + final Connection connection = statement.getDaanseConnection(); final Context context = connection.getContext(); final int hitCountInc = hitCount - this.cellCacheHitCount; final int missCountInc = missCount - this.cellCacheMissCount; @@ -388,7 +388,7 @@ public final LocalDateTime getStartTime() { return startTime; } - public Statement getMondrianStatement() { + public Statement getDaanseStatement() { return statement; } @@ -425,7 +425,7 @@ public void registerStatement( Locus locus, java.sql.Statement statement ) { } private void fireExecutionEndEvent() { - final Connection connection = statement.getMondrianConnection(); + final Connection connection = statement.getDaanseConnection(); final Context context = connection.getContext(); ExecutionEndEvent endEvent = new ExecutionEndEvent( @@ -445,7 +445,7 @@ private void fireExecutionEndEvent() { } private void fireExecutionStartEvent() { - final Connection connection = statement.getMondrianConnection(); + final Connection connection = statement.getDaanseConnection(); final Context context = connection.getContext(); diff --git a/common/src/main/java/org/eclipse/daanse/olap/server/LocusImpl.java b/common/src/main/java/org/eclipse/daanse/olap/server/LocusImpl.java index 2868a90..c8dde9e 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/server/LocusImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/server/LocusImpl.java @@ -122,7 +122,7 @@ public static T execute( } public final Context getContext() { - return getExecution().getMondrianStatement().getMondrianConnection().getContext(); + return getExecution().getDaanseStatement().getDaanseConnection().getContext(); } @Override diff --git a/common/src/main/java/org/eclipse/daanse/olap/server/StatementImpl.java b/common/src/main/java/org/eclipse/daanse/olap/server/StatementImpl.java index 4208857..97d2d1f 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/server/StatementImpl.java +++ b/common/src/main/java/org/eclipse/daanse/olap/server/StatementImpl.java @@ -85,7 +85,7 @@ public synchronized void start(Execution execution) { if (this.execution != null) { throw new AssertionError(); } - if (execution.getMondrianStatement() != this) { + if (execution.getDaanseStatement() != this) { throw new AssertionError(); } this.execution = execution; @@ -141,12 +141,12 @@ public long getQueryTimeoutMillis() { @Override public CatalogReader getCatalogReader() { - return getMondrianConnection().getCatalogReader().withLocus(); + return getDaanseConnection().getCatalogReader().withLocus(); } @Override public Catalog getCatalog() { - return getMondrianConnection().getCatalog(); + return getDaanseConnection().getCatalog(); } diff --git a/common/src/main/java/org/eclipse/daanse/olap/util/Bug.java b/common/src/main/java/org/eclipse/daanse/olap/util/Bug.java index b67843c..63a48cc 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/util/Bug.java +++ b/common/src/main/java/org/eclipse/daanse/olap/util/Bug.java @@ -1,5 +1,4 @@ /* - * 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. @@ -86,7 +85,7 @@ public static boolean olap4jUpgrade(String reason) { * "NON EMPTY when hierarchy's default member is not 'all'" * is fixed. */ - public static final boolean BugMondrian229Fixed = false; + public static final boolean Bug229Fixed = false; // Properties relating to checkin 7641. // This is part of the junit test Checkin_7641 that @@ -103,7 +102,7 @@ public static boolean olap4jUpgrade(String reason) { * MONDRIAN-207, * "IS EMPTY and IS NULL" is fixed. */ - public static final boolean BugMondrian207Fixed = false; + public static final boolean Bug207Fixed = false; /** * Whether @@ -111,7 +110,7 @@ public static boolean olap4jUpgrade(String reason) { * "Make Native NonEmpty consistant with MSAS" * is fixed. */ - public static final boolean BugMondrian446Fixed = false; + public static final boolean Bug446Fixed = false; /** * Whether @@ -119,7 +118,7 @@ public static boolean olap4jUpgrade(String reason) { * "Predicate references RolapStar.Column when used in AggStar" * is fixed. */ - public static final boolean BugMondrian313Fixed = false; + public static final boolean Bug313Fixed = false; /** * Whether @@ -127,7 +126,7 @@ public static boolean olap4jUpgrade(String reason) { * "Predicate sometimes has null RolapStar.Column" * is fixed. */ - public static final boolean BugMondrian314Fixed = false; + public static final boolean Bug314Fixed = false; /** * Whether @@ -135,7 +134,7 @@ public static boolean olap4jUpgrade(String reason) { * "CrossJoin no empty optimizer eliminates calculated member" * is fixed. */ - public static final boolean BugMondrian328Fixed = false; + public static final boolean Bug328Fixed = false; /** * Whether @@ -144,7 +143,7 @@ public static boolean olap4jUpgrade(String reason) { * is fixed. * */ - public static final boolean BugMondrian361Fixed = false; + public static final boolean Bug361Fixed = false; /** * Whether @@ -152,7 +151,7 @@ public static boolean olap4jUpgrade(String reason) { * "Parent-child hierarchies: <Join> used in dimension" * is fixed. */ - public static final boolean BugMondrian441Fixed = false; + public static final boolean Bug441Fixed = false; /** * Whether @@ -160,14 +159,14 @@ public static boolean olap4jUpgrade(String reason) { * "HighCardinalityTest test cases disabled" * is fixed. */ - public static final boolean BugMondrian486Fixed = false; + public static final boolean Bug486Fixed = false; /** * Whether bug * MONDRIAN-495, "Table filter concept does not support dialects." * is fixed. */ - public static final boolean BugMondrian495Fixed = false; + public static final boolean Bug495Fixed = false; /** * Whether @@ -175,7 +174,7 @@ public static boolean olap4jUpgrade(String reason) { * "RolapResultTest disabled" * is fixed. */ - public static final boolean BugMondrian503Fixed = false; + public static final boolean Bug503Fixed = false; /** * Whether @@ -185,7 +184,7 @@ public static boolean olap4jUpgrade(String reason) { * generally, if the regions overlap, then mondrian counts the overlaps * twice, whereas SSAS 2005 does not. */ - public static final boolean BugMondrian555Fixed = false; + public static final boolean Bug555Fixed = false; /** * Whether @@ -195,14 +194,14 @@ public static boolean olap4jUpgrade(String reason) { * results where the Gender.M values are returned before the Gender.F * values. */ - public static final boolean BugMondrian584Fixed = false; + public static final boolean Bug584Fixed = false; /** * Whether * bug MONDRIAN-641, * "Large NON EMPTY result performs poorly with ResultStyle.ITERABLE" */ - public static final boolean BugMondrian641Fixed = false; + public static final boolean Bug641Fixed = false; /** * Whether @@ -210,7 +209,7 @@ public static boolean olap4jUpgrade(String reason) { * "AS operator has lower precedence than required by MDX specification" * is fixed. */ - public static final boolean BugMondrian648Fixed = false; + public static final boolean Bug648Fixed = false; /** * Whether @@ -218,7 +217,7 @@ public static boolean olap4jUpgrade(String reason) { * "Format treats negative numbers differently than SSAS" * is fixed. */ - public static final boolean BugMondrian687Fixed = false; + public static final boolean Bug687Fixed = false; /** * Whether bug @@ -226,7 +225,7 @@ public static boolean olap4jUpgrade(String reason) { * "When joining a shared dimension into a cube at a level * other than its leaf level, Mondrian gives wrong results" is fixed. */ - public static final boolean BugMondrian747Fixed = false; + public static final boolean Bug747Fixed = false; /** * Whether @@ -234,28 +233,28 @@ public static boolean olap4jUpgrade(String reason) { * "use dynamic parameters and PreparedStatement for frequently executed SQL * patterns" is fixed. */ - public static final boolean BugMondrian759Fixed = false; + public static final boolean Bug759Fixed = false; /** * Whether * bug MONDRIAN-785, * "Native evaluation does not respect ordering" is fixed. */ - public static final boolean BugMondrian785Fixed = false; + public static final boolean Bug785Fixed = false; /** * Whether * bug MONDRIAN-1001, * "Tests disabled due to property trigger issues" is fixed. */ - public static final boolean BugMondrian1001Fixed = false; + public static final boolean Bug1001Fixed = false; /** * Whether * bug MONDRIAN-1001, * "Tests disabled due to property trigger issues" is fixed. */ - public static final boolean BugMondrian2452Fixed = false; + public static final boolean Bug2452Fixed = false; /** * Whether @@ -263,7 +262,7 @@ public static boolean olap4jUpgrade(String reason) { * "Error when using aggregation tables with a hierarchy that has a visible * level behind restricted" is fixed. */ - public static final boolean BugMondrian2440Fixed = false; + public static final boolean Bug2440Fixed = false; /** * Whether RolapCubeMember and RolapMember have been fully segregated; any * piece of code should be working with one or the other, not both. @@ -296,7 +295,7 @@ public static boolean avoidMemoryOverflow(Dialect dialect, boolean memoryMonitor * org.eclipse.daanse.olap.api.MappingLevel.Level#DEBUG or higher), we expect the suite to * take a long time, so we enable the tests. * - * Fixing either {@link #BugMondrian759Fixed MONDRIAN-759} or + * Fixing either {@link #Bug759Fixed MONDRIAN-759} or * FRG-400, "rewrite * statements containing literals to use internally-managed dynamic * parameters instead" would solve the problem. @@ -305,9 +304,9 @@ public static boolean avoidMemoryOverflow(Dialect dialect, boolean memoryMonitor */ public static boolean avoidSlowTestOnLucidDB(Dialect dialect) { return - !BugMondrian759Fixed + !Bug759Fixed && dialect.getDialectName().equals("luciddb") - && !LoggerFactory.getLogger("mondrian.test.PerformanceTest") + && !LoggerFactory.getLogger("daanse.test.PerformanceTest") .isDebugEnabled(); } } diff --git a/common/src/main/java/org/eclipse/daanse/olap/util/CancellationChecker.java b/common/src/main/java/org/eclipse/daanse/olap/util/CancellationChecker.java index 444f987..906f096 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/util/CancellationChecker.java +++ b/common/src/main/java/org/eclipse/daanse/olap/util/CancellationChecker.java @@ -50,8 +50,8 @@ public static void checkCancelOrTimeout( public static void checkCancelOrTimeout( long currentIteration, Execution execution) { - if (execution != null && execution.getMondrianStatement() != null) { - int checkCancelOrTimeoutInterval = execution.getMondrianStatement().getMondrianConnection().getContext() + if (execution != null && execution.getDaanseStatement() != null) { + int checkCancelOrTimeoutInterval = execution.getDaanseStatement().getDaanseConnection().getContext() .getConfigValue(ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL, ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL_DEFAULT_VALUE, Integer.class); synchronized (execution) { if (checkCancelOrTimeoutInterval > 0 diff --git a/common/src/main/java/org/eclipse/daanse/olap/util/MondrianFloatingDecimal.java b/common/src/main/java/org/eclipse/daanse/olap/util/DaanseFloatingDecimal.java similarity index 98% rename from common/src/main/java/org/eclipse/daanse/olap/util/MondrianFloatingDecimal.java rename to common/src/main/java/org/eclipse/daanse/olap/util/DaanseFloatingDecimal.java index 51ca299..57eeaa4 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/util/MondrianFloatingDecimal.java +++ b/common/src/main/java/org/eclipse/daanse/olap/util/DaanseFloatingDecimal.java @@ -36,7 +36,7 @@ * * @author tkafalas */ -class MondrianFloatingDecimal { +class DaanseFloatingDecimal { boolean isExceptional; boolean isNegative; int decExponent; @@ -47,7 +47,7 @@ class MondrianFloatingDecimal { private static final int MAX_SIGNIFICANT_DIGITS = 19; - public MondrianFloatingDecimal(double d) { + public DaanseFloatingDecimal(double d) { if (d < 0) { isNegative = true; d = -d; diff --git a/common/src/main/java/org/eclipse/daanse/olap/util/Format.java b/common/src/main/java/org/eclipse/daanse/olap/util/Format.java index 8f38e85..ece7133 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/util/Format.java +++ b/common/src/main/java/org/eclipse/daanse/olap/util/Format.java @@ -386,7 +386,7 @@ void format(double n, StringBuilder buf) { } else { i = 0; if (formats[0].isApplicableTo(n)) { - if (!Bug.BugMondrian687Fixed) { + if (!Bug.Bug687Fixed) { // Special case for format strings with style, // like "|#|style='red'". JPivot expects the // '-' to immediately precede the digits, viz @@ -451,7 +451,7 @@ void format(long n, StringBuilder buf) { } else { i = 0; if (formats[0].isApplicableTo(n)) { - if (!Bug.BugMondrian687Fixed) { + if (!Bug.Bug687Fixed) { // Special case for format strings with style, // like "|#|style='red'". JPivot expects the // '-' to immediately precede the digits, viz @@ -736,7 +736,7 @@ void format(Calendar calendar, StringBuilder buf) { * prints numbers with a given number of decimal places, leading zeroes, in * exponential notation, etc. * - * It is implemented using {@link MondrianFloatingDecimal}. + * It is implemented using {@link DaanseFloatingDecimal}. */ static class NumericFormat extends JavaFormat { @@ -893,14 +893,14 @@ private int countOccurrences(final String s, final char c) { @Override void format(double n, StringBuilder buf) { - MondrianFloatingDecimal fd = new MondrianFloatingDecimal(n); + DaanseFloatingDecimal fd = new DaanseFloatingDecimal(n); shift(fd, decimalShift); final int formatDigitsRightOfPoint = zeroesRightOfPoint + digitsRightOfPoint; if (n == 0.0 || (n < 0 && !shows(fd, formatDigitsRightOfPoint))) { // Underflow of negative number. Make it zero, so there is no // '-' sign. - fd = new MondrianFloatingDecimal(0); + fd = new DaanseFloatingDecimal(0); } formatFd0( fd, @@ -922,7 +922,7 @@ boolean isApplicableTo(double n) { if (n >= 0) { return true; } - MondrianFloatingDecimal fd = new MondrianFloatingDecimal(n); + DaanseFloatingDecimal fd = new DaanseFloatingDecimal(n); shift(fd, decimalShift); final int formatDigitsRightOfPoint = zeroesRightOfPoint + digitsRightOfPoint; @@ -930,7 +930,7 @@ boolean isApplicableTo(double n) { } private static boolean shows( - MondrianFloatingDecimal fd, + DaanseFloatingDecimal fd, int formatDigitsRightOfPoint) { final int i0 = - fd.decExponent - formatDigitsRightOfPoint; @@ -946,8 +946,8 @@ private static boolean shows( @Override void format(long n, StringBuilder buf) { - MondrianFloatingDecimal fd = - new MondrianFloatingDecimal(n); + DaanseFloatingDecimal fd = + new DaanseFloatingDecimal(n); shift(fd, decimalShift); formatFd0( fd, @@ -2973,7 +2973,7 @@ public String getFormatString() } private static void shift( - MondrianFloatingDecimal fd, + DaanseFloatingDecimal fd, int i) { if (fd.isExceptional @@ -2987,7 +2987,7 @@ private static void shift( /** Formats a floating decimal to a given buffer. */ private static void formatFd0( - MondrianFloatingDecimal fd, + DaanseFloatingDecimal fd, StringBuilder buf, int minDigitsLeftOfDecimal, char decimalChar, // '.' or ',' @@ -3033,7 +3033,7 @@ private static void formatFd0( /** Formats a floating decimal to a given char array. */ private static int formatFd1( - MondrianFloatingDecimal fd, + DaanseFloatingDecimal fd, char[] result, int i, int minDigitsLeftOfDecimal, @@ -3086,7 +3086,7 @@ private static int formatFd1( } static int formatFd2( - MondrianFloatingDecimal fd, + DaanseFloatingDecimal fd, char[] result, int i, int minDigitsLeftOfDecimal, diff --git a/common/src/main/java/org/eclipse/daanse/olap/util/IdentifierParser.java b/common/src/main/java/org/eclipse/daanse/olap/util/IdentifierParser.java index ade336e..b3a911e 100644 --- a/common/src/main/java/org/eclipse/daanse/olap/util/IdentifierParser.java +++ b/common/src/main/java/org/eclipse/daanse/olap/util/IdentifierParser.java @@ -89,11 +89,11 @@ public static class BuilderImpl extends MemberBuilder { } protected Member resolveMember(Hierarchy expectedHierarchy) { - final List mondrianSegmentList = + final List segmentList = Util.convert(this.segmentList); Member member = (Member) Util.lookupCompound( - schemaReader, cube, mondrianSegmentList, !ignoreInvalid, + schemaReader, cube, segmentList, !ignoreInvalid, DataType.MEMBER); if (member == null) { assert ignoreInvalid; @@ -102,9 +102,9 @@ protected Member resolveMember(Hierarchy expectedHierarchy) { } else { // Guess the intended hierarchy from the largest valid // prefix. - for (int i = mondrianSegmentList.size() - 1; i > 0; --i) { + for (int i = segmentList.size() - 1; i > 0; --i) { List partialName = - mondrianSegmentList.subList(0, i); + segmentList.subList(0, i); OlapElement olapElement = schemaReader.lookupCompound( cube, partialName, false, DataType.UNKNOWN); @@ -113,7 +113,7 @@ protected Member resolveMember(Hierarchy expectedHierarchy) { } } throw new MdxChildObjectNotFoundException( - Util.implode(mondrianSegmentList), + Util.implode(segmentList), cube.getQualifiedName()); } } diff --git a/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java b/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java index 0a7ef48..45fde13 100644 --- a/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java +++ b/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java @@ -114,8 +114,8 @@ void setUp() throws Exception { when(evaluator.getQuery()).thenReturn(query); when(query.getStatement()).thenReturn(statement); when(statement.getCurrentExecution()).thenReturn(execution); - when(execution.getMondrianStatement()).thenReturn(statement); - when(statement.getMondrianConnection()).thenReturn(rolapConnection); + when(execution.getDaanseStatement()).thenReturn(statement); + when(statement.getDaanseConnection()).thenReturn(rolapConnection); when(rolapConnection.getContext()).thenReturn(context); when(context.getConfigValue(ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL, ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL_DEFAULT_VALUE, Integer.class)).thenReturn(1000); diff --git a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java index 8009c23..9ef6f19 100644 --- a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java +++ b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java @@ -135,8 +135,8 @@ void testListTupleListTupleIterCalc() { Context context = mock(Context.class); when(context.getConfigValue(ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL, ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL_DEFAULT_VALUE, Integer.class)).thenReturn(0); when(rolapConnection.getContext()).thenReturn(context); - when(statement.getMondrianConnection()).thenReturn(rolapConnection); - when(excMock.getMondrianStatement()).thenReturn(statement); + when(statement.getDaanseConnection()).thenReturn(rolapConnection); + when(excMock.getDaanseStatement()).thenReturn(statement); CrossJoinIterCalc calc = new CrossJoinIterCalc( getResolvedFunCall(), null, crossJoinFunDef.getCtag() ); diff --git a/common/src/test/java/org/eclipse/daanse/olap/util/CancellationCheckerTest.java b/common/src/test/java/org/eclipse/daanse/olap/util/CancellationCheckerTest.java index 71229bd..ab89142 100644 --- a/common/src/test/java/org/eclipse/daanse/olap/util/CancellationCheckerTest.java +++ b/common/src/test/java/org/eclipse/daanse/olap/util/CancellationCheckerTest.java @@ -102,8 +102,8 @@ private void prepareCheckCancelOrTimeoutInterval(int i) { when(context.getConfigValue(ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL, ConfigConstants.CHECK_CANCEL_OR_TIMEOUT_INTERVAL_DEFAULT_VALUE, Integer.class)).thenReturn(i); when(rolapConnection.getContext()).thenReturn(context); - when(statement.getMondrianConnection()).thenReturn(rolapConnection); - when(excMock.getMondrianStatement()).thenReturn(statement); + when(statement.getDaanseConnection()).thenReturn(rolapConnection); + when(excMock.getDaanseStatement()).thenReturn(statement); } } diff --git a/common/src/test/java/org/eclipse/daanse/olap/util/FormatTest.java b/common/src/test/java/org/eclipse/daanse/olap/util/FormatTest.java index 10435fd..a9294d1 100644 --- a/common/src/test/java/org/eclipse/daanse/olap/util/FormatTest.java +++ b/common/src/test/java/org/eclipse/daanse/olap/util/FormatTest.java @@ -291,7 +291,7 @@ void percentWithStyle() { */ @Test void negativePercentWithStyle() { - if (Bug.BugMondrian687Fixed) { + if (Bug.Bug687Fixed) { checkFormat(null, new BigDecimal("-0.0364"), "|#.00%|style=red", "-|3.64%|style=red"); } else { checkFormat(null, new BigDecimal("-0.0364"), "|#.00%|style='red'", "|-3.64%|style='red'"); // confirmed on @@ -299,7 +299,7 @@ void negativePercentWithStyle() { } // exercise code for long (and int) values - if (Bug.BugMondrian687Fixed) { + if (Bug.Bug687Fixed) { checkFormat(null, -364, "|#.00|style=red", "-|364.00|style=red"); } else { checkFormat(null, -364, "|#.00|style=red", "|-364.00|style=red"); // confirmed on SSAS 2005 @@ -317,7 +317,7 @@ void negativePercentWithStyle() { */ @Test void singleQuotes() { - if (Bug.BugMondrian687Fixed) { + if (Bug.Bug687Fixed) { checkFormat(null, 3.64, "|#.00|style='deep red'", "-|364.00|style=deep red"); // confirmed on SSAS 2005 checkFormat(null, 3.64, "|#.00|style=\\'deep red\\'", "-|364.00|style='deep red'"); // confirmed on SSAS // 2005 @@ -403,7 +403,7 @@ void allTokens() { } else if (fe.isDate()) { o = date; } else if (fe.isString()) { - o = "mondrian"; + o = "daanse"; } else { o = d; } diff --git a/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/OtherDiscoverService.java b/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/OtherDiscoverService.java index 5e8d3e9..5cec438 100644 --- a/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/OtherDiscoverService.java +++ b/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/OtherDiscoverService.java @@ -95,7 +95,6 @@ public class OtherDiscoverService { private static final String DBLITERAL = "DBLITERAL_"; private static List>> enums = List.of(AccessEnum.class, AuthenticationModeEnum.class, ProviderTypeEnum.class, TreeOpEnum.class - // mondrian have 4 enums ); private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss") .withZone(ZoneId.systemDefault()); diff --git a/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/Convertor.java b/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/Convertor.java index e1b2ca0..5d27125 100644 --- a/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/Convertor.java +++ b/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/Convertor.java @@ -52,7 +52,7 @@ import org.eclipse.daanse.olap.api.result.CellSetAxis; import org.eclipse.daanse.olap.api.result.CellSetAxisMetaData; import org.eclipse.daanse.olap.api.result.Datatype; -import org.eclipse.daanse.olap.api.result.IMondrianOlap4jProperty; +import org.eclipse.daanse.olap.api.result.IDaanseOlap4jProperty; import org.eclipse.daanse.olap.api.result.Position; import org.eclipse.daanse.olap.api.result.Property; import org.eclipse.daanse.olap.common.SystemWideProperties; @@ -652,7 +652,7 @@ private static MemberTypeR slicerAxis(Member member, List props) { } private static Object getHierarchyProperty(Member member, Property longProp) { - IMondrianOlap4jProperty currentProperty = (IMondrianOlap4jProperty) longProp; + IDaanseOlap4jProperty currentProperty = (IDaanseOlap4jProperty) longProp; String thisHierarchyName = member.getHierarchy().getName(); String thatHierarchyName = currentProperty.getLevel().getHierarchy().getName(); if (thisHierarchyName.equals(thatHierarchyName)) { @@ -804,7 +804,7 @@ private static MemberTypeR getMember(Member member, Position prevPosition, Posit } else if (longProp == Property.StandardMemberProperty.DEPTH) { value = member.getDepth(); } else { - if (longProp instanceof IMondrianOlap4jProperty currentProperty) { + if (longProp instanceof IDaanseOlap4jProperty currentProperty) { String thisHierarchyName = member.getHierarchy().getName(); String thatHierarchyName = currentProperty.getLevel().getHierarchy().getName(); if (thisHierarchyName.equals(thatHierarchyName)) { @@ -821,7 +821,7 @@ private static MemberTypeR getMember(Member member, Position prevPosition, Posit value = getDefaultValue(prop); } if (value != null) { - if (longProp instanceof IMondrianOlap4jProperty) { + if (longProp instanceof IDaanseOlap4jProperty) { any.add(new CellInfoItemR(encoder.encode(prop.getName()), value.toString(), Optional.ofNullable(getXsdType(prop)))); } else { @@ -944,7 +944,7 @@ private static List getHierarchyInfoList(List hierarch for (Hierarchy hierarchy : hierarchies) { List ciiList = new ArrayList<>(); for (final Property prop : props) { - if (prop instanceof IMondrianOlap4jProperty iMondrianProp) { + if (prop instanceof IDaanseOlap4jProperty iMondrianProp) { Optional op = getCellInfoItemProperty(hierarchy, iMondrianProp); if (op.isPresent()) { ciiList.add(op.get()); @@ -960,7 +960,7 @@ private static List getHierarchyInfoList(List hierarch } private static Optional getCellInfoItemProperty(Hierarchy hierarchy, - final IMondrianOlap4jProperty prop) { + final IDaanseOlap4jProperty prop) { String thisHierarchyName = hierarchy.getName(); String thatHierarchiName = prop.getLevel().getHierarchy().getName(); if (thisHierarchyName.equals(thatHierarchiName)) { @@ -988,7 +988,7 @@ private static Object[] getAttributes(Property prop, Hierarchy hierarchy) { values.add("name"); values.add(new StringBuilder(hierarchy.getUniqueName()).append(".") .append(Util.quoteMdxIdentifier(longProp.getName())).toString()); - if (!(longProp instanceof IMondrianOlap4jProperty)) { + if (!(longProp instanceof IDaanseOlap4jProperty)) { values.add("type"); values.add(getXsdType(longProp)); } @@ -1006,7 +1006,7 @@ private static List getProps(CellSetAxisMetaData queryAxis) { } private static boolean isValidProp(List positions, Property prop) { - if (!(prop instanceof IMondrianOlap4jProperty)) { + if (!(prop instanceof IDaanseOlap4jProperty)) { return true; } for (Position pos : positions) {