Skip to content

Main031225 #56

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 4 commits into
base: main
Choose a base branch
from
Open

Main031225 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d662d9
fix imports in xmla
stbischof Dec 2, 2025
4a2d130
migrate to ExecutionContext for ScopedValue-based context management
stbischof Dec 2, 2025
8ebafaa
try to fix or un-hide MemoryOutOfBoundException
stbischof Dec 3, 2025
fb1d102
fix tests
dbulahov Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions api/src/main/java/org/eclipse/daanse/olap/api/CacheCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
*/
package org.eclipse.daanse.olap.api;

import org.eclipse.daanse.olap.api.execution.ExecutionContext;

public interface CacheCommand<T> extends Message {
Locus getLocus();

ExecutionContext getExecutionContext();

T call() throws Exception;
}
2 changes: 2 additions & 0 deletions api/src/main/java/org/eclipse/daanse/olap/api/ISegmentCacheIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*/
package org.eclipse.daanse.olap.api;

import org.eclipse.daanse.olap.api.execution.Execution;

public interface ISegmentCacheIndex {

void cancelExecutionSegments(Execution executionImpl);
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/org/eclipse/daanse/olap/api/ISegmentCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.io.PrintWriter;

import org.eclipse.daanse.olap.api.CacheControl.CellRegion;
import org.eclipse.daanse.olap.api.execution.ExecutionContext;

public interface ISegmentCacheManager {

Expand All @@ -25,7 +26,7 @@ public interface ISegmentCacheManager {
*/
void shutdown();

void printCacheState(CellRegion region, PrintWriter pw, Locus locus);
void printCacheState(CellRegion region, PrintWriter pw, ExecutionContext executionContext);

<T> T execute( CacheCommand<T> command );

Expand Down
25 changes: 0 additions & 25 deletions api/src/main/java/org/eclipse/daanse/olap/api/Locus.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions api/src/main/java/org/eclipse/daanse/olap/api/ResultShepherd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.util.concurrent.Callable;

import org.eclipse.daanse.olap.api.execution.Execution;
import org.eclipse.daanse.olap.api.result.Result;

public interface ResultShepherd {
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/org/eclipse/daanse/olap/api/Statement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.eclipse.daanse.olap.api.connection.Connection;
import org.eclipse.daanse.olap.api.element.Catalog;
import org.eclipse.daanse.olap.api.execution.Execution;
import org.eclipse.daanse.olap.api.query.component.Query;
import org.eclipse.daanse.olap.api.query.component.QueryComponent;
import org.eclipse.daanse.olap.api.result.CellSet;
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/org/eclipse/daanse/olap/api/connection/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
import org.eclipse.daanse.olap.api.CacheControl;
import org.eclipse.daanse.olap.api.CatalogReader;
import org.eclipse.daanse.olap.api.Context;
import org.eclipse.daanse.olap.api.Execution;
import org.eclipse.daanse.olap.api.Statement;
import org.eclipse.daanse.olap.api.access.Role;
import org.eclipse.daanse.olap.api.element.Catalog;
import org.eclipse.daanse.olap.api.execution.Execution;
import org.eclipse.daanse.olap.api.query.component.Expression;
import org.eclipse.daanse.olap.api.query.component.Query;
import org.eclipse.daanse.olap.api.query.component.QueryComponent;
Expand Down
16 changes: 13 additions & 3 deletions ...rg/eclipse/daanse/olap/api/Execution.java → .../daanse/olap/api/execution/Execution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.olap.api;
package org.eclipse.daanse.olap.api.execution;

import java.time.Duration;

import org.eclipse.daanse.olap.api.QueryTiming;
import org.eclipse.daanse.olap.api.Statement;

public interface Execution {

void cancelSqlStatements();
Expand All @@ -56,8 +59,6 @@ public interface Execution {

void setExpCacheCounts(int expResultCacheHitCount, int expResultCacheMissCount);

void registerStatement(Locus locus, java.sql.Statement stmt);

void end();

void start();
Expand All @@ -70,6 +71,15 @@ public interface Execution {

int getExpCacheMissCount();

/**
* Converts this Execution to an ExecutionContext for use with ScopedValue-based
* context propagation. This method provides a bridge between the legacy
* Execution interface and the new ExecutionContext approach.
*
* @return the ExecutionContext representation of this execution
*/
ExecutionContext asContext();

/**
* Enumeration of the states of an Execution instance.
*/
Expand Down
Loading
Loading