You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:29:03 UTC
[27/50] [abbrv] incubator-ignite git commit: # sprint-1 moved
existing IgniteFuture to internal package
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index fd9ab76..3e8abd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -114,12 +114,12 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
/** Active futures of this data loader. */
@GridToStringInclude
- private final Collection<IgniteFuture<?>> activeFuts = new GridConcurrentHashSet<>();
+ private final Collection<IgniteInternalFuture<?>> activeFuts = new GridConcurrentHashSet<>();
/** Closure to remove from active futures. */
@GridToStringExclude
- private final IgniteInClosure<IgniteFuture<?>> rmvActiveFut = new IgniteInClosure<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> t) {
+ private final IgniteInClosure<IgniteInternalFuture<?>> rmvActiveFut = new IgniteInClosure<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> t) {
boolean rmv = activeFuts.remove(t);
assert rmv;
@@ -257,7 +257,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> future() {
+ @Override public IgniteInternalFuture<?> future() {
return fut;
}
@@ -356,14 +356,14 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> addData(Map<K, V> entries) throws IllegalStateException {
+ @Override public IgniteInternalFuture<?> addData(Map<K, V> entries) throws IllegalStateException {
A.notNull(entries, "entries");
return addData(entries.entrySet());
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> addData(Collection<? extends Map.Entry<K, V>> entries) {
+ @Override public IgniteInternalFuture<?> addData(Collection<? extends Map.Entry<K, V>> entries) {
A.notEmpty(entries, "entries");
enterBusy();
@@ -397,21 +397,21 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> addData(Map.Entry<K, V> entry) throws IgniteCheckedException, IllegalStateException {
+ @Override public IgniteInternalFuture<?> addData(Map.Entry<K, V> entry) throws IgniteCheckedException, IllegalStateException {
A.notNull(entry, "entry");
return addData(F.asList(entry));
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> addData(K key, V val) throws IgniteCheckedException, IllegalStateException {
+ @Override public IgniteInternalFuture<?> addData(K key, V val) throws IgniteCheckedException, IllegalStateException {
A.notNull(key, "key");
return addData(new Entry0<>(key, val));
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> removeData(K key) throws IgniteCheckedException, IllegalStateException {
+ @Override public IgniteInternalFuture<?> removeData(K key) throws IgniteCheckedException, IllegalStateException {
return addData(key, null);
}
@@ -491,8 +491,8 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
final Collection<Map.Entry<K, V>> entriesForNode = e.getValue();
- IgniteInClosure<IgniteFuture<?>> lsnr = new IgniteInClosure<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> t) {
+ IgniteInClosure<IgniteInternalFuture<?>> lsnr = new IgniteInClosure<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> t) {
try {
t.get();
@@ -555,11 +555,11 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
private void doFlush() throws IgniteCheckedException {
lastFlushTime = U.currentTimeMillis();
- List<IgniteFuture> activeFuts0 = null;
+ List<IgniteInternalFuture> activeFuts0 = null;
int doneCnt = 0;
- for (IgniteFuture<?> f : activeFuts) {
+ for (IgniteInternalFuture<?> f : activeFuts) {
if (!f.isDone()) {
if (activeFuts0 == null)
activeFuts0 = new ArrayList<>((int)(activeFuts.size() * 1.2));
@@ -577,10 +577,10 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
return;
while (true) {
- Queue<IgniteFuture<?>> q = null;
+ Queue<IgniteInternalFuture<?>> q = null;
for (Buffer buf : bufMappings.values()) {
- IgniteFuture<?> flushFut = buf.flush();
+ IgniteInternalFuture<?> flushFut = buf.flush();
if (flushFut != null) {
if (q == null)
@@ -595,7 +595,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
boolean err = false;
- for (IgniteFuture fut = q.poll(); fut != null; fut = q.poll()) {
+ for (IgniteInternalFuture fut = q.poll(); fut != null; fut = q.poll()) {
try {
fut.get();
}
@@ -615,7 +615,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
doneCnt = 0;
for (int i = 0; i < activeFuts0.size(); i++) {
- IgniteFuture f = activeFuts0.get(i);
+ IgniteInternalFuture f = activeFuts0.get(i);
if (f == null)
doneCnt++;
@@ -752,7 +752,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
private final ClusterNode node;
/** Active futures. */
- private final Collection<IgniteFuture<Object>> locFuts;
+ private final Collection<IgniteInternalFuture<Object>> locFuts;
/** Buffered entries. */
private List<Map.Entry<K, V>> entries;
@@ -775,8 +775,8 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
/** Closure to signal on task finish. */
@GridToStringExclude
- private final IgniteInClosure<IgniteFuture<Object>> signalC = new IgniteInClosure<IgniteFuture<Object>>() {
- @Override public void apply(IgniteFuture<Object> t) {
+ private final IgniteInClosure<IgniteInternalFuture<Object>> signalC = new IgniteInClosure<IgniteInternalFuture<Object>>() {
+ @Override public void apply(IgniteInternalFuture<Object> t) {
signalTaskFinished(t);
}
};
@@ -809,7 +809,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
* @return Future for operation.
*/
@Nullable GridFutureAdapter<?> update(Iterable<Map.Entry<K, V>> newEntries,
- IgniteInClosure<IgniteFuture<?>> lsnr) throws IgniteInterruptedException {
+ IgniteInClosure<IgniteInternalFuture<?>> lsnr) throws IgniteInterruptedException {
List<Map.Entry<K, V>> entries0 = null;
GridFutureAdapter<Object> curFut0;
@@ -853,7 +853,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
* @throws org.apache.ignite.IgniteInterruptedException If thread has been interrupted.
*/
@Nullable
- IgniteFuture<?> flush() throws IgniteInterruptedException {
+ IgniteInternalFuture<?> flush() throws IgniteInterruptedException {
List<Map.Entry<K, V>> entries0 = null;
GridFutureAdapter<Object> curFut0 = null;
@@ -874,14 +874,14 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
// Create compound future for this flush.
GridCompoundFuture<Object, Object> res = null;
- for (IgniteFuture<Object> f : locFuts) {
+ for (IgniteInternalFuture<Object> f : locFuts) {
if (res == null)
res = new GridCompoundFuture<>(ctx);
res.add(f);
}
- for (IgniteFuture<Object> f : reqs.values()) {
+ for (IgniteInternalFuture<Object> f : reqs.values()) {
if (res == null)
res = new GridCompoundFuture<>(ctx);
@@ -906,7 +906,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
/**
* @param f Future that finished.
*/
- private void signalTaskFinished(IgniteFuture<Object> f) {
+ private void signalTaskFinished(IgniteInternalFuture<Object> f) {
assert f != null;
sem.release();
@@ -925,7 +925,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
incrementActiveTasks();
- IgniteFuture<Object> fut;
+ IgniteInternalFuture<Object> fut;
if (isLocNode) {
fut = ctx.closure().callLocalSafe(
@@ -933,8 +933,8 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
locFuts.add(fut);
- fut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() {
- @Override public void apply(IgniteFuture<Object> t) {
+ fut.listenAsync(new IgniteInClosure<IgniteInternalFuture<Object>>() {
+ @Override public void apply(IgniteInternalFuture<Object> t) {
try {
boolean rmv = locFuts.remove(t);
@@ -1123,7 +1123,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay
void cancelAll() {
IgniteCheckedException err = new IgniteCheckedException("Data loader has been cancelled: " + IgniteDataLoaderImpl.this);
- for (IgniteFuture<?> f : locFuts) {
+ for (IgniteInternalFuture<?> f : locFuts) {
try {
f.cancel();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
index 2ba9782..03216a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
@@ -23,7 +23,6 @@ import org.apache.ignite.dataload.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.cache.dr.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -50,7 +49,7 @@ public class GridDrDataLoadCacheUpdater<K, V> implements IgniteDataLoadCacheUpda
if (log.isDebugEnabled())
log.debug("Running DR put job [nodeId=" + ctx.localNodeId() + ", cacheName=" + cacheName + ']');
- IgniteFuture<?> f = cache.context().preloader().startFuture();
+ IgniteInternalFuture<?> f = cache.context().preloader().startFuture();
if (!f.isDone())
f.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessorAdapter.java
index 3a383d1..5d8c179 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessorAdapter.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.email;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.lang.*;
import java.util.*;
@@ -68,7 +67,7 @@ public abstract class IgniteEmailProcessorAdapter extends GridProcessorAdapter {
* @param html HTML format flag.
* @return Future for scheduled email.
*/
- public abstract IgniteFuture<Boolean> schedule(String subj, String body, boolean html);
+ public abstract IgniteInternalFuture<Boolean> schedule(String subj, String body, boolean html);
/**
* Schedules sending of given email. If SMTP is disabled - this method is no-op. Emails will be send
@@ -81,5 +80,5 @@ public abstract class IgniteEmailProcessorAdapter extends GridProcessorAdapter {
* @param addrs Addresses.
* @return Future for scheduled email.
*/
- public abstract IgniteFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs);
+ public abstract IgniteInternalFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteNoopEmailProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteNoopEmailProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteNoopEmailProcessor.java
index 5d97490..4812f57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteNoopEmailProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/email/IgniteNoopEmailProcessor.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.email;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.util.future.*;
import java.util.*;
@@ -45,12 +44,12 @@ public class IgniteNoopEmailProcessor extends IgniteEmailProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html) {
+ @Override public IgniteInternalFuture<Boolean> schedule(String subj, String body, boolean html) {
return new GridFinishedFuture<>(ctx, true);
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs) {
+ @Override public IgniteInternalFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs) {
return new GridFinishedFuture<>(ctx, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAsyncImpl.java
index 58de369..79cbad2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAsyncImpl.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.fs.mapreduce.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
@@ -130,7 +131,7 @@ public class GridGgfsAsyncImpl extends IgniteAsyncSupportAdapter<IgniteFs> imple
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException {
+ @Override public IgniteInternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException {
return ggfs.awaitDeletesAsync();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
index 44623fb..71c018a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
@@ -71,7 +71,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
private GridCache<Object, Object> dataCache;
/** */
- private IgniteFuture<?> dataCacheStartFut;
+ private IgniteInternalFuture<?> dataCacheStartFut;
/** Local GGFS metrics. */
private GridGgfsLocalMetrics metrics;
@@ -110,7 +110,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
private long trashPurgeTimeout;
/** On-going remote reads futures. */
- private final ConcurrentHashMap8<GridGgfsBlockKey, IgniteFuture<byte[]>> rmtReadFuts =
+ private final ConcurrentHashMap8<GridGgfsBlockKey, IgniteInternalFuture<byte[]>> rmtReadFuts =
new ConcurrentHashMap8<>();
/** Executor service for puts in dual mode */
@@ -379,7 +379,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @return Requested data block or {@code null} if nothing found.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public IgniteFuture<byte[]> dataBlock(final GridGgfsFileInfo fileInfo, final IgniteFsPath path,
+ @Nullable public IgniteInternalFuture<byte[]> dataBlock(final GridGgfsFileInfo fileInfo, final IgniteFsPath path,
final long blockIdx, @Nullable final IgniteFsReader secReader)
throws IgniteCheckedException {
//assert validTxState(any); // Allow this method call for any transaction state.
@@ -400,17 +400,17 @@ public class GridGgfsDataManager extends GridGgfsManager {
", blockIdx=" + blockIdx + ']');
}
- IgniteFuture<byte[]> fut = dataCachePrj.getAsync(key);
+ IgniteInternalFuture<byte[]> fut = dataCachePrj.getAsync(key);
if (secReader != null) {
- fut = fut.chain(new CX1<IgniteFuture<byte[]>, byte[]>() {
- @Override public byte[] applyx(IgniteFuture<byte[]> fut) throws IgniteCheckedException {
+ fut = fut.chain(new CX1<IgniteInternalFuture<byte[]>, byte[]>() {
+ @Override public byte[] applyx(IgniteInternalFuture<byte[]> fut) throws IgniteCheckedException {
byte[] res = fut.get();
if (res == null) {
GridFutureAdapter<byte[]> rmtReadFut = new GridFutureAdapter<>(ggfsCtx.kernalContext());
- IgniteFuture<byte[]> oldRmtReadFut = rmtReadFuts.putIfAbsent(key, rmtReadFut);
+ IgniteInternalFuture<byte[]> oldRmtReadFut = rmtReadFuts.putIfAbsent(key, rmtReadFut);
if (oldRmtReadFut == null) {
try {
@@ -491,7 +491,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @param fileInfo File info of file opened to write.
* @return Future that will be completed when all ack messages are received or when write failed.
*/
- public IgniteFuture<Boolean> writeStart(GridGgfsFileInfo fileInfo) {
+ public IgniteInternalFuture<Boolean> writeStart(GridGgfsFileInfo fileInfo) {
WriteCompletionFuture fut = new WriteCompletionFuture(ggfsCtx.kernalContext(), fileInfo.id());
WriteCompletionFuture oldFut = pendingWrites.putIfAbsent(fileInfo.id(), fut);
@@ -594,7 +594,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @param fileInfo File details to remove data for.
* @return Delete future that will be completed when file is actually erased.
*/
- public IgniteFuture<Object> delete(GridGgfsFileInfo fileInfo) {
+ public IgniteInternalFuture<Object> delete(GridGgfsFileInfo fileInfo) {
//assert validTxState(any); // Allow this method call for any transaction state.
if (!fileInfo.isFile()) {
@@ -1048,8 +1048,8 @@ public class GridGgfsDataManager extends GridGgfsManager {
else {
callGgfsLocalSafe(new GridPlainCallable<Object>() {
@Override @Nullable public Object call() throws Exception {
- storeBlocksAsync(blocks).listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> fut) {
+ storeBlocksAsync(blocks).listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> fut) {
try {
fut.get();
@@ -1242,7 +1242,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @return Future that will be completed after put is done.
*/
@SuppressWarnings("unchecked")
- private IgniteFuture<?> storeBlocksAsync(Map<GridGgfsBlockKey, byte[]> blocks) {
+ private IgniteInternalFuture<?> storeBlocksAsync(Map<GridGgfsBlockKey, byte[]> blocks) {
assert !blocks.isEmpty();
if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
@@ -1276,8 +1276,8 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @param blocksMsg Write request message.
*/
private void processBlocksMessage(final UUID nodeId, final GridGgfsBlocksMessage blocksMsg) {
- storeBlocksAsync(blocksMsg.blocks()).listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> fut) {
+ storeBlocksAsync(blocksMsg.blocks()).listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> fut) {
IgniteCheckedException err = null;
try {
@@ -1681,7 +1681,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
* @param info File info to delete.
* @return Future which completes when entry is actually removed.
*/
- private IgniteFuture<Object> deleteAsync(GridGgfsFileInfo info) {
+ private IgniteInternalFuture<Object> deleteAsync(GridGgfsFileInfo info) {
GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ggfsCtx.kernalContext());
delReqs.offer(F.t(fut, info));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsEx.java
index 154a641..153d8f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsEx.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
@@ -100,7 +101,7 @@ public interface GridGgfsEx extends IgniteFs {
* @return Future which will be completed when all entries existed in trash by the time of invocation are removed.
* @throws IgniteCheckedException If failed.
*/
- public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException;
+ public IgniteInternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException;
/**
* Gets client file system log directory.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
index 84942ce..2e20e62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -1550,7 +1550,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
*
* @return Future.
*/
- IgniteFuture<?> formatAsync() throws IgniteCheckedException {
+ IgniteInternalFuture<?> formatAsync() throws IgniteCheckedException {
IgniteUuid id = meta.softDelete(null, null, ROOT_ID);
if (id == null)
@@ -1576,7 +1576,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException {
+ @Override public IgniteInternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException {
Collection<IgniteUuid> ids = meta.pendingDeletes();
if (!ids.isEmpty()) {
@@ -1588,7 +1588,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
for (IgniteUuid id : ids) {
GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ggfsCtx.kernalContext());
- IgniteFuture<Object> oldFut = delFuts.putIfAbsent(id, fut);
+ IgniteInternalFuture<Object> oldFut = delFuts.putIfAbsent(id, fut);
if (oldFut != null)
resFut.add(oldFut);
@@ -1708,7 +1708,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
* @param arg Optional task argument.
* @return Execution future.
*/
- <T, R> IgniteFuture<R> executeAsync(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr,
+ <T, R> IgniteInternalFuture<R> executeAsync(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr,
Collection<IgniteFsPath> paths, @Nullable T arg) {
return executeAsync(task, rslvr, paths, true, cfg.getMaximumTaskRangeLength(), arg);
}
@@ -1727,7 +1727,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
* @param arg Optional task argument.
* @return Execution future.
*/
- <T, R> IgniteFuture<R> executeAsync(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr,
+ <T, R> IgniteInternalFuture<R> executeAsync(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr,
Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
return ggfsCtx.kernalContext().task().execute(task, new IgniteFsTaskArgsImpl<>(cfg.getName(), paths, rslvr,
skipNonExistentFiles, maxRangeLen, arg));
@@ -1742,7 +1742,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
* @param arg Optional task argument.
* @return Execution future.
*/
- <T, R> IgniteFuture<R> executeAsync(Class<? extends IgniteFsTask<T, R>> taskCls,
+ <T, R> IgniteInternalFuture<R> executeAsync(Class<? extends IgniteFsTask<T, R>> taskCls,
@Nullable IgniteFsRecordResolver rslvr, Collection<IgniteFsPath> paths, @Nullable T arg) {
return executeAsync(taskCls, rslvr, paths, true, cfg.getMaximumTaskRangeLength(), arg);
}
@@ -1760,7 +1760,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
* @param arg Optional task argument.
* @return Execution future.
*/
- <T, R> IgniteFuture<R> executeAsync(Class<? extends IgniteFsTask<T, R>> taskCls,
+ <T, R> IgniteInternalFuture<R> executeAsync(Class<? extends IgniteFsTask<T, R>> taskCls,
@Nullable IgniteFsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles,
long maxRangeLen, @Nullable T arg) {
return ggfsCtx.kernalContext().task().execute((Class<IgniteFsTask<T, R>>)taskCls,
@@ -1835,7 +1835,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
}
/** {@inheritDoc} */
- @Override public <R> IgniteFuture<R> future() {
+ @Override public <R> IgniteInternalFuture<R> future() {
throw new IllegalStateException("Asynchronous mode is not enabled.");
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsInputStreamImpl.java
index 19e899a..558d932 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsInputStreamImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -59,13 +60,13 @@ public class GridGgfsInputStreamImpl extends GridGgfsInputStreamAdapter {
private long pos;
/** Local cache. */
- private final Map<Long, IgniteFuture<byte[]>> locCache;
+ private final Map<Long, IgniteInternalFuture<byte[]>> locCache;
/** Maximum local cache size. */
private final int maxLocCacheSize;
/** Pending data read futures which were evicted from the local cache before completion. */
- private final Set<IgniteFuture<byte[]>> pendingFuts;
+ private final Set<IgniteInternalFuture<byte[]>> pendingFuts;
/** Pending futures lock. */
private final Lock pendingFutsLock = new ReentrantLock();
@@ -280,7 +281,7 @@ public class GridGgfsInputStreamImpl extends GridGgfsInputStreamAdapter {
secReader.close();
// Ensuring local cache futures completion.
- for (IgniteFuture<byte[]> fut : locCache.values()) {
+ for (IgniteInternalFuture<byte[]> fut : locCache.values()) {
try {
fut.get();
}
@@ -427,7 +428,7 @@ public class GridGgfsInputStreamImpl extends GridGgfsInputStreamAdapter {
private byte[] block(long blockIdx) throws IOException, IgniteCheckedException {
assert blockIdx >= 0;
- IgniteFuture<byte[]> bytesFut = locCache.get(blockIdx);
+ IgniteInternalFuture<byte[]> bytesFut = locCache.get(blockIdx);
if (bytesFut == null) {
if (closed)
@@ -482,18 +483,18 @@ public class GridGgfsInputStreamImpl extends GridGgfsInputStreamAdapter {
* @param idx Block index.
* @param fut Future.
*/
- private void addLocalCacheFuture(long idx, IgniteFuture<byte[]> fut) {
+ private void addLocalCacheFuture(long idx, IgniteInternalFuture<byte[]> fut) {
assert Thread.holdsLock(this);
if (!locCache.containsKey(idx)) {
if (locCache.size() == maxLocCacheSize) {
- final IgniteFuture<byte[]> evictFut = locCache.remove(locCache.keySet().iterator().next());
+ final IgniteInternalFuture<byte[]> evictFut = locCache.remove(locCache.keySet().iterator().next());
if (!evictFut.isDone()) {
pendingFuts.add(evictFut);
- evictFut.listenAsync(new IgniteInClosure<IgniteFuture<byte[]>>() {
- @Override public void apply(IgniteFuture<byte[]> t) {
+ evictFut.listenAsync(new IgniteInClosure<IgniteInternalFuture<byte[]>>() {
+ @Override public void apply(IgniteInternalFuture<byte[]> t) {
pendingFuts.remove(evictFut);
pendingFutsLock.lock();
@@ -521,7 +522,7 @@ public class GridGgfsInputStreamImpl extends GridGgfsInputStreamAdapter {
* @return Requested data block or {@code null} if nothing found.
* @throws IgniteCheckedException If failed.
*/
- @Nullable protected IgniteFuture<byte[]> dataBlock(GridGgfsFileInfo fileInfo, long blockIdx) throws IgniteCheckedException {
+ @Nullable protected IgniteInternalFuture<byte[]> dataBlock(GridGgfsFileInfo fileInfo, long blockIdx) throws IgniteCheckedException {
return data.dataBlock(fileInfo, path, blockIdx, secReader);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsIpcHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsIpcHandler.java
index 323c1a0..dd9a13c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsIpcHandler.java
@@ -104,7 +104,7 @@ class GridGgfsIpcHandler implements GridGgfsServerHandler {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridGgfsMessage> handleAsync(final GridGgfsClientSession ses,
+ @Override public IgniteInternalFuture<GridGgfsMessage> handleAsync(final GridGgfsClientSession ses,
final GridGgfsMessage msg, DataInput in) {
if (!mgmt)
GridLicenseUseRegistry.onUsage(HADOOP, getClass());
@@ -116,7 +116,7 @@ class GridGgfsIpcHandler implements GridGgfsServerHandler {
final GridGgfsIpcCommand cmd = msg.command();
- IgniteFuture<GridGgfsMessage> fut;
+ IgniteInternalFuture<GridGgfsMessage> fut;
switch (cmd) {
// Execute not-blocking command synchronously in worker thread.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
index feb86a0..d63f25a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
@@ -55,7 +56,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
private GridCache<Object, Object> metaCache;
/** */
- private IgniteFuture<?> metaCacheStartFut;
+ private IgniteInternalFuture<?> metaCacheStartFut;
/** File ID to file info projection. */
private GridCacheProjectionEx<IgniteUuid, GridGgfsFileInfo> id2InfoPrj;
@@ -1672,12 +1673,12 @@ public class GridGgfsMetaManager extends GridGgfsManager {
id2InfoPrj.invoke(parentInfo.id(),
new UpdateListing(path.name(), new GridGgfsListingEntry(newInfo), false));
- IgniteFuture<?> delFut = ggfsCtx.data().delete(oldInfo);
+ IgniteInternalFuture<?> delFut = ggfsCtx.data().delete(oldInfo);
// Record PURGE event if needed.
if (evts.isRecordable(EVT_GGFS_FILE_PURGED)) {
- delFut.listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> t) {
+ delFut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> t) {
try {
t.get(); // Ensure delete succeeded.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java
index 73010c5..4ce2d47 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.thread.*;
import org.apache.ignite.internal.fs.common.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -256,7 +256,7 @@ public class GridGgfsServer {
GridGgfsMessage msg = marsh.unmarshall(cmd, hdr, dis);
- IgniteFuture<GridGgfsMessage> fut = hnd.handleAsync(ses, msg, dis);
+ IgniteInternalFuture<GridGgfsMessage> fut = hnd.handleAsync(ses, msg, dis);
// If fut is null, no response is required.
if (fut != null) {
@@ -287,8 +287,8 @@ public class GridGgfsServer {
}
}
else {
- fut.listenAsync(new CIX1<IgniteFuture<GridGgfsMessage>>() {
- @Override public void applyx(IgniteFuture<GridGgfsMessage> fut) {
+ fut.listenAsync(new CIX1<IgniteInternalFuture<GridGgfsMessage>>() {
+ @Override public void applyx(IgniteInternalFuture<GridGgfsMessage> fut) {
GridGgfsMessage res;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServerHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServerHandler.java
index df5091a..470f56d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServerHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServerHandler.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.fs.common.*;
import org.jetbrains.annotations.*;
@@ -38,7 +38,7 @@ public interface GridGgfsServerHandler {
* @return Future that will be completed when response is ready or {@code null} if no
* response is required.
*/
- @Nullable public IgniteFuture<GridGgfsMessage> handleAsync(GridGgfsClientSession ses,
+ @Nullable public IgniteInternalFuture<GridGgfsMessage> handleAsync(GridGgfsClientSession ses,
GridGgfsMessage msg, DataInput in);
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsOutputStreamImpl.java
index f069eae..955a615 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsOutputStreamImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.fs;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -68,7 +69,7 @@ class IgniteFsOutputStreamImpl extends IgniteFsOutputStreamAdapter {
private int remainderDataLen;
/** Write completion future. */
- private final IgniteFuture<Boolean> writeCompletionFut;
+ private final IgniteInternalFuture<Boolean> writeCompletionFut;
/** GGFS mode. */
private final IgniteFsMode mode;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
index 03fa0a2..c861ea8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.hadoop;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.hadoop.*;
import org.apache.ignite.internal.util.future.*;
@@ -50,7 +49,7 @@ public class IgniteHadoopNoopProcessor extends IgniteHadoopProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) {
+ @Override public IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) {
return new GridFinishedFutureEx<>(new IgniteCheckedException("Hadoop is not available."));
}
@@ -65,7 +64,7 @@ public class IgniteHadoopNoopProcessor extends IgniteHadoopProcessorAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException {
+ @Override public IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessorAdapter.java
index fbbf647..05e0e35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessorAdapter.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.hadoop;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.hadoop.*;
/**
@@ -56,7 +55,7 @@ public abstract class IgniteHadoopProcessorAdapter extends GridProcessorAdapter
* @param jobInfo Job info to submit.
* @return Execution future.
*/
- public abstract IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo);
+ public abstract IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo);
/**
* Gets Hadoop job execution status.
@@ -83,7 +82,7 @@ public abstract class IgniteHadoopProcessorAdapter extends GridProcessorAdapter
* @return Job finish future or {@code null}.
* @throws IgniteCheckedException If failed.
*/
- public abstract IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException;
+ public abstract IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException;
/**
* Kills job.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index f91c7e0..60528fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -54,7 +54,7 @@ public interface GridQueryIndexing {
* @param qry Query.
* @return Future.
*/
- public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry);
+ public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry);
/**
* @param space Space.
@@ -62,7 +62,7 @@ public interface GridQueryIndexing {
* @param params Parameters.
* @return Result.
*/
- public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params);
+ public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params);
/**
* Queries individual fields (generally used by JDBC drivers).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index e14aa10..b094250 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -168,7 +168,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param valTypeName Value type name.
* @return Future that will be completed when rebuilding of all indexes is finished.
*/
- public IgniteFuture<?> rebuildIndexes(@Nullable final String space, String valTypeName) {
+ public IgniteInternalFuture<?> rebuildIndexes(@Nullable final String space, String valTypeName) {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to rebuild indexes (grid is stopping).");
@@ -185,7 +185,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param desc Type descriptor.
* @return Future that will be completed when rebuilding of all indexes is finished.
*/
- private IgniteFuture<?> rebuildIndexes(@Nullable final String space, @Nullable final TypeDescriptor desc) {
+ private IgniteInternalFuture<?> rebuildIndexes(@Nullable final String space, @Nullable final TypeDescriptor desc) {
if (idx == null)
return new GridFinishedFuture<>(ctx, new IgniteCheckedException("Indexing is disabled."));
@@ -225,7 +225,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @return Future that will be completed when rebuilding of all indexes is finished.
*/
@SuppressWarnings("unchecked")
- public IgniteFuture<?> rebuildAllIndexes() {
+ public IgniteInternalFuture<?> rebuildAllIndexes() {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to get space size (grid is stopping).");
@@ -233,7 +233,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
GridCompoundFuture<?, ?> fut = new GridCompoundFuture<Object, Object>(ctx);
for (Map.Entry<TypeId, TypeDescriptor> e : types.entrySet())
- fut.add((IgniteFuture)rebuildIndexes(e.getKey().space, e.getValue()));
+ fut.add((IgniteInternalFuture)rebuildIndexes(e.getKey().space, e.getValue()));
fut.markInitialized();
@@ -440,7 +440,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param qry Query.
* @return Future.
*/
- public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry) {
+ public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, GridCacheTwoStepQuery qry) {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to execute query (grid is stopping).");
@@ -458,7 +458,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param params Parameters.
* @return Result.
*/
- public IgniteFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params) {
+ public IgniteInternalFuture<GridCacheSqlResult> queryTwoStep(String space, String sqlQry, Object[] params) {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to execute query (grid is stopping).");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 0735447..1b480e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -79,7 +79,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
return handleAsync(req).get();
}
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
return handleAsync0(req);
}
};
@@ -88,7 +88,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
* @param req Request.
* @return Future.
*/
- private IgniteFuture<GridRestResponse> handleAsync0(final GridRestRequest req) {
+ private IgniteInternalFuture<GridRestResponse> handleAsync0(final GridRestRequest req) {
if (!busyLock.tryReadLock())
return new GridFinishedFuture<>(ctx,
new IgniteCheckedException("Failed to handle request (received request while stopping grid)."));
@@ -101,10 +101,10 @@ public class GridRestProcessor extends GridProcessorAdapter {
GridWorker w = new GridWorker(ctx.gridName(), "rest-proc-worker", log) {
@Override protected void body() {
try {
- IgniteFuture<GridRestResponse> res = handleRequest(req);
+ IgniteInternalFuture<GridRestResponse> res = handleRequest(req);
- res.listenAsync(new IgniteInClosure<IgniteFuture<GridRestResponse>>() {
- @Override public void apply(IgniteFuture<GridRestResponse> f) {
+ res.listenAsync(new IgniteInClosure<IgniteInternalFuture<GridRestResponse>>() {
+ @Override public void apply(IgniteInternalFuture<GridRestResponse> f) {
try {
fut.onDone(f.get());
}
@@ -150,7 +150,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
* @param req Request.
* @return Future.
*/
- private IgniteFuture<GridRestResponse> handleRequest(final GridRestRequest req) {
+ private IgniteInternalFuture<GridRestResponse> handleRequest(final GridRestRequest req) {
if (startLatch.getCount() > 0) {
try {
startLatch.await();
@@ -195,7 +195,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
GridRestCommandHandler hnd = handlers.get(req.command());
- IgniteFuture<GridRestResponse> res = hnd == null ? null : hnd.handleAsync(req);
+ IgniteInternalFuture<GridRestResponse> res = hnd == null ? null : hnd.handleAsync(req);
if (res == null)
return new GridFinishedFuture<>(ctx,
@@ -203,8 +203,8 @@ public class GridRestProcessor extends GridProcessorAdapter {
final GridSecurityContext subjCtx0 = subjCtx;
- return res.chain(new C1<IgniteFuture<GridRestResponse>, GridRestResponse>() {
- @Override public GridRestResponse apply(IgniteFuture<GridRestResponse> f) {
+ return res.chain(new C1<IgniteInternalFuture<GridRestResponse>, GridRestResponse>() {
+ @Override public GridRestResponse apply(IgniteInternalFuture<GridRestResponse> f) {
GridRestResponse res;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
index 1fcba69..ed9fd81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProtocolHandler.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.rest;
import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.rest.request.*;
/**
@@ -36,5 +36,5 @@ public interface GridRestProtocolHandler {
* @param req Request.
* @return Future.
*/
- public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req);
+ public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
index 1f585ce..e185332 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/GridRestCommandHandler.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.rest.handlers;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.rest.request.*;
@@ -36,5 +36,5 @@ public interface GridRestCommandHandler {
* @param req Request.
* @return Future.
*/
- public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req);
+ public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 8d67de4..9497936 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -127,7 +127,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(final GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(final GridRestRequest req) {
assert req instanceof GridRestCacheRequest : "Invalid command for topology handler: " + req;
assert SUPPORTED_COMMANDS.contains(req.command());
@@ -153,7 +153,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
final Long ttl = req0.ttl();
- IgniteFuture<GridRestResponse> fut;
+ IgniteInternalFuture<GridRestResponse> fut;
switch (cmd) {
case CACHE_GET: {
@@ -337,7 +337,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* @return Operation result in future.
* @throws IgniteCheckedException If failed
*/
- private IgniteFuture<GridRestResponse> executeCommand(
+ private IgniteInternalFuture<GridRestResponse> executeCommand(
@Nullable UUID destId,
UUID clientId,
final String cacheName,
@@ -382,7 +382,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* @return Operation result in future.
* @throws IgniteCheckedException If failed
*/
- private IgniteFuture<GridRestResponse> executeCommand(
+ private IgniteInternalFuture<GridRestResponse> executeCommand(
@Nullable UUID destId,
UUID clientId,
final String cacheName,
@@ -417,7 +417,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* @return Future of operation result.
* @throws IgniteCheckedException In case of error.
*/
- private static IgniteFuture<?> incrementOrDecrement(CacheProjection<Object, Object> cache, String key,
+ private static IgniteInternalFuture<?> incrementOrDecrement(CacheProjection<Object, Object> cache, String key,
GridRestCacheRequest req, final boolean decr) throws IgniteCheckedException {
assert cache != null;
assert key != null;
@@ -451,7 +451,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* @return Future of operation result.
* @throws IgniteCheckedException In case of any exception.
*/
- private static IgniteFuture<?> appendOrPrepend(
+ private static IgniteInternalFuture<?> appendOrPrepend(
final GridKernalContext ctx,
final CacheProjection<Object, Object> cache,
final Object key, GridRestCacheRequest req, final boolean prepend) throws IgniteCheckedException {
@@ -555,10 +555,10 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* @param key Affinity key for previous operation.
* @return Rest response.
*/
- private static IgniteClosure<IgniteFuture<?>, GridRestResponse> resultWrapper(
+ private static IgniteClosure<IgniteInternalFuture<?>, GridRestResponse> resultWrapper(
final CacheProjection<Object, Object> c, @Nullable final Object key) {
- return new CX1<IgniteFuture<?>, GridRestResponse>() {
- @Override public GridRestResponse applyx(IgniteFuture<?> f) throws IgniteCheckedException {
+ return new CX1<IgniteInternalFuture<?>, GridRestResponse>() {
+ @Override public GridRestResponse applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException {
GridCacheRestResponse resp = new GridCacheRestResponse();
resp.setResponse(f.get());
@@ -617,7 +617,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
/**
* Fixed result closure.
*/
- private static final class FixedResult extends CX1<IgniteFuture<?>, Object> {
+ private static final class FixedResult extends CX1<IgniteInternalFuture<?>, Object> {
/** */
private static final long serialVersionUID = 0L;
@@ -632,7 +632,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public Object applyx(IgniteFuture<?> f) throws IgniteCheckedException {
+ @Override public Object applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException {
f.get();
return res;
@@ -643,7 +643,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* Type alias.
*/
private abstract static class CacheCommand
- extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
+ extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> {
/** */
private static final long serialVersionUID = 0L;
@@ -654,7 +654,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
* Type alias.
*/
private abstract static class CacheProjectionCommand
- extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteFuture<?>> {
+ extends IgniteClosure2X<CacheProjection<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> {
/** */
private static final long serialVersionUID = 0L;
@@ -788,7 +788,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return c.getAsync(key);
}
}
@@ -809,7 +809,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return c.getAllAsync(keys);
}
}
@@ -830,7 +830,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return c.putAllAsync(map).chain(new FixedResult(true));
}
}
@@ -851,7 +851,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return c.removexAsync(key);
}
}
@@ -872,7 +872,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return (F.isEmpty(keys) ? c.removeAllAsync() : c.removeAllAsync(keys))
.chain(new FixedResult(true));
}
@@ -904,7 +904,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
return exp == null && val == null ? c.removexAsync(key) :
exp == null ? c.putxIfAbsentAsync(key, val) :
val == null ? c.removeAsync(key, exp) :
@@ -938,7 +938,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
if (ttl != null && ttl > 0) {
Duration duration = new Duration(MILLISECONDS, ttl);
@@ -975,7 +975,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
if (ttl != null && ttl > 0) {
Duration duration = new Duration(MILLISECONDS, ttl);
@@ -1012,7 +1012,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
if (ttl != null && ttl > 0) {
Duration duration = new Duration(MILLISECONDS, ttl);
@@ -1044,7 +1044,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
throws IgniteCheckedException {
return incrementOrDecrement(c, (String)key, req, false);
}
@@ -1071,7 +1071,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException {
return incrementOrDecrement(c, (String)key, req, true);
}
}
@@ -1097,7 +1097,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
throws IgniteCheckedException {
return appendOrPrepend(ctx, c, key, req, false);
}
@@ -1124,7 +1124,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx)
throws IgniteCheckedException {
return appendOrPrepend(ctx, c, key, req, true);
}
@@ -1136,7 +1136,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override public IgniteFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
+ @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object, Object> c, GridKernalContext ctx) {
CacheMetrics metrics = c.cache().metrics();
assert metrics != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
index 72236a0..2ebea11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
@@ -69,7 +69,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
assert req instanceof GridRestCacheQueryRequest;
assert SUPPORTED_COMMANDS.contains(req.command());
@@ -114,7 +114,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
* @param c Closure to execute.
* @return Execution future.
*/
- private IgniteFuture<GridRestResponse> execute(UUID destId, String cacheName, Callable<GridRestResponse> c) {
+ private IgniteInternalFuture<GridRestResponse> execute(UUID destId, String cacheName, Callable<GridRestResponse> c) {
boolean locExec = destId == null || destId.equals(ctx.localNodeId()) || replicatedCacheAvailable(cacheName);
if (locExec)
@@ -143,16 +143,16 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
* @param c Closure to execute.
* @return Execution future.
*/
- private IgniteFuture<GridRestResponse> broadcast(String cacheName, Callable<Object> c) {
+ private IgniteInternalFuture<GridRestResponse> broadcast(String cacheName, Callable<Object> c) {
IgniteCompute comp = ctx.grid().compute(ctx.grid().forCache(cacheName)).withNoFailover().withAsync();
try {
comp.broadcast(c);
- IgniteFuture<Collection<Object>> fut = comp.future();
+ IgniteInternalFuture<Collection<Object>> fut = comp.future();
- return fut.chain(new C1<IgniteFuture<Collection<Object>>, GridRestResponse>() {
- @Override public GridRestResponse apply(IgniteFuture<Collection<Object>> fut) {
+ return fut.chain(new C1<IgniteInternalFuture<Collection<Object>>, GridRestResponse>() {
+ @Override public GridRestResponse apply(IgniteInternalFuture<Collection<Object>> fut) {
try {
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
index 3c65b6d..6a676fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.handlers.log;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.rest.handlers.*;
import org.apache.ignite.internal.processors.rest.request.*;
@@ -82,7 +81,7 @@ public class GridLogCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
assert req instanceof GridRestLogRequest : "Invalid command for topology handler: " + req;
assert SUPPORTED_COMMANDS.contains(req.command());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
index b0a3f10..ea4a70b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.handlers.metadata;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.portables.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
@@ -55,7 +54,7 @@ public class GridPortableMetadataHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
assert SUPPORTED_COMMANDS.contains(req.command()) : req.command();
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 0012712..5178847 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -128,7 +128,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
try {
return handleAsyncUnsafe(req);
}
@@ -148,7 +148,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
* @return Future.
* @throws IgniteCheckedException On any handling exception.
*/
- private IgniteFuture<GridRestResponse> handleAsyncUnsafe(final GridRestRequest req) throws IgniteCheckedException {
+ private IgniteInternalFuture<GridRestResponse> handleAsyncUnsafe(final GridRestRequest req) throws IgniteCheckedException {
assert req instanceof GridRestTaskRequest : "Invalid command for topology handler: " + req;
assert SUPPORTED_COMMANDS.contains(req.command());
@@ -226,8 +226,8 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
fut.onDone(res);
}
- taskFut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() {
- @Override public void apply(IgniteFuture<Object> f) {
+ taskFut.listenAsync(new IgniteInClosure<IgniteInternalFuture<Object>>() {
+ @Override public void apply(IgniteInternalFuture<Object> f) {
try {
TaskDescriptor desc;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index ba5e9da..7c05047 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.affinity.consistenthash.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.internal.processors.port.*;
import org.apache.ignite.internal.processors.rest.*;
@@ -59,7 +58,7 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
assert req instanceof GridRestTopologyRequest : "Invalid command for topology handler: " + req;
assert SUPPORTED_COMMANDS.contains(req.command());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
index d1f71cb..77e9288 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.rest.handlers.version;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.rest.handlers.*;
import org.apache.ignite.internal.processors.rest.request.*;
@@ -50,7 +49,7 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
assert req != null;
assert SUPPORTED_COMMANDS.contains(req.command());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 8fbe916..5bf5263 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.internal.processors.rest.*;
@@ -120,20 +119,20 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
return;
}
- IgniteFuture<GridRestResponse> lastFut = ses.removeMeta(LAST_FUT.ordinal());
+ IgniteInternalFuture<GridRestResponse> lastFut = ses.removeMeta(LAST_FUT.ordinal());
if (lastFut != null && lastFut.isDone())
lastFut = null;
- IgniteFuture<GridRestResponse> f;
+ IgniteInternalFuture<GridRestResponse> f;
if (lastFut == null)
f = handleRequest0(ses, req, cmd);
else {
f = new GridEmbeddedFuture<>(
lastFut,
- new C2<GridRestResponse, Exception, IgniteFuture<GridRestResponse>>() {
- @Override public IgniteFuture<GridRestResponse> apply(GridRestResponse res, Exception e) {
+ new C2<GridRestResponse, Exception, IgniteInternalFuture<GridRestResponse>>() {
+ @Override public IgniteInternalFuture<GridRestResponse> apply(GridRestResponse res, Exception e) {
return handleRequest0(ses, req, cmd);
}
},
@@ -150,7 +149,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
* @param cmd Command.
* @return Future or {@code null} if processed immediately.
*/
- @Nullable private IgniteFuture<GridRestResponse> handleRequest0(
+ @Nullable private IgniteInternalFuture<GridRestResponse> handleRequest0(
final GridNioSession ses,
final GridMemcachedMessage req,
final GridTuple3<GridRestCommand, Boolean, Boolean> cmd
@@ -165,10 +164,10 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
return null;
}
- IgniteFuture<GridRestResponse> f = hnd.handleAsync(createRestRequest(req, cmd.get1()));
+ IgniteInternalFuture<GridRestResponse> f = hnd.handleAsync(createRestRequest(req, cmd.get1()));
- f.listenAsync(new CIX1<IgniteFuture<GridRestResponse>>() {
- @Override public void applyx(IgniteFuture<GridRestResponse> f) throws IgniteCheckedException {
+ f.listenAsync(new CIX1<IgniteInternalFuture<GridRestResponse>>() {
+ @Override public void applyx(IgniteInternalFuture<GridRestResponse> f) throws IgniteCheckedException {
GridRestResponse restRes = f.get();
// Handle 'Stat' command (special case because several packets are included in response).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
index 64a3a68..9aaf3c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.client.marshaller.*;
import org.apache.ignite.internal.processors.rest.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
@@ -177,8 +176,8 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli
final GridRestRequest req = createRestRequest(ses, msg);
if (req != null)
- hnd.handleAsync(req).listenAsync(new CI1<IgniteFuture<GridRestResponse>>() {
- @Override public void apply(IgniteFuture<GridRestResponse> fut) {
+ hnd.handleAsync(req).listenAsync(new CI1<IgniteInternalFuture<GridRestResponse>>() {
+ @Override public void apply(IgniteInternalFuture<GridRestResponse> fut) {
GridClientResponse res = new GridClientResponse();
res.requestId(msg.requestId());