Cleanup
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java index 71fbeb6..fd0cf9e 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java
@@ -21,7 +21,6 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import org.apache.calcite.DataContext; @@ -283,29 +282,6 @@ }); } - /** - * Submits a Runnable task for execution and returns a Future - * representing that task. The Future's {@code get} method will - * return {@code null} upon <em>successful</em> completion. - * - * @param task the task to submit. - * @return a {@link CompletableFuture} representing pending task - */ - public CompletableFuture<?> submit(RunnableX task, Consumer<Throwable> onError) { - assert !isCancelled() : "Call submit after execution was cancelled."; - - return executor.submit(qryId, fragmentId(), () -> { - try { - task.run(); - } - catch (Throwable e) { - onError.accept(e); - - throw new IgniteException("Unexpected exception", e); - } - }); - } - /** */ @FunctionalInterface public interface RunnableX {
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutor.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutor.java index 830a4d2..6891cde 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutor.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutor.java
@@ -18,8 +18,6 @@ package org.apache.ignite.internal.processors.query.calcite.exec; import java.util.UUID; -import java.util.concurrent.CompletableFuture; - import org.apache.ignite.internal.processors.query.calcite.util.Service; /** @@ -34,16 +32,4 @@ * @param qryTask Query task. */ void execute(UUID qryId, long fragmentId, Runnable qryTask); - - /** - * Returns a new CompletableFuture that is asynchronously completed - * by a task running in the given executor after it runs the given - * action. - * - * @param qryId Id of the query this task created for. - * @param fragmentId Id of the particular fragment this task created for. - * @param qryTask The task to submit. - * @return the new CompletableFuture - */ - CompletableFuture<?> submit(UUID qryId, long fragmentId, Runnable qryTask); }
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutorImpl.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutorImpl.java index ddbd1ee..c572901 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutorImpl.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryTaskExecutorImpl.java
@@ -19,7 +19,6 @@ import java.util.Objects; import java.util.UUID; -import java.util.concurrent.CompletableFuture; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.query.calcite.CalciteQueryProcessor; import org.apache.ignite.internal.processors.query.calcite.util.AbstractService; @@ -80,11 +79,6 @@ } /** {@inheritDoc} */ - @Override public CompletableFuture<?> submit(UUID qryId, long fragmentId, Runnable qryTask) { - return stripedThreadPoolExecutor.submit(qryTask, hash(qryId, fragmentId)); - } - - /** {@inheritDoc} */ @Override public void onStart(GridKernalContext ctx) { exceptionHandler(ctx.uncaughtExceptionHandler());
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java index 4bfad68..cc28c00 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java
@@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; @@ -109,21 +108,6 @@ } /** - * Submits a {@link Runnable} task for execution and returns a {@link CompletableFuture} representing that task. - * The command with the same {@code index} will be executed in the same thread. - * - * @param task The task to submit. - * @param idx Task index. - * @return a {@link Future} representing pending completion of the task. - * @throws RejectedExecutionException if the task cannot be - * scheduled for execution. - * @throws NullPointerException if the task is {@code null}. - */ - public CompletableFuture<?> submit(Runnable task, int idx) { - return CompletableFuture.runAsync(task, execs[threadId(idx)]); - } - - /** * @param idx Index. * @return Stripped thread ID. */
diff --git a/modules/core/src/test/config/log4j-test.xml b/modules/core/src/test/config/log4j-test.xml index 91a8919..e82c103 100755 --- a/modules/core/src/test/config/log4j-test.xml +++ b/modules/core/src/test/config/log4j-test.xml
@@ -133,10 +133,6 @@ --> <!-- Disable all open source debugging. --> -<!-- <category name="org.apache.calcite">--> -<!-- <level value="DEBUG"/>--> -<!-- </category>--> - <category name="org"> <level value="INFO"/> </category>