drop SqlManagedQuery, and instead move SQL concerns into SqlExecution… #3347
Conversation
awildturtok
force-pushed
the
feature/invert-control-for-ExecutionManager
branch
from
b30af59
to
7c15a45
Compare
|
Das ist ein ziemlich signifikanter Eingriff. Hoffnung ist, dass wir durch das invertieren alles an Logik zusammen ziehen können und nur noch die submission in die entsprechenden Query-Engines getrennt handlen müssen (ich weiß 🦄 ... aber.) Die vereinheitlichung fehlt noch, jetzt sollte @jnsrnhld aber in der Lage sein, Formulare einzureichen. |
| @@ -30,6 +30,6 @@ public class CollectQueryResult extends NamespaceMessage { | |||
| public void react(DistributedNamespace context) throws Exception { | |||
| log.info("Received {} of size {}", result, result.getResults().size()); | |||
|
|
|||
| context.getExecutionManager().handleQueryResult(result); | |||
| result.addResult(context.getExecutionManager() /*TODO*/); | |||
There was a problem hiding this comment.
Kannst du das nicht auch über eine ReactingMessage lösen?
backend/src/main/java/com/bakdata/conquery/models/query/DistributedExecutionManager.java
Outdated
Show resolved
Hide resolved
| @@ -177,17 +207,19 @@ public void clearQueryResults(ManagedExecution execution) { | |||
|
|
|||
| @Override | |||
| public Stream<EntityResult> streamQueryResults(ManagedExecution execution) { | |||
| final List<List<EntityResult>> resultParts = executionResults.getIfPresent(execution.getId()); | |||
| final Map<?, List<EntityResult>> resultParts = executionResults.getIfPresent(execution.getId()); | |||
There was a problem hiding this comment.
was ist das ?, oder ist das egal?
There was a problem hiding this comment.
das ist die workerId, die ist an der Stelle egal.
in dem commit glaube nochmal klarer was passiert
| @Override | ||
| public void addResult(ShardResult result) { | ||
| log.debug("Received Result[size={}] for Query[{}]", result.getResults().size(), result.getQueryId()); | ||
|
|
||
| log.trace("Received Result\n{}", result.getResults()); | ||
|
|
||
| if (result.getError().isPresent()) { | ||
| fail(result.getError().get()); | ||
| return; | ||
| } | ||
|
|
||
| involvedWorkers.remove(result.getWorkerId()); | ||
|
|
||
| getNamespace().getExecutionManager().addQueryResult(this, result.getResults()); | ||
|
|
||
| if (involvedWorkers.isEmpty() && getState() == ExecutionState.RUNNING) { | ||
| finish(ExecutionState.DONE); | ||
| } | ||
| } |
There was a problem hiding this comment.
Das ist gut, dass die Methode aus der Klasse fliegt
| //TODO handle finishing etc here. | ||
| if (execution instanceof ManagedInternalForm<?> managedForm) { | ||
| managedForm.getSubQueries().values().forEach(subQuery -> doExecute(namespace, managedForm)); | ||
| managedForm.finish(ExecutionState.DONE); |
There was a problem hiding this comment.
du musst hier auch den state der subqueries checken :D wenn davon eine failed ist alles failed.
There was a problem hiding this comment.
Guter Punkt, hab es erstmal nur soweit gebracht dass bei mir ein FormTest im SQL-Mode durchläuft 😄
backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java
Show resolved
Hide resolved
backend/src/main/java/com/bakdata/conquery/models/query/DistributedExecutionManager.java
Outdated
Show resolved
Hide resolved
backend/src/main/java/com/bakdata/conquery/sql/execution/SqlExecutionService.java
Show resolved
Hide resolved
backend/src/main/java/com/bakdata/conquery/models/query/DistributedExecutionManager.java
Show resolved
Hide resolved
…butedExecutionManager.java
delete-merged-branch
bot
deleted the
feature/invert-control-for-ExecutionManager
branch
…Manager.