Skip to content

Commit 9225dde

Browse files
dbulahovstbischof
dbulahov
authored and
stbischof
committed
remove mondrian from code
Signed-off-by: dbulahov <bulahovdenis@gmail.com>
1 parent 4cbb3b4 commit 9225dde

File tree

31 files changed

+133
-136
lines changed

31 files changed

+133
-136
lines changed

‎api/src/main/java/org/eclipse/daanse/olap/api/Execution.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface Execution {
3434

3535
void cancelSqlStatements();
3636

37-
Statement getMondrianStatement();
37+
Statement getDaanseStatement();
3838

3939
void setOutOfMemory(String string);
4040

‎api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface IAggregationManager {
2121

2222
void shutdown();
2323

24-
ISegmentCacheManager getCacheMgr(Connection mondrianConnection);
24+
ISegmentCacheManager getCacheMgr(Connection connection);
2525

2626
CacheControl getCacheControl(Connection rolapConnection, PrintWriter pw);
2727

‎api/src/main/java/org/eclipse/daanse/olap/api/Statement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public interface Statement {
7474
*
7575
* @return connection
7676
*/
77-
Connection getMondrianConnection();
77+
Connection getDaanseConnection();
7878

7979

8080
void setQuery(Query query);

api/src/main/java/org/eclipse/daanse/olap/api/result/IMondrianOlap4jProperty.java renamed to api/src/main/java/org/eclipse/daanse/olap/api/result/IDaanseOlap4jProperty.java

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

1616
import org.eclipse.daanse.olap.api.element.Level;
1717

18-
public interface IMondrianOlap4jProperty extends Property{
18+
public interface IDaanseOlap4jProperty extends Property{
1919
/**
2020
* @return Level
2121
*/

common/src/main/java/org/eclipse/daanse/olap/common/MondrianPropertiesBase.java renamed to common/src/main/java/org/eclipse/daanse/olap/common/DaansePropertiesBase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@
7575
* @author jhyde
7676
* @since 22 December, 2002
7777
*/
78-
public abstract class MondrianPropertiesBase extends Properties {
78+
public abstract class DaansePropertiesBase extends Properties {
7979

8080
private final transient PropertySource propertySource;
8181
private int populateCount;
8282

8383
private static final Logger LOGGER =
84-
LoggerFactory.getLogger(MondrianPropertiesBase.class);
84+
LoggerFactory.getLogger(DaansePropertiesBase.class);
8585

86-
protected static final String MONDRIAN_DOT_PROPERTIES = "mondrian.properties";
86+
protected static final String MONDRIAN_DOT_PROPERTIES = "daanse.properties";
8787

88-
protected MondrianPropertiesBase(PropertySource propertySource) {
88+
protected DaansePropertiesBase(PropertySource propertySource) {
8989
this.propertySource = propertySource;
9090
}
9191

@@ -254,15 +254,15 @@ public void populate() {
254254
} else {
255255
// Then try load it from classloader
256256
url =
257-
MondrianPropertiesBase.class.getClassLoader().getResource(
257+
DaansePropertiesBase.class.getClassLoader().getResource(
258258
MONDRIAN_DOT_PROPERTIES);
259259
}
260260

261261
if (url != null) {
262262
load(new UrlPropertySource(url));
263263
} else {
264264
LOGGER.warn(
265-
"mondrian.properties can't be found under '{}' or classloader",
265+
"daanse.properties can't be found under '{}' or classloader",
266266
new File(".").getAbsolutePath());
267267
}
268268

@@ -273,7 +273,7 @@ public void populate() {
273273
{
274274
String key = (String) keys.nextElement();
275275
String value = System.getProperty(key);
276-
if (key.startsWith("mondrian.")) {
276+
if (key.startsWith("daanse.")) {
277277
// NOTE: the super allows us to bybase calling triggers
278278
// Is this the correct behavior?
279279
if (LOGGER.isDebugEnabled()) {

‎common/src/main/java/org/eclipse/daanse/olap/common/ResultBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public abstract class ResultBase implements Result {
5656

5757
protected ResultBase(Execution execution, Axis[] axes) {
5858
this.execution = execution;
59-
this.statement = execution.getMondrianStatement();
59+
this.statement = execution.getDaanseStatement();
6060
this.query = statement.getQuery();
6161
assert query != null;
6262
this.axes =

‎common/src/main/java/org/eclipse/daanse/olap/common/SystemWideProperties.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* properties using the inherited {@link java.util.Properties#getProperty(String)}
2424
* method, we recommend that you use methods in this class.
2525
*/
26-
public class SystemWideProperties extends MondrianPropertiesBase {
26+
public class SystemWideProperties extends DaansePropertiesBase {
2727
/**
2828
* Properties, drawn from {@link System#getProperties},
2929
* plus the contents of "mondrian.properties" if it
@@ -42,29 +42,29 @@ private SystemWideProperties() {
4242

4343
public void populateInitial() {
4444
CaseSensitive =
45-
this.getBoolean("mondrian.olap.case.sensitive", false);
45+
this.getBoolean("daanse.olap.case.sensitive", false);
4646
CaseSensitiveMdxInstr =
47-
this.getBoolean("mondrian.olap.case.sensitive.CaseSensitiveMdxInstr", false);
47+
this.getBoolean("daanse.olap.case.sensitive.CaseSensitiveMdxInstr", false);
4848
CompareSiblingsByOrderKey =
49-
this.getBoolean("mondrian.rolap.compareSiblingsByOrderKey", false);
49+
this.getBoolean("daanse.rolap.compareSiblingsByOrderKey", false);
5050
EnableExpCache =
51-
this.getBoolean("mondrian.expCache.enable", true);
51+
this.getBoolean("daanse.expCache.enable", true);
5252
EnableNativeNonEmpty =
53-
this.getBoolean("mondrian.native.nonempty.enable", true);
53+
this.getBoolean("daanse.native.nonempty.enable", true);
5454
EnableNonEmptyOnAllAxis =
55-
this.getBoolean("mondrian.rolap.nonempty", false);
55+
this.getBoolean("daanse.rolap.nonempty", false);
5656
EnableRolapCubeMemberCache =
57-
this.getBoolean("mondrian.rolap.EnableRolapCubeMemberCache", true);
57+
this.getBoolean("daanse.rolap.EnableRolapCubeMemberCache", true);
5858
EnableTriggers =
59-
this.getBoolean("mondrian.olap.triggers.enable", true);
59+
this.getBoolean("daanse.olap.triggers.enable", true);
6060
FilterChildlessSnowflakeMembers =
61-
this.getBoolean("mondrian.rolap.FilterChildlessSnowflakeMembers", true);
61+
this.getBoolean("daanse.rolap.FilterChildlessSnowflakeMembers", true);
6262
MaxConstraints =
63-
this.getInteger("mondrian.rolap.maxConstraints", 1000);
63+
this.getInteger("daanse.rolap.maxConstraints", 1000);
6464
NullMemberRepresentation =
65-
getProperty("mondrian.olap.NullMemberRepresentation", "#null");
65+
getProperty("daanse.olap.NullMemberRepresentation", "#null");
6666
ResultLimit =
67-
this.getInteger("mondrian.result.limit", 0);
67+
this.getInteger("daanse.result.limit", 0);
6868

6969
}
7070

@@ -87,7 +87,7 @@ public static SystemWideProperties instance() {
8787
* case-sensitive matching when looking up identifiers. The default is
8888
* false.
8989
*/
90-
@PropertyAnnotation(path = "mondrian.olap.case.sensitive")
90+
@PropertyAnnotation(path = "daanse.olap.case.sensitive")
9191
public transient Boolean CaseSensitive;
9292

9393

@@ -97,7 +97,7 @@ public static SystemWideProperties instance() {
9797
* Default value is false.
9898
*
9999
*/
100-
@PropertyAnnotation(path = "mondrian.olap.case.sensitive.CaseSensitiveMdxInstr")
100+
@PropertyAnnotation(path = "daanse.olap.case.sensitive.CaseSensitiveMdxInstr")
101101
public transient Boolean CaseSensitiveMdxInstr;
102102

103103

@@ -106,7 +106,7 @@ public static SystemWideProperties instance() {
106106
* compared according to order key value fetched from their ordinal
107107
* expression. The default is false (only database ORDER BY is used).
108108
*/
109-
@PropertyAnnotation(path = "mondrian.rolap.compareSiblingsByOrderKey")
109+
@PropertyAnnotation(path = "daanse.rolap.compareSiblingsByOrderKey")
110110
public transient Boolean CompareSiblingsByOrderKey;
111111

112112

@@ -117,14 +117,14 @@ public static SystemWideProperties instance() {
117117
* Order([Product].MEMBERS, [Measures].[Unit Sales])) would perform
118118
* many redundant sorts. The default is true.
119119
*/
120-
@PropertyAnnotation(path = "mondrian.expCache.enable")
120+
@PropertyAnnotation(path = "daanse.expCache.enable")
121121
public transient Boolean EnableExpCache;
122122

123123
/**
124124
* If enabled some NON EMPTY set operations like member.children,
125125
* level.members and member descendants will be computed in SQL.
126126
*/
127-
@PropertyAnnotation(path = "mondrian.native.nonempty.enable")
127+
@PropertyAnnotation(path = "daanse.native.nonempty.enable")
128128
public transient Boolean EnableNativeNonEmpty;
129129
/**
130130
* Boolean property that controls whether each query axis implicit has the
@@ -146,7 +146,7 @@ public static SystemWideProperties instance() {
146146
* construct, and we may obsolete this cache and this
147147
* property.
148148
*/
149-
@PropertyAnnotation(path = "mondrian.rolap.EnableRolapCubeMemberCache")
149+
@PropertyAnnotation(path = "daanse.rolap.EnableRolapCubeMemberCache")
150150
public transient Boolean EnableRolapCubeMemberCache;
151151

152152

@@ -159,7 +159,7 @@ public static SystemWideProperties instance() {
159159
* MondrianProperties.instance().populate(null) or
160160
* MondrianProperties.instance().QueryLimit.set(50).
161161
*/
162-
@PropertyAnnotation(path = "mondrian.olap.triggers.enable")
162+
@PropertyAnnotation(path = "daanse.olap.triggers.enable")
163163
public transient Boolean EnableTriggers;
164164

165165

@@ -180,7 +180,7 @@ public static SystemWideProperties instance() {
180180
* table, during your ETL process, and to set this property to
181181
* {@code false}.
182182
*/
183-
@PropertyAnnotation(path = "mondrian.rolap.FilterChildlessSnowflakeMembers")
183+
@PropertyAnnotation(path = "daanse.rolap.FilterChildlessSnowflakeMembers")
184184
public transient Boolean FilterChildlessSnowflakeMembers;
185185

186186
/**
@@ -197,7 +197,7 @@ public static SystemWideProperties instance() {
197197
* Other: 10,000
198198
*
199199
*/
200-
@PropertyAnnotation(path = "mondrian.rolap.maxConstraints")
200+
@PropertyAnnotation(path = "daanse.rolap.maxConstraints")
201201
public transient Integer MaxConstraints;
202202

203203

@@ -216,7 +216,7 @@ public static SystemWideProperties instance() {
216216
* Integer property that, if set to a value greater than zero, limits the
217217
* maximum size of a result set.
218218
*/
219-
@PropertyAnnotation(path = "mondrian.result.limit")
219+
@PropertyAnnotation(path = "daanse.result.limit")
220220
public transient Integer ResultLimit;
221221

222222
}

‎common/src/main/java/org/eclipse/daanse/olap/common/Util.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public class Util {
167167
private static final Logger LOGGER = LoggerFactory.getLogger(Util.class);
168168

169169
public static final Logger PROFILE_LOGGER =
170-
LoggerFactory.getLogger("mondrian.profile");
170+
LoggerFactory.getLogger("daanse.profile");
171171

172172
/**
173173
* Special value which indicates that a {@code double} computation has returned the MDX null value. See {@link
@@ -2501,7 +2501,7 @@ public static String convertOlap4jConnectStringToNativeMondrian(
25012501
{
25022502
if (url.startsWith("jdbc:mondrian:")) {
25032503
return "Provider=Mondrian; "
2504-
+ url.substring("jdbc:mondrian:".length());
2504+
+ url.substring("jdbc:daanse:".length());
25052505
}
25062506
return null;
25072507
}

‎common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public synchronized void addStatement(Statement statement) {
176176
connections.size());
177177
}
178178
statements.add( statement);
179-
final Connection connection = statement.getMondrianConnection();
179+
final Connection connection = statement.getDaanseConnection();
180180

181181
MdxStatementStartEvent mdxStatementStartEvent = new MdxStatementStartEvent(new MdxStatementEventCommon(
182182
new ConnectionEventCommon(
@@ -198,7 +198,7 @@ public synchronized void removeStatement(Statement statement) {
198198
throw new OlapRuntimeException("Server already shutdown.");
199199
}
200200
statements.remove(statement);
201-
final Connection connection = statement.getMondrianConnection();
201+
final Connection connection = statement.getDaanseConnection();
202202

203203

204204
MdxStatementEndEvent mdxStatementEndEvent = new MdxStatementEndEvent(
@@ -223,7 +223,7 @@ public EventBus getMonitor() {
223223

224224
@Override
225225
public List<Statement> getStatements(org.eclipse.daanse.olap.api.connection.Connection connection) {
226-
return statements.stream().filter(stmnt -> stmnt.getMondrianConnection().equals(connection))
226+
return statements.stream().filter(stmnt -> stmnt.getDaanseConnection().equals(connection))
227227
.toList();
228228
}
229229

‎common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.eclipse.daanse.olap.common.StandardProperty;
4444
import org.eclipse.daanse.olap.fun.FunUtil;
4545

46-
//import mondrian.util.Bug;
4746
/**
4847
* MemberBase is a partial implementation of {@link Member}.
4948
*

0 commit comments

Comments
 (0)