To create an instance of this interface, use - * {@link org.eclipse.daanse.olap.api.Connection#getCacheControl}.
- * - *Methods concerning cell cache:
Methods concerning member cache:
The members must belong to the same level of the same hierarchy. - * One of the bounds may be null. - * - *
For example, given
- *
- * Member member97Q3; // [Time].[1997].[Q3]
- * Member member98Q2; // [Time].[1998].[Q2]
- *
| Expression | - *Meaning | - *
|---|---|
- * createMemberRegion(true, member97Q3, true, member98Q2,
- * false)
- * |
- * The members between 97Q3 and 98Q2, inclusive: - * [Time].[1997].[Q3], - * [Time].[1997].[Q4], - * [Time].[1998].[Q1], - * [Time].[1998].[Q2] |
- *
- * createMemberRegion(true, member97Q3, false, member98Q2,
- * false)
- * |
- * The members between 97Q3 and 98Q2, exclusive: - * [Time].[1997].[Q4], - * [Time].[1998].[Q1] |
- *
- * createMemberRegion(true, member97Q3, false, member98Q2,
- * false)
- * |
- * The members between 97Q3 and 98Q2, including their descendants, and
- * including the lower bound but not the upper bound: - * [Time].[1997].[Q3], - * [Time].[1997].[Q3].[7], - * [Time].[1997].[Q3].[8], - * [Time].[1997].[Q3].[9], - * [Time].[1997].[Q4], - * [Time].[1997].[Q4].[10], - * [Time].[1997].[Q4].[11], - * [Time].[1997].[Q4].[12], - * [Time].[1998].[Q1], - * [Time].[1998].[Q1].[1], - * [Time].[1998].[Q1].[2], - * [Time].[1998].[Q1].[3] |
- *
The ordinal position of the new member among its siblings is implied - * by its properties.
- * - * @param member the new member - * @return the command - * - * @throws IllegalArgumentException if member null - * or if member belongs to a parent-child hierarchy - */ - MemberEditCommand createAddCommand( - Member member) throws IllegalArgumentException; - - /** - * Creates a command to Move a member (with its descendants) to a new - * location, that is to a new parent. - * @param member the member moved - * @param loc the new parent - * @return the command - * - * @throws IllegalArgumentException if member is null, - * or loc is null, - * or member belongs to a parent-child hierarchy, - * or if loc is incompatible with member - */ - MemberEditCommand createMoveCommand( - Member member, - Member loc) throws IllegalArgumentException; - - // commands to change member properties - - /** - * Creates a command to change one property of a member. - * - * @param member the member - * @param name the property name - * @param value the property value - * @return the command - * @throws IllegalArgumentException if the property is invalid for the - * member - */ - MemberEditCommand createSetPropertyCommand( - Member member, - String name, - Object value) throws IllegalArgumentException; - - /** - * Creates a command to several properties changes over a set of - * members. All members must belong to the same Level. - * - * @param set the set of members - * @param propertyValues Collection of property-value pairs - * @return the command - * @throws IllegalArgumentException for an invalid property, or if all - * members in the set do not belong to the same Level. - */ - MemberEditCommand createSetPropertyCommand( - MemberSet set, - MapThis cache is referenced only when creating a new connection, so - * existing connections will continue to use the same schema definition. - * - *
Flushing the schema cache will flush all aggregations and segments
- * associated to it as well.
- */
- void flushSchemaCache();
-
-
-
- /** a region of cells in the cell cache */
- public interface CellRegion {
- /**
- * Returns the dimensionality of a region.
- * @return a list of {@link org.eclipse.daanse.olap.api.element.Dimension} objects.
- */
- List Member sets can be created using methods
- * {@link CacheControl#createMemberSet(Member, boolean)},
- * {@link CacheControl#createMemberSet(boolean, Member, boolean, Member, boolean)},
- * {@link CacheControl#createUnionSet(org.eclipse.daanse.olap.api.CacheControl.MemberSet[])}.
- */
- public interface MemberSet {
- }
-
- /**
- * An operation to be applied to the member cache. The operation does not
- * take effect until {@link CacheControl#execute} is called.
- */
- public interface MemberEditCommand {
- }
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogCache.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogCache.java
deleted file mode 100644
index a14f13c5e7..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogCache.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*
-*/
-package org.eclipse.daanse.olap.api;
-
-public interface CatalogCache {
-
- void clear();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogReader.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogReader.java
deleted file mode 100644
index 4922eefc5d..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/CatalogReader.java
+++ /dev/null
@@ -1,578 +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) 2003-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara
- * Copyright (C) 2021 Sergei Semenkov
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-package org.eclipse.daanse.olap.api;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.eclipse.daanse.olap.api.access.AccessMember;
-import org.eclipse.daanse.olap.api.access.Role;
-import org.eclipse.daanse.olap.api.calc.Calc;
-import org.eclipse.daanse.olap.api.element.Catalog;
-import org.eclipse.daanse.olap.api.element.Cube;
-import org.eclipse.daanse.olap.api.element.DatabaseSchema;
-import org.eclipse.daanse.olap.api.element.Dimension;
-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.api.element.NamedSet;
-import org.eclipse.daanse.olap.api.element.OlapElement;
-import org.eclipse.daanse.olap.api.function.FunctionDefinition;
-import org.eclipse.daanse.olap.api.query.component.Expression;
-
-/**
- * A It is generally created using {@link Connection#getCatalogReader},
- * but also via {@link Cube#getCatalogReader(Role)}. CatalogReader is deprecated for code outside of mondrian. For new code,
- * use the metadata provided by olap4j, for example
- * {@link mondrian.olap4j.MondrianOlap4jSchema#getCubes()}.
- *
- * If you use a CatalogReader from outside of a mondrian statement, you may
- * get a {@link java.util.EmptyStackException} indicating that mondrian cannot
- * deduce the current locus (statement context). If you get that error, call
- * {@link #withLocus()} to create a CatalogReader that automatically provides a
- * locus whenever a call is made.
- * If For example, for [Store].[USA].[CA], returns
- * {[Store].[USA], [Store].[All Stores]}.
- *
- * @param member Member
- * @param ancestorList List of ancestors
- */
- void getMemberAncestors(Member member, List This may not be the same as
- * This method is equivalent to calling
- * {@link #getMemberByUniqueName(java.util.List, boolean, MatchType)}
- * with {@link MatchType#EXACT}.
- *
- * @param uniqueNameParts Unique name of member
- * @param failIfNotFound Whether to throw an error, as opposed to returning
- * Resolves a name such as
- * '[Products].[Product Department].[Produce]' by resolving the
- * components ('Products', and so forth) one at a time.
- *
- * @param parent Parent element to search in
- * @param names Exploded compound name, such as {"Products",
- * "Product Department", "Produce"}
- * @param failIfNotFound If the element is not found, determines whether
- * to return null or throw an error
- * @param category Type of returned element, a {@link DataType} value;
- * {@link DataType#UNKNOWN} if it doesn't matter.
- * @param matchType indicates the match mode; if not specified, EXACT
- *
- * @pre parent != null
- * @post !(failIfNotFound && return == null)
- */
- OlapElement lookupCompound(
- OlapElement parent,
- List Resolves a name such as
- * '[Products].[Product Department].[Produce]' by resolving the
- * components ('Products', and so forth) one at a time.
- *
- * @param parent Parent element to search in
- * @param names Exploded compound name, such as {"Products",
- * "Product Department", "Produce"}
- * @param failIfNotFound If the element is not found, determines whether
- * to return null or throw an error
- * @param category Type of returned element, a {@link DataType} value;
- * {@link DataType#UNKNOWN} if it doesn't matter.
- *
- * @pre parent != null
- * @post !(failIfNotFound && return == null)
- */
- OlapElement lookupCompound(
- OlapElement parent,
- List Always equivalent to
- * It is less efficient; use this only if the operation is occurring
- * outside the context of a statement. If you get the internal error
- * "no locus", that's a sign you should use this method. For example, a schema reader from the perspective of a cube will
- * return cube and schema namespaces.
- * After the timeout is reached, the hard reference will be cleared and the
- * schema will be made a candidate for garbage collection. If the timeout wasn't
- * reached yet and a second query requires the same schema, the timeout will be
- * re-computed from the time of the second access and a new hard reference is
- * established until the new timer reaches its end.
- *
- *
- * If the timeout is equal to zero, the schema will get pinned permanently. It
- * is inadvisable to use this mode when using a DynamicSchemaProcessor at the
- * risk of filling up the memory.
- *
- *
- * If the timeout is a negative value, the reference will behave the same as a
- * {@link SoftReference}. This is the default behavior.
- *
- *
- * The timeout value must be provided as a String representing both the time
- * value and the time unit. For example, 1 second is represented as "1s". Valid
- * time units are [d, h, m, s, ms], representing respectively days, hours,
- * minutes, seconds and milliseconds.
- *
- *
- * Defaults to "-1s".
- */
- Duration pinSchemaTimeout();
-
- /**
- * The "AggregateScanSchema" property is the name of the database schema to scan
- * when looking for aggregate tables. If defined, Mondrian will only look for
- * aggregate tables within this schema. This means that all aggregate tables,
- * including explicitly defined tables must be in this schema. If not defined,
- * Mondrian will scan every schema that the database connection has access to
- * when looking for aggregate tables.
- */
- Optional This method is typically called before evaluating an expression which
- * is known to corrupt the evaluation context.
- *
- * Multiple savepoints may be active at the same time for the same
- * evaluator. And, it is allowable to restore to the save savepoint more
- * than once (or not at all). However, when you have rolled back to a
- * particular savepoint you may not restore to a later savepoint.
- *
- * @return Evaluator with each given member overriding the state of the
- * current Evaluator for its hierarchy
- */
- int savepoint();
-
- /**
- * Creates a new Evaluator with the same context as this evaluator.
- *
- * This method is typically called before evaluating an expression which
- * may corrupt the evaluation context.
- *
- * In mondrian-3.3 and later, a more efficient way to save the state of
- * an evaluator is to call {@link #savepoint} followed by
- * {@link #restore(int)}. We recommend using those methods most of the time.
- *
- * However, it makes sense to use this method in the constructor of an
- * iterator. It allows the iterator to modify its evaluation context without
- * affecting the evaluation context of the calling code. This behavior
- * cannot be achieved using {@code savepoint}.
- *
- * @return Evaluator with each given member overriding the state of the
- * current Evaluator for its hierarchy
- */
- Evaluator push();
-
- /**
- * Restores previous evaluator.
- *
- * @param savepoint Savepoint returned by {@link #savepoint()}
- */
- void restore(int savepoint);
-
- /**
- * Makes If {@code safe}, checks whether this is the first time that
- * a member of this hierarchy has been changed since {@link #savepoint()}
- * was called. If so, saves the previous member. If {@code safe} is false,
- * never saves the previous member.
- *
- * Use {@code safe = false} only if you are sure that the context has
- * been set before. For example,
- *
- * Equivalent to
- *
- * Equivalent to
- *
- * Equivalent to
- *
- * Equivalent to
- *
- * If the property is not defined, default value is returned.
- */
- Object getProperty(String name, Object defaultValue);
-
- /**
- * Returns a {@link CatalogReader} appropriate for the current
- * access-control context.
- */
- CatalogReader getCatalogReader();
-
- /**
- * Simple caching of the result of an May be used by expression
- * evaluators to optimize their result. For example, a top-level crossjoin
- * may be optimized by removing all non-empty set elements before
- * performing the crossjoin. This is possible because of the identity
- *
- * Notes: You must not call this method unless
- * {@link #mightReturnNullForUnrelatedDimension()} has returned true.
- *
- * @param members Dimensions for the members need to be checked whether
- * related or unrelated
- *
- * @return boolean
- */
- boolean needToReturnNullForUnrelatedDimension(Member[] members);
-
- /**
- * Returns whether native evaluation is enabled in this context.
- *
- * @return whether native evaluation is enabled in this context
- */
- boolean nativeEnabled();
-
- /**
- * Sets whether native evaluation should be used.
- *
- * @param nativeEnabled Whether native evaluation should be used
- */
- void setNativeEnabled(boolean nativeEnabled);
-
- /**
- * Returns whether the current context is an empty cell.
- *
- * @return Whether the current context is an empty cell
- */
- boolean currentIsEmpty();
-
- /**
- * Returns the member that was the current evaluation context for a
- * particular hierarchy before the most recent change in context.
- *
- * @param hierarchy Hierarchy
- * @return Previous context member for given hierarchy
- */
- Member getPreviousContext(Hierarchy hierarchy);
-
- /**
- * Returns the query timing context for this execution.
- *
- * @return query timing context
- */
- QueryTiming getTiming();
-
- /**
- * Return the list of slicer members in the current evaluator context.
- */
- List The iterator from this iterable maintains the current ordinal
- * property required for the methods {@link #currentOrdinal()} and
- * {@link #currentTuple()}.
- *
- * @param eval Evaluator for current context
- *
- * @return Iterable over the tuples of the set
- */
- TupleIterable evaluateTupleIterable(Evaluator eval);
-
- /**
- * Returns the ordinal of the current member or tuple in the named set.
- *
- * @return Ordinal of the current member or tuple in the named set
- */
- int currentOrdinal();
-
- /**
- * Returns the current member in the named set.
- *
- * Applicable if the named set is a set of members.
- *
- * @return Current member
- */
- Member currentMember();
-
- /**
- * Returns the current tuple in the named set.
- *
- * Applicable if the named set is a set of tuples.
- *
- * @return Current tuple.
- */
- Member[] currentTuple();
- }
-
- /**
- * Interface for generically evaluating a set.
- */
- interface SetEvaluator {
- /**
- * Returns an iterator over the tuples of the named set. Applicable if
- * the named set is a set of tuples.
- *
- * The iterator from this iterable maintains the current ordinal
- * property required for the methods {@link #currentOrdinal()} and
- * {@link #currentTuple()}.
- *
- * @return Iterable over the tuples of the set
- */
- TupleIterable evaluateTupleIterable();
-
- /**
- * Returns the ordinal of the current member or tuple in the named set.
- *
- * @return Ordinal of the current member or tuple in the named set
- */
- int currentOrdinal();
-
- /**
- * Returns the current member in the named set.
- *
- * Applicable if the named set is a set of members.
- *
- * @return Current member
- */
- Member currentMember();
-
- /**
- * Returns the current tuple in the named set.
- *
- * Applicable if the named set is a set of tuples.
- *
- * @return Current tuple.
- */
- Member[] currentTuple();
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java
deleted file mode 100644
index d92b8a534c..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Execution.java
+++ /dev/null
@@ -1,84 +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) 2001-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- All changes after Fork in 2023 ------------------------
- *
- * Project: Eclipse daanse
- *
- * Copyright (c) 2024 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
- * Stefan Bischof (bipolis.org) - initial
- */
-package org.eclipse.daanse.olap.api;
-
-import java.time.Duration;
-
-public interface Execution {
-
- void cancelSqlStatements();
-
- Statement getMondrianStatement();
-
- void setOutOfMemory(String string);
-
- long getId();
-
- void checkCancelOrTimeout();
-
- boolean isCancelOrTimeout();
-
- Duration getElapsedMillis();
-
- void tracePhase(int hitCount, int missCount, int pendingCount);
-
- void setCellCacheHitCount(int hitCount);
-
- void setCellCacheMissCount(int missCount);
-
- void setCellCachePendingCount(int pendingCount);
-
- void setExpCacheCounts(int expResultCacheHitCount, int expResultCacheMissCount);
-
- void registerStatement(Locus locus, java.sql.Statement stmt);
-
- void end();
-
- void start();
-
- void cancel();
-
- QueryTiming getQueryTiming();
-
- int getExpCacheHitCount();
-
- int getExpCacheMissCount();
-
- /**
- * Enumeration of the states of an Execution instance.
- */
- public enum State {
- /**
- * Identifies the state in which an execution is before it has started resolving
- * the query. This doesn't mean that there are no current SQL statements already
- * beeing executed.
- */
- FRESH, RUNNING, ERROR, CANCELED, TIMEOUT, DONE,
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ExpCacheDescriptor.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ExpCacheDescriptor.java
deleted file mode 100644
index d04b223fe4..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ExpCacheDescriptor.java
+++ /dev/null
@@ -1,49 +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) 2001-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- All changes after Fork in 2023 ------------------------
- *
- * Project: Eclipse daanse
- *
- * Copyright (c) 2024 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
- * Stefan Bischof (bipolis.org) - initial
- */
-package org.eclipse.daanse.olap.api;
-
-import org.eclipse.daanse.olap.api.calc.Calc;
-import org.eclipse.daanse.olap.api.query.component.Expression;
-
-public interface ExpCacheDescriptor {
-
- Calc getCalc();
-
- Object evaluate(Evaluator evaluator);
-
- Expression getExp();
-
- /**
- * Returns the ordinals of the hierarchies which this expression is dependent
- * upon. When the cache descriptor is used to generate a cache key, the key will
- * consist of a member from each of these hierarchies.
- */
- int[] getDependentHierarchyOrdinals();
-
-}
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java
deleted file mode 100644
index 23cca16156..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api;
-
-import java.io.PrintWriter;
-
-public interface IAggregationManager {
-
- void shutdown();
-
- ISegmentCacheManager getCacheMgr(Connection mondrianConnection);
-
- CacheControl getCacheControl(Connection rolapConnection, PrintWriter pw);
-
- ISegmentCacheManager getCacheMgr();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISegmentCacheManager.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISegmentCacheManager.java
deleted file mode 100644
index 6db57692fc..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISegmentCacheManager.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-
-package org.eclipse.daanse.olap.api;
-
-import java.io.PrintWriter;
-
-import org.eclipse.daanse.olap.api.CacheControl.CellRegion;
-
-public interface ISegmentCacheManager {
-
- /**
- * Shuts down this cache manager and all active threads and indexes.
- */
- void shutdown();
-
- void printCacheState(CellRegion region, PrintWriter pw, Locus locus);
-
-
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISqlStatement.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISqlStatement.java
deleted file mode 100644
index 39f1994b32..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ISqlStatement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api;
-
-import java.sql.ResultSet;
-
-public interface ISqlStatement {
-
- /**
- * Executes the current statement, and handles any SQLException.
- */
- void execute();
-
- /**
- * Closes all resources (statement, result set) held by this SqlStatement.
- *
- * If any of them fails, wraps them in a
- * {@link RuntimeException} describing the high-level operation which this statement was performing. No further
- * error-handling is required to produce a descriptive stack trace, unless you want to absorb the error. This method is idempotent. This helps to prevent connection leaks. The caller still has to
- * remember to call ResultSet.close(), of course.
- *
- * @return Wrapped result set
- */
- ResultSet getWrappedResultSet();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/IdentifierSegment.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/IdentifierSegment.java
deleted file mode 100644
index da07c925a0..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/IdentifierSegment.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to Julian Hyde under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Julian Hyde licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api;
-
-/**
- * Component in a compound identifier. It is described by its name and how
- * the name is quoted.
- *
- * For example, the identifier
- * QUOTED and UNQUOTED segments are represented using a
- * {@link NameSegment NameSegment};
- * KEY segments are represented using a
- * {@link KeySegment KeySegment}.
- *
- * To parse an identifier into a list of segments, use the method
- * {@link org.olap4j.mdx.IdentifierNode#parseIdentifier(String)} and then call
- * {@link org.olap4j.mdx.IdentifierNode#getSegmentList()} on the resulting
- * node. For example, "[Foo]", "&[123]", "Abc".
- *
- * @return String representation of this Segment
- */
- String toString();
-
- /**
- * Appends a string representation of this Segment to a StringBuffer.
- *
- * @param buf StringBuffer
- */
- void toString(StringBuilder buf);
-
- /**
- * Returns the region of the source code which this Segment was created
- * from, if it was created by parsing.
- *
- * @return region of source code
- */
- ParseRegion getRegion();
-
- /**
- * Returns how this Segment is quoted.
- *
- * @return how this Segment is quoted
- */
- Quoting getQuoting();
-
- /**
- * Returns the name of this IdentifierSegment.
- * Returns {@code null} if this IdentifierSegment represents a key.
- *
- * @return name of this Segment
- */
- String getName();
-
-
-}
-
-// End IdentifierSegment.java
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/KeyIdentifierSegment.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/KeyIdentifierSegment.java
deleted file mode 100644
index 702cd1426a..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/KeyIdentifierSegment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2024 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api;
-
-import java.util.List;
-
-public non-sealed interface KeyIdentifierSegment extends IdentifierSegment {
-
- /**
- * Returns the key components, if this IdentifierSegment is a key. (That is, if
- * {@link #getQuoting()} returns {@link Quoting#KEY}.)
- *
- * Returns null otherwise.
- *
- * @return Components of key, or null if this IdentifierSegment is not a key
- */
- List Elements' names are hierarchical, so elements are resolved one
- * name segment at a time. It is possible for an element to be defined
- * in a different namespace than its parent: for example, stored member
- * [Dim].[Hier].[X].[Y] might have a child [Dim].[Hier].[X].[Y].[Z] which
- * is a calculated member defined using a WITH MEMBER clause. If {@code matchType} is {@link MatchType#EXACT}, effect is
- * identical to calling
- * {@link #lookupChild(OlapElement, org.eclipse.daanse.olap.api.olap4j.mdx.IdentifierSegment)}. Match type is ignored except when searching for members. A parameter is not an expression; see {@link ParameterExpr}.
- *
- * @author jhyde
- * @since Jul 22, 2006
- */
-public interface Parameter {
- /**
- * Returns the scope where this parameter is defined.
- *
- * @return Scope of the parameter
- */
- Scope getScope();
-
- /**
- * Returns the type of this Parameter.
- *
- * @return Type of the parameter
- */
- Type getType();
-
- /**
- * Returns the expression which provides the default value for this
- * Parameter. Never null.
- *
- * @return Default value expression of the parameter
- */
- Expression getDefaultExp();
-
- /**
- * Returns the name of this Parameter.
- *
- * @return Name of the parameter
- */
- String getName();
-
- /**
- * Returns the description of this Parameter.
- *
- * @return Description of the parameter
- */
- String getDescription();
-
- /**
- * Returns whether the value of this Parameter can be modified in a query.
- *
- * @return Whether parameter is modifiable
- */
- boolean isModifiable();
-
- /**
- * Returns the value of this parameter.
- *
- * If {@link #setValue(Object)} has not been called, returns the default
- * value of this parameter.
- *
- * The type of the value is (depending on the type of the parameter)
- * a {@link String}, {@link Number}, or {@link Member}.
- *
- * @return The value of this parameter
- */
- Object getValue();
-
- /**
- * Sets the value of this parameter.
- *
- * @param value Value of the parameter; must be a {@link String},
- * a {@link Double}, or a {@link org.eclipse.daanse.olap.api.element.Member}
- */
- void setValue(Object value);
-
- /**
- * Returns whether the value of this parameter has been set.
- *
- * If the value has not been set, this parameter will return its default
- * value.
- *
- * Setting a parameter to {@code null} is not equivalent to unsetting it.
- * To unset a parameter, call {@link #unsetValue}.
- *
- * @return Whether this parameter has been assigned a value
- */
- boolean isSet();
-
- /**
- * Unsets the value of this parameter.
- *
- * After calling this method, the parameter will revert to its default
- * value, as if {@link #setValue(Object)} had not been called, and
- * {@link #isSet()} will return {@code false}.
- */
- void unsetValue();
-
- /**
- * Scope where a parameter is defined.
- */
- enum Scope {
- System,
- Schema,
- Connection,
- Statement
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ParseRegion.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ParseRegion.java
deleted file mode 100644
index 7f647ce1b9..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ParseRegion.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-package org.eclipse.daanse.olap.api;
-
-public interface ParseRegion {
-
- /**
- * Return starting line number (1-based).
- *
- * @return 1-based starting line number
- */
- int getStartLine();
-
- /**
- * Return starting column number (1-based).
- *
- * @return 1-based starting column number
- */
- int getStartColumn();
-
- /**
- * Return ending line number (1-based).
- *
- * @return 1-based ending line number
- */
- int getEndLine();
-
- /**
- * Return ending column number (1-based).
- *
- * @return 1-based starting endings column number
- */
- int getEndColumn();
-
-}
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ProfileHandler.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ProfileHandler.java
deleted file mode 100644
index e4da40c6c8..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ProfileHandler.java
+++ /dev/null
@@ -1,23 +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 org.eclipse.daanse.olap.api;
-
-/**
- * Called when a statement has profile information.
- */
-public interface ProfileHandler {
- /**
- * Called when a statement has finished executing.
- *
- * @param plan Annotated plan
- * @param timing Query timings
- */
- public void explain(String plan, QueryTiming timing);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/QueryTiming.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/QueryTiming.java
deleted file mode 100644
index 1e154cdbfa..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/QueryTiming.java
+++ /dev/null
@@ -1,61 +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) 2001-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- All changes after Fork in 2023 ------------------------
- *
- * Project: Eclipse daanse
- *
- * Copyright (c) 2024 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
- * Stefan Bischof (bipolis.org) - initial
- */
-package org.eclipse.daanse.olap.api;
-
-import java.time.Duration;
-
-public interface QueryTiming {
-
- /**
- * Marks the start of a Query component's execution.
- *
- * @param name Name of the component
- */
- void markStart(String name);
-
- /**
- * Marks the end of a Query component's execution.
- *
- * @param name Name of the component
- */
- void markEnd(String name);
-
- /**
- * Marks the duration of a Query component's execution.
- *
- * markFull is synchronized because it may be called from either Actor's spawn
- * thread or RolapResultShepherd thread
- *
- * @param name Name of the component
- * @param duration Duration of the execution
- */
-
- void markFull(String string, Duration duration);
-
-}
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Quoting.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/Quoting.java
deleted file mode 100644
index 9741db3d97..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Quoting.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api;
-
-public enum Quoting {
- /**
- * Unquoted identifier, for example "Measures".
- */
- UNQUOTED,
-
- /**
- * Quoted identifier, for example "[Measures]".
- */
- QUOTED,
-
- /**
- * Identifier quoted with an ampersand to indicate a key value, for
- * example the second segment in "[Employees].&[89]".
- */
- KEY
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ResultShepherd.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ResultShepherd.java
deleted file mode 100644
index 5e75005023..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ResultShepherd.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2024 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
- */
-package org.eclipse.daanse.olap.api;
-
-import java.util.concurrent.Callable;
-
-import org.eclipse.daanse.olap.api.result.Result;
-
-public interface ResultShepherd {
-
- /**
- * Executes and shepherds the execution of an Execution instance.
- * The shepherd will wrap the Execution instance into a Future object
- * which can be monitored for exceptions. If any are encountered,
- * two things will happen. First, the user thread will be returned and
- * the resulting exception will bubble up. Second, the execution thread
- * will attempt to do a graceful stop of all running SQL statements and
- * release all other resources gracefully in the background.
- * @param execution An Execution instance.
- * @param callable A callable to monitor returning a Result instance.
- * @throws mondrian.olap.ResourceLimitExceededException if some resource limit specified
- * in the property file was exceeded
- * @throws mondrian.olap.QueryCanceledException if query was canceled during execution
- * @throws mondrian.olap.QueryTimeoutException if query exceeded timeout specified in
- * the property file
- * @return A Result object, as supplied by the Callable passed as a
- * parameter.
- */
- Result shepherdExecution(Execution execution, Callable Profiling information will be sent to the given writer when
- * {@link org.eclipse.daanse.olap.api.result.Result#close()} is called.
- *
- * If profileHandler is null, disables profiling.
- *
- * @param profileHandler Writer to which to send profiling information
- */
- void enableProfiling(ProfileHandler profileHandler);
-
- ProfileHandler getProfileHandler();
-
- /**
- * Sets the timeout of this statement, in milliseconds.
- *
- * Zero means no timeout.
- *
- * Contrast with JDBC's {@link java.sql.Statement#setQueryTimeout(int)}
- * method, which uses an {@code int} value and a granularity of seconds.
- *
- * @param timeoutMillis Timeout in milliseconds
- */
- void setQueryTimeoutMillis(long timeoutMillis);
-
- /**
- * Returns the query timeout of this statement, in milliseconds.
- *
- * Zero means no timeout. Contrast with JDBC's {@link java.sql.Statement#getQueryTimeout()}
- * method, which uses an {@code int} value and a granularity of seconds.
- *
- * @return Timeout in milliseconds
- */
- long getQueryTimeoutMillis();
-
- /**
- * Issues a cancel request on this statement.
- *
- * Once the thread running the statement detects the cancel request,
- * execution will throw an exception. See
- * An expression calls {@link #validate} on each of its children,
- * which in turn calls {@link Expression#accept}.
- *
- * @author jhyde
- */
-public interface Validator {
- /**
- * Returns the {@link Query} which is being validated.
- */
- Query getQuery();
-
- /**
- * Validates an expression, and returns the expression it resolves to.
- *
- * @param exp Expression to validate
- * @param scalar Whether the context requires that the expression is
- * evaluated to a value, as opposed to a tuple
- */
- Expression validate(Expression exp, boolean scalar);
-
- /**
- * Validates a usage of a parameter.
- *
- * It must resolve to the same object (although sub-objects may change).
- */
- void validate(ParameterExpression parameterExpr);
-
- /**
- * Validates a child member property.
- *
- * It must resolve to the same object (although sub-objects may change).
- */
- void validate(MemberProperty memberProperty);
-
- /**
- * Validates an axis.
- *
- * It must resolve to the same object (although sub-objects may change).
- */
- void validate(QueryAxis axis);
-
- /**
- * Validates a formula.
- *
- * It must resolve to the same object (although sub-objects may change).
- */
- void validate(Formula formula);
-
- /**
- * Returns whether the current context requires an expression.
- */
- boolean requiresExpression();
-
- /**
- * Returns whether we can convert an argument to a parameter type.
- *
- * @param ordinal argument ordinal
- * @param fromExp argument type
- * @param to parameter type
- * @param conversions List of conversions performed;
- * method adds an element for each non-trivial conversion (for
- * example, converting a member to a level).
- * @return Whether we can convert an argument to a parameter type
- */
- boolean canConvert(
- int ordinal,
- Expression fromExp,
- DataType to,
- List Default implementation returns {@code false}.
- *
- * @return whether to resolve function each time
- */
- boolean alwaysResolveFunDef();
-
- /**
- * Returns the schema reader with which to resolve names of MDX objects
- * (dimensions, hierarchies, levels, members, named sets).
- *
- * The schema reader is initially in the context of the query's cube,
- * and during a traversal it may change if named sets are introduced using
- * the 'expr AS alias' construct.
- *
- * @return Schema reader
- */
- CatalogReader getCatalogReader();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Walkable.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/Walkable.java
deleted file mode 100644
index d3a5041c26..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Walkable.java
+++ /dev/null
@@ -1,45 +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) 1999-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api;
-
-/**
- * Allows others to walk to the children of an Object or Tree by using
- * {@link #getChildren()}.
- */
-public interface Walkable Visibility is: For these purposes, children which are below the bottom level are
- * regarded as visible. Descendants which are inaccessible because they are below the
- * bottom level are ignored.
- *
- * @param member Member
- * @return Returns whether a descendant is inaccessible.
- */
- boolean hasInaccessibleDescendants(Member member);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/Role.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/Role.java
deleted file mode 100644
index ce8de8655c..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/Role.java
+++ /dev/null
@@ -1,152 +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-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * jhyde, Oct 5, 2002
- *
- * Contributors:
- * SmartCity Jena - refactor, clean API
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api.access;
-
-import org.eclipse.daanse.olap.api.element.Cube;
-import org.eclipse.daanse.olap.api.element.DatabaseColumn;
-import org.eclipse.daanse.olap.api.element.DatabaseSchema;
-import org.eclipse.daanse.olap.api.element.DatabaseTable;
-import org.eclipse.daanse.olap.api.element.Dimension;
-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.api.element.NamedSet;
-import org.eclipse.daanse.olap.api.element.OlapElement;
-import org.eclipse.daanse.olap.api.element.Catalog;
-
-/**
- * A At present, the only way to create a role is programmatically. You then
- * add appropriate permissions, and associate the role with a connection.
- * Queries executed for the duration of the connection will be using the role
- * for security control.
- *
- * Mondrian does not have any notion of a 'user'. It is the client
- * application's responsibility to create a role appropriate for the user who
- * is establishing the connection.
- *
- * @author jhyde
- * @since Oct 5, 2002
- */
-public interface Role {
-
- /**
- * Returns the access this role has to a given schema.
- *
- * @pre schema != null
- * @post return == Access.ALL
- * || return == Access.NONE
- * || return == Access.ALL_DIMENSIONS
- */
- AccessCatalog getAccess(Catalog schema);
-
- /**
- * Returns the access this role has to a given cube.
- *
- * @pre cube != null
- * @post return == Access.ALL || return == Access.NONE
- */
- AccessCube getAccess(Cube cube);
-
-
- /**
- * Returns the access this role has to a given dimension.
- *
- * @pre dimension != null
- * @post Access.instance().isValid(return)
- */
- AccessDimension getAccess(Dimension dimension);
-
- /**
- * Returns the access this role has to a given hierarchy.
- *
- * @pre hierarchy != null
- * @post return == Access.NONE
- * || return == Access.ALL
- * || return == Access.CUSTOM
- */
- AccessHierarchy getAccess(Hierarchy hierarchy);
-
- /**
- * Returns the details of this hierarchy's access, or null if the hierarchy
- * has not been given explicit access.
- *
- * @pre hierarchy != null
- */
- HierarchyAccess getAccessDetails(Hierarchy hierarchy);
-
- /**
- * Returns the access this role has to a given level.
- *
- * @pre level != null
- * @post Access.instance().isValid(return)
- */
- AccessMember getAccess(Level level);
-
- /**
- * Returns the access this role has to a given member.
- *
- * @pre member != null
- * @pre isMutable()
- * @post return == Access.NONE
- * || return == Access.ALL
- * || return == Access.CUSTOM
- */
- AccessMember getAccess(Member member);
-
- /**
- * Returns the access this role has to a given named set.
- *
- * @pre set != null
- * @pre isMutable()
- * @post return == Access.NONE || return == Access.ALL
- */
- AccessMember getAccess(NamedSet set);
-
- /**
- * Returns whether this role is allowed to see a given element.
- * @pre olapElement != null
- */
- boolean canAccess(OlapElement olapElement);
-
- boolean canAccess(DatabaseSchema databaseSchema, Catalog catalog);
-
- AccessDatabaseSchema getAccess(DatabaseSchema databaseSchema, Catalog catalog);
-
- AccessDatabaseTable getAccess(DatabaseTable databaseTable, AccessDatabaseSchema accessDatabaseSchemaParent);
-
- AccessDatabaseColumn getAccess(DatabaseColumn column, AccessDatabaseTable accessDatabaseTable);
-}
-
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/RollupPolicy.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/RollupPolicy.java
deleted file mode 100644
index d024e9a3c6..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/RollupPolicy.java
+++ /dev/null
@@ -1,55 +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-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * jhyde, Oct 5, 2002
- *
- * Contributors:
- * SmartCity Jena - refactor, clean API
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api.access;
-
-/**
- * Enumeration of the policies by which a cell is calculated if children of a
- * member are not accessible.
- */
-public enum RollupPolicy {
- /**
- * The value of the cell is null if any of the children are inaccessible.
- */
- HIDDEN,
-
- /**
- * The value of the cell is obtained by rolling up the values of accessible
- * children.
- */
- PARTIAL,
-
- /**
- * The value of the cell is obtained by rolling up the values of all children.
- */
- FULL,
-}
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/package-info.java
deleted file mode 100644
index a0c3abfe38..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/access/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* Copyright (c) 2022 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
-*/
-
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.access;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/aggregator/Aggregator.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/aggregator/Aggregator.java
deleted file mode 100644
index 83ce920ebc..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/aggregator/Aggregator.java
+++ /dev/null
@@ -1,109 +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) 2003-2005 Julian Hyde
- * Copyright (C) 2005-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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api.aggregator;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.DataTypeJdbc;
-import org.eclipse.daanse.olap.api.Evaluator;
-import org.eclipse.daanse.olap.api.calc.Calc;
-import org.eclipse.daanse.olap.api.calc.todo.TupleList;
-import org.eclipse.daanse.olap.api.function.FunctionDefinition;
-
-
-/**
- * Describes an aggregation operator, such as "sum" or "count".
- *
- * @see FunctionDefinition
- * @see Evaluator
- *
- * @author jhyde$
- * @since Jul 9, 2003$
- */
-public interface Aggregator {
-
- /**
- * Returns the name of the Aggregator.
- * @return name of the Aggregator
- */
- String getName();
-
- /**
- * Returns the aggregator used to combine sub-totals into a grand-total.
- *
- * @return aggregator used to combine sub-totals into a grand-total
- */
- Aggregator getRollup();
-
- /**
- * Applies this aggregator to an expression over a set of members and
- * returns the result.
- *
- * @param evaluator Evaluation context
- * @param members List of members, not null
- * @param calc Expression to evaluate
- *
- * @return result of applying this aggregator to a set of members/tuples
- */
- Object aggregate(Evaluator evaluator, TupleList members, Calc calc);
-
- /**
- * Tells Mondrian if this aggregator can perform fast aggregation
- * using only the raw data of a given object type. This will
- * determine if Mondrian will attempt to perform in-memory rollups
- * on raw segment data by invoking {@link #aggregate}.
- *
- * This is only invoked for rollup operations.
- *
- * @param datatype The datatype of the object we would like to rollup.
- * @return Whether this aggregator supports fast aggregation
- */
- boolean supportsFastAggregates(DataTypeJdbc datatype);
-
- /**
- * Applies this aggregator over a raw list of objects for a rollup
- * operation. This is useful when the values are already resolved
- * and we are dealing with a raw {@link SegmentBody} object.
- *
- * Only gets called if
- * {@link #supportsFastAggregates(DataTypeJdbc)} is true.
- *
- * This is only invoked for rollup operations.
- *
- * @param rawData An array of values in its raw form, to be aggregated.
- * @return A rolled up value of the raw data.
- * if the object type is not supported.
- */
- Object aggregate(List If it does not depend on the hierarchy, then re-evaluating the
- * expression with a different member of this context must produce the
- * same answer. One application of this method is for the compiler to figure out
- * whether the compiled expression is returning a mutable list. If a mutable
- * list is required, the compiler can create a mutable copy.
- *
- * @see ExpressionCompiler#compileList(org.eclipse.daanse.olap.api.query.component.Expression, boolean)
- */
- ResultStyle getResultStyle();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/ConstantCalc.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/ConstantCalc.java
deleted file mode 100644
index 0324977ca7..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/ConstantCalc.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-* 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
-*/
-package org.eclipse.daanse.olap.api.calc;
-
-/**
- * Marker Interface for {@link Calc} that returns the same value on each call of
- * {@link #evaluate(mondrian.olap.Evaluator)} method.
- */
-public interface ConstantCalc If The Always equivalent to Such an expression is generally a list of {@link Member} objects or a
- * list of tuples (each represented by a {@link Member} array).
- *
- * See {@link #compileList(org.eclipse.daanse.olap.api.query.component.Expression)}.
- *
- * @param exp Expression
- * @param mutable Whether resulting list is mutable
- */
- TupleListCalc compileList(Expression exp, boolean mutable);
-
- /**
- * Compiles an expression which yields an immutable {@link Iterable} result.
- *
- * @param exp Expression
- * @return Calculator which yields an Iterable
- */
- TupleIteratorCalc compileIter(Expression exp);
-
- /**
- * Compiles an expression which yields a If the expression yields a member or tuple, the calculator will
- * automatically apply that member or tuple to the current dimensional
- * context and return the value of the current measure.
- *
- * @param exp Expression
- * @param specific Whether to try to use the specific compile method for
- * scalar types. For example, if NOTE: This method will be removed when we store parameter values
- * in the {@link org.eclipse.daanse.olap.api.result.Result} rather than in the
- * {@link mondrian.olap.QueryImpl}.
- *
- * @param value New value
- * @param assigned Whether {@link #isParameterSet()} should return true;
- * supply value {@code false} if this is an internal assignment, to
- * remember the default value
- */
- void setParameterValue(Object value, boolean assigned);
-
- /**
- * Returns the value of this parameter.
- *
- * NOTE: This method will be removed when we store parameter values
- * in the {@link org.eclipse.daanse.olap.api.result.Result} rather than in the
- * {@link mondrian.olap.QueryImpl}.
- */
- Object getParameterValue();
-
- /**
- * Returns whether the parameter has been assigned a value. (That value
- * may be null.)
- *
- * @return Whether parmaeter has been assigned a value.
- */
- boolean isParameterSet();
-
- void setCachedDefaultValue(Object value);
-
- Object getCachedDefaultValue();
-
- /**
- * Unsets the parameter value.
- */
- void unsetParameterValue();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/compiler/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/compiler/package-info.java
deleted file mode 100644
index 77a22211a1..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/compiler/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* 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
-*/
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.calc.compiler;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/package-info.java
deleted file mode 100644
index d9e3997c06..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* 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
-*/
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.calc;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/profile/CalcEvaluationProfile.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/profile/CalcEvaluationProfile.java
deleted file mode 100644
index 508d87092e..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/profile/CalcEvaluationProfile.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* 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
-*/
-package org.eclipse.daanse.olap.api.calc.profile;
-
-import java.time.Instant;
-import java.util.Map;
-
-public interface CalcEvaluationProfile {
-
- Instant start();
-
- Instant end();
-
- Object evaluationResult();
-
- Map Stops short of the full {@link java.util.Iterator} interface. If you want
- * that, see {@link TupleIterator}.
- *
- * @author Julian Hyde
- */
-public interface TupleCursor {
- void setContext(Evaluator evaluator);
-
- /**
- * Moves the iterator forward one position.
- *
- * Returns false only when end of data has been reached.
- *
- * Similar to calling the {@link java.util.Iterator} methods
- * {@link java.util.Iterator#hasNext()} followed by
- * {@link java.util.Iterator#next()} but
- * does not construct an object, and is therefore cheaper.
- *
- * If you want to use an Iterator, see {@link TupleIterator}.
- *
- * @return Whether was able to move forward a position
- */
- boolean forward();
-
- /**
- * Returns the tuple that this cursor is positioned on.
- *
- * This method never returns null, and may safely be called multiple
- * times (or not all) for each position in the iteration.
- *
- * Invalid to call this method when the cursor is has not been
- * positioned, for example, if {@link #forward()} has not been called or
- * if the most recent call to {@code forward} returned {@code false}.
- *
- * @return Current tuple
- */
- List This method saves the overhead of a memory allocation when the
- * resulting tuple will be written immediately to an array. The effect of
- * {@code currentToArray(members, 0)} is the same as calling
- * {@code current().toArray(members)}.
- *
- * Before calling this method, you must position the iterator at a valid
- * position. Typically you would call hasNext followed by next; or forward.
- *
- * @param members Members
- * @param offset Offset in the array to write to
- */
- void currentToArray(Member[] members, int offset);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleIterable.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleIterable.java
deleted file mode 100644
index 5c516c3b75..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleIterable.java
+++ /dev/null
@@ -1,90 +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.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-
-package org.eclipse.daanse.olap.api.calc.todo;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.element.Member;
-
-/**
- * Extension to {@link Iterable} that returns a {@link TupleIterator}.
- *
- * If efficiency is important, call {@link #tupleCursor()} rather than
- * {@link #tupleIterator()} if possible. Because {@link TupleCursor} is a
- * simpler API to implement than {@link TupleIterator}, in some cases the
- * implementation may be more efficient.
- *
- * @author jhyde
- */
-public interface TupleIterable extends Iterable Always has the same effect as calling {@link #iterator()}.
- *
- * @see #tupleCursor()
- *
- * @return cursor over the tuples returned by this iterable
- */
- TupleIterator tupleIterator();
-
- /**
- * Creates a cursor over the contents of this iterable.
- *
- * The contents of the cursor will always be the same as those returned
- * by {@link #tupleIterator()}. Because {@link TupleCursor} is a simpler API
- * to implement than {@link TupleIterator}, in some cases the implementation
- * may be more efficient.
- *
- * @return cursor over the tuples returned by this iterable
- */
- TupleCursor tupleCursor();
-
- /**
- * Returns the number of members in each tuple.
- *
- * @return The number of members in each tuple
- */
- int getArity();
-
- /**
- * Returns an iterable over the members at a given column.
- *
- * The iteratble returns an interator that is modifiable if and only if
- * this TupleIterable is modifiable.
- *
- * If this {@code TupleIterable} happens to be a {@link TupleList},
- * the method is overridden to return a {@link List}<{@link Member}>.
- *
- * @param column Ordinal of the member in each tuple to project
- * @return Iterable that returns an iterator over members
- * @throws IllegalArgumentException if column is not less than arity
- */
- Iterable Extends {@link TupleCursor} to support the standard Java iterator
- * API. For some implementations, using the iterator API (in particular the
- * {@link #next} and {@link #hasNext} methods) may be more expensive than using
- * cursor's {@link #forward} method.
- *
- * @author jhyde
- */
-public interface TupleIterator extends Iterator Note that {@code list.get(row, column)}
- * is equivalent to {@code list.slice(column).get(row)}
- * and {@code list.get(row).get(column)}
- * but is more efficient for most implementations of TupleList.
- *
- * @param slice Column ordinal
- * @param index Row ordinal
- * @return Member at given row and column
- */
- Member get(int slice, int index);
-
- /**
- * Returns a list of the members at a given column.
- *
- * The list is modifiable if and only if this TupleList is modifiable.
- * Adding an element to a slice will create a tuple whose members in other
- * columns are null.
- * Removing an element from a slicer will remove a tuple.
- *
- * @param column Ordinal of the member in each tuple to project
- * @return List of members
- * @throws IllegalArgumentException if column is not less than arity
- */
- @Override
- List If capacity is negative, populates the list. A deep copy is made,
- * so that it the contents of the list are not affected to changes to any
- * backing collections.
- *
- * @param capacity Capacity
- * @return Copy of list, empty if capacity is non-negative
- */
- TupleList copyList(int capacity);
-
- void addTuple(Member... members);
-
- TupleList project(int[] destIndices);
-
- void addCurrent(TupleCursor tupleIter);
-
- // override, refining return type
- @Override
- TupleList subList(int fromIndex, int toIndex);
-
- TupleList withPositionCallback(PositionCallback positionCallback);
-
- /**
- * Fixes the tuples of this list, so that their contents will not change
- * even if elements of the list are reordered or removed. Returns this
- * list if possible.
- *
- * @return List whose tuples are invariant if the list is sorted or filtered
- */
- TupleList fix();
-
- interface PositionCallback {
- void onPosition(int index);
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleListCalc.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleListCalc.java
deleted file mode 100644
index 684b7cfa6e..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/calc/todo/TupleListCalc.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*
-*/
-
-package org.eclipse.daanse.olap.api.calc.todo;
-
-import org.eclipse.daanse.olap.api.calc.Calc;
-
-public interface TupleListCalc extends TupleIteratorCalc
- * TODO: Make this method return RolapCubeHierarchy, when the measures hierarchy
- * is a RolapCubeHierarchy.
- *
- * @return List of hierarchies
- */
- List
- * If a hierarchy is subject to access-control, some of the levels may not be
- * visible; use {@link CatalogReader#getHierarchyLevels} instead.
- *
- * @post return != null
- */
- List getLevels();
-
- /**
- * Returns the default member of this hierarchy.
- *
- *
- * If a hierarchy is subject to access-control, the default member may not be
- * visible, so use {@link CatalogReader#getHierarchyDefaultMember}.
- *
- * @post return != null
- */
- Member getDefaultMember();
-
- /**
- * Returns the "All" member of this hierarchy.
- *
- * @post return != null
- */
- Member getAllMember();
-
- /**
- * Returns a special member representing the "null" value. This never occurs on
- * an axis, but may occur if functions such as
- * Temporarily defined against RolapHierarchy; will be moved to
- * RolapCubeHierarchy as soon as the measures hierarchy is a RolapCubeHierarchy.
- *
- * @return Ordinal of this hierarchy in its cube
- */
- int getOrdinalInCube();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KPI.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KPI.java
deleted file mode 100644
index 886721ab45..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KPI.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-package org.eclipse.daanse.olap.api.element;
-
-public interface KPI {
- String getName();
-
- String getDisplayFolder();
-
- String getCurrentTimeMember();
-
- String getTrend();
-
- String getWeight();
-
- String getTrendGraphic();
-
- String getStatusGraphic();
-
- KPI getParentKpi();
-
- String getValue();
-
- String getGoal();
-
- String getStatus();
-
- String getDescription();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KeyMember.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KeyMember.java
deleted file mode 100644
index 11a30bcdd9..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/KeyMember.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2025 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
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface KeyMember extends Member{
- Object getKey();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Level.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Level.java
deleted file mode 100644
index febaf3c8ea..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Level.java
+++ /dev/null
@@ -1,104 +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) 1999-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * Contributors:
- * SmartCity Jena - refactor, clean API
- *
- * ---- 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.api.element;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.CatalogReader;
-import org.eclipse.daanse.olap.api.SqlExpression;
-import org.eclipse.daanse.olap.api.formatter.MemberFormatter;
-
-/**
- * A
- * Note #1: In an access-controlled context, the first visible level of a
- * hierarchy (as returned by {@link CatalogReader#getHierarchyLevels}) may not
- * have a depth of 0.
- *
- * Note #2: In a parent-child hierarchy, the depth of a member (as returned by
- * {@link CatalogReader#getMemberDepth}) may not be the same as the depth of its
- * level.
- */
- int getDepth();
-
- @Override
- Hierarchy getHierarchy();
-
- Level getChildLevel();
-
- Level getParentLevel();
-
- boolean isAll();
-
- boolean areMembersUnique();
-
- LevelType getLevelType();
-
- /** Returns properties defined against this level. */
- Property[] getProperties();
-
- /** Returns properties defined against this level and parent levels. */
- Property[] getInheritedProperties();
-
- /**
- * Returns the object that is used to format members of this level.
- */
- MemberFormatter getMemberFormatter();
-
- /**
- * Returns the approximate number of members in this level, or
- * {@link Integer#MIN_VALUE} if no approximation is known.
- */
- int getApproxRowCount();
-
- int getCardinality();
-
- List Every member belongs to a {@link Level} of a {@link Hierarchy}. Members
- * except the root member have a parent, and members not at the leaf level have one or more children.
- *
- * Measures are a special kind of member. They belong to their own
- * dimension, There are also special members representing the 'All' value of a
- * hierarchy, the null value, and the error value.
- *
- * Members can have member properties. Their {@link Level#getProperties}
- * defines which are allowed.
- *
- * @author jhyde, 2 March, 1999
- */
-public interface Member extends OlapElement, Comparable, MetaElement {
-
- /**
- * Returns this member's parent, or null (not the 'null member', as returned by {@link Hierarchy#getNullMember})
- * if it
- * has no parent.
- *
- * In an access-control context, a member may have no visible
- * parents, so use {@link CatalogReader#getMemberParent}.
- */
- Member getParentMember();
-
- Level getLevel();
-
- @Override
-Hierarchy getHierarchy();
-
- /**
- * Returns name of parent member, or empty string (not null) if we are the root.
- */
- String getParentUniqueName();
-
- /**
- * Returns the type of member.
- */
- MemberType getMemberType();
-
- /**
- * @return True when the member is a leaf member, meaning it has no children
- */
- boolean isParentChildLeaf();
-
- /**
- * @return True when the member is part of a Parent-Child hierarchy and it is a physical member. In a Parent Child
- * Hierarchy without a closure table, each member needs to be treated as calculated. We need a way to distinguish
- * between true calculated members and physical members that exist in the source data
- */
- boolean isParentChildPhysicalMember();
-
- enum MemberType {
- UNKNOWN,
- REGULAR, // adMemberRegular
- ALL,
- MEASURE,
- FORMULA,
- /**
- * This member is its hierarchy's NULL member (such as is returned by
- * Normally {@link #isCalculated} and {@link #isEvaluated} should return
- * the same value, but in situations where mondrian would like to treat the two concepts separately such in role based
- * security, these values may differ.
- *
- * @return true if evaluated
- */
- boolean isEvaluated();
-
- int getSolveOrder();
-
- Expression getExpression();
-
- /**
- * Returns a list of the ancestor members of this member.
- *
- * @deprecated Use {@link CatalogReader#getMemberAncestors(Member, java.util.List)}.
- */
- @Deprecated
-List Returns this member if this member is a leaf member, or if the
- * nonleaf member does not have an associated data member.
- * A set can be defined in a query, using a
- * This is necessary when there are several 'AS' expressions, or an 'AS'
- * expression overrides a named set defined using 'WITH MEMBER' clause or
- * against a cube.
- */
- String getNameUniqueWithinQuery();
-
- /**
- * Returns whether this named set is dynamic.
- *
- *
- * Evaluation rules:
- *
- * Example 1:
- * Example 2:
- * Example 3:
- * Visibility is a hint for client applications. An element's visibility does
- * not affect how it is treated when MDX queries are evaluated.
- *
- * @return Whether this element is visible
- */
- boolean isVisible();
-
- enum LocalizedProperty {
- CAPTION, DESCRIPTION
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/ParentChildMember.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/ParentChildMember.java
deleted file mode 100644
index 945f3732a5..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/ParentChildMember.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2025 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
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface ParentChildMember extends KeyMember{
-
- Member createPseudoLeafMember(Member child, String name);
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PhysicalCube.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PhysicalCube.java
deleted file mode 100644
index 2fb579a039..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PhysicalCube.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface PhysicalCube extends Cube {
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Property.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Property.java
deleted file mode 100644
index 6d1ca32431..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Property.java
+++ /dev/null
@@ -1,84 +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) 2001-2005 Julian Hyde
- * Copyright (C) 2005-2018 Hitachi Vantara and others
- * All Rights Reserved.
- *
- * jhyde, 12 September, 2002
- * ---- All changes after Fork in 2023 ------------------------
- *
- * Project: Eclipse daanse
- *
- * Copyright (c) 2025 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
- * Stefan Bischof (bipolis.org) - initial
- */
-package org.eclipse.daanse.olap.api.element;
-
-import org.eclipse.daanse.olap.api.formatter.MemberPropertyFormatter;
-
-public interface Property {
-
- /**
- * Returns the datatype of the property.
- */
- Datatype getType();
-
- MemberPropertyFormatter getFormatter();
-
- /**
- * Returns the caption of this property.
- */
- String getCaption();
-
- /**
- * Returns whether this property is for system use only.
- */
- boolean isInternal();
-
- /**
- * Returns whether this property is a standard member property.
- */
- boolean isMemberProperty();
-
- /**
- * Returns whether this property is a standard cell property.
- */
- boolean isCellProperty();
-
- String getName();
-
- String getDescription();
-
- public enum Datatype {
- TYPE_STRING(null), TYPE_NUMERIC(null), TYPE_INTEGER("INT"), TYPE_LONG("LONG"),
- TYPE_BOOLEAN(null), TYPE_DATE(null), TYPE_TIME(null), TYPE_TIMESTAMP(null), TYPE_OTHER(null);
-
- private String type;
-
- Datatype(String type) {
- this.type = type;
- }
-
- public String getInternalType() {
- return type;
- }
-
- public boolean isNumeric() {
- return this == TYPE_NUMERIC || this == TYPE_INTEGER || this == TYPE_LONG;
- }
- }
-
-}
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PseudoLeafMember.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PseudoLeafMember.java
deleted file mode 100644
index 989db96b8e..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/PseudoLeafMember.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface PseudoLeafMember {
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/StoredMeasure.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/StoredMeasure.java
deleted file mode 100644
index b4180c0c63..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/StoredMeasure.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface StoredMeasure extends Measure {
-
- String getAggregateFunction();
-
- /**
- * Returns the cube this measure belongs to.
- */
- Cube getCube();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCube.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCube.java
deleted file mode 100644
index d175105f01..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCube.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2025 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, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface VirtualCube extends Cube {
-
- boolean shouldIgnoreUnrelatedDimensions(String name);
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCubeMeasure.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCubeMeasure.java
deleted file mode 100644
index 26b71da8e2..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/VirtualCubeMeasure.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2025 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
- */
-package org.eclipse.daanse.olap.api.element;
-
-public interface VirtualCubeMeasure extends StoredMeasure {
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/package-info.java
deleted file mode 100644
index a4e47ec6ba..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* Copyright (c) 2022 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
-*/
-
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.element;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/CellRequestQuantumExceededException.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/CellRequestQuantumExceededException.java
deleted file mode 100644
index a34b6f2c8a..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/CellRequestQuantumExceededException.java
+++ /dev/null
@@ -1,56 +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.
- *
- * ---- 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.api.exception;
-
-/**
- * Signals that there are enough outstanding cell requests that it is
- * worth terminating this phase of execution and asking the segment cache
- * for all of the cells that have been asked for.
- *
- * Not really an exception, just a way of aborting a process so that we can
- * do some work and restart the process. Any code that handles this exception
- * is typically in a loop that calls {@link mondrian.rolap.RolapResult#phase}.
- * There are several advantages to this:
- * The method adds an item to
- * For example, the
- * Some caches (e.g. memcached) never generate this kind of event.
- *
- * In JBoss Infinispan, one scenario that causes this kind of event is as
- * follows. A user issues an MDX query against a different Mondrian node in the
- * same Infinispan cluster. To resolve missing cells, that node issues a SQL
- * statement to load a segment. Infinispan propagates that segment to its peers,
- * and each peer is notified that an "external segment" is now in the cache.
- *
- * If ordinal is greater than 4, returns a non-standard axis called "AXIS(n)".
- * Never returns null.
- *
- * @param ordinal Ordinal
- * @return Axis
- */
- public static AxisOrdinal forLogicalOrdinal(final int ordinal) {
- if (ordinal + 2 > SECTIONS.ordinal()) {
- return new AxisOrdinalR(ordinal, false);
- } else {
- return values()[ordinal + 2];
- }
- }
-
- @Override
- public int logicalOrdinal() {
- return ordinal() - 2;
- }
-
- @Override
- public boolean isFilter() {
- return this == SLICER;
- }
- }
-
- record AxisOrdinalR(int logicalOrdinal, boolean isFilter) implements AxisOrdinal {
- @Override
- public String name() {
- return new StringBuilder("AXIS(").append(logicalOrdinal).append(")").toString();
- }
-
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CalculatedFormula.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CalculatedFormula.java
deleted file mode 100644
index abda1c1107..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CalculatedFormula.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-public non-sealed interface CalculatedFormula extends QueryComponent {
-
- String getCubeName();
-
- Formula getFormula();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CellProperty.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CellProperty.java
deleted file mode 100644
index 101415a451..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/CellProperty.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-public non-sealed interface CellProperty extends QueryComponent {
-
- boolean isNameEquals(String propertyName);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DimensionExpression.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DimensionExpression.java
deleted file mode 100644
index c265b3855e..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DimensionExpression.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-import org.eclipse.daanse.olap.api.element.Dimension;
-
-public non-sealed interface DimensionExpression extends QueryComponent {
-
- Dimension getDimension();
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DmvQuery.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DmvQuery.java
deleted file mode 100644
index 48589e757a..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/DmvQuery.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-import java.util.List;
-
-public non-sealed interface DmvQuery extends QueryComponent {
-
- String getTableName();
-
- Expression getWhereExpression();
-
- List The parser creates function calls as an
- * {@link mondrian.mdx.UnresolvedFunCallImpl unresolved function call}.
- * The validator converts it to a
- * {@link mondrian.mdx.ResolvedFunCallImpl resolved function call},
- * which has a {@link FunctionDefinition function definition} and extra type information.
- *
- * @author jhyde
- * @since Jan 6, 2006
- */
-public interface FunctionCall extends Expression {
- /**
- * Returns the CatalogReader queries schema objects ({@link Catalog},
- * {@link Cube}, {@link Dimension}, {@link Hierarchy}, {@link Level},
- * {@link Member}).
- *
- * CatalogReader
- * is implementing.
- */
- Role getRole();
-
- /**
- * Returns the accessible dimensions of a cube.
- *
- * @pre dimension != null
- * @post return != null
- */
- Listhierarchy.
- *
- * @param hierarchy Hierarchy
- * @see #getCalculatedMembers(Hierarchy)
- */
- Listmember.
- * @pre member != null
- * @post return != null
- */
- Listmember, optimized
- * for NON EMPTY.
- * context == null then
- * there is no context and all members are returned - then
- * its identical to {@link #getMemberChildren(Member)}.
- * If context is not null, the resulting members
- * may be restricted to those members that have a
- * non empty row in the fact table for context.
- * Wether or not optimization is possible depends
- * on the CatalogReader implementation.
- */
- Listmembers.
- *
- * @param members Array of members
- * @return array of child members
- *
- * @pre members != null
- * @post return != null
- */
- Listmembers
- * which is not empty in context.
- *
- * @param members Array of members
- * @param context Evaluation context
- * @return array of child members
- *
- * @pre members != null
- * @post return != null
- */
- Listmember.
- *
- * @param member Member
- * @pre member != null
- * @return null if member is a root member
- */
- Member getMemberParent(Member member);
-
- /**
- * Returns a list of ancestors of member, in depth order.
- *
- * member.{@link Member#getLevel getLevel}().
- * {@link Level#getDepth getDepth}()
- * for three reasons:
- *
- */
- int getMemberDepth(Member member);
-
- /**
- * Finds a member based upon its unique name.
- *
- * @param uniqueNameParts Unique name of member
- * @param failIfNotFound Whether to throw an error, as opposed to returning
- * null, if there is no such member.
- * @param matchType indicates the match mode; if not specified, EXACT
- * @return The member, or null if not found
- */
- Member getMemberByUniqueName(
- Listnull, if there is no such member.
- * @return The member, or null if not found
- */
- Member getMemberByUniqueName(
- Listlist all members between startMember
- * and endMember (inclusive) which belong to
- * level.
- */
- void getMemberRange(
- Level level, Member startMember, Member endMember, Listn further along in the same level from
- * member.
- *
- * @pre member != null
- */
- Member getLeadMember(Member member, int n);
-
- /**
- * Compares a pair of {@link Member}s according to their order in a prefix
- * traversal. (that is, it
- * is an ancestor or a earlier), is a sibling, or comes later in a prefix
- * traversal.
- * @return A negative integer if m1 is an ancestor, an earlier
- * sibling of an ancestor, or a descendent of an earlier sibling, of
- * m2;
- * zero if m1 is a sibling of m2;
- * a positive integer if m1 comes later in the prefix
- * traversal then m2.
- */
- int compareMembersHierarchically(Member m1, Member m2);
-
- /**
- * Looks up the child of parent called name, or
- * an approximation according to matchType, returning
- * null if no element is found.
- *
- * @param parent Parent element to search in
- * @param name Compound in compound name, such as "[Product]" or "&[1]"
- * @param matchType Match type
- *
- * @return Element with given name, or null
- */
- OlapElement getElementChild(
- OlapElement parent,
- Segment name,
- MatchType matchType);
-
- /**
- * Looks up the child of parent name, returning
- * null if no element is found.
- *
- * getElementChild(parent, name, MatchType.EXACT).
- *
- * @param parent Parent element to search in
- * @param name Compound in compound name, such as "[Product]" or "&[1]"
- *
- * @return Element with given name, or null
- */
- OlapElement getElementChild(
- OlapElement parent,
- Segment name);
-
- /**
- * Returns the members of a level, optionally including calculated members.
- */
- ListConnection. You may not use this
- * Connection after closing it.
- */
- void close();
-
- /**
- * Executes a query.
- *
- * @throws RuntimeException if another thread cancels the query's statement.
- *
- * @deprecated This method is deprecated and will be removed in
- * mondrian-4.0. It operates by internally creating a statement. Better
- * to use olap4j and explicitly create a statement.
- */
- @Deprecated
- Result execute(Query query);
-
- Statement createStatement();
-
- /**
- * Returns the locale this connection belongs to. Determines, for example,
- * the currency string used in formatting cell values.
- *
- * @see mondrian.util.Format
- */
- Locale getLocale();
-
- /**
- * Parses an expresion.
- */
- Expression parseExpression(String s);
-
- /**
- * Parses a query.
- */
- Query parseQuery(String s);
-
- /**
- * Parses a statement.
- *
- * @param mdx MDX string
- * @return A {@link Query} if it is a SELECT statement, a
- * {@link DrillThrough} if it is a DRILLTHROUGH statement
- */
- QueryComponent parseStatement(String mdx);
-
- /**
- * Sets the privileges for the this connection.
- *
- * @pre role != null
- * @pre role.isMutable()
- */
- void setRole(Role role);
-
- /**
- * Returns the access-control profile for this connection.
- * @post role != null
- * @post role.isMutable()
- */
- Role getRole();
-
- /**
- * Returns a schema reader with access control appropriate to the current
- * role.
- */
- CatalogReader getCatalogReader();
-
-
- /**
- * Returns an object with which to explicitly control the contents of the
- * cache.
- *
- * @param pw Writer to which to write logging information; may be null
- */
- CacheControl getCacheControl(PrintWriter pw);
-
- /**
- * Returns the data source this connection uses to create connections
- * to the underlying JDBC database.
- *
- * @return Data source
- */
- DataSource getDataSource();
-
- Context getContext();
-
- Scenario getScenario();
-
- Scenario createScenario();
-
- void setScenario(Scenario scenario);
- /**
- * Returns the identifier of this connection. Unique within the lifetime of
- * this JVM.
- *
- * @return Identifier of this connection
- */
- long getId();
-
- Statement getInternalStatement();
-
- /**
- * Executes a statement.
- *
- * @param execution Execution context (includes statement, query)
- */
- Result execute(Execution execution);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ConnectionProps.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/ConnectionProps.java
deleted file mode 100644
index 2bb99d3de2..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/ConnectionProps.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2024 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
- */
-package org.eclipse.daanse.olap.api;
-
-import java.lang.ref.SoftReference;
-import java.time.Duration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-
-public interface ConnectionProps {
-
-
-
- /**
- * The "Role" property is the name of the {@link mondrian.olap.Role role} to
- * adopt. If not specified, the connection uses a role which has access to every
- * object in the schema.
- */
- ListEvaluator holds the context necessary to evaluate an
- * expression.
- *
- * @author jhyde
- * @since 27 July, 2001
- */
-public interface Evaluator{
-
- /**
- * Returns the current cube.
- */
- Cube getCube();
-
- /**
- * Returns the current query.
- */
- Query getQuery();
-
- /**
- * Returns the start time of the current query.
- */
- Date getQueryStartTime();
-
- /**
- * Creates a savepoint encapsulating the current state of the evalutor.
- * You can restore the evaluator to this state by calling
- * {@link #restore(int)} with the value returned by this method.
- *
- * member the current member of its hierarchy.
- *
- * @param member New member
- *
- * @return Previous member of this hierarchy
- */
- Member setContext(Member member);
-
- /**
- * Makes member the current member of its hierarchy.
- *
- *
- *
- *
- * @param member New member
- * @param safe Whether to store the member of this hierarchy that was
- * current last time that {@link #savepoint()} was called.
- */
- void setContext(Member member, boolean safe);
-
- /**
- * Sets the context to a list of members.
- *
- * int n = 0;
- * for (Member member : members) {
- * evaluator.setContext(member, n++ > 0);
- * }
- *
- * @param memberList List of members
- */
- void setContext(Listfor (Member member : memberList) {
- * setContext(member);
- * }
- *
- * @param memberList List of members
- * @param safe Whether to store the member of each hierarchy that was
- * current last time that {@link #savepoint()} was called.
- */
- void setContext(Listfor (Member member : memberList) {
- * setContext(member, safe);
- * }
- *
- * @param members Array of members
- */
- void setContext(Member[] members);
-
- /**
- * Sets the context to an array of members, optionally skipping the check
- * whether it is necessary to store the previous member of each hierarchy.
- *
- * for (Member member : memberList) {
- * setContext(member);
- * }
- *
- * @param members Array of members
- * @param safe Whether to store the member of each hierarchy that was
- * current last time that {@link #savepoint()} was called.
- */
- void setContext(Member[] members, boolean safe);
-
- Member getContext(Hierarchy hierarchy);
-
- /**
- * Calculates and returns the value of the cell at the current context.
- */
- Object evaluateCurrent();
-
- /**
- * Returns the format string for this cell. This is computed by evaluating
- * the format expression in the current context, and therefore different
- * cells may have different format strings.
- */
- public String getFormatString();
-
- /**
- * Formats a value as a string according to the current context's
- * format.
- */
- String format(Object o);
-
- /**
- * Formats a value as a string according to the current context's
- * format, using a given format string.
- */
- String format(Object o, String formatString);
-
- /**
- * Returns the connection's locale.
- */
- Locale getConnectionLocale();
-
- /**
- * Retrieves the value of property for (Member member : memberList) {
- * setContext(member, safe);
- * }name. If more than one
- * member in the current context defines that property, the one with the
- * highest solve order has precedence.
- *
- * Exp. The
- * key for the cache consists of all members of the current
- * context that exp depends on. Members of
- * independent hierarchies are not part of the key.
- *
- * @see mondrian.calc.Calc#dependsOn(Hierarchy)
- */
- Object getCachedResult(ExpCacheDescriptor key);
-
- /**
- * Returns true for an axis that is NON EMPTY.
- *
- *
- */
- boolean isNonEmpty();
-
- /**
- * Sets whether an expression evaluation should filter out empty cells.
- * Allows expressions to modify non empty flag to evaluate their children.
- */
- void setNonEmpty(boolean nonEmpty);
-
- /**
- * Creates an exception which indicates that an error has occurred during
- * the runtime evaluation of a function. The caller should then throw that
- * exception.
- */
- RuntimeException newEvalException(Object context, String s);
-
- /**
- * Returns an evaluator for a set.
- *
- * @param exp Expression
- * @param create Whether to create evaluator if not found
- * @return Evaluator of named set
- */
- SetEvaluator getSetEvaluator(Expression exp, boolean create);
-
- /**
- * Returns an evaluator for a named set.
- *
- * @param namedSet Named set
- * @param create Whether to create evaluator if not found
- * @return Evaluator of named set
- */
- NamedSetEvaluator getNamedSetEvaluator(NamedSet namedSet, boolean create);
-
- /**
- * Returns an array of the members which make up the current context.
- */
- Member[] getMembers();
-
- /**
- * Returns an array of the non-All members which make up the current
- * context.
- *
- * nonempty(crossjoin(a, b)) ==
- * nonempty(crossjoin(nonempty(a), nonempty(b));
- *
- */
- Member[] getNonAllMembers();
-
- /**
- * Returns the number of times that this evaluator has told a lie when
- * retrieving cell values.
- */
- int getMissCount();
-
- /**
- * Returns the value of a parameter, evaluating its default value if it is
- * not set.
- */
- Object getParameterValue(ParameterSlot slot);
-
- /**
- * @return the iteration length of the current context
- */
- int getIterationLength();
-
- /**
- * Sets the iteration length for the current evaluator context
- *
- * @param length length to be set
- */
- void setIterationLength(int length);
-
- /**
- * @return true if evaluating axes
- */
- boolean isEvalAxes();
-
- /**
- * Indicate whether the evaluator is evaluating the axes
- *
- * @param evalAxes true if evaluating axes
- */
- void setEvalAxes(boolean evalAxes);
-
- /**
- * Returns a new Aggregator whose aggregation context adds a given list of
- * tuples, and whose evaluation context is the same as this
- * Aggregator.
- *
- * @param list List of tuples
- * @return Aggregator with list added to its aggregation
- * context
- */
- Evaluator pushAggregation(List[Store].USA.[New Mexico].&[45] has four segments:
- *
- *
- * MatchType enumerates the allowable match modes when
- * searching for a member based on its unique name.
- *
- * @author Zelaine Fong
- */
-public enum MatchType {
- /** Match the unique name exactly, do not query database for members */
- EXACT_SCHEMA,
- /** Match the unique name exactly */
- EXACT,
- /** If no exact match, return the preceding member */
- BEFORE,
- /** If no exact match, return the next member */
- AFTER,
- /** Return the first child */
- FIRST,
- /** Return the last child */
- LAST;
-
- /**
- * Return true if either Exact or Exact Schema value
- * is selected.
- *
- * @return true if exact
- */
- public boolean isExact() {
- return this == EXACT || this == EXACT_SCHEMA;
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameIdentifierSegment.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameIdentifierSegment.java
deleted file mode 100644
index 61ceadfca9..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameIdentifierSegment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2024 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
- */
-package org.eclipse.daanse.olap.api;
-
-public non-sealed interface NameIdentifierSegment extends IdentifierSegment {
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameResolver.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameResolver.java
deleted file mode 100644
index b6b4747ac6..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/NameResolver.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2024 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
- */
-package org.eclipse.daanse.olap.api;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.element.OlapElement;
-
-public interface NameResolver {
-
- /**
- * Resolves a list of segments (a parsed identifier) to an OLAP element.
- *
- * @param parent Parent element to search in, usually a cube
- * @param segments Exploded compound name, such as {"Products",
- * "Product Department", "Produce"}
- * @param failIfNotFound If the element is not found, determines whether
- * to return null or throw an error
- * @param category Type of returned element, a {@link DataType} value;
- * {@link DataType#UNKNOWN} if it doesn't matter.
- * @param matchType Match type
- * @param namespaces Namespaces wherein to find child element at each step
- * @return OLAP element with given name, or null if not found
- */
- OlapElement resolve(OlapElement parent, ListBasicQueryTest.testCancel for an example of usage of this
- * method.SubtotalVisibility enumerates the allowed values of
- * whether subtotals are visible.
- */
-public enum SubtotalVisibility {
- Undefined,
- Hide,
- Show;
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Validator.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/Validator.java
deleted file mode 100644
index cb07b7f0e8..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/Validator.java
+++ /dev/null
@@ -1,166 +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) 2005-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara
- * All Rights Reserved.
- *
- * For more information please visit the Project: Hitachi Vantara - Mondrian
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api;
-
-import java.util.List;
-
-import org.eclipse.daanse.mdx.model.api.expression.operation.OperationAtom;
-import org.eclipse.daanse.olap.api.function.FunctionDefinition;
-import org.eclipse.daanse.olap.api.function.FunctionResolver;
-import org.eclipse.daanse.olap.api.function.FunctionService;
-import org.eclipse.daanse.olap.api.query.component.Expression;
-import org.eclipse.daanse.olap.api.query.component.Formula;
-import org.eclipse.daanse.olap.api.query.component.MemberProperty;
-import org.eclipse.daanse.olap.api.query.component.ParameterExpression;
-import org.eclipse.daanse.olap.api.query.component.Query;
-import org.eclipse.daanse.olap.api.query.component.QueryAxis;
-import org.eclipse.daanse.olap.api.type.Type;
-
-/**
- * Provides context necessary to resolve identifiers to objects, function
- * calls to specific functions.
- *
- *
- *
true if at least one of the descendants of the
- * given Member is inaccessible to this Role.
- *
- * Role is a collection of access rights to cubes, permissions,
- * and so forth.
- *
- * <Member>.CurrentMember function) are made
- * explicit in the physical language.
- *
- * Compilation
- *
- * Expressions are generally created from using an expression compiler
- * ({@link ExpressionCompiler}). There are often more than one evaluation strategy
- * for a given expression, and compilation process gives us an opportunity to
- * choose the optimal one.
- *
- *
- *
- * @author jhyde
- * @since Sep 26, 2005
- */
-public interface Calc
- *
- *
- *
- * @param hierarchy Hierarchy
- * @return Whether this expression's result depends upon the current member
- * of the hierarchy
- */
- boolean dependsOn(Hierarchy hierarchy);
-
- /**
- * Returns the type.
- */
- Type getType();
-
- /**
- * Returns style in which the result of evaluating this expression is
- * returned.
- *
- *
- * depends on all dimensions except [Measures].[Unit Sales][Measures].
- *
- *
- * depends on all hierarchies except [Measures] and [Time].
- *
- * ([Measures].[Unit Sales],
- * [Time].[1997]) > 1000
- * depends upon all hierarchies except [Store] and [Measures].
- * How so? Normally the scalar expression would depend upon all hierarchies
- * except [Measures], but the Filter([Store].[USA].Children,
- * [Measures].[Unit Sales] < 50)Filter function sets the [Store]
- * context before evaluating the scalar expression, so it is not inherited
- * from the surrounding context.
- *
- * resultType is not null, casts the expression to that
- * type. Throws an exception if that conversion is not allowed by the
- * type system.
- *
- * preferredResultStyles parameter specifies a list
- * of desired result styles. It must not be null, but may be empty.
- *
- * @param exp Expression
- *
- * @param resultType Desired result type, or null to use expression's
- * current type
- *
- * @param preferredResultStyles List of result types, in descending order
- * of preference. Never null.
- *
- * @return Compiled expression, or null if none can satisfy
- */
- Calc compileAs(
- Expression exp,
- Type resultType,
- Listint result.
- * The expression is implicitly converted into a scalar.
- */
- IntegerCalc compileInteger(Expression exp);
-
- /**
- * Compiles an expression which yields a {@link String} result.
- * The expression is implicitly converted into a scalar.
- */
- StringCalc compileString(Expression exp);
-
- /**
- * Compiles an expression which yields a {@link java.util.Date} result.
- * The expression is implicitly converted into a scalar.
- */
- DateTimeCalc compileDateTime(Expression exp);
-
- /**
- * Compiles an expression which yields an immutable {@link TupleList}
- * result.
- *
- * {@link #compileList}(exp, false).
- */
- TupleListCalc compileList(Expression exp);
-
- /**
- * Compiles an expression which yields {@link TupleList} result.
- *
- * boolean result.
- *
- * @param exp Expression
- * @return Calculator which yields a boolean
- */
- BooleanCalc compileBoolean(Expression exp);
-
- /**
- * Compiles an expression which yields a double result.
- *
- * @param exp Expression
- * @return Calculator which yields a double
- */
- DoubleCalc compileDouble(Expression exp);
-
- /**
- * Compiles an expression which yields a tuple result.
- *
- * @param exp Expression
- * @return Calculator which yields a tuple
- */
- TupleCalc compileTuple(Expression exp);
-
- /**
- * Compiles an expression to yield a scalar result.
- *
- * specific is true and
- * exp is a string expression, calls
- * {@link #compileString(org.eclipse.daanse.olap.api.query.component.Expression)}
- * @return Calculation which returns the scalar value of the expression
- */
- Calc compileScalar(Expression exp, boolean specific);
-
- /**
- * Implements a parameter, returning a unique slot which will hold the
- * parameter's value.
- *
- * @param parameter Parameter
- * @return Slot
- */
- ParameterSlot registerParameter(Parameter parameter);
-
- /**
- * Returns a list of the {@link ResultStyle}s
- * acceptable to the caller.
- */
- ListDesign notes
- *
- *
- *
- *
- *
- * @author jhyde
- */
-public interface TupleList
-extends ListCatalog is a collection of cubes, shared dimensions, and
- * roles.
- *
- * @author jhyde
- */
-public interface Catalog extends MetaElement {
-
- /**
- * Returns the name of this catalog.
- *
- * @post return != null
- * @post return.length() > 0
- */
- String getName();
-
- /**
- * Returns the description of this catalog.
- *
- * @return
- */
- String getDescription();
-
- /**
- * Returns the uniquely generated id of this catalog.
- */
- String getId();
-
- /**
- * Returns a list of all cubes in this catalog.
- */
- Listnull if no such role exists.
- */
- Role lookupRole(String role);
-
- /**
- * Returns this schema's parameters.
- */
- Parameter[] getParameters();
-
- /**
- * Returns when this schema was last loaded.
- *
- * @return Date and time when this schema was last loaded
- */
- Instant getCatalogLoadDate();
-
- /**
- * Returns a list of warnings and errors that occurred while loading this
- * schema.
- *
- * @return list of warnings
- */
- Listunique is true)
- * equals s.
- */
- Hierarchy lookupHierarchy(NameSegment s, boolean unique);
-
- /**
- * Returns Member[]. It builds Member[] by analyzing cellset, which gets created
- * by running mdx sQuery. query has to be in the format of
- * something like "[with calculated members] select *members* on columns from
- * this".
- */
- Member[] getMembersForQuery(String query, Listrole is null, the returned schema reader also
- * obeys the access-control profile of role.
- */
- CatalogReader getCatalogReader(Role role);
-
- /**
- * Finds out non joining dimensions for this cube.
- *
- * @param tuple array of members
- * @return Set of dimensions that do not exist (non joining) in this cube
- */
- SetDimension represents a dimension of a cube.
- *
- * @author jhyde, 1 March, 1999
- */
-public interface Dimension extends OlapElement, MetaElement {
- public static final String MEASURES_UNIQUE_NAME = "[Measures]";
- public static final String MEASURES_NAME = "Measures";
-
- /**
- * Returns an array of the hierarchies which belong to this dimension.
- */
- List getHierarchies();
-
- /**
- * Returns whether this is the [Measures] dimension.
- */
- boolean isMeasures();
-
- /**
- * Returns the type of this dimension ({@link DimensionType#STANDARD_DIMENSION}
- * or {@link DimensionType#TIME_DIMENSION}
- */
- DimensionType getDimensionType();
-
- /**
- * Returns the schema this dimension belongs to.
- */
- Catalog getCatalog();
-
- Cube getCube();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/DimensionType.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/DimensionType.java
deleted file mode 100644
index baccd6f33c..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/DimensionType.java
+++ /dev/null
@@ -1,71 +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) 2004-2005 Galt Johnson
- * Copyright (C) 2004-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api.element;
-
-/**
- * Enumerates the types of dimensions.
- *
- * @author Galt Johnson
- * @since 5 April, 2004
- */
-public enum DimensionType {
- /**
- * Indicates that the dimension is not related to time.
- */
- STANDARD_DIMENSION("StandardDimension"),
-
- /**
- * Indicates that a dimension is a time dimension.
- */
- TIME_DIMENSION("TimeDimension"),
-
- /**
- * Indicates the a dimension is the measures dimension.
- */
- MEASURES_DIMENSION("MeasuresDimension");
-
- private final String value;
-
- DimensionType(String v) {
- value = v;
- }
-
- public String getValue() {
- return value;
- }
-
- public static DimensionType fromValue(String v) {
- for (DimensionType c : DimensionType.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Hierarchy.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Hierarchy.java
deleted file mode 100644
index f64330d59c..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/Hierarchy.java
+++ /dev/null
@@ -1,123 +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) 1999-2005 Julian Hyde
- * Copyright (C) 2005-2017 Hitachi Vantara and others
- * All Rights Reserved.
- * Contributors:
- * SmartCity Jena - refactor, clean API
- *
- * ---- 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
- * Stefan Bischof (bipolis.org) - initial
- */
-
-package org.eclipse.daanse.olap.api.element;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.CatalogReader;
-import org.eclipse.daanse.olap.api.query.component.Formula;
-
-/**
- * A Hierarchy is a set of members, organized into levels.
- */
-public interface Hierarchy extends OlapElement, MetaElement {
- /**
- * Returns the dimension this hierarchy belongs to.
- */
- @Override
- Dimension getDimension();
-
- /**
- * Returns the levels in this hierarchy.
- *
- * Lead,
- * NextMember and ParentMember walk off the end of the
- * hierarchy.
- *
- * @post return != null
- */
- Member getNullMember();
-
- boolean hasAll();
-
- /**
- * Creates a member of this hierarchy. If this is the measures hierarchy, a
- * calculated member is created, and formula must not be null.
- */
- Member createMember(Member parent, Level level, String name, Formula formula);
-
- /**
- * Returns the unique name of this hierarchy, always including the dimension
- * name, e.g. "[Time].[Time]", regardless of whether
- * {@link SystemWideProperties#SsasCompatibleNaming} is enabled.
- *
- * @deprecated Will be removed in mondrian-4.0, when {@link #getUniqueName()}
- * will have this behavior.
- *
- * @return Unique name of hierarchy.
- */
- @Deprecated
- String getUniqueNameSsas();
-
- String getDisplayFolder();
-
- String origin();
-
- ListLevel is a group of {@link Member}s in a {@link Hierarchy},
- * all with the same attributes and at the same depth in the hierarchy.
- *
- * @author jhyde, 1 March, 1999
- */
-public interface Level extends OlapElement, MetaElement {
-
- /**
- * Returns the depth of this level.
- *
- * Member is a 'point' on a dimension of a cube. Examples are
- * [Time].[1997].[January],
- * [Customer].[All Customers],
- * [Customer].[USA].[CA],
- * [Measures].[Unit Sales].
- *
- * [Measures].
- *
- * [Gender].[All Gender].PrevMember, for example).
- */
- NULL
- }
-
- /**
- * Only allowable if the member is part of the WITH clause of a query.
- */
- void setName( String name );
-
- /**
- * Returns whether this is the 'all' member.
- */
- boolean isAll();
-
- /**
- * Returns whether this is a member of the measures dimension.
- */
- boolean isMeasure();
-
- /**
- * Returns whether this is the 'null member'.
- */
- boolean isNull();
-
- /**
- * Returns whether member is equal to, a child, or a descendent of this Member.
- */
- boolean isChildOrEqualTo( Member member );
-
- /**
- * Returns whether this member is computed using either a with member clause in an mdx query or a
- * calculated member defined in cube.
- */
- boolean isCalculated();
-
- /**
- * Returns whether this member should be evaluated within the Evaluator.
- *
- * propertyName. Name match is case-sensitive.
- */
- Object getPropertyValue( String propertyName );
-
- /**
- * Returns the value of the property named propertyName, matching according to the required
- * case-sensitivity.
- */
- Object getPropertyValue( String propertyName, boolean matchCase );
-
- /**
- * Returns the formatted value of the property named
- * propertyName.
- */
- String getPropertyFormattedValue( String propertyName );
-
- /**
- * Sets a property of this member to a given value.
- */
- void setProperty( String name, Object value );
-
- /**
- * Returns the definitions of the properties this member may have.
- */
- Property[] getProperties();
-
- /**
- * Returns the ordinal of the member.
- */
- int getOrdinal();
-
- /**
- * Returns the order key of the member (relative to its siblings); null if undefined or unavailable.
- */
- Comparable getOrderKey();
-
- /**
- * Returns whether this member is 'hidden', as per the rules which define a ragged hierarchy.
- */
- boolean isHidden();
-
- /**
- * returns the depth of this member, which is not the level's depth in case of parent child dimensions
- *
- * @return depth
- */
- int getDepth();
-
- /**
- * Returns the system-generated data member that is associated with a nonleaf member of a dimension.
- *
- * otherMember.
- *
- * @param otherMember
- * @return
- */
- boolean isOnSameHierarchyChain( Member otherMember );
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/MetaData.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/MetaData.java
deleted file mode 100644
index 86d11affe9..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/element/MetaData.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-package org.eclipse.daanse.olap.api.element;
-
-import java.util.Locale;
-import java.util.Optional;
-
-import org.eclipse.daanse.olap.api.element.OlapElement.LocalizedProperty;
-
-public interface MetaData {
-
- OptionalWITH SET clause, or in
- * a schema. Named sets in a schema can be defined against a particular cube or
- * virtual cube, or shared between all cubes.
- *
- *
- *
- * @return Whether this named set is dynamic
- */
- boolean isDynamic();
-
- ListOlapElement is a catalog object (dimension, hierarchy, level,
- * member).
- *
- * @author jhyde, 21 January, 1999
- */
-public interface OlapElement {
- String getUniqueName();
-
- String getName();
-
- String getDescription();
-
- /**
- * Looks up a child element, returning null if it does not exist.
- */
- OlapElement lookupChild(CatalogReader schemaReader, Segment s, MatchType matchType);
-
- /**
- * Returns the name of this element qualified by its class, for example
- * "hierarchy 'Customers'".
- */
- String getQualifiedName();
-
- String getCaption();
-
- /**
- * Returns the value of a property (caption or description) of this element in
- * the given locale.
- *
- * @param locale Locale
- * @return Localized caption or description
- */
- String getLocalized(LocalizedProperty prop, Locale locale);
-
- Hierarchy getHierarchy();
-
- /**
- * Returns the dimension of a this expression, or null if no dimension is
- * defined. Applicable only to set expressions.
- *
- *
- *
- *
has dimension
- * [Sales].children
- *
- *
- * [Sales].
- *
- *
- *
has dimension [Promotion Media].
- *
- * order(except([Promotion Media].[Media Type].members,
- * {[Promotion Media].[Media Type].[No Media]}),
- * [Measures].[Unit Sales], DESC)
- *
- *
- *
- *
- *
has no dimension (well, actually it is [Product] x [Gender],
- * but we can't represent that, so we return null);
- *
- * CrossJoin([Product].[Product Department].members,
- * [Gender].members)
- *
- *
- *
- *
- */
-public final class CellRequestQuantumExceededException
- extends RuntimeException
-{
- public static final CellRequestQuantumExceededException INSTANCE =
- new CellRequestQuantumExceededException();
-
- private CellRequestQuantumExceededException() {
- }
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/OlapRuntimeException.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/OlapRuntimeException.java
deleted file mode 100644
index 20d5b6c17b..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/OlapRuntimeException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2025 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
- */
-package org.eclipse.daanse.olap.api.exception;
-
-@SuppressWarnings("serial")
-public class OlapRuntimeException extends RuntimeException {
-
- public OlapRuntimeException(Throwable cause) {
- super(cause);
- }
-
- public OlapRuntimeException(String message) {
- super(message);
- }
-
- public OlapRuntimeException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/package-info.java
deleted file mode 100644
index c004fa36d1..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/exception/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.exception;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/CellFormatter.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/CellFormatter.java
deleted file mode 100644
index 389a45557e..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/CellFormatter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-package org.eclipse.daanse.olap.api.formatter;
-
-public interface CellFormatter {
-
- String format(Object value);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberFormatter.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberFormatter.java
deleted file mode 100644
index cc43feea19..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberFormatter.java
+++ /dev/null
@@ -1,36 +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) 2004-2005 TONBELLER AG
- * Copyright (C) 2006-2017 Hitachi Vantara and others
- * 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.api.formatter;
-
-import org.eclipse.daanse.olap.api.element.Member;
-
-
-public interface MemberFormatter {
-
-
- String format(Member member);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberPropertyFormatter.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberPropertyFormatter.java
deleted file mode 100644
index 4eec8f9244..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/MemberPropertyFormatter.java
+++ /dev/null
@@ -1,35 +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) 2004-2005 TONBELLER AG
- * Copyright (C) 2006-2017 Hitachi Vantara and others
- * 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.api.formatter;
-
-import org.eclipse.daanse.olap.api.element.Member;
-import org.eclipse.daanse.olap.api.element.Property;
-
-public interface MemberPropertyFormatter {
-
- String format(Member member, Property property, Object value);
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/package-info.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/package-info.java
deleted file mode 100644
index df2b456042..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/formatter/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-* Copyright (c) 2025 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
-*/
-
-@org.osgi.annotation.bundle.Export
-@org.osgi.annotation.versioning.Version("0.0.1")
-package org.eclipse.daanse.olap.api.formatter;
\ No newline at end of file
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionDefinition.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionDefinition.java
deleted file mode 100644
index 6d802b517c..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* 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
-*/
-
-package org.eclipse.daanse.olap.api.function;
-
-import java.io.PrintWriter;
-
-import org.eclipse.daanse.olap.api.Validator;
-import org.eclipse.daanse.olap.api.calc.Calc;
-import org.eclipse.daanse.olap.api.calc.compiler.ExpressionCompiler;
-import org.eclipse.daanse.olap.api.query.component.Expression;
-import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
-
-public interface FunctionDefinition {
-
- FunctionMetaData getFunctionMetaData();
-
- /**
- * Creates an expression which represents a call to this function with
- * a given set of arguments. The result is usually a {@link ResolvedFunCall} but
- * not always.
- */
- Expression createCall(Validator validator, Expression[] args);
-
- /**
- * Returns an Signature-Description of the function.
- */
- String getSignature();
-// FunctionMetaData fi= getFunctionMetaData();
-// return fi.functionAtom().syntax().getSignature(
-// fi.functionAtom().name(),
-// fi.returnCategory(),
-// fi.parameterDataTypes());
-
-
- /**
- * Writes a function call with given {@link Expression}s into MDX.
- */
- void unparse(Expression[] args, PrintWriter pw);
-
-// getFunctionMetaData().functionAtom().syntax().unparse(getFunctionMetaData().functionAtom().name(), args, pw);
-
-
- Calc compileCall(ResolvedFunCall call, ExpressionCompiler compiler);
-
-
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionMetaData.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionMetaData.java
deleted file mode 100644
index 5e55c332d3..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionMetaData.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* 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
-*/
-
-package org.eclipse.daanse.olap.api.function;
-
-import org.eclipse.daanse.mdx.model.api.expression.operation.OperationAtom;
-import org.eclipse.daanse.olap.api.DataType;
-
-public interface FunctionMetaData {
-
- OperationAtom operationAtom();
-
- String description();
-
- DataType returnCategory();
-
- DataType[] parameterDataTypes();
-
- FunctionParameter[] parameters();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionParameter.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionParameter.java
deleted file mode 100644
index ec0828624f..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/function/FunctionParameter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2024 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
-*/
-
-package org.eclipse.daanse.olap.api.function;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.eclipse.daanse.olap.api.DataType;
-
-public interface FunctionParameter {
-
- DataType dataType();
-
- Optionalconversions every time it performs an
- * implicit type-conversion. If there are several candidate functions with the
- * same signature, the validator will choose the one which used the fewest
- * implicit conversions.
- * positionOfArgument
- * must be a scalar expression. Returns false if any of the
- * variants of this resolver allows a set as its
- * positionOfArgumentth argument; true otherwise.
- *
- * if the ( positionOfArgument < 1 ) implementations must return false;
- *
- */
- boolean requiresScalarExpressionOnArgument(int positionOfArgument);
-
- /**
- * Returns a {@link List} of symbolic constants which can appear as arguments to
- * this function.
- *
- * DrilldownMember may take the symbol
- * RECURSIVE as an argument. Most functions do not define any
- * symbolic constants.
- *
- * @return An {@link List} of the names of the symbolic constants
- */
- default ListAxisOrdinal describes the allowable values for an axis code.
- *
- * @author jhyde
- * @since Feb 21, 2003
- */
-public interface AxisOrdinal {
- /**
- * Returns the name of this axis, e.g. "COLUMNS", "SLICER", "AXIS(17)".
- *
- * @return Name of the axis
- */
- String name();
-
- /**
- * Returns the ordinal of this axis. {@link StandardAxisOrdinal#COLUMNS} = 0,
- * {@link StandardAxisOrdinal#ROWS} = 1, etc.
- *
- * @return ordinal of this axis
- */
- int logicalOrdinal();
-
- /**
- * Returns whether this is the filter (slicer) axis.
- *
- * @return whether this is the filter axis
- */
- boolean isFilter();
-
- public enum StandardAxisOrdinal implements AxisOrdinal {
- /** No axis. */
- NONE,
-
- /** Slicer axis. */
- SLICER,
-
- /** Columns axis (also known as X axis), logical ordinal = 0. */
- COLUMNS,
-
- /** Rows axis (also known as Y axis), logical ordinal = 1. */
- ROWS,
-
- /** Pages axis, logical ordinal = 2. */
- PAGES,
-
- /** Chapters axis, logical ordinal = 3. */
- CHAPTERS,
-
- /** Sections axis, logical ordinal = 4. */
- SECTIONS;
-
- /**
- * Returns an axis with a given number.
- *
- * FunCall is a function applied to a list of operands.
- *
- * indexth argument to this function
- * call.
- *
- * @param index Ordinal of the argument
- * @return indexth argument to this function call
- */
- Expression getArg(int index);
-
- /**
- * Returns the arguments to this function.
- *
- * @return array of arguments
- */
- Expression[] getArgs();
-
- /**
- * Returns the number of arguments to this function.
- *
- * @return number of arguments
- */
- int getArgCount();
-
- /**
- * Returns the OperationAtom.
- */
- OperationAtom getOperationAtom();
-
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/HierarchyExpression.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/HierarchyExpression.java
deleted file mode 100644
index 07c901e208..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/HierarchyExpression.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-import org.eclipse.daanse.olap.api.element.Hierarchy;
-
-public non-sealed interface HierarchyExpression extends QueryComponent {
-
- /**
- * Returns the hierarchy.
- */
- Hierarchy getHierarchy();
-
-}
diff --git a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/Id.java b/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/Id.java
deleted file mode 100644
index 891f305241..0000000000
--- a/olap/api/src/main/java/org/eclipse/daanse/olap/api/query/component/Id.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2022 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
- */
-package org.eclipse.daanse.olap.api.query.component;
-
-import java.util.List;
-
-import org.eclipse.daanse.olap.api.Segment;
-
-public non-sealed interface Id extends QueryComponent {
-
- String[] toStringArray();
-
- List