Skip to content

add caching by catalog and cube #109

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
dbulahov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add caching by catalog and cube #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/org/eclipse/daanse/olap/api/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,6 @@ default List<String> getKeywordList() {
ExpressionCompiler createDependencyTestingCompiler(ExpressionCompiler compiler);

List<CustomAggregatorFactory> getCustomAggregators();

boolean isCashEnabled(String cube);
}
4 changes: 4 additions & 0 deletions common/src/main/java/org/eclipse/daanse/olap/common/ConfigConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public class ConfigConstants {
public static final String SOLVE_ORDER_MODE = "solveOrderMode";
public static final String CHOOSE_AGGREGATE_BY_VOLUME = "chooseAggregateByVolume";
public static final String DISABLE_CACHING = "disableCaching";
public static final String DISABLE_CACHING_CATALOGS = "disableCachingCatalogs";
public static final String DISABLE_CACHING_CUBES = "disableCachingCubes";
public static final String DISABLE_LOCAL_SEGMENT_CACHE = "disableLocalSegmentCache";
public static final String ENABLE_GROUPING_SETS = "enableGroupingSets";
public static final String ENABLE_SESSION_CACHING = "enableSessionCaching";
Expand Down Expand Up @@ -81,6 +83,8 @@ public class ConfigConstants {
public static final String SOLVE_ORDER_MODE_DEFAULT_VALUE = "ABSOLUTE";
public static final boolean CHOOSE_AGGREGATE_BY_VOLUME_DEFAULT_VALUE = false;
public static final boolean DISABLE_CACHING_DEFAULT_VALUE = false;
public static final String DISABLE_CACHING_CATALOGS_DEFAULT_VALUE = "";
public static final String DISABLE_CACHING_CUBES_DEFAULT_VALUE = "";
public static final boolean DISABLE_LOCAL_SEGMENT_CACHE_DEFAULT_VALUE = false;
public static final boolean ENABLE_GROUPING_SETS_DEFAULT_VALUE = false;
public static final boolean ENABLE_SESSION_CACHING_DEFAULT_VALUE = false;
Expand Down
33 changes: 33 additions & 0 deletions common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
package org.eclipse.daanse.olap.core;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
Expand All @@ -35,6 +37,7 @@
import org.eclipse.daanse.olap.api.monitor.event.MdxStatementStartEvent;
import org.eclipse.daanse.olap.api.monitor.event.ServertEventCommon;
import org.eclipse.daanse.olap.api.result.ResultShepherd;
import org.eclipse.daanse.olap.common.ConfigConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -249,4 +252,34 @@ public <T> T getConfigValue(String key, T dflt, Class<T> clazz) {
return dflt;
}
}

@Override
public boolean isCashEnabled(String cubeName) {
final String catalog = getName();
if (getConfigValue(ConfigConstants.DISABLE_CACHING, ConfigConstants.DISABLE_CACHING_DEFAULT_VALUE, Boolean.class)) {
return false;
} else {
String catalogNames = getConfigValue(ConfigConstants.DISABLE_CACHING_CATALOGS, ConfigConstants.DISABLE_CACHING_CATALOGS_DEFAULT_VALUE, String.class);
String[] catalogNamesArray = catalogNames.split(";");
if (catalogNamesArray != null && Arrays.stream(catalogNamesArray).anyMatch(it -> catalog.equals(it))) {
return false;
} else {
String catalogCubeNames = getConfigValue(ConfigConstants.DISABLE_CACHING_CUBES, ConfigConstants.DISABLE_CACHING_CUBES_DEFAULT_VALUE, String.class);
String[] cubesNamesArray = catalogCubeNames.split(";");
if (cubesNamesArray != null){
Map<String, List<String>> map = new HashMap<>();
for (String p : catalogNamesArray) {
String[] arr = p.split("-->");
if (arr != null && arr.length == 2) {
map.computeIfAbsent(arr[0], k -> new ArrayList<>()).add(arr[1]);
}
}
if (map.containsKey(catalog) && map.get(catalog).contains(cubeName)) {
return false;
}
}
}
}
return true;
}
}
Loading