[31/49] incubator-ignite git commit: IGNITE-9655 - Fixed retry logic.
IGNITE-9655 - Fixed retry logic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0b62470
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0b62470
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0b62470
Branch: refs/heads/sprint-1
Commit: f0b624701975b1b2fe6c4a411190a5efe4902317
Parents: 908f97f
Author: Alexey Goncharuk
Authored: Thu Feb 12 19:52:54 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Feb 12 19:52:54 2015 -0800
--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0b62470/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e4e886e..4c6af2c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -641,6 +641,8 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
for (IgniteTxEntry e : writes) {
IgniteTxEntry txEntry = tx.entry(e.txKey());
+GridCacheContext cacheCtx = txEntry.context();
+
assert txEntry != null : "Missing tx entry for key [tx=" + tx
+ ", key=" + e.txKey() + ']';
while (true) {
@@ -670,6 +672,7 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
}
catch (GridCacheEntryRemovedException ignored) {
// Retry.
+
txEntry.cached(cacheCtx.cache().entryEx(txEntry.key()), txEntry.keyBytes());
}
}
}
@@ -681,6 +684,8 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
if (res.hasOwnedValue(ver.getKey()))
continue;
+GridCacheContext cacheCtx = txEntry.context();
+
while (true) {
try {
GridCacheEntryEx entry = txEntry.cached();
@@ -709,6 +714,7 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
}
catch (GridCacheEntryRemovedException ignored) {
// Retry.
+txEntry.cached(cacheCtx.cache().entryEx(txEntry.key()),
txEntry.keyBytes());
}
}
}
[18/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
deleted file mode 100644
index ba21e25..000
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.extensions.communication;
-
-import org.apache.ignite.internal.direct.*;
-
-/**
- * TODO
- */
-public final class MessageWriteState {
-public static MessageWriteState create(MessageFormatter formatter) {
-MessageWriter writer = formatter.writer();
-
-MessageWriteState state = new MessageWriteState(writer);
-
-// TODO: rework
-((DirectMessageWriter)writer).state(state);
-
-return state;
-}
-
-private final MessageWriter writer;
-
-private final Stack stack;
-
-private MessageWriteState(MessageWriter writer) {
-this.writer = writer;
-
-stack = new Stack(-1);
-}
-
-public MessageWriter writer() {
-return writer;
-}
-
-public boolean isTypeWritten() {
-return stack.current() >= 0;
-}
-
-public void setTypeWritten() {
-assert stack.current() == -1;
-
-stack.incrementCurrent();
-}
-
-public int index() {
-return stack.current();
-}
-
-public void increment() {
-stack.incrementCurrent();
-}
-
-public void forward() {
-stack.push();
-}
-
-public void backward(boolean finished) {
-if (finished)
-stack.resetCurrent();
-
-stack.pop();
-}
-
-public void reset() {
-stack.reset();
-}
-
-private static class Stack {
-private final int[] arr = new int[10];
-
-private final int initVal;
-
-private int pos;
-
-private Stack(int initVal) {
-this.initVal = initVal;
-
-for (int i = 0; i < arr.length; i++)
-arr[i] = initVal;
-}
-
-int current() {
-return arr[pos];
-}
-
-void incrementCurrent() {
-arr[pos]++;
-}
-
-void resetCurrent() {
-arr[pos] = initVal;
-}
-
-void push() {
-pos++;
-}
-
-void pop() {
-pos--;
-}
-
-void reset() {
-assert pos == 0;
-
-resetCurrent();
-}
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index e6117a8..ee729e8 100644
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -255,4 +255,18 @@ public interface MessageWriter {
*/
public boolean writeMap(String name, Map map,
MessageAdapter.Type keyType,
MessageAdapter.Type valType);
+
+public boolean isTypeWritten();
+
+public void onTypeWritten();
+
+public int state();
+
+public void incrementState();
+
+public void beforeInnerMessageWrite();
+
+public void afterInnerMessageWrite(boolean finished);
+
+public void reset();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
--
diff --git
a/modules/core/src/
[18/28] incubator-ignite git commit: ignite-sql-old - fixes
ignite-sql-old - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bc35189
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bc35189
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bc35189
Branch: refs/heads/sprint-1
Commit: 8bc35189ea3036553b8b027bd4fbdeb5c8032d0a
Parents: 23781f3
Author: S.Vladykin
Authored: Sat Feb 14 14:23:01 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 14:23:01 2015 +0300
--
.../processors/query/GridQueryProcessor.java| 116 +++
1 file changed, 116 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc35189/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 7972497..603ee8c 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
@@ -22,8 +22,10 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
@@ -33,14 +35,17 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.*;
import org.apache.ignite.spi.indexing.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
import static org.apache.ignite.internal.IgniteComponentType.*;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.*;
@@ -471,6 +476,117 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
/**
* @param space Space.
+ * @param type Type.
+ * @param sqlQry Query.
+ * @param params Parameters.
+ * @return Cursor.
+ */
+public Iterator> queryLocal(String space, String
type, String sqlQry, Object[] params) {
+if (!busyLock.enterBusy())
+throw new IllegalStateException("Failed to execute query (grid is
stopping).");
+
+try {
+TypeDescriptor typeDesc = typesByName.get(new TypeName(space,
type));
+
+if (typeDesc == null || !typeDesc.registered())
+return new GridEmptyCloseableIterator<>();
+
+final GridCloseableIterator> i =
idx.query(space, sqlQry, F.asList(params), typeDesc,
+idx.backupFilter());
+
+if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) {
+ctx.event().record(new CacheQueryExecutedEvent<>(
+ctx.discovery().localNode(),
+"SQL query executed.",
+EVT_CACHE_QUERY_EXECUTED,
+CacheQueryType.SQL,
+null,
+null,
+sqlQry,
+null,
+null,
+params,
+null,
+null));
+}
+
+return new ClIter>() {
+@Override public void close() throws Exception {
+i.close();
+}
+
+@Override public boolean hasNext() {
+return i.hasNext();
+}
+
+@Override public Cache.Entry next() {
+IgniteBiTuple t = i.next();
+
+return new CacheEntryImpl<>(t.getKey(), t.getValue());
+}
+
+@Override public void remove() {
+throw new UnsupportedOperationException();
+}
+};
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException(e);
+}
+finally {
+busyLock.leaveBusy();
+}
+}
+
+/**
+ * Closeable iterator.
+ */
+private static interface ClIter extends AutoCloseable
[39/50] [abbrv] incubator-ignite git commit: # ignite-nio - Renaming
# ignite-nio - Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37e76c40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37e76c40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37e76c40
Branch: refs/heads/sprint-1-start-nodes
Commit: 37e76c40064575b55c39a6f8729cddad3a7cf526
Parents: 512ffc5
Author: Valentin Kulichenko
Authored: Sun Feb 15 00:16:21 2015 -0800
Committer: Valentin Kulichenko
Committed: Sun Feb 15 00:16:21 2015 -0800
--
.../internal/direct/DirectMessageWriter.java| 2 +-
.../direct/DirectMessageWriterState.java| 113 +++
.../internal/direct/MessageWriterState.java | 113 ---
3 files changed, 114 insertions(+), 114 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37e76c40/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index 0438bb2..238ecb6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -32,7 +32,7 @@ public class DirectMessageWriter implements MessageWriter {
private final DirectByteBufferStream stream = new
DirectByteBufferStream(null);
/** State. */
-private final MessageWriterState state = new MessageWriterState();
+private final DirectMessageWriterState state = new
DirectMessageWriterState();
/** {@inheritDoc} */
@Override public void setBuffer(ByteBuffer buf) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37e76c40/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
new file mode 100644
index 000..a84060d
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.direct;
+
+import java.util.*;
+
+/**
+ * Writer state.
+ */
+public class DirectMessageWriterState {
+/** Initial array size. */
+private static final int INIT_SIZE = 10;
+
+/** Initial value. */
+private static final int INIT_VAL = -1;
+
+/** Stack array. */
+private int[] stack;
+
+/** Current position. */
+private int pos;
+
+public DirectMessageWriterState() {
+stack = new int[INIT_SIZE];
+
+Arrays.fill(stack, INIT_VAL);
+}
+
+/**
+ * @return Whether type is written.
+ */
+public boolean isTypeWritten() {
+return state() >= 0;
+}
+
+/**
+ * Callback called after type is written.
+ */
+public void onTypeWritten() {
+assert state() == -1;
+
+incrementState();
+}
+
+/**
+ * @return Current state.
+ */
+public int state() {
+return stack[pos];
+}
+
+/**
+ * Increments state.
+ */
+public void incrementState() {
+stack[pos]++;
+}
+
+/**
+ * Callback called before inner message is written.
+ */
+public void beforeInnerMessageWrite() {
+pos++;
+
+// Growing never happen for Ignite messages, but we need
+// to support it for custom messages from plugins.
+if (pos == stack.length) {
+int[] stack0 = stack;
+
+stack = new int[stack.length << 1];
+
+System.arraycopy(stack0, 0, stack, 0, stack0.length);
+
+A
[21/49] incubator-ignite git commit: GG-9655 - Fixing tests after merge.
GG-9655 - Fixing tests after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/212293eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/212293eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/212293eb
Branch: refs/heads/sprint-1
Commit: 212293eb2bede9cca6610e7c43e870ab386bd3f8
Parents: 886299d
Author: Alexey Goncharuk
Authored: Wed Feb 4 17:53:05 2015 -0800
Committer: Alexey Goncharuk
Committed: Wed Feb 4 17:53:05 2015 -0800
--
.../processors/cache/GridCacheContext.java | 30 ++--
.../processors/cache/GridCacheMapEntry.java | 166 +++
.../processors/cache/GridCacheMvcc.java | 8 +-
.../cache/GridCacheMvccCandidate.java | 18 --
.../distributed/dht/GridDhtCacheEntry.java | 10 +-
.../distributed/dht/GridDhtLockFuture.java | 111 +
.../distributed/dht/GridDhtTxPrepareFuture.java | 3 +
.../near/GridNearTxPrepareFuture.java | 32 +++-
.../GridCacheAbstractJobExecutionTest.java | 11 ++
9 files changed, 131 insertions(+), 258 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/212293eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 1f624f8..c738b27 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1482,7 +1482,7 @@ public class GridCacheContext implements
Externalizable {
*/
public boolean dhtMap(UUID nearNodeId, long topVer, GridDhtCacheEntry entry, IgniteLogger log,
Map>> dhtMap,
-Map>> nearMap) throws
GridCacheEntryRemovedException {
+@Nullable Map>> nearMap)
throws GridCacheEntryRemovedException {
assert topVer != -1;
Collection dhtNodes =
dht().topology().nodes(entry.partition(), topVer);
@@ -1490,25 +1490,27 @@ public class GridCacheContext implements
Externalizable {
if (log.isDebugEnabled())
log.debug("Mapping entry to DHT nodes [nodes=" +
U.nodeIds(dhtNodes) + ", entry=" + entry + ']');
-Collection readers = entry.readers();
+Collection dhtRemoteNodes = F.view(dhtNodes,
F.remoteNodes(nodeId())); // Exclude local node.
-Collection nearNodes = null;
+boolean ret = map(entry, dhtRemoteNodes, dhtMap);
-if (!F.isEmpty(readers)) {
-nearNodes = discovery().nodes(readers, F0.notEqualTo(nearNodeId));
+if (nearMap != null) {
+Collection readers = entry.readers();
-if (log.isDebugEnabled())
-log.debug("Mapping entry to near nodes [nodes=" +
U.nodeIds(nearNodes) + ", entry=" + entry + ']');
-}
-else if (log.isDebugEnabled())
-log.debug("Entry has no near readers: " + entry);
+Collection nearNodes = null;
-Collection dhtRemoteNodes = F.view(dhtNodes,
F.remoteNodes(nodeId())); // Exclude local node.
+if (!F.isEmpty(readers)) {
+nearNodes = discovery().nodes(readers,
F0.notEqualTo(nearNodeId));
-boolean ret = map(entry, dhtRemoteNodes, dhtMap);
+if (log.isDebugEnabled())
+log.debug("Mapping entry to near nodes [nodes=" +
U.nodeIds(nearNodes) + ", entry=" + entry + ']');
+}
+else if (log.isDebugEnabled())
+log.debug("Entry has no near readers: " + entry);
-if (nearNodes != null && !nearNodes.isEmpty())
-ret |= map(entry, F.view(nearNodes, F.notIn(dhtNodes)), nearMap);
+if (nearNodes != null && !nearNodes.isEmpty())
+ret |= map(entry, F.view(nearNodes, F.notIn(dhtNodes)),
nearMap);
+}
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/212293eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 61d4959..ada0c1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/pro
[01/17] incubator-ignite git commit: ignite-nio - Removing message clone
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-nio dcb4c7093 -> 5085e4681
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
deleted file mode 100644
index ba21e25..000
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.extensions.communication;
-
-import org.apache.ignite.internal.direct.*;
-
-/**
- * TODO
- */
-public final class MessageWriteState {
-public static MessageWriteState create(MessageFormatter formatter) {
-MessageWriter writer = formatter.writer();
-
-MessageWriteState state = new MessageWriteState(writer);
-
-// TODO: rework
-((DirectMessageWriter)writer).state(state);
-
-return state;
-}
-
-private final MessageWriter writer;
-
-private final Stack stack;
-
-private MessageWriteState(MessageWriter writer) {
-this.writer = writer;
-
-stack = new Stack(-1);
-}
-
-public MessageWriter writer() {
-return writer;
-}
-
-public boolean isTypeWritten() {
-return stack.current() >= 0;
-}
-
-public void setTypeWritten() {
-assert stack.current() == -1;
-
-stack.incrementCurrent();
-}
-
-public int index() {
-return stack.current();
-}
-
-public void increment() {
-stack.incrementCurrent();
-}
-
-public void forward() {
-stack.push();
-}
-
-public void backward(boolean finished) {
-if (finished)
-stack.resetCurrent();
-
-stack.pop();
-}
-
-public void reset() {
-stack.reset();
-}
-
-private static class Stack {
-private final int[] arr = new int[10];
-
-private final int initVal;
-
-private int pos;
-
-private Stack(int initVal) {
-this.initVal = initVal;
-
-for (int i = 0; i < arr.length; i++)
-arr[i] = initVal;
-}
-
-int current() {
-return arr[pos];
-}
-
-void incrementCurrent() {
-arr[pos]++;
-}
-
-void resetCurrent() {
-arr[pos] = initVal;
-}
-
-void push() {
-pos++;
-}
-
-void pop() {
-pos--;
-}
-
-void reset() {
-assert pos == 0;
-
-resetCurrent();
-}
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index e6117a8..ee729e8 100644
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -255,4 +255,18 @@ public interface MessageWriter {
*/
public boolean writeMap(String name, Map map,
MessageAdapter.Type keyType,
MessageAdapter.Type valType);
+
+public boolean isTypeWritten();
+
+public void onTypeWritten();
+
+public int state();
+
+public void incrementState();
+
+public void beforeInnerMessageWrite();
+
+public void afterInnerMessageWrite(boolean finished);
+
+public void reset();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
--
[23/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index de6e6e8..c732be5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -178,28 +178,6 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-super.clone0(_msg);
-
-GridDhtAtomicUpdateResponse _clone = (GridDhtAtomicUpdateResponse)_msg;
-
-_clone.futVer = futVer != null ? (GridCacheVersion)futVer.clone() :
null;
-_clone.failedKeys = failedKeys;
-_clone.failedKeysBytes = failedKeysBytes;
-_clone.err = err;
-_clone.errBytes = errBytes;
-_clone.nearEvicted = nearEvicted;
-_clone.nearEvictedBytes = nearEvictedBytes;
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -244,7 +222,6 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean readFrom(ByteBuffer buf) {
reader.setBuffer(buf);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 41c8d42..c206264 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -543,46 +543,6 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-super.clone0(_msg);
-
-GridNearAtomicUpdateRequest _clone = (GridNearAtomicUpdateRequest)_msg;
-
-_clone.nodeId = nodeId;
-_clone.futVer = futVer != null ? (GridCacheVersion)futVer.clone() :
null;
-_clone.fastMap = fastMap;
-_clone.updateVer = updateVer != null ?
(GridCacheVersion)updateVer.clone() : null;
-_clone.topVer = topVer;
-_clone.syncMode = syncMode;
-_clone.op = op;
-_clone.keys = keys;
-_clone.keyBytes = keyBytes;
-_clone.vals = vals;
-_clone.valBytes = valBytes;
-_clone.invokeArgs = invokeArgs;
-_clone.invokeArgsBytes = invokeArgsBytes;
-_clone.drVers = drVers;
-_clone.drTtls = drTtls != null ? (GridLongList)drTtls.clone() : null;
-_clone.drExpireTimes = drExpireTimes != null ?
(GridLongList)drExpireTimes.clone() : null;
-_clone.retval = retval;
-_clone.expiryPlc = expiryPlc;
-_clone.expiryPlcBytes = expiryPlcBytes;
-_clone.filter = filter;
-_clone.filterBytes = filterBytes;
-_clone.hasPrimary = hasPrimary;
-_clone.forceTransformBackups = forceTransformBackups;
-_clone.subjId = subjId;
-_clone.taskNameHash = taskNameHash;
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -717,7 +677,6 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean readFrom(ByteBuff
[47/50] [abbrv] incubator-ignite git commit: Made TransactionConfiguration serializable again (it is added to the node attributes)
Made TransactionConfiguration serializable again (it is added to the node
attributes)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/436fa000
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/436fa000
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/436fa000
Branch: refs/heads/sprint-1-start-nodes
Commit: 436fa0004a79fb3575669d36b106a3187bb83c54
Parents: c851305
Author: Alexey Goncharuk
Authored: Sun Feb 15 01:42:09 2015 -0800
Committer: Alexey Goncharuk
Committed: Sun Feb 15 01:42:09 2015 -0800
--
.../apache/ignite/configuration/TransactionConfiguration.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/436fa000/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index ecc21e8..ee01f3c 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -19,10 +19,12 @@ package org.apache.ignite.configuration;
import org.apache.ignite.transactions.*;
+import java.io.*;
+
/**
* Transactions configuration.
*/
-public class TransactionConfiguration {
+public class TransactionConfiguration implements Serializable {
/** Default value for 'txSerializableEnabled' flag. */
public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false;
[06/45] incubator-ignite git commit: IGNITE-50 Fixed for p2pDisabled cfg. Added tests.
IGNITE-50 Fixed for p2pDisabled cfg. Added tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c92a044c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c92a044c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c92a044c
Branch: refs/heads/ignite-sql-old
Commit: c92a044c301181f05a7f5c8d78de739331b1c9ac
Parents: 8d347ed
Author: nikolay_tikhonov
Authored: Sat Feb 14 14:19:43 2015 +0300
Committer: nikolay_tikhonov
Committed: Sat Feb 14 14:19:43 2015 +0300
--
.../deployment/GridDeploymentManager.java | 2 +-
...niteCacheContinuousExecutionContextTest.java | 34
...IgniteCacheIsolatedExecutionContextTest.java | 34
...niteCacheP2PDisableExecutionContextTest.java | 34
.../IgniteCachePrivateExecutionContextTest.java | 34
.../IgniteCacheSharedExecutionContextTest.java | 34
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +++
7 files changed, 176 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c92a044c/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
index d8bce03..3d3bdc8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
@@ -69,7 +69,7 @@ public class GridDeploymentManager extends
GridManagerAdapter {
locDep = ann != null ?
new LocalDeployment(
ctx.config().getDeploymentMode(),
-U.gridClassLoader(),
+ctx.config().getClassLoader() != null ?
ctx.config().getClassLoader() : U.gridClassLoader(),
IgniteUuid.fromUuid(ctx.localNodeId()),
ctx.userVersion(U.gridClassLoader()),
String.class.getName()) :
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c92a044c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheContinuousExecutionContextTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheContinuousExecutionContextTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheContinuousExecutionContextTest.java
new file mode 100644
index 000..b3ddd2b
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheContinuousExecutionContextTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.context;
+
+import org.apache.ignite.configuration.*;
+
+/**
+ *
+ */
+public class IgniteCacheContinuousExecutionContextTest extends
IgniteCacheAtomicExecutionContextTest {
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+cfg.setDeploymentMode(DeploymentMode.CONTINUOUS);
+
+return cfg;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c92a044c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheIsolatedExecutionContextTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheIsolatedExecutionContex
[20/30] incubator-ignite git commit: IGNITE-SQL Changed sql examples.
IGNITE-SQL Changed sql examples.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eef98c23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eef98c23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eef98c23
Branch: refs/heads/ignite-nio
Commit: eef98c23faa640eceeaafaa4fe6bfeb6ce650274
Parents: 23781f3
Author: nikolay_tikhonov
Authored: Sat Feb 14 15:20:29 2015 +0300
Committer: nikolay_tikhonov
Committed: Sat Feb 14 15:20:29 2015 +0300
--
.../datagrid/CachePopularNumbersExample.java| 31 +--
.../examples/datagrid/CacheQueryExample.java| 194 +--
.../starschema/CacheStarSchemaExample.java | 43 ++--
3 files changed, 79 insertions(+), 189 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eef98c23/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index e793f70..0f71681 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -18,13 +18,13 @@
package org.apache.ignite.examples.datagrid;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.query.*;
import javax.cache.processor.*;
import java.util.*;
+import static org.apache.ignite.cache.query.Query.*;
+
/**
* Real time popular numbers counter.
*
@@ -113,37 +113,20 @@ public class CachePopularNumbersExample {
*/
private static TimerTask scheduleQuery(final Ignite ignite, Timer timer,
final int cnt) {
TimerTask task = new TimerTask() {
-private CacheQuery> qry;
-
@Override public void run() {
// Get reference to cache.
-GridCache cache = ignite.cache(CACHE_NAME);
-
-if (qry == null)
-qry = cache.queries().
-createSqlFieldsQuery("select _key, _val from Long
order by _val desc limit " + cnt);
+IgniteCache cache = ignite.jcache(CACHE_NAME);
try {
-List> results = new
ArrayList<>(qry.execute().get());
-
-Collections.sort(results, new Comparator>() {
-@Override public int compare(List r1, List r2) {
-long cnt1 = (Long)r1.get(1);
-long cnt2 = (Long)r2.get(1);
-
-return cnt1 < cnt2 ? 1 : cnt1 > cnt2 ? -1 : 0;
-}
-});
-
-for (int i = 0; i < cnt && i < results.size(); i++) {
-List res = results.get(i);
+List> results = new ArrayList<>(cache.queryFields(
+sql("select _key, _val from Long order by _val desc
limit ?").setArgs(cnt)).getAll());
+for (List res : results)
System.out.println(res.get(0) + "=" + res.get(1));
-}
System.out.println("");
}
-catch (IgniteCheckedException e) {
+catch (Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eef98c23/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index fe5bf7f..e041244 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -18,15 +18,16 @@
package org.apache.ignite.examples.datagrid;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
+import javax.cache.*;
import java.io.*;
import java.util.*;
+import static org.apache.ignite.cache.query.Query.*;
+
/**
* Cache queries exa
[38/50] [abbrv] incubator-ignite git commit: Revert "ignite-nio - Removing message clone"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 20f9cc3..5455a7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -348,7 +348,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
return false;
if (!writer.isTypeWritten()) {
-if (!writer.writeMessageType(directType()))
+if (!writer.writeByte(null, directType()))
return false;
writer.onTypeWritten();
@@ -356,55 +356,55 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
switch (writer.state()) {
case 24:
-if (!writer.writeField("accessTtl", accessTtl,
MessageFieldType.LONG))
+if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
case 25:
-if (!writer.writeField("invalidateEntries", invalidateEntries,
MessageFieldType.BIT_SET))
+if (!writer.writeBitSet("invalidateEntries",
invalidateEntries))
return false;
writer.incrementState();
case 26:
-if (!writer.writeField("miniId", miniId,
MessageFieldType.IGNITE_UUID))
+if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 27:
-if (!writer.writeCollectionField("nearKeyBytes", nearKeyBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeCollection("nearKeyBytes", nearKeyBytes,
MessageFieldType.BYTE_ARR))
return false;
writer.incrementState();
case 28:
-if (!writer.writeField("ownedBytes", ownedBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeByteArray("ownedBytes", ownedBytes))
return false;
writer.incrementState();
case 29:
-if (!writer.writeField("preloadKeys", preloadKeys,
MessageFieldType.BIT_SET))
+if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
case 30:
-if (!writer.writeField("subjId", subjId,
MessageFieldType.UUID))
+if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 31:
-if (!writer.writeField("taskNameHash", taskNameHash,
MessageFieldType.INT))
+if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 32:
-if (!writer.writeField("topVer", topVer,
MessageFieldType.LONG))
+if (!writer.writeLong("topVer", topVer))
return false;
writer.incrementState();
@@ -423,7 +423,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
switch (readState) {
case 24:
-accessTtl = reader.readField("accessTtl",
MessageFieldType.LONG);
+accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
return false;
@@ -431,7 +431,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 25:
-invalidateEntries = reader.readField("invalidateEntries",
MessageFieldType.BIT_SET);
+invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
return false;
@@ -439,7 +439,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 26:
-miniId = reader.readField("miniId",
MessageFieldType.IGNITE_UUID);
+miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -447,7 +447,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 27:
-nearKeyBytes = reader.readCollectionField("nearKeyBytes",
[13/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1d41941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1d41941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1d41941
Branch: refs/heads/sprint-1
Commit: f1d419418b9d429634658af38ac47c9f156f0931
Parents: d674a08
Author: Valentin Kulichenko
Authored: Sat Feb 14 18:25:40 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 18:25:40 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 71 ++--
.../internal/direct/DirectByteBufferStream.java | 116 ++-
.../communication/MessageAdapter.java | 47
3 files changed, 116 insertions(+), 118 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1d41941/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index c163684..80cf53e 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -63,6 +63,56 @@ public class CommunicationMessageCodeGenerator {
private static final String BUF_VAR = "buf";
/** */
+private static final Map, MessageAdapter.Type> TYPES =
U.newHashMap(30);
+
+static {
+TYPES.put(byte.class, MessageAdapter.Type.BYTE);
+TYPES.put(Byte.class, MessageAdapter.Type.BYTE);
+TYPES.put(short.class, MessageAdapter.Type.SHORT);
+TYPES.put(Short.class, MessageAdapter.Type.SHORT);
+TYPES.put(int.class, MessageAdapter.Type.INT);
+TYPES.put(Integer.class, MessageAdapter.Type.INT);
+TYPES.put(long.class, MessageAdapter.Type.LONG);
+TYPES.put(Long.class, MessageAdapter.Type.LONG);
+TYPES.put(float.class, MessageAdapter.Type.FLOAT);
+TYPES.put(Float.class, MessageAdapter.Type.FLOAT);
+TYPES.put(double.class, MessageAdapter.Type.DOUBLE);
+TYPES.put(Double.class, MessageAdapter.Type.DOUBLE);
+TYPES.put(char.class, MessageAdapter.Type.CHAR);
+TYPES.put(Character.class, MessageAdapter.Type.CHAR);
+TYPES.put(boolean.class, MessageAdapter.Type.BOOLEAN);
+TYPES.put(Boolean.class, MessageAdapter.Type.BOOLEAN);
+TYPES.put(byte[].class, MessageAdapter.Type.BYTE_ARR);
+TYPES.put(short[].class, MessageAdapter.Type.SHORT_ARR);
+TYPES.put(int[].class, MessageAdapter.Type.INT_ARR);
+TYPES.put(long[].class, MessageAdapter.Type.LONG_ARR);
+TYPES.put(float[].class, MessageAdapter.Type.FLOAT_ARR);
+TYPES.put(double[].class, MessageAdapter.Type.DOUBLE_ARR);
+TYPES.put(char[].class, MessageAdapter.Type.CHAR_ARR);
+TYPES.put(boolean[].class, MessageAdapter.Type.BOOLEAN_ARR);
+TYPES.put(String.class, MessageAdapter.Type.STRING);
+TYPES.put(BitSet.class, MessageAdapter.Type.BIT_SET);
+TYPES.put(UUID.class, MessageAdapter.Type.UUID);
+TYPES.put(IgniteUuid.class, MessageAdapter.Type.IGNITE_UUID);
+}
+
+/**
+ * @param cls Class.
+ * @return Type enum value.
+ */
+private static MessageAdapter.Type typeEnum(Class cls) {
+MessageAdapter.Type type = TYPES.get(cls);
+
+if (type == null) {
+assert MessageAdapter.class.isAssignableFrom(cls) : cls;
+
+type = MessageAdapter.Type.MSG;
+}
+
+return type;
+}
+
+/** */
private final Collection write = new ArrayList<>();
/** */
@@ -540,19 +590,19 @@ public class CommunicationMessageCodeGenerator {
returnFalseIfFailed(write, "writer.writeMessage", field, name);
else if (type.isArray()) {
returnFalseIfFailed(write, "writer.writeObjectArray", field, name,
-type.getComponentType().getSimpleName() + ".class");
+"Type." + typeEnum(type.getComponentType()));
}
else if (Collection.class.isAssignableFrom(type) &&
!Set.class.isAssignableFrom(type)) {
assert colItemType != null;
-returnFalseIfFailed(write, "writer.writeCollection", field, name,
colItemType.getSimpleName() + ".class");
+returnFalseIfFailed(write, "writer.writeCollection", field, name,
"Type." + typeEnum(colItemType));
}
else if (Map.class.isAssignableFrom(type)) {
assert mapKeyType != null;
[43/45] incubator-ignite git commit: Merge branch 'ignite-sql-old' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old
Merge branch 'ignite-sql-old' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4873f043 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4873f043 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4873f043 Branch: refs/heads/ignite-sql-old Commit: 4873f0437aa5445c95daba509c17a886cb6100fa Parents: 2e834e6 f0a6747 Author: S.Vladykin Authored: Sun Feb 15 05:46:28 2015 +0300 Committer: S.Vladykin Committed: Sun Feb 15 05:46:28 2015 +0300 -- .../commands/cache/VisorCacheCommandSpec.scala | 39 ++-- 1 file changed, 20 insertions(+), 19 deletions(-) --
incubator-ignite git commit: # sprint-1 Change timeout for test.
Repository: incubator-ignite Updated Branches: refs/heads/sprint-1-start-nodes [created] b07576239 # sprint-1 Change timeout for test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0757623 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0757623 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0757623 Branch: refs/heads/sprint-1-start-nodes Commit: b07576239f4c3861e02fa8285926ef6f5ac382f1 Parents: f846f8a Author: anovikov Authored: Sun Feb 15 13:10:28 2015 +0700 Committer: anovikov Committed: Sun Feb 15 13:10:28 2015 +0700 -- .../ignite/internal/IgniteProjectionStartStopRestartSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0757623/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java -- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java index babdbbb..f4a6355 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java @@ -76,7 +76,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract private static final String CUSTOM_CFG_ATTR_VAL = "true"; /** */ -private static final long WAIT_TIMEOUT = 40 * 1000; +private static final long WAIT_TIMEOUT = 90 * 1000; /** */ private String pwd;
[16/17] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af8edc04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af8edc04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af8edc04 Branch: refs/heads/ignite-nio Commit: af8edc04c356be979e4e10c6ed3574c43a547dfa Parents: 3a05bf1 Author: Valentin Kulichenko Authored: Sat Feb 14 22:39:52 2015 -0800 Committer: Valentin Kulichenko Committed: Sat Feb 14 22:39:52 2015 -0800 -- .../CommunicationMessageCodeGenerator.java | 2 +- .../ignite/internal/GridJobCancelRequest.java | 14 +- .../ignite/internal/GridJobExecuteRequest.java | 86 +++ .../ignite/internal/GridJobExecuteResponse.java | 30 +-- .../ignite/internal/GridJobSiblingsRequest.java | 10 +- .../internal/GridJobSiblingsResponse.java | 6 +- .../ignite/internal/GridTaskCancelRequest.java | 6 +- .../ignite/internal/GridTaskSessionRequest.java | 14 +- .../internal/direct/DirectMessageReader.java| 219 ++ .../internal/direct/DirectMessageWriter.java| 179 +++ .../checkpoint/GridCheckpointRequest.java | 14 +- .../managers/communication/GridIoMessage.java | 30 +-- .../communication/GridIoUserMessage.java| 30 +-- .../deployment/GridDeploymentInfoBean.java | 22 +- .../deployment/GridDeploymentRequest.java | 22 +- .../deployment/GridDeploymentResponse.java | 14 +- .../eventstorage/GridEventStorageMessage.java | 38 ++-- .../cache/GridCacheEvictionRequest.java | 14 +- .../cache/GridCacheEvictionResponse.java| 14 +- .../processors/cache/GridCacheMessage.java | 14 +- .../processors/cache/GridCacheValueBytes.java | 10 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 22 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 14 +- ...CachePessimisticCheckCommittedTxRequest.java | 30 +-- ...achePessimisticCheckCommittedTxResponse.java | 18 +- .../distributed/GridCacheTtlUpdateRequest.java | 26 +-- .../distributed/GridDistributedBaseMessage.java | 22 +- .../distributed/GridDistributedLockRequest.java | 66 +++--- .../GridDistributedLockResponse.java| 14 +- .../GridDistributedTxFinishRequest.java | 54 ++--- .../GridDistributedTxFinishResponse.java| 10 +- .../GridDistributedTxPrepareRequest.java| 58 ++--- .../GridDistributedTxPrepareResponse.java | 10 +- .../GridDistributedUnlockRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentResponse.java | 10 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++-- .../distributed/dht/GridDhtLockResponse.java| 18 +- .../distributed/dht/GridDhtTxFinishRequest.java | 54 ++--- .../dht/GridDhtTxFinishResponse.java| 6 +- .../dht/GridDhtTxPrepareRequest.java| 50 ++--- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../GridDhtAtomicDeferredUpdateResponse.java| 6 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 82 +++ .../dht/atomic/GridDhtAtomicUpdateResponse.java | 18 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +++ .../atomic/GridNearAtomicUpdateResponse.java| 46 ++-- .../dht/preloader/GridDhtForceKeysRequest.java | 18 +- .../dht/preloader/GridDhtForceKeysResponse.java | 18 +- .../GridDhtPartitionDemandMessage.java | 26 +-- .../preloader/GridDhtPartitionExchangeId.java | 14 +- .../GridDhtPartitionSupplyMessage.java | 26 +-- .../GridDhtPartitionsAbstractMessage.java | 10 +- .../preloader/GridDhtPartitionsFullMessage.java | 10 +- .../GridDhtPartitionsSingleMessage.java | 6 +- .../GridDhtPartitionsSingleRequest.java | 2 +- .../distributed/near/GridNearGetRequest.java| 46 ++-- .../distributed/near/GridNearGetResponse.java | 30 +-- .../distributed/near/GridNearLockRequest.java | 50 ++--- .../distributed/near/GridNearLockResponse.java | 22 +- .../near/GridNearTxFinishRequest.java | 26 +-- .../near/GridNearTxFinishResponse.java | 14 +- .../near/GridNearTxPrepareRequest.java | 34 +-- .../near/GridNearTxPrepareResponse.java | 26 +-- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 78 +++ .../cache/query/GridCacheQueryResponse.java | 26 +-- .../cache/version/GridCacheVersion.java | 18 +- .../clock/GridClockDeltaSnapshotMessage.java| 10 +- .../processors/clock/GridClockDeltaVersion.java | 10 +- .../continuous/GridContinuousMessage.java | 18 +- .../dataload/GridDataLoadRequest.java | 54 ++--- .../dataload/GridDat
[13/28] incubator-ignite git commit: IGNITE-143 - Continuous queries refactoring (manual merge)
IGNITE-143 - Continuous queries refactoring (manual merge)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4654779
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4654779
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4654779
Branch: refs/heads/sprint-1
Commit: e4654779f0e24e5a47b830467f25abb3b61dcea3
Parents: 4f649be
Author: Valentin Kulichenko
Authored: Fri Feb 13 17:16:23 2015 -0800
Committer: Valentin Kulichenko
Committed: Fri Feb 13 17:16:23 2015 -0800
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4654779/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 53fc796..ede310a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -250,7 +250,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter accepAll() {
+private IgniteBiPredicate acceptAll() {
return new IgniteBiPredicate() {
@Override public boolean apply(K k, V v) {
return true;
@@ -271,7 +271,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter p = ((ScanQuery)filter).getFilter();
-qry = delegate.queries().createScanQuery(p != null ? p :
accepAll());
+qry = delegate.queries().createScanQuery(p != null ? p :
acceptAll());
if (grp != null)
qry.projection(grp);
[01/45] incubator-ignite git commit: broken properties test
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sql-old f0a674770 -> a8573b48a broken properties test Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c1f17fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c1f17fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c1f17fc Branch: refs/heads/ignite-sql-old Commit: 5c1f17fcdccd8cd83b4ab837215e805f0d21633e Parents: 81c443a Author: Anton Vinogradov Authored: Wed Feb 11 10:42:48 2015 +0300 Committer: Anton Vinogradov Committed: Wed Feb 11 10:42:48 2015 +0300 -- .../optimized/optimized-classnames.properties | 68 ++-- 1 file changed, 34 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c1f17fc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties -- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties index e6ece60..1983a60 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties @@ -1,3 +1,37 @@ +org.apache.tools.ant.Location +org.apache.tools.ant.Project$AntRefTable +org.apache.tools.ant.RuntimeConfigurable +org.apache.tools.ant.UnsupportedAttributeException +org.apache.tools.ant.UnsupportedElementException +org.apache.tools.ant.launch.LaunchException +org.apache.tools.ant.taskdefs.ManifestException +org.apache.tools.ant.taskdefs.optional.EchoProperties$1 +org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbc$EjbcException +org.apache.tools.ant.taskdefs.optional.testing.BuildTimeoutException +org.apache.tools.ant.types.resources.ImmutableResourceException +org.apache.tools.ant.util.IdentityStack +org.apache.tools.ant.util.LayoutPreservingProperties +org.apache.tools.ant.util.LazyHashtable +org.apache.tools.ant.util.LinkedHashtable +org.apache.tools.ant.util.VectorSet +org.apache.tools.mail.ErrorInQuitException +org.codehaus.plexus.interpolation.InterpolationException +org.codehaus.plexus.interpolation.reflection.MethodMap$AmbiguousException +org.codehaus.plexus.util.FastMap +org.codehaus.plexus.util.cli.CommandLineException +org.codehaus.plexus.util.cli.CommandLineTimeOutException +org.codehaus.plexus.util.dag.CycleDetectedException +org.codehaus.plexus.util.dag.DAG +org.codehaus.plexus.util.dag.Vertex +org.codehaus.plexus.util.introspection.MethodMap$AmbiguousException +org.codehaus.plexus.util.reflection.ReflectorException +org.codehaus.plexus.util.xml.XmlReaderException +org.codehaus.plexus.util.xml.XmlStreamReaderException +org.codehaus.plexus.util.xml.pull.XmlPullParserException +org.pcollections.MapPSet$In +org.pcollections.SimpleImmutableEntry +org.slf4j.helpers.BasicMarker +org.slf4j.helpers.NOPLogger jodd.cache.LRUCache$1 jodd.csselly.CSSellyException jodd.csselly.Combinator @@ -1613,37 +1647,3 @@ org.apache.tools.ant.BuildException org.apache.tools.ant.ComponentHelper$AntTypeTable org.apache.tools.ant.ExitException org.apache.tools.ant.ExitStatusException -org.apache.tools.ant.Location -org.apache.tools.ant.Project$AntRefTable -org.apache.tools.ant.RuntimeConfigurable -org.apache.tools.ant.UnsupportedAttributeException -org.apache.tools.ant.UnsupportedElementException -org.apache.tools.ant.launch.LaunchException -org.apache.tools.ant.taskdefs.ManifestException -org.apache.tools.ant.taskdefs.optional.EchoProperties$1 -org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbc$EjbcException -org.apache.tools.ant.taskdefs.optional.testing.BuildTimeoutException -org.apache.tools.ant.types.resources.ImmutableResourceException -org.apache.tools.ant.util.IdentityStack -org.apache.tools.ant.util.LayoutPreservingProperties -org.apache.tools.ant.util.LazyHashtable -org.apache.tools.ant.util.LinkedHashtable -org.apache.tools.ant.util.VectorSet -org.apache.tools.mail.ErrorInQuitException -org.codehaus.plexus.interpolation.InterpolationException -org.codehaus.plexus.interpolation.reflection.MethodMap$AmbiguousException -org.codehaus.plexus.util.FastMap -org.codehaus.plexus.util.cli.CommandLineException -org.codehaus.plexus.util.cli.CommandLineTimeOutException -org.codehaus.plexus.util.dag.CycleDetectedException -org.codehaus.plexus.util.dag.DAG -org.codehaus.plexus.util.dag.Vertex -org.codehaus.plexus.util.introspection.MethodMap$AmbiguousException -org.codehaus.plexus.util.reflection.ReflectorException -org.codehaus.plexus.util.xml.XmlReaderException -org.codehaus.plexus.util.xml.
[21/28] incubator-ignite git commit: ignite-sql-old - rename
ignite-sql-old - rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72ec8d62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72ec8d62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72ec8d62
Branch: refs/heads/sprint-1
Commit: 72ec8d62595a240496c9a948e6d0374785c318b0
Parents: d026ccf
Author: S.Vladykin
Authored: Sat Feb 14 15:24:10 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 15:24:10 2015 +0300
--
.../configuration/CacheConfiguration.java | 5 +-
.../configuration/IgniteConfiguration.java | 10 +-
.../org/apache/ignite/internal/IgnitionEx.java | 5 +-
.../managers/indexing/GridIndexingManager.java | 2 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/query/GridCacheSqlMetadata.java | 2 +-
.../ignite/spi/indexing/GridIndexingSpi.java| 112 --
.../spi/indexing/GridNoopIndexingSpi.java | 66 ---
.../apache/ignite/spi/indexing/IndexingSpi.java | 113 +++
.../spi/indexing/noop/NoopIndexingSpi.java | 68 +++
.../IgniteTxExceptionAbstractSelfTest.java | 5 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
pom.xml | 4 +-
13 files changed, 200 insertions(+), 196 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72ec8d62/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 5978e8b..84c047c 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.eviction.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.spi.indexing.*;
@@ -1434,7 +1433,7 @@ public class CacheConfiguration extends
MutableConfiguration {
* SPI is configured. In majority of the cases default value should be
used.
*
* @return Name of SPI to use for indexing.
- * @see GridIndexingSpi
+ * @see IndexingSpi
*/
public String getIndexingSpiName() {
return indexingSpiName;
@@ -1448,7 +1447,7 @@ public class CacheConfiguration extends
MutableConfiguration {
* SPI is configured. In majority of the cases default value should be
used.
*
* @param indexingSpiName Name.
- * @see GridIndexingSpi
+ * @see IndexingSpi
*/
public void setIndexingSpiName(String indexingSpiName) {
this.indexingSpiName = indexingSpiName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72ec8d62/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index f07cec5..1695ab7 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -314,7 +314,7 @@ public class IgniteConfiguration {
private SwapSpaceSpi swapSpaceSpi;
/** Indexing SPI. */
-private GridIndexingSpi indexingSpi;
+private IndexingSpi indexingSpi;
/** Address resolver. */
private AddressResolver addrRslvr;
@@ -1808,12 +1808,12 @@ public class IgniteConfiguration {
}
/**
- * Sets fully configured instances of {@link
org.apache.ignite.spi.indexing.GridIndexingSpi}.
+ * Sets fully configured instances of {@link IndexingSpi}.
*
- * @param indexingSpi Fully configured instances of {@link
org.apache.ignite.spi.indexing.GridIndexingSpi}.
+ * @param indexingSpi Fully configured instances of {@link IndexingSpi}.
* @see IgniteConfiguration#getIndexingSpi()
*/
-public void setIndexingSpi(GridIndexingSpi indexingSpi) {
+public void setIndexingSpi(IndexingSpi indexingSpi) {
this.indexingSpi = indexingSpi;
}
@@ -1822,7 +1822,7 @@ public class IgniteConfiguration {
*
* @return Indexing SPI implementation.
*/
-public GridIndexingSpi getI
[05/28] incubator-ignite git commit: ignite-sql-old - rename
ignite-sql-old - rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cb1fb4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cb1fb4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cb1fb4c
Branch: refs/heads/sprint-1
Commit: 5cb1fb4c394a5a0e26eec6a145b8af72ed40545f
Parents: 5504579
Author: S.Vladykin
Authored: Sat Feb 14 01:16:50 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 01:16:50 2015 +0300
--
.../apache/ignite/cache/query/CacheQueries.java | 2 +-
.../apache/ignite/cache/query/CacheQuery.java | 2 +-
.../cache/query/CacheQueryConfiguration.java| 180 --
.../ignite/cache/query/CacheQueryMetrics.java | 60 --
.../cache/query/CacheQueryTypeResolver.java | 32
.../apache/ignite/cache/query/QueryMetrics.java | 60 ++
.../ignite/cache/query/QueryTypeResolver.java | 32
.../configuration/CacheConfiguration.java | 1 -
.../configuration/CacheQueryConfiguration.java | 182 +++
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/query/GridCacheQueriesProxy.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../query/GridCacheQueryMetricsAdapter.java | 4 +-
.../processors/query/GridQueryProcessor.java| 4 +-
.../visor/cache/VisorCacheQueryMetrics.java | 2 +-
.../cache/GridCacheQueryMetricsSelfTest.java| 4 +-
17 files changed, 287 insertions(+), 286 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb1fb4c/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java
index 36ae24b..2003172 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueries.java
@@ -143,7 +143,7 @@ public interface CacheQueries {
*
* @return Cache query metrics.
*/
-public CacheQueryMetrics metrics();
+public QueryMetrics metrics();
/**
* Resets accumulated metrics.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb1fb4c/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
index 1d4a3a7..f16eba2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
@@ -286,7 +286,7 @@ public interface CacheQuery {
*
* @return Query metrics.
*/
-public CacheQueryMetrics metrics();
+public QueryMetrics metrics();
/**
* Resets metrics for this query.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb1fb4c/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java
deleted file mode 100644
index e96e222..000
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.query;
-
-import java.io.*;
-
-/**
- * Query configuration object.
- */
-public class CacheQueryConfiguration implements Serializable {
-/** */
-private static final long
[06/49] incubator-ignite git commit: #ingite-9655 - Regenerated messages.
#ingite-9655 - Regenerated messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bc80265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bc80265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bc80265
Branch: refs/heads/sprint-1
Commit: 8bc802657d411208e2cbb719e1d7a20ecb721785
Parents: ebcbb95
Author: Alexey Goncharuk
Authored: Thu Jan 29 12:20:44 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Jan 29 12:20:44 2015 -0800
--
.../distributed/GridDistributedLockRequest.java | 58 -
.../GridDistributedTxFinishRequest.java | 28 +++--
.../GridDistributedTxPrepareRequest.java| 119 +--
.../distributed/dht/GridDhtLockRequest.java | 59 -
.../distributed/dht/GridDhtTxFinishRequest.java | 98 +++
.../dht/GridDhtTxPrepareRequest.java| 48
.../distributed/near/GridNearLockRequest.java | 79 ++--
.../near/GridNearTxFinishRequest.java | 46 +++
.../near/GridNearTxPrepareRequest.java | 63 +++---
.../near/GridNearTxPrepareResponse.java | 52 ++--
10 files changed, 361 insertions(+), 289 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 52967ea..09a11d4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -396,43 +396,43 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage
}
switch (commState.idx) {
-case 9:
+case 8:
if (!commState.putGridUuid(futId))
return false;
commState.idx++;
-case 10:
+case 9:
if (!commState.putByteArray(grpLockKeyBytes))
return false;
commState.idx++;
-case 11:
+case 10:
if (!commState.putBoolean(isInTx))
return false;
commState.idx++;
-case 12:
+case 11:
if (!commState.putBoolean(isInvalidate))
return false;
commState.idx++;
-case 13:
+case 12:
if (!commState.putBoolean(isRead))
return false;
commState.idx++;
-case 14:
+case 13:
if (!commState.putEnum(isolation))
return false;
commState.idx++;
-case 15:
+case 14:
if (keyBytes != null) {
if (commState.it == null) {
if (!commState.putInt(keyBytes.size()))
@@ -459,47 +459,48 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage
commState.idx++;
-case 16:
+case 15:
if (!commState.putCacheVersion(nearXidVer))
return false;
commState.idx++;
-case 17:
+case 16:
if (!commState.putUuid(nodeId))
return false;
commState.idx++;
-case 18:
+case 17:
if (!commState.putBoolean(partLock))
return false;
commState.idx++;
-case 19:
+case 18:
if (!commState.putBooleanArray(retVals))
return false;
commState.idx++;
-case 20:
+case 19:
if (!commState.putLong(threadId))
return false;
commState.idx++;
-case 21:
+case 20:
if (!commState.putLong(timeout))
return false;
commState.idx++;
-case 22:
+case 21:
if (!commState.putInt(txSize))
return false;
commState.idx++;
+
}
return true;
@@ -514,7 +515,7 @@ public class GridDistributedLock
[27/30] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old Conflicts: modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ddbfb711 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddbfb711 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddbfb711 Branch: refs/heads/ignite-nio Commit: ddbfb711000b4402a4755d865da4bf6d0de43e84 Parents: 4873f04 f846f8a Author: S.Vladykin Authored: Sun Feb 15 06:01:30 2015 +0300 Committer: S.Vladykin Committed: Sun Feb 15 06:01:30 2015 +0300 -- assembly/core-jar.xml | 49 - assembly/dependencies-fabric.xml| 53 +- assembly/dependencies-hadoop.xml| 42 +- assembly/dependencies-optional-fabric.xml |1 - assembly/dependencies-optional-hadoop.xml |1 - .../client/memcache/MemcacheRestExample.java|3 +- modules/core/licenses/sun-bcl-license.txt | 50 + modules/core/pom.xml| 16 - .../ignite/internal/GridKernalGateway.java |7 + .../ignite/internal/GridKernalGatewayImpl.java | 16 + .../apache/ignite/internal/IgniteKernal.java| 23 +- .../deployment/GridDeploymentManager.java |2 +- .../processors/cache/GridCacheMvccManager.java | 15 + .../processors/cache/GridCacheProcessor.java|8 + .../optimized/optimized-classnames.properties | 254 +- .../fifoqueue/FifoQueueCollisionSpi.java|6 +- .../PriorityQueueCollisionSpi.java |6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 70 +- .../org/jdk8/backport/ConcurrentHashMap8.java | 3825 ++ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 + .../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ++ .../main/java/org/jdk8/backport/LongAdder.java | 235 ++ .../main/java/org/jdk8/backport/Striped64.java | 370 ++ .../org/jdk8/backport/ThreadLocalRandom8.java | 231 ++ .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 ++ .../internal/GridReleaseTypeSelfTest.java | 35 +- .../GridTopologyBuildVersionSelfTest.java | 101 - .../internal/GridUpdateNotifierSelfTest.java|4 + .../GridCacheConcurrentTxMultiNodeTest.java |4 +- ...CacheFullTextQueryMultithreadedSelfTest.java |2 +- .../cache/GridCacheLuceneQueryIndexTest.java| 16 +- .../cache/GridCacheOffHeapSelfTest.java |2 +- .../cache/GridCacheP2PUndeploySelfTest.java |2 +- .../cache/GridCacheQueryIndexSelfTest.java |5 +- .../GridCacheQueryInternalKeysSelfTest.java |2 +- .../cache/GridCacheSwapPreloadSelfTest.java |2 +- .../GridCacheVariableTopologySelfTest.java |2 +- .../IgniteCacheAbstractStopBusySelfTest.java| 381 ++ .../IgniteCacheAtomicStopBusySelfTest.java | 59 + ...gniteCacheTransactionalStopBusySelfTest.java | 53 + .../cache/IgniteTxMultiNodeAbstractTest.java|6 +- ...niteCacheContinuousExecutionContextTest.java | 34 + ...IgniteCacheIsolatedExecutionContextTest.java | 34 + ...niteCacheP2PDisableExecutionContextTest.java | 34 + .../IgniteCachePrivateExecutionContextTest.java | 34 + .../IgniteCacheSharedExecutionContextTest.java | 34 + .../GridCacheQueueCleanupSelfTest.java |8 +- .../GridCacheAbstractJobExecutionTest.java |7 +- .../GridCacheClientModesAbstractSelfTest.java |9 +- ...ePartitionedNearDisabled
[10/45] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-opti.prop-test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de43b938/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties --
[27/49] incubator-ignite git commit: IGNITE-9655 Merge fixes.
IGNITE-9655 Merge fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e50dbdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e50dbdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e50dbdd
Branch: refs/heads/sprint-1
Commit: 0e50dbdd2a3c1a235e50e3ef200bd54567ebcfb7
Parents: 3728ac3
Author: Alexey Goncharuk
Authored: Thu Feb 12 15:22:25 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Feb 12 15:22:25 2015 -0800
--
.../internal/processors/cache/transactions/IgniteTxManager.java | 2 +-
.../processors/cache/GridCacheAbstractFullApiSelfTest.java| 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e50dbdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 87708ed..bf8f855 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -893,7 +893,7 @@ public class IgniteTxManager extends
GridCacheSharedManagerAdapter {
* @param tx Transaction.
*/
private void removeObsolete(IgniteInternalTx tx) {
-Collection> entries = (tx.local() && !tx.dht()) ?
tx.allEntries() : tx.writeEntries();
+Collection> entries = tx.local() ? tx.allEntries()
: tx.writeEntries();
for (IgniteTxEntry entry : entries) {
GridCacheEntryEx cached = entry.cached();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e50dbdd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 6b21114..6f3c1f9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3819,9 +3819,6 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
checkIteratorRemove(cache, entries);
checkIteratorEmpty(cache);
-
-for (int i = 0; i < SIZE; i++)
-cache.remove(Integer.toString(i));
}
/**
[04/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
index 611eeda..7712ac3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
@@ -112,11 +112,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
/** {@inheritDoc} */
@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
@Override public MessageAdapter clone() {
-GridCacheOptimisticCheckPreparedTxRequest _clone = new
GridCacheOptimisticCheckPreparedTxRequest();
-
-clone0(_clone);
-
-return _clone;
+throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
@@ -135,48 +131,51 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
/** {@inheritDoc} */
@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf) {
+MessageWriteState state = MessageWriteState.get();
+MessageWriter writer = state.writer();
+
writer.setBuffer(buf);
if (!super.writeTo(buf))
return false;
-if (!typeWritten) {
+if (!state.isTypeWritten()) {
if (!writer.writeByte(null, directType()))
return false;
-typeWritten = true;
+state.setTypeWritten();
}
-switch (state) {
+switch (state.index()) {
case 8:
if (!writer.writeIgniteUuid("futId", futId))
return false;
-state++;
+state.increment();
case 9:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
-state++;
+state.increment();
case 10:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
-state++;
+state.increment();
case 11:
if (!writer.writeBoolean("sys", sys))
return false;
-state++;
+state.increment();
case 12:
if (!writer.writeInt("txNum", txNum))
return false;
-state++;
+state.increment();
}
@@ -191,14 +190,14 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
if (!super.readFrom(buf))
return false;
-switch (state) {
+switch (readState) {
case 8:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
return false;
-state++;
+readState++;
case 9:
miniId = reader.readIgniteUuid("miniId");
@@ -206,7 +205,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
if (!reader.isLastRead())
return false;
-state++;
+readState++;
case 10:
nearXidVer = reader.readMessage("nearXidVer");
@@ -214,7 +213,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
if (!reader.isLastRead())
return false;
-state++;
+readState++;
case 11:
sys = reader.readBoolean("sys");
@@ -222,7 +221,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
if (!reader.isLastRead())
return false;
-state++;
+readState++;
case 12:
txNum = reader.readInt("txNum");
@@ -230,7 +229,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest extends GridDistrib
if (!reader.isLastRead())
return false;
-state++;
+readState++;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java
--
diff --git
a/modules/core/src/main/j
[10/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e74ff005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e74ff005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e74ff005 Branch: refs/heads/sprint-1 Commit: e74ff005db2442888c5fc67096a0dbfe9fbbac93 Parents: 6f20eb2 Author: Valentin Kulichenko Authored: Sat Feb 14 15:59:26 2015 -0800 Committer: Valentin Kulichenko Committed: Sat Feb 14 15:59:27 2015 -0800 -- .../CommunicationMessageCodeGenerator.java | 8 +- .../ignite/internal/GridJobCancelRequest.java | 3 +- .../ignite/internal/GridJobExecuteRequest.java | 3 +- .../ignite/internal/GridJobExecuteResponse.java | 3 +- .../ignite/internal/GridJobSiblingsRequest.java | 3 +- .../internal/GridJobSiblingsResponse.java | 3 +- .../ignite/internal/GridTaskCancelRequest.java | 3 +- .../ignite/internal/GridTaskSessionRequest.java | 3 +- .../internal/direct/DirectByteBufferStream.java | 2 +- .../checkpoint/GridCheckpointRequest.java | 3 +- .../managers/communication/GridIoMessage.java | 3 +- .../communication/GridIoUserMessage.java| 3 +- .../deployment/GridDeploymentInfoBean.java | 3 +- .../deployment/GridDeploymentRequest.java | 3 +- .../deployment/GridDeploymentResponse.java | 3 +- .../eventstorage/GridEventStorageMessage.java | 3 +- .../cache/GridCacheEvictionRequest.java | 5 +- .../cache/GridCacheEvictionResponse.java| 5 +- .../processors/cache/GridCacheMessage.java | 3 +- .../processors/cache/GridCacheValueBytes.java | 3 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 5 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 5 +- ...CachePessimisticCheckCommittedTxRequest.java | 5 +- ...achePessimisticCheckCommittedTxResponse.java | 5 +- .../distributed/GridCacheTtlUpdateRequest.java | 5 +- .../distributed/GridDistributedBaseMessage.java | 5 +- .../distributed/GridDistributedLockRequest.java | 5 +- .../GridDistributedLockResponse.java| 5 +- .../GridDistributedTxFinishRequest.java | 5 +- .../GridDistributedTxFinishResponse.java| 5 +- .../GridDistributedTxPrepareRequest.java| 5 +- .../GridDistributedTxPrepareResponse.java | 5 +- .../GridDistributedUnlockRequest.java | 5 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 +- .../dht/GridDhtAffinityAssignmentResponse.java | 5 +- .../distributed/dht/GridDhtLockRequest.java | 5 +- .../distributed/dht/GridDhtLockResponse.java| 5 +- .../distributed/dht/GridDhtTxFinishRequest.java | 5 +- .../dht/GridDhtTxFinishResponse.java| 5 +- .../dht/GridDhtTxPrepareRequest.java| 5 +- .../dht/GridDhtTxPrepareResponse.java | 5 +- .../distributed/dht/GridDhtUnlockRequest.java | 5 +- .../GridDhtAtomicDeferredUpdateResponse.java| 5 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 5 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 5 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 5 +- .../atomic/GridNearAtomicUpdateResponse.java| 5 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 +- .../dht/preloader/GridDhtForceKeysResponse.java | 5 +- .../GridDhtPartitionDemandMessage.java | 5 +- .../preloader/GridDhtPartitionExchangeId.java | 3 +- .../GridDhtPartitionSupplyMessage.java | 5 +- .../GridDhtPartitionsAbstractMessage.java | 5 +- .../preloader/GridDhtPartitionsFullMessage.java | 5 +- .../GridDhtPartitionsSingleMessage.java | 5 +- .../GridDhtPartitionsSingleRequest.java | 5 +- .../distributed/near/GridNearGetRequest.java| 25 ++-- .../distributed/near/GridNearGetResponse.java | 5 +- .../distributed/near/GridNearLockRequest.java | 5 +- .../distributed/near/GridNearLockResponse.java | 5 +- .../near/GridNearTxFinishRequest.java | 5 +- .../near/GridNearTxFinishResponse.java | 5 +- .../near/GridNearTxPrepareRequest.java | 5 +- .../near/GridNearTxPrepareResponse.java | 5 +- .../distributed/near/GridNearUnlockRequest.java | 5 +- .../cache/query/GridCacheQueryRequest.java | 5 +- .../cache/query/GridCacheQueryResponse.java | 5 +- .../cache/version/GridCacheVersion.java | 3 +- .../clock/GridClockDeltaSnapshotMessage.java| 3 +- .../processors/clock/GridClockDeltaVersion.java | 3 +- .../continuous/GridContinuousMessage.java | 3 +- .../dataload/GridDataLoadRequest.java | 3 +- .../dataload/GridDataLoadResponse.java | 3 +- .../processors/igfs/IgfsAckMessage.java | 5 +- .../internal/processors/igfs/IgfsBlockKey.java | 3
[02/28] incubator-ignite git commit: ignite-sql-old - annotations
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
--
diff --git
a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index 37755e9..1a26615 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -18,7 +18,7 @@
package org.apache.ignite.scalar
import org.apache.ignite.cache.GridCache
-import org.apache.ignite.cache.query.{CacheQuerySqlField, CacheQueryTextField}
+import org.apache.ignite.cache.query.annotations.{QueryTextField,
QuerySqlField}
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.internal.IgniteVersionUtils
@@ -129,10 +129,10 @@ import scala.annotation.meta.field
*/
object scalar extends ScalarConversions {
/** Type alias for `CacheQuerySqlField`. */
-type ScalarCacheQuerySqlField = CacheQuerySqlField @field
+type ScalarCacheQuerySqlField = QuerySqlField @field
/** Type alias for `CacheQueryTextField`. */
-type ScalarCacheQueryTextField = CacheQueryTextField @field
+type ScalarCacheQueryTextField = QueryTextField @field
/**
* Prints Scalar ASCII-logo.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
index 76f2444..e023275 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
@@ -18,7 +18,7 @@
package org.apache.ignite.visor.commands.cache
import org.apache.ignite.Ignition
-import org.apache.ignite.cache.query.CacheQuerySqlField
+import org.apache.ignite.cache.query.annotations.QuerySqlField
import org.apache.ignite.visor.visor
import org.scalatest._
@@ -97,6 +97,6 @@ class VisorCacheCommandSpec extends FlatSpec with Matchers
with BeforeAndAfterAl
* Object for queries.
*/
private case class Foo(
-@CacheQuerySqlField
+@QuerySqlField
value: Int
)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
index b0c3e8d..d8bba98 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java
@@ -17,7 +17,7 @@
package org.apache.ignite.yardstick.cache.model;
-import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
import java.io.*;
@@ -26,11 +26,11 @@ import java.io.*;
*/
public class Organization implements Externalizable {
/** Organization ID. */
-@CacheQuerySqlField(index = true)
+@QuerySqlField(index = true)
private int id;
/** Organization name. */
-@CacheQuerySqlField(index = true)
+@QuerySqlField(index = true)
private String name;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
index fd7cd73..df8d58b 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java
@@ -17,7 +17,7 @@
package org.apache.ignite.yardstick.cache.model;
-import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
import java.io.*;
@@ -26,23 +26,23 @@ import java.io.*;
*/
public class Person implements Externalizable {
/** Person ID. */
-@CacheQuerySqlField(index = true)
+@QuerySqlField(index = true)
private int id;
/** Organization ID. */
-@CacheQuerySqlField(index = true)
+@QuerySql
[43/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35e64ef2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35e64ef2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35e64ef2
Branch: refs/heads/sprint-1
Commit: 35e64ef296653c4fbe961e2193daf37de31a18ba
Parents: a214c0a
Author: Valentin Kulichenko
Authored: Sat Feb 14 23:25:04 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 23:25:04 2015 -0800
--
.../ignite/plugin/extensions/communication/MessageAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35e64ef2/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
index 2b3cfc4..807bda5 100644
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
@@ -74,7 +74,7 @@ public abstract class MessageAdapter implements Serializable {
}
/**
- * Enum representing possible field types.
+ * Enum representing possible types of collection items.
*/
public enum Type {
/** Byte. */
[3/6] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1d41941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1d41941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1d41941
Branch: refs/heads/ignite-nio
Commit: f1d419418b9d429634658af38ac47c9f156f0931
Parents: d674a08
Author: Valentin Kulichenko
Authored: Sat Feb 14 18:25:40 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 18:25:40 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 71 ++--
.../internal/direct/DirectByteBufferStream.java | 116 ++-
.../communication/MessageAdapter.java | 47
3 files changed, 116 insertions(+), 118 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1d41941/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index c163684..80cf53e 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -63,6 +63,56 @@ public class CommunicationMessageCodeGenerator {
private static final String BUF_VAR = "buf";
/** */
+private static final Map, MessageAdapter.Type> TYPES =
U.newHashMap(30);
+
+static {
+TYPES.put(byte.class, MessageAdapter.Type.BYTE);
+TYPES.put(Byte.class, MessageAdapter.Type.BYTE);
+TYPES.put(short.class, MessageAdapter.Type.SHORT);
+TYPES.put(Short.class, MessageAdapter.Type.SHORT);
+TYPES.put(int.class, MessageAdapter.Type.INT);
+TYPES.put(Integer.class, MessageAdapter.Type.INT);
+TYPES.put(long.class, MessageAdapter.Type.LONG);
+TYPES.put(Long.class, MessageAdapter.Type.LONG);
+TYPES.put(float.class, MessageAdapter.Type.FLOAT);
+TYPES.put(Float.class, MessageAdapter.Type.FLOAT);
+TYPES.put(double.class, MessageAdapter.Type.DOUBLE);
+TYPES.put(Double.class, MessageAdapter.Type.DOUBLE);
+TYPES.put(char.class, MessageAdapter.Type.CHAR);
+TYPES.put(Character.class, MessageAdapter.Type.CHAR);
+TYPES.put(boolean.class, MessageAdapter.Type.BOOLEAN);
+TYPES.put(Boolean.class, MessageAdapter.Type.BOOLEAN);
+TYPES.put(byte[].class, MessageAdapter.Type.BYTE_ARR);
+TYPES.put(short[].class, MessageAdapter.Type.SHORT_ARR);
+TYPES.put(int[].class, MessageAdapter.Type.INT_ARR);
+TYPES.put(long[].class, MessageAdapter.Type.LONG_ARR);
+TYPES.put(float[].class, MessageAdapter.Type.FLOAT_ARR);
+TYPES.put(double[].class, MessageAdapter.Type.DOUBLE_ARR);
+TYPES.put(char[].class, MessageAdapter.Type.CHAR_ARR);
+TYPES.put(boolean[].class, MessageAdapter.Type.BOOLEAN_ARR);
+TYPES.put(String.class, MessageAdapter.Type.STRING);
+TYPES.put(BitSet.class, MessageAdapter.Type.BIT_SET);
+TYPES.put(UUID.class, MessageAdapter.Type.UUID);
+TYPES.put(IgniteUuid.class, MessageAdapter.Type.IGNITE_UUID);
+}
+
+/**
+ * @param cls Class.
+ * @return Type enum value.
+ */
+private static MessageAdapter.Type typeEnum(Class cls) {
+MessageAdapter.Type type = TYPES.get(cls);
+
+if (type == null) {
+assert MessageAdapter.class.isAssignableFrom(cls) : cls;
+
+type = MessageAdapter.Type.MSG;
+}
+
+return type;
+}
+
+/** */
private final Collection write = new ArrayList<>();
/** */
@@ -540,19 +590,19 @@ public class CommunicationMessageCodeGenerator {
returnFalseIfFailed(write, "writer.writeMessage", field, name);
else if (type.isArray()) {
returnFalseIfFailed(write, "writer.writeObjectArray", field, name,
-type.getComponentType().getSimpleName() + ".class");
+"Type." + typeEnum(type.getComponentType()));
}
else if (Collection.class.isAssignableFrom(type) &&
!Set.class.isAssignableFrom(type)) {
assert colItemType != null;
-returnFalseIfFailed(write, "writer.writeCollection", field, name,
colItemType.getSimpleName() + ".class");
+returnFalseIfFailed(write, "writer.writeCollection", field, name,
"Type." + typeEnum(colItemType));
}
else if (Map.class.isAssignableFrom(type)) {
assert mapKeyType != null;
[07/49] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38121645/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index d92ad4d,4f55e2f..66bde26
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -461,19 -461,20 +461,26 @@@ public abstract class GridCacheAbstract
public void testGetAll() throws Exception {
IgniteTx tx = txEnabled() ? cache().txStart() : null;
-cache().put("key1", 1);
-cache().put("key2", 2);
+try {
+cache().put("key1", 1);
+cache().put("key2", 2);
-if (tx != null)
-tx.commit();
+if (tx != null)
+tx.commit();
+}
+finally {
+if (tx != null)
+tx.close();
+}
- assert cache().getAll(null).isEmpty();
+ GridTestUtils.assertThrows(log, new Callable() {
+ @Override public Void call() throws Exception {
+ cache().getAll(null).isEmpty();
+
+ return null;
+ }
+ }, NullPointerException.class, null);
+
assert cache().getAll(Collections.emptyList()).isEmpty();
Map map1 = cache().getAll(F.asList("key1", "key2",
"key"));
@@@ -500,36 -501,29 +507,35 @@@
if (txEnabled()) {
tx = cache().txStart();
-assert cache().getAll(Collections.emptyList()).isEmpty();
+try {
- assert cache().getAll(null).isEmpty();
+assert
cache().getAll(Collections.emptyList()).isEmpty();
-map1 = cache().getAll(F.asList("key1", "key2", "key"));
+map1 = cache().getAll(F.asList("key1", "key2", "key"));
-info("Retrieved map1: " + map1);
+info("Retrieved map1: " + map1);
-assert 2 == map1.size() : "Invalid map: " + map1;
+assert 2 == map1.size() : "Invalid map: " + map1;
-assertEquals(1, (int)map1.get("key1"));
-assertEquals(2, (int)map1.get("key2"));
-assertNull(map1.get("key"));
+assertEquals(1, (int)map1.get("key1"));
+assertEquals(2, (int)map1.get("key2"));
+assertNull(map1.get("key"));
-map2 = cache().getAll(F.asList("key1", "key2", "key"));
+map2 = cache().getAll(F.asList("key1", "key2", "key"));
-info("Retrieved map2: " + map2);
+info("Retrieved map2: " + map2);
-assert 2 == map2.size() : "Invalid map: " + map2;
+assert 2 == map2.size() : "Invalid map: " + map2;
-assertEquals(1, (int)map2.get("key1"));
-assertEquals(2, (int)map2.get("key2"));
-assertNull(map2.get("key"));
+assertEquals(1, (int)map2.get("key1"));
+assertEquals(2, (int)map2.get("key2"));
+assertNull(map2.get("key"));
-tx.commit();
+tx.commit();
+}
+finally {
+if (tx != null)
+tx.close();
+}
}
}
@@@ -1643,31 -1630,25 +1662,31 @@@
public void testPutxAsync() throws Exception {
IgniteTx tx = txEnabled() ? cache().txStart() : null;
-cache().put("key2", 1);
+try {
+cache().put("key2", 1);
- IgniteFuture fut1 = cache().putxAsync("key1", 10);
- IgniteFuture fut2 = cache().putxAsync("key2", 11);
-IgniteInternalFuture fut1 = cache().putxAsync("key1", 10);
-IgniteInternalFuture fut2 = cache().putxAsync("key2", 11);
++IgniteInternalFuture fut1 = cache().putxAsync("key1",
10);
++IgniteInternalFuture fut2 = cache().putxAsync("key2",
11);
- IgniteFuture f = null;
-IgniteInternalFuture f = null;
++IgniteInternalFuture f = null;
-if (tx != null) {
-tx = (IgniteTx)tx.withAsync();
+if (tx != null) {
- tx = (IgniteTx)tx.enableAsync();
++tx = (IgniteTx)tx.withAsync();
-tx.commit();
+tx.commit();
-f = tx.future();
-}
+f = tx.future();
+}
-assert fut1.get();
-assert fut2.get();
+assert fut1.get();
+assert fut2.get();
-assert f == null || f.get().state() == COMMITTED;
+
[11/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index de6e6e8..c732be5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -178,28 +178,6 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-super.clone0(_msg);
-
-GridDhtAtomicUpdateResponse _clone = (GridDhtAtomicUpdateResponse)_msg;
-
-_clone.futVer = futVer != null ? (GridCacheVersion)futVer.clone() :
null;
-_clone.failedKeys = failedKeys;
-_clone.failedKeysBytes = failedKeysBytes;
-_clone.err = err;
-_clone.errBytes = errBytes;
-_clone.nearEvicted = nearEvicted;
-_clone.nearEvictedBytes = nearEvictedBytes;
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -244,7 +222,6 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean readFrom(ByteBuffer buf) {
reader.setBuffer(buf);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 41c8d42..c206264 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -543,46 +543,6 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-super.clone0(_msg);
-
-GridNearAtomicUpdateRequest _clone = (GridNearAtomicUpdateRequest)_msg;
-
-_clone.nodeId = nodeId;
-_clone.futVer = futVer != null ? (GridCacheVersion)futVer.clone() :
null;
-_clone.fastMap = fastMap;
-_clone.updateVer = updateVer != null ?
(GridCacheVersion)updateVer.clone() : null;
-_clone.topVer = topVer;
-_clone.syncMode = syncMode;
-_clone.op = op;
-_clone.keys = keys;
-_clone.keyBytes = keyBytes;
-_clone.vals = vals;
-_clone.valBytes = valBytes;
-_clone.invokeArgs = invokeArgs;
-_clone.invokeArgsBytes = invokeArgsBytes;
-_clone.drVers = drVers;
-_clone.drTtls = drTtls != null ? (GridLongList)drTtls.clone() : null;
-_clone.drExpireTimes = drExpireTimes != null ?
(GridLongList)drExpireTimes.clone() : null;
-_clone.retval = retval;
-_clone.expiryPlc = expiryPlc;
-_clone.expiryPlcBytes = expiryPlcBytes;
-_clone.filter = filter;
-_clone.filterBytes = filterBytes;
-_clone.hasPrimary = hasPrimary;
-_clone.forceTransformBackups = forceTransformBackups;
-_clone.subjId = subjId;
-_clone.taskNameHash = taskNameHash;
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -717,7 +677,6 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage im
}
/** {@inheritDoc} */
-@SuppressWarnings("all")
@Override public boolean readFrom(ByteBuff
[14/49] incubator-ignite git commit: GG-9655 - Fixing tests after merge.
GG-9655 - Fixing tests after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c5e5ccb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c5e5ccb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c5e5ccb
Branch: refs/heads/sprint-1
Commit: 0c5e5ccb047289025dcd3cd37e24d4da0b0cec50
Parents: 9a995a3
Author: Alexey Goncharuk
Authored: Fri Jan 30 17:10:44 2015 -0800
Committer: Alexey Goncharuk
Committed: Fri Jan 30 17:10:44 2015 -0800
--
.../internal/processors/cache/GridCacheEntryInfo.java | 9 +
.../internal/processors/cache/GridCacheMapEntry.java| 9 +++--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 12 ++--
.../cache/distributed/dht/GridDhtTxPrepareResponse.java | 2 ++
.../cache/transactions/IgniteTxLocalAdapter.java| 7 +--
.../cache/GridCacheAbstractFullApiSelfTest.java | 3 +++
6 files changed, 32 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c5e5ccb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index ad8d862..099f876 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -80,6 +80,13 @@ public class GridCacheEntryInfo implements
Externalizable {
}
/**
+ * @param cacheId Cache ID.
+ */
+public void cacheId(int cacheId) {
+this.cacheId = cacheId;
+}
+
+/**
* @param key Entry key.
*/
public void key(K key) {
@@ -254,6 +261,7 @@ public class GridCacheEntryInfo implements
Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeInt(cacheId);
out.writeBoolean(keyBytesSent);
out.writeBoolean(valBytesSent);
@@ -299,6 +307,7 @@ public class GridCacheEntryInfo implements
Externalizable {
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+cacheId = in.readInt();
keyBytesSent = in.readBoolean();
valBytesSent = in.readBoolean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c5e5ccb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 3c4e9d6..61d4959 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -426,6 +426,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
info = new GridCacheEntryInfo<>();
info.key(key);
+info.cacheId(cctx.cacheId());
long expireTime = expireTimeExtras();
@@ -1675,9 +1676,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
if (isNew())
unswap(true, retval);
-boolean newTtlResolved = false;
-
-boolean drNeedResolve = false;
+boolean drNeedResolve;
Object transformClo = null;
@@ -1715,8 +1714,6 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
newExpireTime = CU.toExpireTime(newTtl);
}
-newTtlResolved = true;
-
GridCacheVersionedEntryEx oldEntry =
versionedEntry();
GridCacheVersionedEntryEx newEntry =
new GridCachePlainVersionedEntry<>(k, (V)writeObj,
newTtl, newExpireTime, drVer);
@@ -1871,7 +1868,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
expiryPlc.ttlUpdated(key,
getOrMarshalKeyBytes(),
version(),
-hasReaders() ? ((GridDhtCacheEntry)
this).readers() : null);
+hasReaders() ? ((GridDhtCacheEntry)
this).reader
[42/49] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Ignite-9655-merge - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/16c3ccee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16c3ccee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16c3ccee
Branch: refs/heads/sprint-1
Commit: 16c3cceeb2e5110832b34d8b77596036071c2f4c
Parents: 109dbe7
Author: Alexey Goncharuk
Authored: Sat Feb 14 19:59:59 2015 -0800
Committer: Alexey Goncharuk
Committed: Sat Feb 14 19:59:59 2015 -0800
--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java| 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16c3ccee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 8fb8a28..bcecc96 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -529,23 +529,22 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
if (replied.compareAndSet(false, true)) {
try {
sendPrepareResponse(createPrepareResponse());
-
-return true;
}
catch (IgniteCheckedException e) {
-onError(e);
-
-return true;
+U.error(log, "Failed to send prepare response for
transaction: " + tx, e);
}
finally {
// Will call super.onDone().
onComplete();
}
+
+return true;
}
else {
// Other thread is completing future. Wait for it to complete.
try {
-get();
+if (err != null)
+get();
}
catch (IgniteInterruptedException e) {
onError(new IgniteCheckedException("Got interrupted while
waiting for replies to be sent.", e));
[41/49] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Ignite-9655-merge - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/109dbe76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/109dbe76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/109dbe76
Branch: refs/heads/sprint-1
Commit: 109dbe7649f18a1935d460587e2f34e1316bf43d
Parents: bcd76e1
Author: Alexey Goncharuk
Authored: Sat Feb 14 14:14:28 2015 -0800
Committer: Alexey Goncharuk
Committed: Sat Feb 14 14:14:28 2015 -0800
--
.../processors/cache/GridCacheAdapter.java | 1 +
.../cache/GridCacheSharedContext.java | 2 +
.../GridDistributedTxRemoteAdapter.java | 9 ++--
.../distributed/dht/GridDhtTxPrepareFuture.java | 50 +---
.../near/GridNearTxPrepareFuture.java | 12 +++--
.../cache/transactions/IgniteTxAdapter.java | 24 +-
.../cache/transactions/IgniteTxHandler.java | 13 +++--
.../transactions/IgniteTxLocalAdapter.java | 24 +-
.../cache/GridCacheAbstractSelfTest.java| 2 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 3 +-
.../IgniteTxExceptionAbstractSelfTest.java | 37 ---
...heConcurrentEvictionConsistencySelfTest.java | 8 ++--
...iteCacheNoLoadPreviousValueAbstractTest.java | 5 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 10 ++--
14 files changed, 96 insertions(+), 104 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/109dbe76/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index cca6cf1..0b3a0a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3988,6 +3988,7 @@ public abstract class GridCacheAdapter implements
GridCache,
*/
private void localLoadAndUpdate(final Collection keys) throws
IgniteCheckedException {
try (final IgniteDataLoader ldr = ctx.kernalContext().dataLoad().dataLoader(ctx.namex(), false)) {
+ldr.allowOverwrite(true);
ldr.skipStore(true);
final Collection> col = new
ArrayList<>(ldr.perNodeBufferSize());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/109dbe76/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 332abac..ab4e0ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -29,6 +29,7 @@ import
org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.marshaller.*;
import org.jetbrains.annotations.*;
@@ -40,6 +41,7 @@ import static
org.apache.ignite.internal.processors.cache.CacheFlag.*;
/**
* Shared context.
*/
+@GridToStringExclude
public class GridCacheSharedContext {
/** Kernal context. */
private GridKernalContext kernalCtx;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/109dbe76/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 00be565..b6f814a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.processors.cache.*;
[25/30] incubator-ignite git commit: ignite-sql-old - tests
ignite-sql-old - tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e834e6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e834e6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e834e6b
Branch: refs/heads/ignite-nio
Commit: 2e834e6bcfa256ecaf988fed343b433976d75def
Parents: a50e052
Author: S.Vladykin
Authored: Sun Feb 15 05:46:16 2015 +0300
Committer: S.Vladykin
Committed: Sun Feb 15 05:46:16 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../GridCacheCrossCacheQuerySelfTestNewApi.java | 410 +++
2 files changed, 414 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e834e6b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 1361b8b..30a9708 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -304,7 +304,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter 0)
+qry.pageSize(q.getPageSize());
qry.enableDedup(false);
qry.includeBackups(false);
@@ -424,7 +425,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> q =
((GridCacheQueriesEx)delegate.queries()).createSqlFieldsQuery(qry.getSql(),
false);
-q.pageSize(qry.getPageSize());
+if (qry.getPageSize() > 0)
+q.pageSize(qry.getPageSize());
CacheQueryFuture> fut = q.execute(qry.getArgs());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e834e6b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
new file mode 100644
index 000..6dcf5dd
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
@@ -0,0 +1,410 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import javax.cache.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.query.Query.*;
+
+/**
+ * Tests cross cache queries.
+ */
+public class GridCacheCrossCacheQuerySelfTestNewApi extends
GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private Ignite ignite;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gri
[25/45] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-50
Merge branch 'sprint-1' into ignite-50 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50faae23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50faae23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50faae23 Branch: refs/heads/ignite-sql-old Commit: 50faae23a98b7a747649434bd2b810fbc6a46513 Parents: c92a044 e06e973 Author: nikolay_tikhonov Authored: Sat Feb 14 15:22:11 2015 +0300 Committer: nikolay_tikhonov Committed: Sat Feb 14 15:22:11 2015 +0300 -- examples/pom-standalone.xml | 6 ++ examples/pom.xml| 12 +++ .../client/memcache/MemcacheRestExample.java| 3 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 4 +- .../store/jdbc/CacheAbstractJdbcStore.java | 3 +- .../configuration/CacheConfiguration.java | 4 +- .../cache/GridCacheConcurrentMap.java | 7 +- .../processors/cache/GridCacheEntrySet.java | 3 +- .../cache/affinity/GridCacheAffinityProxy.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../cache/GridCacheQueryCommandHandler.java | 6 +- .../protocols/tcp/GridTcpRestNioListener.java | 16 +++- .../cache/VisorCacheMetricsCollectorTask.java | 10 ++- .../node/VisorNodeEventsCollectorTask.java | 3 +- .../internal/visor/query/VisorQueryTask.java| 45 ++- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 3 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java| 16 ++-- .../cache/GridCacheOffHeapSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 2 +- .../cache/GridCacheQueryIndexSelfTest.java | 5 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 +- .../GridCacheVariableTopologySelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java| 6 +- .../GridCacheQueueCleanupSelfTest.java | 8 +- .../GridCacheAbstractJobExecutionTest.java | 7 +- .../GridCacheClientModesAbstractSelfTest.java | 9 ++- ...ePartitionedNearDisabledMetricsSelfTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 8 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 7 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 13 ++-- ...ridCacheContinuousQueryAbstractSelfTest.java | 44 +-- ...dCacheContinuousQueryReplicatedSelfTest.java | 9 ++- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +-- ...cheReduceFieldsQueryPartitionedSelfTest.java | 3 +- .../GridContinuousOperationsLoadTest.java | 2 +- modules/extdata/p2p/pom.xml | 6 ++ .../query/h2/GridH2IndexingGeoSelfTest.java | 8 +- modules/hadoop/pom.xml | 12 +++ modules/hibernate/pom.xml | 6 ++ .../GridHibernateAccessStrategyAdapter.java | 3 +- .../hibernate/GridHibernateRegionFactory.java | 7 +- modules/indexing/pom.xml| 12 +++ .../GridCacheAbstractFieldsQuerySelfTest.java | 47 +-- .../cache/GridCacheAbstractQuerySelfTest.java | 82 ++-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 5 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../GridCacheQueryMultiThreadedSelfTest.java| 30 +++ .../GridCacheSqlQueryMultiThreadedSelfTest.java | 3 +- .../processors/cache/GridCacheSwapSelfTest.java | 7 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 3 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 3 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 3 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 23 +++--- .../near/GridCacheQueryNodeRestartSelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedQuerySelfTest.java | 6 +- .../local/GridCacheLocalQuerySelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java| 16 ++-- .../query/h2/sql/GridQueryParsingTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- modules/jta/pom.xml | 6 ++ modules/scalar/pom.xml | 6 ++ modules/spring/pom.xml | 6 ++ .../org/apache/ignite/IgniteSpringBean.java | 3 +- .../ignite/cache/spring/SpringCacheManager.java | 3 +- .../cache/spring/SpringDynamicCacheManager.java | 2 +- modules/visor-console/pom.xml | 12 +++ .../commands/cache/VisorCacheCommand.scala
[46/49] incubator-ignite git commit: Ignite-9655-merge - Fixing tests, commented test according to the ticket.
Ignite-9655-merge - Fixing tests, commented test according to the ticket.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e0ccef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e0ccef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e0ccef9
Branch: refs/heads/sprint-1
Commit: 4e0ccef955138052e87ce5f63e85a9b94fcab0b0
Parents: aa83f60
Author: Alexey Goncharuk
Authored: Sun Feb 15 00:05:06 2015 -0800
Committer: Alexey Goncharuk
Committed: Sun Feb 15 00:05:06 2015 -0800
--
.../internal/processors/cache/transactions/IgniteTxHandler.java| 2 +-
.../org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 640e492..600e0d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -506,7 +506,7 @@ public class IgniteTxHandler {
req.miniId(), new IgniteCheckedException("Transaction has been
already completed."));
try {
-ctx.io().send(nodeId, res, tx.ioPolicy());
+ctx.io().send(nodeId, res, req.system() ? UTILITY_CACHE_POOL :
SYSTEM_POOL);
}
catch (Throwable e) {
// Double-check.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
index 2852631..5c7581a 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
@@ -42,7 +42,7 @@ public class IgniteCacheRestartTestSuite extends TestSuite {
// The rest.
suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class);
-suite.addTestSuite(GridCachePutAllFailoverSelfTest.class);
+//suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); TODO
IGNITE-157
return suite;
}
[32/45] incubator-ignite git commit: ignite-242 Jdk8 dependency removed
ignite-242 Jdk8 dependency removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6758f736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6758f736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6758f736
Branch: refs/heads/ignite-sql-old
Commit: 6758f736f1095e288857f81c5c1fea993132e26b
Parents: c1e649d
Author: Anton Vinogradov
Authored: Sat Feb 14 16:03:52 2015 +0300
Committer: Anton Vinogradov
Committed: Sat Feb 14 16:03:52 2015 +0300
--
assembly/core-jar.xml | 1 -
assembly/dependencies-optional-fabric.xml | 1 -
assembly/dependencies-optional-hadoop.xml | 1 -
examples/pom.xml | 6 --
modules/core/pom.xml | 6 --
modules/hadoop/pom.xml| 6 --
modules/indexing/pom.xml | 6 --
modules/visor-console/pom.xml | 6 --
8 files changed, 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/assembly/core-jar.xml
--
diff --git a/assembly/core-jar.xml b/assembly/core-jar.xml
index 4a2f040..343fe64 100644
--- a/assembly/core-jar.xml
+++ b/assembly/core-jar.xml
@@ -32,7 +32,6 @@
-org.apache.ignite:jdk8-backport
org.apache.ignite:ignite-core
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/assembly/dependencies-optional-fabric.xml
--
diff --git a/assembly/dependencies-optional-fabric.xml
b/assembly/dependencies-optional-fabric.xml
index 5089bc4..db5489d 100644
--- a/assembly/dependencies-optional-fabric.xml
+++ b/assembly/dependencies-optional-fabric.xml
@@ -33,7 +33,6 @@
true
-org.apache.ignite:jdk8-backport
org.apache.ignite:ignite-core
org.apache.ignite:ignite-clients
org.apache.ignite:ignite-spring
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/assembly/dependencies-optional-hadoop.xml
--
diff --git a/assembly/dependencies-optional-hadoop.xml
b/assembly/dependencies-optional-hadoop.xml
index 12d73bc..7f79310 100644
--- a/assembly/dependencies-optional-hadoop.xml
+++ b/assembly/dependencies-optional-hadoop.xml
@@ -33,7 +33,6 @@
true
-org.apache.ignite:jdk8-backport
org.apache.ignite:ignite-core
org.apache.ignite:ignite-clients
org.apache.ignite:ignite-spring
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 70b0e2a..717a7c7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,12 +41,6 @@
org.apache.ignite
-jdk8-backport
-${ignite.version}
-
-
-
-org.apache.ignite
ignite-core
${ignite.version}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 0bf638a..316b1ae 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -43,12 +43,6 @@
-org.apache.ignite
-jdk8-backport
-${ignite.version}
-
-
-
mx4j
mx4j-tools
3.0.1
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/modules/hadoop/pom.xml
--
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 6f270ca..312f247 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -44,12 +44,6 @@
org.apache.ignite
-jdk8-backport
-${ignite.version}
-
-
-
-org.apache.ignite
ignite-core
${ignite.version}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6758f736/modules/indexing/pom.xml
--
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 0125e83..716d6bf 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -44,12 +44,6 @@
org.apache.ignite
-jdk8-backport
-
[24/30] incubator-ignite git commit: ignite-sql-old - fixes
ignite-sql-old - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a50e0524
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a50e0524
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a50e0524
Branch: refs/heads/ignite-nio
Commit: a50e0524421dfa267488b8fa3b430c0e59f33ba8
Parents: 42e5786
Author: S.Vladykin
Authored: Sun Feb 15 05:08:02 2015 +0300
Committer: S.Vladykin
Committed: Sun Feb 15 05:08:02 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 111 +--
1 file changed, 76 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50e0524/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b4cfc09..1361b8b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -264,7 +264,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> query(Query filter, @Nullable ClusterGroup
grp) {
+private QueryCursor> doQuery(Query filter, @Nullable
ClusterGroup grp) {
final CacheQuery> qry;
final CacheQueryFuture> fut;
@@ -296,30 +296,27 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(new
GridCloseableIteratorAdapter>() {
-/** */
-Map.Entry cur;
+qry =
((GridCacheQueriesEx)delegate.queries()).createSqlQuery(q.getType(),
q.getSql());
-@Override protected Entry onNext() throws
IgniteCheckedException {
-if (!onHasNext())
-throw new NoSuchElementException();
+if (grp != null)
+qry.projection(grp);
-Map.Entry e = cur;
+qry.pageSize(q.getPageSize());
-cur = null;
+qry.enableDedup(false);
+qry.includeBackups(false);
-return new CacheEntryImpl<>(e.getKey(), e.getValue());
-}
-
-@Override protected boolean onHasNext() throws
IgniteCheckedException {
-return cur != null || (cur = fut.next()) != null;
-}
+fut = qry.execute(q.getArgs());
+}
+else
+throw new IgniteException("Unsupported query predicate: " +
filter);
-@Override protected void onClose() throws IgniteCheckedException {
-fut.cancel();
+return new QueryCursorImpl<>(new
ClIter,Cache.Entry>(fut) {
+@Override protected Cache.Entry convert(Map.Entry e) {
+return new CacheEntryImpl<>(e.getKey(), e.getValue());
}
});
}
@@ -387,7 +384,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter)qry, false);
-return query(qry, projection(false));
+return doQuery(qry, projection(false));
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -428,7 +422,17 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> q =
((GridCacheQueriesEx)delegate.queries()).createSqlFieldsQuery(qry.getSql(),
false);
+
+q.pageSize(qry.getPageSize());
+
+CacheQueryFuture> fut = q.execute(qry.getArgs());
+
+return new QueryCursorImpl<>(new ClIter, List>(fut) {
+@Override protected List convert(List row) {
+return row;
+}
+});
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -446,9 +450,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalQuery(SqlQuery p) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
-//ctx.name(), p.getType(), p.getSql(), p.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
+ctx.name(), p.getType(), p.getSql(), p.getArgs()));
}
/**
@@ -456,9 +459,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalFieldsQuery(SqlFieldsQuery q) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
-//ctx.name(), q.getSql(), q.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
+ctx.name(), q.getSql(), q.getArgs()));
[23/30] incubator-ignite git commit: # IGNITE-153 temporary commented test.
# IGNITE-153 temporary commented test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0a67477
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0a67477
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0a67477
Branch: refs/heads/ignite-nio
Commit: f0a674770d24e5375cd23ee09c8a560d5a573c80
Parents: eef98c2
Author: AKuznetsov
Authored: Sat Feb 14 20:28:53 2015 +0700
Committer: AKuznetsov
Committed: Sat Feb 14 20:28:53 2015 +0700
--
.../commands/cache/VisorCacheCommandSpec.scala | 39 ++--
1 file changed, 20 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0a67477/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
index e023275..d9241e0 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
@@ -64,25 +64,26 @@ class VisorCacheCommandSpec extends FlatSpec with Matchers
with BeforeAndAfterAl
visor.cache()
}
-it should "run query and display information about caches" in {
-val g = Ignition.ignite
-
-val c = g.cache[Int, Foo]("replicated")
-
-c.put(0, Foo(20))
-c.put(1, Foo(100))
-c.put(2, Foo(101))
-c.put(3, Foo(150))
-
-// Create two queries
-val q1 = c.queries().createSqlQuery(classOf[Foo], "_key > ?")
-c.queries().createSqlQuery(classOf[Foo], "_key = ?")
-
-// Execute only one query
-q1.execute(100.asInstanceOf[java.lang.Integer]).get
-
-visor cache "-a"
-}
+// TODO IGNITE-153 Fix in sprint-2 after new SQL API will implemented.
+//it should "run query and display information about caches" in {
+//val g = Ignition.ignite
+//
+//val c = g.cache[Int, Foo]("replicated")
+//
+//c.put(0, Foo(20))
+//c.put(1, Foo(100))
+//c.put(2, Foo(101))
+//c.put(3, Foo(150))
+//
+//// Create two queries
+//val q1 = c.queries().createSqlQuery(classOf[Foo], "_key > ?")
+//c.queries().createSqlQuery(classOf[Foo], "_key = ?")
+//
+//// Execute only one query
+//q1.execute(100.asInstanceOf[java.lang.Integer]).get
+//
+//visor cache "-a"
+//}
it should "display correct information for 'replicated' cache only" in {
visor cache "-n=replicated -a"
[05/17] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 7ffb4a1..4df98f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -144,17 +144,6 @@ public class GridCommunicationSendMessageSelfTest extends
GridCommonAbstractTest
/** */
private static class TestMessage extends MessageAdapter {
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-return this;
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer)
{
//writer.setBuffer(buf);
//
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 0f5ac97..b112617 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -220,17 +220,6 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
/** */
private static class Message extends MessageAdapter implements
Serializable {
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer)
{
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index b185031..e4d6ab4 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -108,17 +108,6 @@ class GridTestMessage extends MessageAdapter implements
Externalizable {
}
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
index 8e64667..82b3030 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
@@ -94,27 +94,6 @@ public class GridTestMessage extends MessageAdapter {
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-GridTestMessage msg = new GridTestMessage();
-
-clone0(msg);
-
-return msg;
-}
-
-/
[06/50] [abbrv] incubator-ignite git commit: # ignite-nio - Removing message clone
# ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e66c060e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e66c060e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e66c060e
Branch: refs/heads/sprint-1
Commit: e66c060ed6bcb4fe8a45790ecfb1476f1bc3b7b5
Parents: 947723c
Author: Valentin Kulichenko
Authored: Fri Feb 13 20:17:06 2015 -0800
Committer: Valentin Kulichenko
Committed: Fri Feb 13 20:17:06 2015 -0800
--
.../org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java| 4 ++--
.../ignite/internal/util/nio/GridShmemCommunicationClient.java | 4 ++--
.../ignite/internal/util/nio/GridTcpCommunicationClient.java| 5 -
3 files changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
index 4f17a20..d1ae451 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java
@@ -152,7 +152,7 @@ public class IpcToNioAdapter {
assert writeBuf.hasArray();
try {
-//MessageAdapter.WRITER.set(formatter.writer());
+MessageWriteState.create(formatter);
int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf);
@@ -162,7 +162,7 @@ public class IpcToNioAdapter {
return new GridNioFinishedFuture(e);
}
finally {
-//MessageAdapter.WRITER.remove();
+MessageWriteState.clear();
}
return new GridNioFinishedFuture<>((Object)null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
index d81ba8e..e5ab12a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
@@ -116,7 +116,7 @@ public class GridShmemCommunicationClient extends
GridAbstractCommunicationClien
assert writeBuf.hasArray();
try {
-//MessageAdapter.WRITER.set(formatter.writer());
+MessageWriteState.create(formatter);
int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf);
@@ -126,7 +126,7 @@ public class GridShmemCommunicationClient extends
GridAbstractCommunicationClien
throw new IgniteCheckedException("Failed to send message to remote
node: " + shmem, e);
}
finally {
-//MessageAdapter.WRITER.remove();
+MessageWriteState.clear();
}
markUsed();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66c060e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java
index e3e93bc..4dc326d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java
@@ -197,7 +197,7 @@ public class GridTcpCommunicationClient extends
GridAbstractCommunicationClient
assert writeBuf.hasArray();
try {
-//msg.setWriter(formatter.writer());
+MessageWriteState.create(formatter);
int cnt = U.writeMessageFully(msg, out, writeBuf);
@@ -206,6 +206,9 @@ public class GridTcpCommunicationClient extends
GridAbstractCommunicationClient
catch (IOException e) {
throw new IgniteCheckedException("Failed to send message to remote
node: " + sock.getRemoteSocketAddress(), e);
}
+finally {
+MessageWriteState.clear();
+}
markUsed();
[09/49] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f13453f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f13453f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f13453f2
Branch: refs/heads/sprint-1
Commit: f13453f23eed7ce215952716854d24412baea3a1
Parents: 3812164
Author: Alexey Goncharuk
Authored: Thu Jan 29 13:58:21 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Jan 29 13:58:21 2015 -0800
--
.../GridDistributedTxRemoteAdapter.java | 52 +---
.../distributed/dht/GridDhtTxPrepareFuture.java | 6 +--
.../near/GridNearTxPrepareFuture.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 4 +-
4 files changed, 30 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f13453f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 4a11e8e..9bf7255 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -506,41 +506,37 @@ public class GridDistributedTxRemoteAdapter extends
IgniteTxAdapter
GridCacheVersion explicitVer =
txEntry.drVersion();
-boolean drNeedResolve =
-
cacheCtx.conflictNeedResolve(cached.version(), explicitVer);
+boolean drNeedResolve =
+
cacheCtx.conflictNeedResolve(cached.version(), explicitVer);
-if (drNeedResolve) {
-IgniteBiTuple>
-drRes = conflictResolve(op,
txEntry.key(), val, valBytes,
-txEntry.ttl(),
txEntry.drExpireTime(), explicitVer, cached);
+if (drNeedResolve) {
+IgniteBiTuple>
+drRes = conflictResolve(op,
txEntry.key(), val, valBytes,
+txEntry.ttl(),
txEntry.drExpireTime(), explicitVer, cached);
-assert drRes != null;
+assert drRes != null;
-
GridCacheVersionConflictContextImpl drCtx = drRes.get2();
+GridCacheVersionConflictContextImpl drCtx = drRes.get2();
-if (drCtx.isUseOld())
-op = NOOP;
-else if (drCtx.isUseNew()) {
-txEntry.ttl(drCtx.ttl());
+if (drCtx.isUseOld())
+op = NOOP;
+else if (drCtx.isUseNew()) {
+txEntry.ttl(drCtx.ttl());
-if
(drCtx.newEntry().dataCenterId() != cacheCtx.dataCenterId())
-
txEntry.drExpireTime(drCtx.expireTime());
-else
-txEntry.drExpireTime(-1L);
-}
-else if (drCtx.isMerge()) {
-op = drRes.get1();
-val = drCtx.mergeValue();
-valBytes = null;
-explicitVer = writeVersion();
-
-txEntry.ttl(drCtx.ttl());
+if
(drCtx.newEntry().dataCenterId() != cacheCtx.dataCenterId())
+
txEntry.drExpireTime(drCtx.expireTime());
+
[1/2] incubator-ignite git commit: # IGNITE-248 Cleanup code, added missing javadocs, fixed inspections warnings, added new properties to configurations.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-248 [created] 9c30477a2
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c30477a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
index eec959c..51dc092 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
@@ -32,7 +32,7 @@ public class VisorMetricsConfiguration implements
Serializable {
private long expTime;
/** Number of node metrics stored in memory. */
-private int historySize;
+private int histSize;
/** Frequency of metrics log printout. */
private long logFreq;
@@ -69,14 +69,14 @@ public class VisorMetricsConfiguration implements
Serializable {
* @return Number of node metrics stored in memory.
*/
public int historySize() {
-return historySize;
+return histSize;
}
/**
- * @param historySize New number of node metrics stored in memory.
+ * @param histSize New number of node metrics stored in memory.
*/
-public void historySize(int historySize) {
-this.historySize = historySize;
+public void historySize(int histSize) {
+this.histSize = histSize;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c30477a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index 7d4d665..ea8a8fc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -36,16 +36,16 @@ public class VisorNodeDataCollectorJobResult implements
Serializable {
private String gridName;
/** Node topology version. */
-private long topologyVersion;
+private long topVer;
/** Task monitoring state collected from node. */
private boolean taskMonitoringEnabled;
/** Node events. */
-private final Collection events = new ArrayList<>();
+private final Collection evts = new ArrayList<>();
/** Exception while collecting node events. */
-private Throwable eventsEx;
+private Throwable evtsEx;
/** Node caches. */
private final Collection caches = new ArrayList<>();
@@ -86,72 +86,117 @@ public class VisorNodeDataCollectorJobResult implements
Serializable {
* @return Current topology version.
*/
public long topologyVersion() {
-return topologyVersion;
+return topVer;
}
/**
- * @param topologyVersion New topology version value.
+ * @param topVer New topology version value.
*/
-public void topologyVersion(long topologyVersion) {
-this.topologyVersion = topologyVersion;
+public void topologyVersion(long topVer) {
+this.topVer = topVer;
}
+/**
+ * @return Current task monitoring state.
+ */
public boolean taskMonitoringEnabled() {
return taskMonitoringEnabled;
}
+/**
+ * @param taskMonitoringEnabled New value of task monitoring state.
+ */
public void taskMonitoringEnabled(boolean taskMonitoringEnabled) {
this.taskMonitoringEnabled = taskMonitoringEnabled;
}
+/**
+ * @return Collection of collected events.
+ */
public Collection events() {
-return events;
+return evts;
}
+/**
+ * @return Exception caught during collecting events.
+ */
public Throwable eventsEx() {
-return eventsEx;
+return evtsEx;
}
-public void eventsEx(Throwable eventsEx) {
-this.eventsEx = eventsEx;
+/**
+ * @param evtsEx Exception caught during collecting events.
+ */
+public void eventsEx(Throwable evtsEx) {
+this.evtsEx = evtsEx;
}
+/**
+ * @return Collected cache metrics.
+ */
public Collection caches() {
return caches;
}
+/**
+ * @return Exception caught during collecting caches metrics.
+ */
public Throwable cachesEx() {
return cachesEx;
}
+/**
+ * @param cachesEx Exception caught during collecting caches metrics.
+ */
public void cachesEx(Throwable cac
[07/30] incubator-ignite git commit: ignite-sql-old - rename
ignite-sql-old - rename Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb65ec55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb65ec55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb65ec55 Branch: refs/heads/ignite-nio Commit: cb65ec550fc3f89ac04f1eef09f31a8d4e206e21 Parents: 5cb1fb4 Author: S.Vladykin Authored: Sat Feb 14 01:31:32 2015 +0300 Committer: S.Vladykin Committed: Sat Feb 14 01:31:32 2015 +0300 -- .../datagrid/CachePopularNumbersExample.java| 2 +- .../examples/datagrid/CacheQueryExample.java| 2 +- .../starschema/CacheStarSchemaExample.java | 2 +- .../apache/ignite/cache/CacheProjection.java| 4 +- .../cache/query/CacheContinuousQuery.java | 1 + .../apache/ignite/cache/query/CacheQueries.java | 152 -- .../apache/ignite/cache/query/CacheQuery.java | 295 -- .../ignite/cache/query/CacheQueryFuture.java| 66 - .../ignite/cache/query/CacheQueryType.java | 47 --- .../apache/ignite/cache/query/QueryMetrics.java | 2 + .../cache/query/annotations/QuerySqlField.java | 2 +- .../cache/query/annotations/QueryTextField.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 1 + .../ignite/events/CacheQueryReadEvent.java | 1 + .../cache/CacheWeakQueryIteratorsHolder.java| 2 +- .../processors/cache/GridCacheAdapter.java | 1 - .../cache/GridCacheProjectionImpl.java | 1 - .../processors/cache/GridCacheProxyImpl.java| 1 - .../processors/cache/query/CacheQueries.java| 153 ++ .../processors/cache/query/CacheQuery.java | 296 +++ .../cache/query/CacheQueryFuture.java | 66 + .../processors/cache/query/CacheQueryType.java | 47 +++ .../query/GridCacheDistributedQueryManager.java | 1 - .../cache/query/GridCacheLocalQueryManager.java | 1 - .../cache/query/GridCacheQueriesEx.java | 1 - .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheQueryErrorFuture.java | 1 - .../query/GridCacheQueryFutureAdapter.java | 1 - .../cache/query/GridCacheQueryManager.java | 18 +- .../cache/query/GridCacheQueryType.java | 4 +- .../GridCacheContinuousQueryHandler.java| 1 + .../query/jdbc/GridCacheQueryJdbcTask.java | 1 - .../datastructures/GridCacheSetImpl.java| 1 - .../cache/GridCacheQueryCommandHandler.java | 1 - .../internal/visor/query/VisorQueryTask.java| 1 - .../internal/visor/query/VisorQueryUtils.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/GridCacheQueryIndexSelfTest.java | 2 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java| 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 2 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 1 - .../cache/GridCacheAbstractQuerySelfTest.java | 3 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 1 - .../cache/GridCacheQueryMetricsSelfTest.java| 1 + .../GridCacheQueryMultiThreadedSelfTest.java| 1 - ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 2 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 2 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 2 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 1 - .../local/GridCacheLocalQuerySelfTest.java | 2 +- .../query/h2/GridH2IndexRebuildTest.java| 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 1 - .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- .../cache/IgniteSqlQueryPutBenchmark.java | 2 +- 70 files changed, 617 insertions(+), 627 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb65ec55/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample
[41/50] [abbrv] incubator-ignite git commit: # ignite-nio - Test fix
# ignite-nio - Test fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b46cea82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b46cea82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b46cea82
Branch: refs/heads/sprint-1-start-nodes
Commit: b46cea826650fe83072dea431d4fe2a234778c27
Parents: 37e76c4
Author: Valentin Kulichenko
Authored: Sun Feb 15 00:18:14 2015 -0800
Committer: Valentin Kulichenko
Committed: Sun Feb 15 00:18:14 2015 -0800
--
.../communication/GridCommunicationSendMessageSelfTest.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b46cea82/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 4df98f2..d37c67c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -145,10 +145,9 @@ public class GridCommunicationSendMessageSelfTest extends
GridCommonAbstractTest
private static class TestMessage extends MessageAdapter {
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer)
{
-//writer.setBuffer(buf);
-//
-//return writer.writeByte(null, directType());
-return true;
+writer.setBuffer(buf);
+
+return writer.writeByte(null, directType());
}
/** {@inheritDoc} */
[04/28] incubator-ignite git commit: ignite-sql-old - annotations
ignite-sql-old - annotations
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55045794
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55045794
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55045794
Branch: refs/heads/sprint-1
Commit: 550457941c749712b0d26f3f965188f4cc687a2a
Parents: 8be3faa
Author: S.Vladykin
Authored: Sat Feb 14 01:07:26 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 01:07:26 2015 +0300
--
.../apache/ignite/cache/query/CacheQuery.java | 16 +--
.../cache/query/CacheQueryGroupIndex.java | 49
.../ignite/cache/query/CacheQuerySqlField.java | 123 ---
.../cache/query/CacheQuerySqlFunction.java | 67 --
.../ignite/cache/query/CacheQueryTextField.java | 33 -
.../query/annotations/QuerySqlFunction.java | 2 +-
.../processors/query/GridQueryProcessor.java| 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 4 +-
8 files changed, 12 insertions(+), 284 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55045794/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
index efb15a8..1d4a3a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQuery.java
@@ -91,33 +91,33 @@ import org.jetbrains.annotations.*;
*
* public class Organization {
* // Indexed field.
- * @CacheQuerySqlField(index = true)
+ * @QuerySqlField(index = true)
* private long id;
*
* // Indexed field.
- * @CacheQuerySqlField(index = true)
+ * @QuerySqlField(index = true)
* private String name;
* ...
* }
*
* public class Person {
* // Indexed field.
- * @CacheQuerySqlField(index = true)
+ * @QuerySqlField(index = true)
* private long id;
*
* // Indexed field (Organization ID, used as a foreign key).
- * @CacheQuerySqlField(index = true)
+ * @QuerySqlField(index = true)
* private long orgId;
*
* // Without SQL field annotation, this field cannot be used in queries.
* private String name;
*
* // Not indexed field.
- * @CacheQuerySqlField
+ * @QuerySqlField
* private double salary;
*
* // Index for text search.
- * @CacheQueryTextField
+ * @QueryTextField
* private String resume;
* ...
* }
@@ -154,11 +154,11 @@ import org.jetbrains.annotations.*;
*
* private class MapPoint implements Serializable {
* // Geospatial index.
- * @CacheQuerySqlField(index = true)
+ * @QuerySqlField(index = true)
* private com.vividsolutions.jts.geom.Point location;
*
* // Not indexed field.
- * @CacheQuerySqlField
+ * @QuerySqlField
* private String name;
*
* public MapPoint(com.vividsolutions.jts.geom.Point location, String
name) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55045794/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryGroupIndex.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryGroupIndex.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryGroupIndex.java
deleted file mode 100644
index 5c15baf..000
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryGroupIndex.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.query;
-
-import java.lang.annotation.*;
-
-/**
- * Describes group index.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface CacheQueryGroupIn
[2/4] incubator-ignite git commit: # IGNITE-248 Cleanup code, added missing javadocs, fixed inspections warnings, added new properties to configurations.
# IGNITE-248 Cleanup code, added missing javadocs, fixed inspections warnings, added new properties to configurations. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c30477a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c30477a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c30477a Branch: refs/heads/sprint-1 Commit: 9c30477a2510012c38327659ff1a4a9ee888e42f Parents: f846f8a Author: AKuznetsov Authored: Sun Feb 15 12:32:19 2015 +0700 Committer: AKuznetsov Committed: Sun Feb 15 12:32:19 2015 +0700 -- .../configuration/TransactionConfiguration.java | 7 +- .../apache/ignite/internal/visor/VisorJob.java | 3 +- .../internal/visor/VisorMultiNodeTask.java | 9 +- .../ignite/internal/visor/cache/VisorCache.java | 8 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../visor/cache/VisorCacheConfiguration.java| 18 --- .../visor/cache/VisorCacheDgcConfiguration.java | 97 .../visor/cache/VisorCacheLoadTask.java | 4 +- .../internal/visor/cache/VisorCacheMetrics.java | 18 +-- .../cache/VisorCacheStoreConfiguration.java | 7 +- .../VisorCacheWriteBehindConfiguration.java | 6 +- .../compute/VisorComputeMonitoringHolder.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 17 ++- .../visor/debug/VisorThreadLockInfo.java| 12 +- .../visor/debug/VisorThreadMonitorInfo.java | 6 +- .../event/VisorGridAuthenticationEvent.java | 10 +- .../event/VisorGridAuthorizationEvent.java | 10 +- .../visor/event/VisorGridDeploymentEvent.java | 10 +- .../visor/event/VisorGridDiscoveryEvent.java| 10 +- .../internal/visor/event/VisorGridEvent.java| 18 +-- .../internal/visor/event/VisorGridJobEvent.java | 30 ++-- .../event/VisorGridSecuritySessionEvent.java| 10 +- .../visor/event/VisorGridTaskEvent.java | 30 ++-- .../internal/visor/file/VisorFileBlock.java | 10 +- .../internal/visor/file/VisorFileBlockTask.java | 10 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 3 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 6 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 10 +- .../visor/igfs/VisorIgfsProfilerTask.java | 12 ++ .../VisorIgfsProfilerUniformityCounters.java| 19 ++- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../visor/log/VisorLogSearchResult.java | 20 +-- .../internal/visor/misc/VisorNopTask.java | 3 + .../visor/node/VisorAtomicConfiguration.java| 104 + .../visor/node/VisorBasicConfiguration.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 86 +++ .../visor/node/VisorGridConfiguration.java | 37 + .../visor/node/VisorIgfsConfiguration.java | 48 +++--- .../visor/node/VisorMetricsConfiguration.java | 10 +- .../node/VisorNodeDataCollectorJobResult.java | 67 ++-- .../visor/node/VisorNodeDataCollectorTask.java | 71 + .../node/VisorNodeDataCollectorTaskArg.java | 19 ++- .../node/VisorNodeDataCollectorTaskResult.java | 18 +-- .../node/VisorNodeEventsCollectorTask.java | 33 ++-- .../visor/node/VisorRestConfiguration.java | 6 +- .../visor/node/VisorSpisConfiguration.java | 9 +- .../node/VisorTransactionConfiguration.java | 153 +++ .../visor/query/VisorQueryCleanupTask.java | 2 +- .../internal/visor/query/VisorQueryTask.java| 4 +- .../streamer/VisorStreamerConfiguration.java| 6 +- .../visor/streamer/VisorStreamerMetrics.java| 6 +- .../internal/visor/util/VisorMimeTypes.java | 51 --- .../internal/visor/util/VisorTaskUtils.java | 48 +++--- .../commands/cache/VisorCacheCommand.scala | 5 - .../config/VisorConfigurationCommand.scala | 10 +- 55 files changed, 788 insertions(+), 463 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c30477a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java index 13ac061..ecc21e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java @@ -19,15 +19,10 @@ package org.apache.ignite.configuration; import org.apache.ignite.transactions.*; -import java.io.*; - /** * Transactions configuration. */ -public class TransactionConfiguration implements Serializ
[3/4] incubator-ignite git commit: Merge branches 'ignite-248' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-248
Merge branches 'ignite-248' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-248 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d868865a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d868865a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d868865a Branch: refs/heads/sprint-1 Commit: d868865a867abaec9848c6f47b176ef2b0307131 Parents: 9c30477 73bc9d3 Author: AKuznetsov Authored: Sun Feb 15 15:33:39 2015 +0700 Committer: AKuznetsov Committed: Sun Feb 15 15:33:39 2015 +0700 -- examples/config/example-cache.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 69 +- .../datagrid/CacheDataLoaderExample.java| 1 - .../datagrid/CachePopularNumbersExample.java| 31 +- .../examples/datagrid/CacheQueryExample.java| 209 ++--- .../starschema/CacheStarSchemaExample.java | 41 +- .../datagrid/starschema/DimProduct.java | 6 +- .../examples/datagrid/starschema/DimStore.java | 6 +- .../datagrid/starschema/FactPurchase.java | 10 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 15 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 13 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 32 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 39 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 11 +- .../clients/src/test/resources/spring-cache.xml | 2 +- .../CommunicationMessageCodeGenerator.java | 24 + .../java/org/apache/ignite/IgniteCache.java | 44 +- .../org/apache/ignite/IgniteDataLoader.java | 22 +- .../apache/ignite/cache/CacheProjection.java| 4 +- .../cache/query/CacheContinuousQuery.java | 284 -- .../cache/query/CacheContinuousQueryEntry.java | 49 - .../apache/ignite/cache/query/CacheQueries.java | 152 .../apache/ignite/cache/query/CacheQuery.java | 294 -- .../cache/query/CacheQueryConfiguration.java| 180 .../ignite/cache/query/CacheQueryFuture.java| 66 -- .../cache/query/CacheQueryGroupIndex.java | 49 - .../ignite/cache/query/CacheQueryMetrics.java | 60 -- .../ignite/cache/query/CacheQuerySqlField.java | 123 --- .../cache/query/CacheQuerySqlFunction.java | 67 -- .../ignite/cache/query/CacheQueryTextField.java | 33 - .../ignite/cache/query/CacheQueryType.java | 47 - .../cache/query/CacheQueryTypeResolver.java | 32 - .../ignite/cache/query/ContinuousQuery.java | 314 +++ .../org/apache/ignite/cache/query/Query.java| 143 +++ .../cache/query/QueryAffinityPredicate.java | 135 --- .../cache/query/QueryContinuousPredicate.java | 215 - .../apache/ignite/cache/query/QueryCursor.java | 22 +- .../apache/ignite/cache/query/QueryMetrics.java | 62 ++ .../ignite/cache/query/QueryPredicate.java | 76 -- .../apache/ignite/cache/query/QueryReducer.java | 30 - .../ignite/cache/query/QuerySqlPredicate.java | 118 --- .../ignite/cache/query/QueryTextPredicate.java | 90 -- .../ignite/cache/query/QueryTypeResolver.java | 32 + .../apache/ignite/cache/query/ScanQuery.java| 76 ++ .../org/apache/ignite/cache/query/SpiQuery.java | 64 ++ .../ignite/cache/query/SqlFieldsQuery.java | 98 ++ .../org/apache/ignite/cache/query/SqlQuery.java | 142 +++ .../apache/ignite/cache/query/TextQuery.java| 119 +++ .../cache/query/annotations/QuerySqlField.java | 8 +- .../query/annotations/QuerySqlFunction.java | 4 +- .../cache/query/annotations/QueryTextField.java | 8 +- .../configuration/CacheConfiguration.java | 6 +- .../configuration/CacheQueryConfiguration.java | 182 .../configuration/IgniteConfiguration.java | 10 +- .../configuration/QueryConfiguration.java | 3 +- .../ignite/events/CacheQueryExecutedEvent.java | 9 +- .../ignite/events/CacheQueryReadEvent.java | 9 +- .../org/apache/ignite/internal/IgnitionEx.java | 5 +- .../communication/GridIoMessageFactory.java | 10 - .../managers/indexing/GridIndexingManager.java | 4 +- .../affinity/GridAffinityProcessor.java | 36 +- .../processors/cache/CacheEntryEvent.java | 78 -- .../processors/cache/CacheMetricsImpl.java | 8 +- .../cache/CacheWeakQueryIteratorsHolder.java| 2 +- .../processors/cache/GridCacheAdapter.java | 36 +- .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheEntryInfo.java| 9 + .../processors/cache/GridCacheMapEntry.java | 185 ++-- .../processors/cache/GridCacheMvcc.java | 8 +- .../cache/GridCacheMvccCandidate.java | 18 - .../processors/cache/GridCacheProcessor.java| 8 +- .../processors/cache/GridCacheProjectionEx.java | 5 + .../cache/GridCacheProjectionImpl.java | 1 - .../processors/cache
[17/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dcb4c709
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dcb4c709
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dcb4c709
Branch: refs/heads/sprint-1
Commit: dcb4c70930787b74a0aa421982f3fac717e73ebc
Parents: f9f06c0
Author: Valentin Kulichenko
Authored: Sat Feb 14 19:45:14 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 19:45:14 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 8 ++-
.../internal/direct/DirectByteBufferStream.java | 5 +-
.../internal/direct/DirectMessageReader.java| 4 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +-
.../distributed/near/GridNearLockRequest.java | 4 +-
.../distributed/near/GridNearLockResponse.java | 4 +-
.../communication/MessageAdapter.java | 55
.../extensions/communication/MessageReader.java | 3 +-
10 files changed, 42 insertions(+), 49 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index 7ce89a7..a9846d1 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -674,8 +674,12 @@ public class CommunicationMessageCodeGenerator {
}
else if (BASE_CLS.isAssignableFrom(type))
returnFalseIfReadFailed(name, "reader.readMessage", field);
-else if (type.isArray())
-returnFalseIfReadFailed(name, "reader.readObjectArray", field,
"Type." + typeEnum(type.getComponentType()));
+else if (type.isArray()) {
+Class compType = type.getComponentType();
+
+returnFalseIfReadFailed(name, "reader.readObjectArray", field,
"Type." + typeEnum(compType),
+compType.getSimpleName() + ".class");
+}
else if (Collection.class.isAssignableFrom(type) &&
!Set.class.isAssignableFrom(type)) {
assert colItemType != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
index f503223..fed6a53 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
@@ -967,10 +967,11 @@ public class DirectByteBufferStream {
/**
* @param itemType Component type.
+ * @param itemCls Component class.
* @return Array.
*/
@SuppressWarnings("unchecked")
-public T[] readObjectArray(MessageAdapter.Type itemType) {
+public T[] readObjectArray(MessageAdapter.Type itemType, Class
itemCls) {
if (readSize == -1) {
int size = readInt();
@@ -982,7 +983,7 @@ public class DirectByteBufferStream {
if (readSize >= 0) {
if (objArr == null)
-objArr = (Object[])Array.newInstance(itemType.clazz(),
readSize);
+objArr = (Object[])Array.newInstance(itemCls, readSize);
for (int i = readItems; i < readSize; i++) {
Object item = read(itemType);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index 191c522..f52a4c8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -236,8 +236,8 @@ public class DirectMessageReader implements MessageReader {
[03/17] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index 60108c8..7ac8041 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -298,39 +298,37 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessag
/** {@inheritDoc} */
@SuppressWarnings("all")
-@Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) {
-MessageWriter writer = state.writer();
-
+@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
-if (!super.writeTo(buf, state))
+if (!super.writeTo(buf, writer))
return false;
-if (!state.isTypeWritten()) {
+if (!writer.isTypeWritten()) {
if (!writer.writeByte(null, directType()))
return false;
-state.setTypeWritten();
+writer.onTypeWritten();
}
-switch (state.index()) {
+switch (writer.state()) {
case 8:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
-state.increment();
+writer.incrementState();
case 9:
if (!writer.writeIgniteUuid("futId", futId))
return false;
-state.increment();
+writer.incrementState();
case 10:
if (!writer.writeCollection("valBytes", valBytes, Type.MSG))
return false;
-state.increment();
+writer.incrementState();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 46aa9d8..5688cfc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -376,99 +376,97 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMes
/** {@inheritDoc} */
@SuppressWarnings("all")
-@Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) {
-MessageWriter writer = state.writer();
-
+@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
-if (!super.writeTo(buf, state))
+if (!super.writeTo(buf, writer))
return false;
-if (!state.isTypeWritten()) {
+if (!writer.isTypeWritten()) {
if (!writer.writeByte(null, directType()))
return false;
-state.setTypeWritten();
+writer.onTypeWritten();
}
-switch (state.index()) {
+switch (writer.state()) {
case 8:
if (!writer.writeMessage("baseVer", baseVer))
return false;
-state.increment();
+writer.incrementState();
case 9:
if (!writer.writeBoolean("commit", commit))
return false;
-state.increment();
+writer.incrementState();
case 10:
if (!writer.writeMessage("commitVer", commitVer))
return false;
-state.increment();
+writer.incrementState();
case 11:
if (!writer.writeIgniteUuid("futId", futId))
return false;
-state.increment();
+writer.incrementState();
case 12:
if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes))
return false;
-state.increment();
+writer.incrementState();
case 13:
if (!writer.writeBoolean("invalidate", invalid
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-52 [deleted] c63177e98
[03/30] incubator-ignite git commit: ignite-sql-old - annotations
ignite-sql-old - annotations
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8be3faa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8be3faa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8be3faa7
Branch: refs/heads/ignite-nio
Commit: 8be3faa768d43f8427b44afa9684a945814092af
Parents: 6f2dc26
Author: S.Vladykin
Authored: Sat Feb 14 00:54:32 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 00:54:32 2015 +0300
--
.../examples/datagrid/CacheQueryExample.java| 17 +--
.../datagrid/starschema/DimProduct.java | 6 +-
.../examples/datagrid/starschema/DimStore.java | 6 +-
.../datagrid/starschema/FactPurchase.java | 10 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 15 ++-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 13 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 32 ++---
.../ignite/jdbc/JdbcResultSetSelfTest.java | 39 +++---
.../ignite/jdbc/JdbcStatementSelfTest.java | 11 +-
.../apache/ignite/cache/query/CacheQuery.java | 9 +-
.../query/annotations/QueryGroupIndex.java | 49
.../cache/query/annotations/QuerySqlField.java | 125 +++
.../query/annotations/QuerySqlFunction.java | 67 ++
.../cache/query/annotations/QueryTextField.java | 35 ++
.../configuration/QueryConfiguration.java | 3 +-
.../processors/query/GridQueryProcessor.java| 21 ++--
.../GridCacheConcurrentTxMultiNodeTest.java | 21 ++--
...CacheFullTextQueryMultithreadedSelfTest.java | 3 +-
.../cache/GridCacheLuceneQueryIndexTest.java| 6 +-
.../cache/GridCacheOffHeapSelfTest.java | 4 +-
.../cache/GridCacheQueryEmbeddedValue.java | 10 +-
.../cache/GridCacheQueryIndexSelfTest.java | 3 +-
.../processors/cache/GridCacheTestValue.java| 4 +-
.../processors/cache/GridCacheTestValue2.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 9 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +-
.../ignite/loadtests/mapper/TestObject.java | 6 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 5 +-
.../processors/query/h2/IgniteH2Indexing.java | 3 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 13 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 29 ++---
.../cache/GridCacheCrossCacheQuerySelfTest.java | 17 +--
.../cache/GridCacheQueryLoadSelfTest.java | 4 +-
.../GridCacheQueryMultiThreadedSelfTest.java| 3 +-
.../cache/GridCacheQueryTestValue.java | 20 +--
.../GridCacheSqlQueryMultiThreadedSelfTest.java | 3 +-
.../processors/cache/GridCacheSwapSelfTest.java | 4 +-
.../GridCacheReplicatedQuerySelfTest.java | 3 +-
.../query/h2/GridH2IndexRebuildTest.java| 13 +-
.../query/h2/sql/GridQueryParsingTest.java | 17 +--
.../loadtests/h2indexing/GridTestEntity.java| 6 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 6 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../yardstick/cache/model/Organization.java | 6 +-
.../ignite/yardstick/cache/model/Person.java| 12 +-
45 files changed, 499 insertions(+), 208 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 04fb53d..238429c 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.lang.*;
import java.io.*;
@@ -374,27 +375,27 @@ public class CacheQueryExample {
*/
private static class Person implements Serializable {
/** Person ID (indexed). */
-@CacheQuerySqlField(index = true)
+@QuerySqlField(index = true)
private UUID id;
/** Organization ID (indexed). */
-@CacheQuerySqlField(index = true)
+@QuerySqlField(index = true)
private UUID orgId;
/** First name (not-indexed). */
-@CacheQuerySqlField
+@QuerySqlField
private String firstName;
/** Last name (not indexed). */
-@CacheQuerySqlField
+@QuerySqlField
private String lastName;
[34/45] incubator-ignite git commit: IGNITE-CANCELLED Cancel user's request when grid stopping.
IGNITE-CANCELLED Cancel user's request when grid stopping.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5182f50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5182f50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5182f50
Branch: refs/heads/ignite-sql-old
Commit: d5182f506cd0cce4e200448cb06103d199c60963
Parents: 188a18d
Author: nikolay_tikhonov
Authored: Sat Feb 14 17:35:22 2015 +0300
Committer: nikolay_tikhonov
Committed: Sat Feb 14 17:35:22 2015 +0300
--
.../ignite/internal/GridKernalGateway.java | 7 +
.../ignite/internal/GridKernalGatewayImpl.java | 16 +
.../apache/ignite/internal/IgniteKernal.java| 23 +-
.../processors/cache/GridCacheMvccManager.java | 15 +
.../processors/cache/GridCacheProcessor.java| 8 +
.../internal/GridUpdateNotifierSelfTest.java| 4 +
.../IgniteCacheAbstractStopBusySelfTest.java| 371 +++
.../IgniteCacheAtomicStopBusySelfTest.java | 59 +++
...gniteCacheTransactionalStopBusySelfTest.java | 53 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
10 files changed, 557 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5182f50/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
index e3fdd15..09164d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGateway.java
@@ -127,5 +127,12 @@ public interface GridKernalGateway {
* Gets user stack trace through the first call of grid public API.
*/
public String userStackTrace();
+
+/**
+ * @param timeout Timeout.
+ * @return {@code True} if write lock has been acquired.
+ * @throws InterruptedException If interrupted.
+ */
+public boolean tryWriteLock(long timeout) throws InterruptedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5182f50/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
index cd2f219..5982005 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
@@ -121,6 +121,22 @@ public class GridKernalGatewayImpl implements
GridKernalGateway, Serializable {
Thread.currentThread().interrupt();
}
+/** {@inheritDoc} */
+@Override public boolean tryWriteLock(long timeout) throws
InterruptedException {
+boolean acquired = rwLock.tryWriteLock(timeout, TimeUnit.MILLISECONDS);
+
+if (acquired) {
+if (stackTrace == null)
+stackTrace = stackTrace();
+
+enterThreadLocals();
+
+return true;
+}
+
+return false;
+}
+
/**
* Retrieves user stack trace.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5182f50/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 51ff4a8..c253182 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1732,6 +1732,7 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
}
IgniteEmailProcessorAdapter email = ctx.email();
+GridCacheProcessor cacheProcessor = ctx.cache();
List comps = ctx.components();
@@ -1761,7 +1762,27 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
if (metricsLogTimer != null)
metricsLogTimer.cancel();
-gw.writeLock();
+boolean interrupted = false;
+
+while (true) {
+try {
+if (gw.tryWriteLock(10))
+break;
+}
+catch (InterruptedException e) {
+// Preserve interrupt s
[36/49] incubator-ignite git commit: IGNITE-9655-Merge - Fixed Hadoop tests.
IGNITE-9655-Merge - Fixed Hadoop tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79d5d325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79d5d325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79d5d325
Branch: refs/heads/sprint-1
Commit: 79d5d325d68092385a34b8adc63a9fb0244dc79e
Parents: 25f55de
Author: Alexey Goncharuk
Authored: Fri Feb 13 19:03:33 2015 -0800
Committer: Alexey Goncharuk
Committed: Fri Feb 13 19:03:33 2015 -0800
--
.../processors/cache/transactions/IgniteTxLocalAdapter.java| 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79d5d325/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 5c8d1ac..97564e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1988,8 +1988,6 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
if (invokeMap != null)
transform = true;
-assert !transform || retval;
-
groupLockSanityCheck(cacheCtx, keys);
for (K key : keys) {
[20/49] incubator-ignite git commit: GG-9655 - Fixing tests after merge.
GG-9655 - Fixing tests after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/886299da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/886299da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/886299da
Branch: refs/heads/sprint-1
Commit: 886299da986e0c76299283837cf19801da1958fd
Parents: bc89139
Author: Alexey Goncharuk
Authored: Tue Feb 3 11:52:00 2015 -0800
Committer: Alexey Goncharuk
Committed: Tue Feb 3 11:52:00 2015 -0800
--
.../distributed/near/GridNearTxPrepareFuture.java | 7 +--
.../processors/cache/GridCacheTestStore.java| 16
...CacheReplicatedGetAndTransformStoreSelfTest.java | 8 +---
3 files changed, 14 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/886299da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index fb422a4..deb991a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -132,7 +132,7 @@ public final class GridNearTxPrepareFuture extends
GridCompoundIdentityFut
if (log.isDebugEnabled())
log.debug("Transaction future received owner changed callback: " +
entry);
-if (entry.context().isNear() && owner != null &&
tx.hasWriteKey(entry.txKey())) {
+if ((entry.context().isNear() || entry.context().isLocal()) && owner
!= null && tx.hasWriteKey(entry.txKey())) {
lockKeys.remove(entry.txKey());
// This will check for locks.
@@ -773,9 +773,12 @@ public final class GridNearTxPrepareFuture extends
GridCompoundIdentityFut
entry.cached(cacheCtx.nearTx().entryExx(entry.key(), topVer),
entry.keyBytes());
else if (!cacheCtx.isLocal())
entry.cached(cacheCtx.colocated().entryExx(entry.key(), topVer,
true), entry.keyBytes());
-else
+else {
entry.cached(cacheCtx.local().entryEx(entry.key(), topVer),
entry.keyBytes());
+lockKeys.add(entry.txKey());
+}
+
if (cur == null || !cur.node().id().equals(primary.id()) || cur.near()
!= cacheCtx.isNear()) {
cur = new GridDistributedTxMapping<>(primary);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/886299da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
index ff600e7..1a28bbf 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java
@@ -188,7 +188,7 @@ public final class GridCacheTestStore extends
CacheStore {
/** {@inheritDoc} */
@Override public String load(Integer key) {
-checkTx(session());
+checkTx(session(), true);
lastMtd = "load";
@@ -218,7 +218,7 @@ public final class GridCacheTestStore extends
CacheStore {
/** {@inheritDoc} */
@Override public Map loadAll(Iterable
keys) {
-checkTx(session());
+checkTx(session(), true);
lastMtd = "loadAll";
@@ -239,7 +239,7 @@ public final class GridCacheTestStore extends
CacheStore {
/** {@inheritDoc} */
@Override public void write(Cache.Entry e)
throws CacheWriterException {
-checkTx(session());
+checkTx(session(), false);
lastMtd = "put";
@@ -253,7 +253,7 @@ public final class GridCacheTestStore extends
CacheStore {
/** {@inheritDoc} */
@Override public void writeAll(Collection> entries)
throws CacheWriterException {
-checkTx(session());
+checkTx(session(), false);
lastMtd = "putAll";
@@ -267,7 +267,7 @@ public final class GridCacheTestStore extends
CacheStore {
/** {@inheritDoc} */
@Override public void delete(Object key) throws CacheWriterException {
-checkTx(session());
+checkTx(session(), false);
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-109 [deleted] e4cd6321c
[45/49] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Ignite-9655-merge - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa83f60f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa83f60f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa83f60f
Branch: refs/heads/sprint-1
Commit: aa83f60fecae61c7c7edf8a0bf2ac8799a143686
Parents: 387c24d
Author: Alexey Goncharuk
Authored: Sat Feb 14 23:49:08 2015 -0800
Committer: Alexey Goncharuk
Committed: Sat Feb 14 23:49:08 2015 -0800
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa83f60f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index ea95283..d081eaf 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -119,7 +119,6 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class);
suite.addTestSuite(GridCacheTtlManagerSelfTest.class);
suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class);
-//suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class);
suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class);
suite.addTestSuite(GridCacheAtomicNearCacheSelfTest.class);
@@ -145,6 +144,7 @@ public class IgniteCacheTestSuite extends TestSuite {
//suite.addTestSuite(GridCacheReplicatedTxExceptionSelfTest.class);
//suite.addTestSuite(GridCacheLocalTxExceptionSelfTest.class);
//suite.addTestSuite(GridCacheNearTxExceptionSelfTest.class);
+//suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
// Local cache.
suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
[49/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac3769be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac3769be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac3769be Branch: refs/heads/sprint-1 Commit: ac3769be71940f11914733c9572db7391d02c504 Parents: 497fc87 73bc9d3 Author: Valentin Kulichenko Authored: Sun Feb 15 00:37:02 2015 -0800 Committer: Valentin Kulichenko Committed: Sun Feb 15 00:37:02 2015 -0800 -- .../datagrid/CacheDataLoaderExample.java| 1 - .../CommunicationMessageCodeGenerator.java | 24 + .../org/apache/ignite/IgniteDataLoader.java | 22 +- .../communication/GridIoMessageFactory.java | 10 - .../affinity/GridAffinityProcessor.java | 36 +- .../processors/cache/CacheMetricsImpl.java | 8 +- .../processors/cache/GridCacheAdapter.java | 35 +- .../processors/cache/GridCacheContext.java | 30 +- .../processors/cache/GridCacheEntryInfo.java| 9 + .../processors/cache/GridCacheMapEntry.java | 159 ++--- .../processors/cache/GridCacheMvcc.java | 8 +- .../cache/GridCacheMvccCandidate.java | 18 - .../processors/cache/GridCacheReturn.java | 57 ++ .../cache/GridCacheSharedContext.java | 2 + .../processors/cache/GridCacheUtils.java| 15 - .../distributed/GridCacheCommittedTxInfo.java | 2 - .../GridCachePerThreadTxCommitBuffer.java | 186 - ...dCachePessimisticCheckCommittedTxFuture.java | 383 --- ...CachePessimisticCheckCommittedTxRequest.java | 282 ...achePessimisticCheckCommittedTxResponse.java | 228 -- .../distributed/GridCacheTxCommitBuffer.java| 60 -- .../distributed/GridDistributedLockRequest.java | 201 +- .../GridDistributedTxFinishRequest.java | 158 + .../distributed/GridDistributedTxMapping.java | 6 +- .../GridDistributedTxPrepareRequest.java| 122 +--- .../GridDistributedTxRemoteAdapter.java | 58 +- .../distributed/dht/GridDhtCacheEntry.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 156 + .../distributed/dht/GridDhtLockRequest.java | 74 +- .../dht/GridDhtTransactionalCacheAdapter.java | 20 +- .../distributed/dht/GridDhtTxFinishFuture.java | 44 +- .../distributed/dht/GridDhtTxFinishRequest.java | 270 +--- .../cache/distributed/dht/GridDhtTxLocal.java | 56 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 109 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 654 -- .../dht/GridDhtTxPrepareRequest.java| 59 +- .../dht/GridDhtTxPrepareResponse.java | 2 + .../cache/distributed/dht/GridDhtTxRemote.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 41 -- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockFuture.java| 8 - .../distributed/near/GridNearLockRequest.java | 87 +-- .../near/GridNearTransactionalCache.java| 3 +- .../near/GridNearTxFinishFuture.java| 2 - .../near/GridNearTxFinishRequest.java | 54 +- .../cache/distributed/near/GridNearTxLocal.java
[49/49] incubator-ignite git commit: Rebuilt optimized-classnames.properties.
Rebuilt optimized-classnames.properties. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73bc9d34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73bc9d34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73bc9d34 Branch: refs/heads/sprint-1 Commit: 73bc9d34b3aa5718db913adb52c594eb0e7c5ce8 Parents: c4ffc84 Author: Alexey Goncharuk Authored: Sun Feb 15 00:18:00 2015 -0800 Committer: Alexey Goncharuk Committed: Sun Feb 15 00:18:00 2015 -0800 -- .../optimized/optimized-classnames.properties | 42 1 file changed, 16 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73bc9d34/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties -- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties index 1143151..fe30a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties @@ -90,12 +90,11 @@ org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity$PartitionSetCom org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction$HashComparator org.apache.ignite.cache.hibernate.GridHibernateAccessStrategyAdapter$ClearKeyCallable -org.apache.ignite.configuration.CacheQueryConfiguration -org.apache.ignite.cache.query.CacheQueryType -org.apache.ignite.cache.query.QueryAffinityPredicate -org.apache.ignite.cache.query.QueryContinuousPredicate -org.apache.ignite.cache.query.QuerySqlPredicate -org.apache.ignite.cache.query.QueryTextPredicate +org.apache.ignite.cache.query.ScanQuery +org.apache.ignite.cache.query.SpiQuery +org.apache.ignite.cache.query.SqlFieldsQuery +org.apache.ignite.cache.query.SqlQuery +org.apache.ignite.cache.query.TextQuery org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$1 org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$2 org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$1 @@ -128,12 +127,11 @@ org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask org.apache.ignite.compute.gridify.aop.GridifyDefaultTask org.apache.ignite.compute.gridify.aop.spring.GridifySpringPointcut$GridifySpringPointcutType +org.apache.ignite.configuration.CacheQueryConfiguration org.apache.ignite.configuration.DeploymentMode org.apache.ignite.configuration.TransactionConfiguration org.apache.ignite.events.CacheEvent org.apache.ignite.events.CachePreloadingEvent -org.apache.ignite.events.CacheQueryExecutedEvent -org.apache.ignite.events.CacheQueryReadEvent org.apache.ignite.events.CheckpointEvent org.apache.ignite.events.DeploymentEvent org.apache.ignite.events.DiscoveryEvent @@ -306,9 +304,11 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$66 org.apache.ignite.internal.processors.cache.GridCacheAdapter$67 org.apache.ignite.internal.processors.cache.GridCacheAdapter$69 org.apache.ignite.internal.processors.cache.GridCacheAdapter$70 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$70$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$71 org.apache.ignite.internal.processors.cache.GridCacheAdapter$72 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$74 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$73 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$75 org.apache.ignite.internal.processors.cache.GridCacheAdapter$8 org.apache.ignite.internal.processors.cache.GridCacheAdapter$9 org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalClearAllCallable @@ -419,8 +419,7 @@ org.apache.ignite.internal.processors.cache.GridCacheUtils$20 org.apache.ignite.internal.processors.cache.GridCacheUtils$21 org.apache.ignite.internal.processors.cache.GridCacheUtils$22 org.apache.ignite.internal.processors.cache.GridCacheUtils$23 -org.apache.ignite.internal.processors.cache.GridCacheUtils$24 -org.apache.ignite.internal.processors.cache.GridCacheUtils$26 +org.apache.ignite.internal.processors.cache.GridCacheUtils$25 org.apache.ignite.internal.processors.cache.GridCacheUtils$3 org.apache.ignite.internal.processors.cache.GridCacheUtils$4 org.apache.ignite.internal.processors.cache.GridCacheUtils$5 @@ -435,20 +434,13 @@ org.apache.ignite.internal.processors.cac
[27/28] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old Conflicts: modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ddbfb711 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddbfb711 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddbfb711 Branch: refs/heads/sprint-1 Commit: ddbfb711000b4402a4755d865da4bf6d0de43e84 Parents: 4873f04 f846f8a Author: S.Vladykin Authored: Sun Feb 15 06:01:30 2015 +0300 Committer: S.Vladykin Committed: Sun Feb 15 06:01:30 2015 +0300 -- assembly/core-jar.xml | 49 - assembly/dependencies-fabric.xml| 53 +- assembly/dependencies-hadoop.xml| 42 +- assembly/dependencies-optional-fabric.xml |1 - assembly/dependencies-optional-hadoop.xml |1 - .../client/memcache/MemcacheRestExample.java|3 +- modules/core/licenses/sun-bcl-license.txt | 50 + modules/core/pom.xml| 16 - .../ignite/internal/GridKernalGateway.java |7 + .../ignite/internal/GridKernalGatewayImpl.java | 16 + .../apache/ignite/internal/IgniteKernal.java| 23 +- .../deployment/GridDeploymentManager.java |2 +- .../processors/cache/GridCacheMvccManager.java | 15 + .../processors/cache/GridCacheProcessor.java|8 + .../optimized/optimized-classnames.properties | 254 +- .../fifoqueue/FifoQueueCollisionSpi.java|6 +- .../PriorityQueueCollisionSpi.java |6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 70 +- .../org/jdk8/backport/ConcurrentHashMap8.java | 3825 ++ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 + .../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ++ .../main/java/org/jdk8/backport/LongAdder.java | 235 ++ .../main/java/org/jdk8/backport/Striped64.java | 370 ++ .../org/jdk8/backport/ThreadLocalRandom8.java | 231 ++ .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 ++ .../internal/GridReleaseTypeSelfTest.java | 35 +- .../GridTopologyBuildVersionSelfTest.java | 101 - .../internal/GridUpdateNotifierSelfTest.java|4 + .../GridCacheConcurrentTxMultiNodeTest.java |4 +- ...CacheFullTextQueryMultithreadedSelfTest.java |2 +- .../cache/GridCacheLuceneQueryIndexTest.java| 16 +- .../cache/GridCacheOffHeapSelfTest.java |2 +- .../cache/GridCacheP2PUndeploySelfTest.java |2 +- .../cache/GridCacheQueryIndexSelfTest.java |5 +- .../GridCacheQueryInternalKeysSelfTest.java |2 +- .../cache/GridCacheSwapPreloadSelfTest.java |2 +- .../GridCacheVariableTopologySelfTest.java |2 +- .../IgniteCacheAbstractStopBusySelfTest.java| 381 ++ .../IgniteCacheAtomicStopBusySelfTest.java | 59 + ...gniteCacheTransactionalStopBusySelfTest.java | 53 + .../cache/IgniteTxMultiNodeAbstractTest.java|6 +- ...niteCacheContinuousExecutionContextTest.java | 34 + ...IgniteCacheIsolatedExecutionContextTest.java | 34 + ...niteCacheP2PDisableExecutionContextTest.java | 34 + .../IgniteCachePrivateExecutionContextTest.java | 34 + .../IgniteCacheSharedExecutionContextTest.java | 34 + .../GridCacheQueueCleanupSelfTest.java |8 +- .../GridCacheAbstractJobExecutionTest.java |7 +- .../GridCacheClientModesAbstractSelfTest.java |9 +- ...ePartitionedNearDisabledMe
[32/49] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-9655-merge
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-9655-merge Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/773c207e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/773c207e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/773c207e Branch: refs/heads/sprint-1 Commit: 773c207eb7c1ba093d0dcd03af4f7290313b6798 Parents: f0b6247 7f062e6 Author: Alexey Goncharuk Authored: Fri Feb 13 14:13:27 2015 -0800 Committer: Alexey Goncharuk Committed: Fri Feb 13 14:13:27 2015 -0800 -- config/fabric/default-config.xml|6 +- config/hadoop/default-config.xml| 30 +- config/ignite-log4j.xml |2 +- docs/core-site.ignite.xml | 26 +- docs/hadoop_readme.md |8 +- examples/config/filesystem/core-site.xml| 14 +- examples/config/filesystem/example-igfs.xml | 165 + examples/config/filesystem/example-ignitefs.xml | 165 - examples/config/filesystem/readme.txt |2 +- examples/pom-standalone.xml | 28 +- .../HibernateL2CacheExampleNodeStartup.java |2 +- .../ignite/examples/igfs/IgfsExample.java | 278 ++ .../examples/igfs/IgfsMapReduceExample.java | 249 ++ .../ignite/examples/igfs/IgfsNodeStartup.java | 41 + .../apache/ignite/examples/igfs/package.html| 24 + .../examples/ignitefs/IgniteFsExample.java | 278 -- .../ignitefs/IgniteFsMapReduceExample.java | 249 -- .../examples/ignitefs/IgniteFsNodeStartup.java | 41 - .../ignite/examples/ignitefs/package.html | 24 - .../MemcacheRestExampleNodeStartup.java |2 +- .../ignite/examples/IgfsExamplesSelfTest.java | 51 + .../examples/IgniteFsExamplesSelfTest.java | 51 - .../testsuites/IgniteExamplesSelfTestSuite.java |2 +- .../src/test/resources/spring-server-node.xml | 23 - .../test/resources/spring-server-ssl-node.xml | 24 - modules/core/pom.xml| 10 + .../src/main/java/org/apache/ignite/Ignite.java | 24 +- .../main/java/org/apache/ignite/IgniteFs.java | 106 +- .../apache/ignite/cache/CacheProjection.java|4 +- .../ignite/cache/cloner/CacheBasicCloner.java | 34 - .../apache/ignite/cache/cloner/CacheCloner.java | 57 - .../ignite/cache/cloner/CacheDeepCloner.java| 87 - .../org/apache/ignite/cache/cloner/package.html | 24 - .../eviction/igfs/CacheIgfsEvictionFilter.java | 35 + .../CacheIgfsPerBlockLruEvictionPolicy.java | 358 +++ ...acheIgfsPerBlockLruEvictionPolicyMXBean.java | 93 + .../ignite/cache/eviction/igfs/package.html | 24 + .../ignitefs/CacheIgniteFsEvictionFilter.java | 35 - .../CacheIgniteFsPerBlockLruEvictionPolicy.java | 358 --- ...IgniteFsPerBlockLruEvictionPolicyMXBean.java | 93 - .../ignite/cache/eviction/ignitefs/package.html | 24 - .../store/jdbc/CacheAbstractJdbcStore.java | 100 +- .../cache/store/jdbc/CacheJdbcPojoStore.java|8 +- .../configuration/CacheConfiguration.java | 34 - .../ignite/configuration/IgfsConfiguration.java | 807 + .../configuration/IgniteConfiguration.java | 128 +- .../configuration/IgniteFsConfiguration.java| 807 - .../ignite/events/AuthenticationEvent.java | 172 - .../ignite/events/AuthorizationEvent.java | 146 - .../org/apache/ignite/events/EventType.java | 248 +- .../org/apache/ignite/events/IgfsEvent.java | 197 ++ .../org/apache/ignite/events/IgniteFsEvent.java | 197 -- .../ignite/events/SecureSessionEvent.java | 154 - .../main/java/org/apache/ignite/igfs/Igfs.java | 216 ++ .../apache/ignite/igfs/IgfsBlockLocation.java | 63 + .../IgfsConcurrentModificationException.java| 36 + .../ignite/igfs/IgfsCorruptedFileException.java | 50 + .../org/apache/ignite/igfs/IgfsException.java | 57 + .../java/org/apache/ignite/igfs/IgfsFile.java | 120 + .../ignite/igfs/IgfsFileNotFoundException.java | 44 + .../igfs/IgfsGroupDataBlocksKeyMapper.java | 101 + .../org/apache/ignite/igfs/IgfsInputStream.java | 80 + .../igfs/IgfsInvalidHdfsVersionException.java | 42 + .../ignite/igfs/IgfsInvalidPathException.java | 57 + .../org/apache/ignite/igfs/IgfsMetrics.java | 159 + .../java/org/apache/ignite/igfs/IgfsMode.java | 80 + .../ignite/igfs/IgfsOutOfSpaceException.java| 58 + .../apache/ignite/igfs/IgfsOutputStream.java| 35 + .../igfs/IgfsParentNotDirectoryException.java | 50 + .../java/org/apache/ignite/igfs/IgfsPath.java | 262 ++ .../igfs/IgfsPathAlreadyExistsException.java| 50 + .../org/apache/ignite/igfs/IgfsPathSummary.java | 138 + .../java/org/apache/ignite/igfs/IgfsReader.java | 38 + .
[04/17] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e63ce523 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e63ce523 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e63ce523 Branch: refs/heads/ignite-nio Commit: e63ce5239df83b8b02e9fe571746a02d6b7c1b28 Parents: dcb4c70 Author: Valentin Kulichenko Authored: Sat Feb 14 21:21:35 2015 -0800 Committer: Valentin Kulichenko Committed: Sat Feb 14 21:21:35 2015 -0800 -- .../CommunicationMessageCodeGenerator.java | 17 +-- .../org/apache/ignite/events/EventType.java | 2 +- .../ignite/internal/GridJobCancelRequest.java | 16 ++- .../ignite/internal/GridJobExecuteRequest.java | 52 .../ignite/internal/GridJobExecuteResponse.java | 24 ++-- .../ignite/internal/GridJobSiblingsRequest.java | 14 +-- .../internal/GridJobSiblingsResponse.java | 12 +- .../ignite/internal/GridTaskCancelRequest.java | 12 +- .../ignite/internal/GridTaskSessionRequest.java | 16 ++- .../internal/direct/DirectByteBufferStream.java | 81 .../internal/direct/DirectMessageWriter.java| 53 ++-- .../internal/direct/MessageWriterState.java | 113 + .../checkpoint/GridCheckpointRequest.java | 16 ++- .../managers/communication/GridIoMessage.java | 24 ++-- .../communication/GridIoUserMessage.java| 24 ++-- .../deployment/GridDeploymentInfoBean.java | 20 ++- .../deployment/GridDeploymentRequest.java | 20 ++- .../deployment/GridDeploymentResponse.java | 16 ++- .../eventstorage/GridEventStorageMessage.java | 28 ++--- .../cache/GridCacheEvictionRequest.java | 18 ++- .../cache/GridCacheEvictionResponse.java| 18 ++- .../processors/cache/GridCacheMessage.java | 16 ++- .../processors/cache/GridCacheValueBytes.java | 14 +-- ...idCacheOptimisticCheckPreparedTxRequest.java | 22 ++-- ...dCacheOptimisticCheckPreparedTxResponse.java | 18 ++- ...CachePessimisticCheckCommittedTxRequest.java | 26 ++-- ...achePessimisticCheckCommittedTxResponse.java | 20 ++- .../distributed/GridCacheTtlUpdateRequest.java | 24 ++-- .../distributed/GridDistributedBaseMessage.java | 22 ++-- .../distributed/GridDistributedLockRequest.java | 44 --- .../GridDistributedLockResponse.java| 18 ++- .../GridDistributedTxFinishRequest.java | 38 +++--- .../GridDistributedTxFinishResponse.java| 16 ++- .../GridDistributedTxPrepareRequest.java| 40 +++--- .../GridDistributedTxPrepareResponse.java | 16 ++- .../GridDistributedUnlockRequest.java | 14 +-- .../dht/GridDhtAffinityAssignmentRequest.java | 14 +-- .../dht/GridDhtAffinityAssignmentResponse.java | 16 ++- .../distributed/dht/GridDhtLockRequest.java | 30 +++-- .../distributed/dht/GridDhtLockResponse.java| 20 ++- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +++--- .../dht/GridDhtTxFinishResponse.java| 14 +-- .../dht/GridDhtTxPrepareRequest.java| 36 +++--- .../dht/GridDhtTxPrepareResponse.java | 22 ++-- .../distributed/dht/GridDhtUnlockRequest.java | 14 +-- .../GridDhtAtomicDeferredUpdateResponse.java| 14 +-- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 52 .../dht/atomic/GridDhtAtomicUpdateResponse.java | 20 ++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 50 .../atomic/GridNearAtomicUpdateResponse.java| 34 +++-- .../dht/preloader/GridDhtForceKeysRequest.java | 20 ++- .../dht/preloader/GridDhtForceKeysResponse.java | 20 ++- .../GridDhtPartitionDemandMessage.java | 24 ++-- .../preloader/GridDhtPartitionExchangeId.java | 16 ++- .../GridDhtPartitionSupplyMessage.java | 24 ++-- .../GridDhtPartitionsAbstractMessage.java | 16 ++- .../preloader/GridDhtPartitionsFullMessage.java | 16 ++- .../GridDhtPartitionsSingleMessage.java | 14 +-- .../GridDhtPartitionsSingleRequest.java | 10 +- .../distributed/near/GridNearGetRequest.java| 34 +++-- .../distributed/near/GridNearGetResponse.java | 26 ++-- .../distributed/near/GridNearLockRequest.java | 36 +++--- .../distributed/near/GridNearLockResponse.java | 22 ++-- .../near/GridNearTxFinishRequest.java | 24 ++-- .../near/GridNearTxFinishResponse.java | 18 ++- .../near/GridNearTxPrepareRequest.java | 28 ++--- .../near/GridNearTxPrepareResponse.java | 24 ++-- .../distributed/near/GridNearUnlockRequest.java | 10 +- .../cache/query/GridCacheQueryRequest.java | 50 .../cache/query/GridCacheQueryResponse.java | 24 ++-- .../cache/version/GridCacheVersion.java | 18 ++- .../clock/GridClockDeltaSnapshotMessage.java| 14 +-- .../proces
[24/28] incubator-ignite git commit: ignite-sql-old - fixes
ignite-sql-old - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a50e0524
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a50e0524
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a50e0524
Branch: refs/heads/sprint-1
Commit: a50e0524421dfa267488b8fa3b430c0e59f33ba8
Parents: 42e5786
Author: S.Vladykin
Authored: Sun Feb 15 05:08:02 2015 +0300
Committer: S.Vladykin
Committed: Sun Feb 15 05:08:02 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 111 +--
1 file changed, 76 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50e0524/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b4cfc09..1361b8b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -264,7 +264,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> query(Query filter, @Nullable ClusterGroup
grp) {
+private QueryCursor> doQuery(Query filter, @Nullable
ClusterGroup grp) {
final CacheQuery> qry;
final CacheQueryFuture> fut;
@@ -296,30 +296,27 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(new
GridCloseableIteratorAdapter>() {
-/** */
-Map.Entry cur;
+qry =
((GridCacheQueriesEx)delegate.queries()).createSqlQuery(q.getType(),
q.getSql());
-@Override protected Entry onNext() throws
IgniteCheckedException {
-if (!onHasNext())
-throw new NoSuchElementException();
+if (grp != null)
+qry.projection(grp);
-Map.Entry e = cur;
+qry.pageSize(q.getPageSize());
-cur = null;
+qry.enableDedup(false);
+qry.includeBackups(false);
-return new CacheEntryImpl<>(e.getKey(), e.getValue());
-}
-
-@Override protected boolean onHasNext() throws
IgniteCheckedException {
-return cur != null || (cur = fut.next()) != null;
-}
+fut = qry.execute(q.getArgs());
+}
+else
+throw new IgniteException("Unsupported query predicate: " +
filter);
-@Override protected void onClose() throws IgniteCheckedException {
-fut.cancel();
+return new QueryCursorImpl<>(new
ClIter,Cache.Entry>(fut) {
+@Override protected Cache.Entry convert(Map.Entry e) {
+return new CacheEntryImpl<>(e.getKey(), e.getValue());
}
});
}
@@ -387,7 +384,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter)qry, false);
-return query(qry, projection(false));
+return doQuery(qry, projection(false));
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -428,7 +422,17 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> q =
((GridCacheQueriesEx)delegate.queries()).createSqlFieldsQuery(qry.getSql(),
false);
+
+q.pageSize(qry.getPageSize());
+
+CacheQueryFuture> fut = q.execute(qry.getArgs());
+
+return new QueryCursorImpl<>(new ClIter, List>(fut) {
+@Override protected List convert(List row) {
+return row;
+}
+});
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -446,9 +450,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalQuery(SqlQuery p) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
-//ctx.name(), p.getType(), p.getSql(), p.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
+ctx.name(), p.getType(), p.getSql(), p.getArgs()));
}
/**
@@ -456,9 +459,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalFieldsQuery(SqlFieldsQuery q) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
-//ctx.name(), q.getSql(), q.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
+ctx.name(), q.getSql(), q.getArgs()));
[49/50] [abbrv] incubator-ignite git commit: # sprint-1 Minor: missing serVer=0.
# sprint-1 Minor: missing serVer=0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/519daee1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/519daee1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/519daee1
Branch: refs/heads/sprint-1-start-nodes
Commit: 519daee13e902e115334c5c9dff53f19ad60d544
Parents: e533d15
Author: AKuznetsov
Authored: Sun Feb 15 17:39:40 2015 +0700
Committer: AKuznetsov
Committed: Sun Feb 15 17:39:40 2015 +0700
--
.../apache/ignite/configuration/TransactionConfiguration.java | 3 +++
.../internal/visor/node/VisorTransactionConfiguration.java| 7 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/519daee1/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index ee01f3c..13ac061 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -25,6 +25,9 @@ import java.io.*;
* Transactions configuration.
*/
public class TransactionConfiguration implements Serializable {
+/** */
+private static final long serialVersionUID = 0L;
+
/** Default value for 'txSerializableEnabled' flag. */
public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/519daee1/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
index 9f2c74a..7bd2ca8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
@@ -21,10 +21,15 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.transactions.*;
+import java.io.*;
+
/**
* Data transfer object for transaction configuration.
*/
-public class VisorTransactionConfiguration {
+public class VisorTransactionConfiguration implements Serializable {
+/** */
+private static final long serialVersionUID = 0L;
+
/** Default cache concurrency. */
private IgniteTxConcurrency dfltConcurrency;
[17/49] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ingite-9655-merge Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f004f9d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f004f9d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f004f9d1 Branch: refs/heads/sprint-1 Commit: f004f9d1252fe5c6358f4ca12a2c1dc81325890f Parents: 9215a07 43e835b Author: Alexey Goncharuk Authored: Mon Feb 2 15:21:50 2015 -0800 Committer: Alexey Goncharuk Committed: Mon Feb 2 15:21:50 2015 -0800 -- .gitignore | 1 - config/fabric/default-config.xml| 2 +- config/ignite-log4j.xml | 27 +-- config/java.util.logging.properties | 6 +- ipc/shmem/readme.txt| 2 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/src/test/resources/log4j.xml| 2 +- .../apache/ignite/IgniteBasicWarmupClosure.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 24 +-- .../org/apache/ignite/cache/CacheEntry.java | 2 +- .../apache/ignite/cache/CacheProjection.java| 10 +- .../cache/CacheWriteSynchronizationMode.java| 10 +- .../configuration/IgniteConfiguration.java | 24 +-- .../ignite/internal/GridKernalContext.java | 8 - .../ignite/internal/GridKernalContextImpl.java | 12 -- .../org/apache/ignite/internal/IgniteEx.java| 8 - .../apache/ignite/internal/IgniteKernal.java| 7 - .../org/apache/ignite/internal/IgnitionEx.java | 1 - .../GridDeploymentPerLoaderStore.java | 20 +- .../GridDeploymentPerVersionStore.java | 4 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheDeploymentManager.java | 161 +++--- .../cache/GridCachePreloaderAdapter.java| 2 +- .../processors/cache/GridCacheProcessor.java| 5 +- .../processors/cache/GridCacheStoreManager.java | 25 ++- .../processors/cache/GridCacheSwapManager.java | 3 +- .../cache/GridCacheWriteBehindStore.java| 21 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../processors/interop/GridInteropAware.java| 49 - .../interop/GridInteropProcessor.java | 82 --- .../interop/GridInteropProcessorAdapter.java| 31 --- .../processors/interop/GridInteropTarget.java | 109 -- .../interop/os/GridOsInteropProcessor.java | 80 --- .../internal/processors/interop/os/package.html | 23 -- .../internal/processors/interop/package.html| 23 -- .../plugin/IgnitePluginProcessor.java | 10 +- .../streamer/GridStreamProcessor.java | 5 +- .../processors/streamer/IgniteStreamerEx.java | 3 +- .../processors/streamer/IgniteStreamerImpl.java | 5 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../main/java/org/apache/ignite/package.html| 2 +- modules/core/src/test/config/example-cache.xml | 8 +- modules/core/src/test/config/ggfs-loopback.xml | 8 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../hadoop/GridHadoopCommandLineTest.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 6 - modules/yardstick/README.md | 67 ++ .../config/benchmark-atomic-win.properties | 42 .../config/benchmark-atomic.properties | 48 + .../config/benchmark-compute-win.properties | 45 .../config/benchmark-compute.properties | 51 + .../config/benchmark-query-win.properties | 43 .../yardstick/config/benchmark-query.properties | 49 + .../config/benchmark-tx-win.properties | 42 .../yardstick/config/benchmark-tx.properties| 48 + .../yardstick/config/benchmark-win.properties | 50 + modules/yardstick/config/benchmark.properties | 61 ++ modules/yardstick/config/ignite-base-config.xml | 118 ++ .../config/ignite-localhost-config.xml | 55 + .../config/ignite-multicast-config.xml | 38 modules/yardstick/pom.xml | 185 .../yardstick/IgniteAbstractBenchmark.java | 130 +++ .../yardstick/IgniteBenchmarkArguments.java | 213 +++ .../org/apache/ignite/yardstick/IgniteNode.java | 191 + .../cache/IgniteCacheAbstractBenchmark.java | 44 .../yardstick/cache/IgniteGetBenchmark.java | 41 .../yardstick/cache/IgnitePutBenchmark.java | 42 .../yardstick/cache/IgnitePutGetBenchmark.java | 47 .../cache/IgnitePutGetTxBenchmark.java | 52 + .../yardstick/cache/IgnitePutTxBenchmark.java | 43 .../cache/IgniteSqlQueryBenchmark.java | 94 .../cac
[1/2] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-9655-merge 911f33741 -> aa83f60fe
Ignite-9655-merge - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/387c24dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/387c24dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/387c24dd
Branch: refs/heads/ignite-9655-merge
Commit: 387c24dd8b87ba5b0dadb420247c0505ffcf1163
Parents: 911f337
Author: Alexey Goncharuk
Authored: Sat Feb 14 23:48:46 2015 -0800
Committer: Alexey Goncharuk
Committed: Sat Feb 14 23:48:46 2015 -0800
--
.../cache/IgniteCacheTransactionalStopBusySelfTest.java | 8
.../org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387c24dd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
index 5ae69d7..07b7c13 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTransactionalStopBusySelfTest.java
@@ -25,28 +25,28 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.*;
public class IgniteCacheTransactionalStopBusySelfTest extends
IgniteCacheAbstractStopBusySelfTest {
/** {@inheritDoc} */
@Override public void testPut() throws Exception {
-bannedMessage.set(GridNearLockRequest.class);
+bannedMessage.set(GridNearTxPrepareRequest.class);
super.testPut();
}
/** {@inheritDoc} */
@Override public void testPutBatch() throws Exception {
-bannedMessage.set(GridNearLockRequest.class);
+bannedMessage.set(GridNearTxPrepareRequest.class);
super.testPut();
}
/** {@inheritDoc} */
@Override public void testPutAsync() throws Exception {
-bannedMessage.set(GridNearLockRequest.class);
+bannedMessage.set(GridNearTxPrepareRequest.class);
super.testPut();
}
/** {@inheritDoc} */
@Override public void testRemove() throws Exception {
-bannedMessage.set(GridNearLockRequest.class);
+bannedMessage.set(GridNearTxPrepareRequest.class);
super.testPut();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/387c24dd/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index cc8863e..ea95283 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -119,7 +119,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class);
suite.addTestSuite(GridCacheTtlManagerSelfTest.class);
suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class);
-suite.addTestSuite(GridCacheStopSelfTest.class);
+//suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class);
suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class);
suite.addTestSuite(GridCacheAtomicNearCacheSelfTest.class);
[18/30] incubator-ignite git commit: ignite-sql-old - fixes
ignite-sql-old - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bc35189
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bc35189
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bc35189
Branch: refs/heads/ignite-nio
Commit: 8bc35189ea3036553b8b027bd4fbdeb5c8032d0a
Parents: 23781f3
Author: S.Vladykin
Authored: Sat Feb 14 14:23:01 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 14:23:01 2015 +0300
--
.../processors/query/GridQueryProcessor.java| 116 +++
1 file changed, 116 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc35189/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 7972497..603ee8c 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
@@ -22,8 +22,10 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
@@ -33,14 +35,17 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.*;
import org.apache.ignite.spi.indexing.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
+import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED;
import static org.apache.ignite.internal.IgniteComponentType.*;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.*;
@@ -471,6 +476,117 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
/**
* @param space Space.
+ * @param type Type.
+ * @param sqlQry Query.
+ * @param params Parameters.
+ * @return Cursor.
+ */
+public Iterator> queryLocal(String space, String
type, String sqlQry, Object[] params) {
+if (!busyLock.enterBusy())
+throw new IllegalStateException("Failed to execute query (grid is
stopping).");
+
+try {
+TypeDescriptor typeDesc = typesByName.get(new TypeName(space,
type));
+
+if (typeDesc == null || !typeDesc.registered())
+return new GridEmptyCloseableIterator<>();
+
+final GridCloseableIterator> i =
idx.query(space, sqlQry, F.asList(params), typeDesc,
+idx.backupFilter());
+
+if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) {
+ctx.event().record(new CacheQueryExecutedEvent<>(
+ctx.discovery().localNode(),
+"SQL query executed.",
+EVT_CACHE_QUERY_EXECUTED,
+CacheQueryType.SQL,
+null,
+null,
+sqlQry,
+null,
+null,
+params,
+null,
+null));
+}
+
+return new ClIter>() {
+@Override public void close() throws Exception {
+i.close();
+}
+
+@Override public boolean hasNext() {
+return i.hasNext();
+}
+
+@Override public Cache.Entry next() {
+IgniteBiTuple t = i.next();
+
+return new CacheEntryImpl<>(t.getKey(), t.getValue());
+}
+
+@Override public void remove() {
+throw new UnsupportedOperationException();
+}
+};
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException(e);
+}
+finally {
+busyLock.leaveBusy();
+}
+}
+
+/**
+ * Closeable iterator.
+ */
+private static interface ClIter extends AutoCloseab
[01/30] incubator-ignite git commit: ignite-sql-old -removed new api
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-nio 35e64ef29 -> 512ffc51e
ignite-sql-old -removed new api
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f2dc26c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f2dc26c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f2dc26c
Branch: refs/heads/ignite-nio
Commit: 6f2dc26cb709c11ce433fbd4cfd2192923cf6d44
Parents: 7f062e6
Author: S.Vladykin
Authored: Sat Feb 14 00:37:24 2015 +0300
Committer: S.Vladykin
Committed: Sat Feb 14 00:37:24 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 9 -
.../cache/query/QueryAffinityPredicate.java | 135
.../cache/query/QueryContinuousPredicate.java | 215 ---
.../apache/ignite/cache/query/QueryCursor.java | 37
.../ignite/cache/query/QueryPredicate.java | 76 ---
.../apache/ignite/cache/query/QueryReducer.java | 30 ---
.../ignite/cache/query/QuerySqlPredicate.java | 118 --
.../ignite/cache/query/QueryTextPredicate.java | 90
.../query/annotations/QueryGroupIndex.java | 49 -
.../cache/query/annotations/QuerySqlField.java | 123 ---
.../query/annotations/QuerySqlFunction.java | 67 --
.../cache/query/annotations/QueryTextField.java | 33 ---
.../processors/cache/IgniteCacheProxy.java | 33 ---
13 files changed, 1015 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f2dc26c/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index a2c5cc0..fabe3b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -18,7 +18,6 @@
package org.apache.ignite;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -191,17 +190,9 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
*/
public boolean isLocalLocked(K key, boolean byCurrThread);
-public QueryCursor> query(QueryPredicate filter);
-public QueryCursor query(QueryReducer, R> rmtRdc,
QueryPredicate filter);
-public QueryCursor> queryFields(QuerySqlPredicate filter);
-public QueryCursor queryFields(QueryReducer, R> rmtRdc,
QuerySqlPredicate filter);
-
-public QueryCursor> localQuery(QueryPredicate filter);
-
-public QueryCursor> localQueryFields(QuerySqlPredicate
filter);
public Iterable> localEntries(CachePeekMode... peekModes)
throws CacheException;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f2dc26c/modules/core/src/main/java/org/apache/ignite/cache/query/QueryAffinityPredicate.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryAffinityPredicate.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryAffinityPredicate.java
deleted file mode 100644
index ea249b1..000
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryAffinityPredicate.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.query;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.cache.*;
-
-/**
- * TODO: Add class description.
- *
- * @author @java.author
- * @version @java.version
- */
-public final class QueryAffinityPredicate extends QueryPredicate {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Predicate. */
-private QueryPredicate p;
-
-/** Keys. */
-private K[] keys;
-
-/** Par
[20/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af8edc04/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
index 23c1306..b99c69d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
@@ -147,7 +147,7 @@ public class GridCacheEvictionRequest extends
GridCacheMessage imple
return false;
if (!writer.isTypeWritten()) {
-if (!writer.writeByte(null, directType()))
+if (!writer.writeMessageType(directType()))
return false;
writer.onTypeWritten();
@@ -155,19 +155,19 @@ public class GridCacheEvictionRequest extends
GridCacheMessage imple
switch (writer.state()) {
case 3:
-if (!writer.writeByteArray("entriesBytes", entriesBytes))
+if (!writer.writeField("entriesBytes", entriesBytes,
MessageFieldType.BYTE_ARR))
return false;
writer.incrementState();
case 4:
-if (!writer.writeLong("futId", futId))
+if (!writer.writeField("futId", futId, MessageFieldType.LONG))
return false;
writer.incrementState();
case 5:
-if (!writer.writeLong("topVer", topVer))
+if (!writer.writeField("topVer", topVer,
MessageFieldType.LONG))
return false;
writer.incrementState();
@@ -186,7 +186,7 @@ public class GridCacheEvictionRequest extends
GridCacheMessage imple
switch (readState) {
case 3:
-entriesBytes = reader.readByteArray("entriesBytes");
+entriesBytes = reader.readField("entriesBytes",
MessageFieldType.BYTE_ARR);
if (!reader.isLastRead())
return false;
@@ -194,7 +194,7 @@ public class GridCacheEvictionRequest extends
GridCacheMessage imple
readState++;
case 4:
-futId = reader.readLong("futId");
+futId = reader.readField("futId", MessageFieldType.LONG);
if (!reader.isLastRead())
return false;
@@ -202,7 +202,7 @@ public class GridCacheEvictionRequest extends
GridCacheMessage imple
readState++;
case 5:
-topVer = reader.readLong("topVer");
+topVer = reader.readField("topVer", MessageFieldType.LONG);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af8edc04/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
index b1f9902..d73240a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
@@ -136,7 +136,7 @@ public class GridCacheEvictionResponse extends
GridCacheMessage {
return false;
if (!writer.isTypeWritten()) {
-if (!writer.writeByte(null, directType()))
+if (!writer.writeMessageType(directType()))
return false;
writer.onTypeWritten();
@@ -144,19 +144,19 @@ public class GridCacheEvictionResponse extends
GridCacheMessage {
switch (writer.state()) {
case 3:
-if (!writer.writeBoolean("err", err))
+if (!writer.writeField("err", err, MessageFieldType.BOOLEAN))
return false;
writer.incrementState();
case 4:
-if (!writer.writeLong("futId", futId))
+if (!writer.writeField("futId", futId, MessageFieldType.LONG))
return false;
writer.incrementState();
case 5:
-if (!writer.writeCollection("rejectedKeyBytes",
rejectedKeyBytes, MessageFieldType.BYTE_ARR))
+if (!writer.writeCollectionField("rejectedKeyBytes",
rejectedKeyBytes, MessageFieldType.BYTE_ARR))
return false;
writer.incrementSta
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-82 [deleted] 8a36ac0fd
[9/9] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35e64ef2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35e64ef2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35e64ef2
Branch: refs/heads/ignite-nio
Commit: 35e64ef296653c4fbe961e2193daf37de31a18ba
Parents: a214c0a
Author: Valentin Kulichenko
Authored: Sat Feb 14 23:25:04 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 23:25:04 2015 -0800
--
.../ignite/plugin/extensions/communication/MessageAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35e64ef2/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
index 2b3cfc4..807bda5 100644
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java
@@ -74,7 +74,7 @@ public abstract class MessageAdapter implements Serializable {
}
/**
- * Enum representing possible field types.
+ * Enum representing possible types of collection items.
*/
public enum Type {
/** Byte. */
[35/50] [abbrv] incubator-ignite git commit: Revert "ignite-nio - Removing message clone"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
index 38f8e9c..16e2327 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
@@ -59,7 +59,7 @@ public class JobStealingRequest extends MessageAdapter {
writer.setBuffer(buf);
if (!writer.isTypeWritten()) {
-if (!writer.writeMessageType(directType()))
+if (!writer.writeByte(null, directType()))
return false;
writer.onTypeWritten();
@@ -67,7 +67,7 @@ public class JobStealingRequest extends MessageAdapter {
switch (writer.state()) {
case 0:
-if (!writer.writeField("delta", delta, MessageFieldType.INT))
+if (!writer.writeInt("delta", delta))
return false;
writer.incrementState();
@@ -83,7 +83,7 @@ public class JobStealingRequest extends MessageAdapter {
switch (readState) {
case 0:
-delta = reader.readField("delta", MessageFieldType.INT);
+delta = reader.readInt("delta");
if (!reader.isLastRead())
return false;
[22/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 7ffb4a1..4df98f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -144,17 +144,6 @@ public class GridCommunicationSendMessageSelfTest extends
GridCommonAbstractTest
/** */
private static class TestMessage extends MessageAdapter {
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-return this;
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer)
{
//writer.setBuffer(buf);
//
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 0f5ac97..b112617 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -220,17 +220,6 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
/** */
private static class Message extends MessageAdapter implements
Serializable {
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer)
{
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index b185031..e4d6ab4 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -108,17 +108,6 @@ class GridTestMessage extends MessageAdapter implements
Externalizable {
}
/** {@inheritDoc} */
-@SuppressWarnings("CloneDoesntCallSuperClone")
-@Override public MessageAdapter clone() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override protected void clone0(MessageAdapter _msg) {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd79c9bf/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
index 8e64667..82b3030 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
@@ -94,27 +94,6 @@ public class GridTestMessage extends MessageAdapter {
}
/** {@inheritDoc} */
-@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-@Override public MessageAdapter clone() {
-GridTestMessage msg = new GridTestMessage();
-
-clone0(msg);
-
-return msg;
-}
-
-/
[26/49] incubator-ignite git commit: Ignite-9655-merge - Regenerated messages.
Ignite-9655-merge - Regenerated messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3728ac33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3728ac33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3728ac33
Branch: refs/heads/sprint-1
Commit: 3728ac33c367216bf170aae41988c7089f5339a1
Parents: df55ba9
Author: Alexey Goncharuk
Authored: Thu Feb 12 13:49:14 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Feb 12 13:49:14 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 24
.../distributed/GridDistributedLockRequest.java | 58 ++-
.../GridDistributedTxFinishRequest.java | 24
.../GridDistributedTxPrepareRequest.java| 50
.../distributed/dht/GridDhtLockRequest.java | 36 ++--
.../distributed/dht/GridDhtTxFinishRequest.java | 37 ++--
.../dht/GridDhtTxPrepareRequest.java| 48
.../distributed/near/GridNearLockRequest.java | 48
.../near/GridNearTxFinishRequest.java | 24
.../near/GridNearTxPrepareRequest.java | 60 ++--
.../near/GridNearTxPrepareResponse.java | 44 +++---
11 files changed, 281 insertions(+), 172 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index f4c8d94..7a91b61 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -97,6 +97,30 @@ public class CommunicationMessageCodeGenerator {
try {
gen.generateAll(true);
+
+//gen.generateAndWrite(GridDistributedLockRequest.class);
+//gen.generateAndWrite(GridDistributedLockResponse.class);
+//gen.generateAndWrite(GridNearLockRequest.class);
+//gen.generateAndWrite(GridNearLockResponse.class);
+//gen.generateAndWrite(GridDhtLockRequest.class);
+//gen.generateAndWrite(GridDhtLockResponse.class);
+//
+//gen.generateAndWrite(GridDistributedTxPrepareRequest.class);
+//gen.generateAndWrite(GridDistributedTxPrepareResponse.class);
+//gen.generateAndWrite(GridNearTxPrepareRequest.class);
+//gen.generateAndWrite(GridNearTxPrepareResponse.class);
+//gen.generateAndWrite(GridDhtTxPrepareRequest.class);
+//gen.generateAndWrite(GridDhtTxPrepareResponse.class);
+//
+//gen.generateAndWrite(GridDistributedTxFinishRequest.class);
+//gen.generateAndWrite(GridDistributedTxFinishResponse.class);
+//gen.generateAndWrite(GridNearTxFinishRequest.class);
+//gen.generateAndWrite(GridNearTxFinishResponse.class);
+//gen.generateAndWrite(GridDhtTxFinishRequest.class);
+//gen.generateAndWrite(GridDhtTxFinishResponse.class);
+//
+//
gen.generateAndWrite(GridCacheOptimisticCheckPreparedTxRequest.class);
+//
gen.generateAndWrite(GridCacheOptimisticCheckPreparedTxResponse.class);
}
catch (Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index b2ed1d0..a280849 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -397,89 +397,90 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage
}
switch (state) {
-case 9:
+case 8:
if (!writer.writeIgniteUuid("futId", futId))
return false;
state++;
-case 10:
+case 9:
if (!w
[15/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca27b586
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca27b586
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca27b586
Branch: refs/heads/sprint-1
Commit: ca27b586a298b859e176779a0458c4b5c882f18b
Parents: f1d4194
Author: Valentin Kulichenko
Authored: Sat Feb 14 18:54:08 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 18:54:08 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 2 +-
.../ignite/internal/GridJobExecuteRequest.java | 8 +--
.../internal/direct/DirectByteBufferStream.java | 61
.../internal/direct/DirectMessageReader.java| 14 ++---
.../internal/direct/DirectMessageWriter.java| 13 +++--
.../communication/GridIoUserMessage.java| 4 +-
.../deployment/GridDeploymentInfoBean.java | 4 +-
.../deployment/GridDeploymentRequest.java | 4 +-
.../eventstorage/GridEventStorageMessage.java | 4 +-
.../cache/GridCacheEvictionResponse.java| 4 +-
.../distributed/GridCacheTtlUpdateRequest.java | 16 ++---
.../distributed/GridDistributedBaseMessage.java | 8 +--
.../distributed/GridDistributedLockRequest.java | 8 +--
.../GridDistributedLockResponse.java| 4 +-
.../GridDistributedTxFinishRequest.java | 8 +--
.../GridDistributedTxPrepareRequest.java| 8 +--
.../GridDistributedUnlockRequest.java | 4 +-
.../distributed/dht/GridDhtLockRequest.java | 4 +-
.../distributed/dht/GridDhtLockResponse.java| 12 ++--
.../distributed/dht/GridDhtTxFinishRequest.java | 8 +--
.../dht/GridDhtTxPrepareRequest.java| 4 +-
.../dht/GridDhtTxPrepareResponse.java | 12 ++--
.../distributed/dht/GridDhtUnlockRequest.java | 4 +-
.../GridDhtAtomicDeferredUpdateResponse.java| 4 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 32 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 20 +++
.../atomic/GridNearAtomicUpdateResponse.java| 12 ++--
.../dht/preloader/GridDhtForceKeysRequest.java | 4 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 4 +-
.../GridDhtPartitionDemandMessage.java | 4 +-
.../GridDhtPartitionSupplyMessage.java | 8 +--
.../distributed/near/GridNearGetRequest.java| 4 +-
.../distributed/near/GridNearGetResponse.java | 4 +-
.../distributed/near/GridNearLockRequest.java | 8 +--
.../distributed/near/GridNearLockResponse.java | 12 ++--
.../near/GridNearTxPrepareRequest.java | 4 +-
.../near/GridNearTxPrepareResponse.java | 12 ++--
.../cache/query/GridCacheQueryResponse.java | 8 +--
.../clock/GridClockDeltaSnapshotMessage.java| 4 +-
.../dataload/GridDataLoadRequest.java | 4 +-
.../processors/igfs/IgfsBlocksMessage.java | 4 +-
.../igfs/IgfsFragmentizerRequest.java | 4 +-
.../streamer/GridStreamerExecutionRequest.java | 4 +-
.../communication/MessageAdapter.java | 55 +++---
.../extensions/communication/MessageReader.java | 15 ++---
.../extensions/communication/MessageWriter.java | 15 ++---
47 files changed, 235 insertions(+), 232 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca27b586/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index 80cf53e..7ce89a7 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -602,7 +602,7 @@ public class CommunicationMessageCodeGenerator {
assert mapValType != null;
returnFalseIfFailed(write, "writer.writeMap", field, name, "Type."
+ typeEnum(mapKeyType),
-"Type." + typeEnum(mapKeyType));
+"Type." + typeEnum(mapValType));
}
else
throw new IllegalStateException("Unsupported type: " + type);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca27b586/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
b/modules/core/src/main/java/org/apache/ignite
[30/30] incubator-ignite git commit: # ignite-nio - JavaDoc
# ignite-nio - JavaDoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/512ffc51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/512ffc51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/512ffc51
Branch: refs/heads/ignite-nio
Commit: 512ffc51e310c0461fc2167d1a90bf1216c13bd5
Parents: c09107b
Author: Valentin Kulichenko
Authored: Sun Feb 15 00:02:41 2015 -0800
Committer: Valentin Kulichenko
Committed: Sun Feb 15 00:02:41 2015 -0800
--
.../extensions/communication/MessageWriter.java | 25
1 file changed, 25 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/512ffc51/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index ee729e8..564fc1e 100644
---
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -256,17 +256,42 @@ public interface MessageWriter {
public boolean writeMap(String name, Map map,
MessageAdapter.Type keyType,
MessageAdapter.Type valType);
+/**
+ * @return Whether type of current message is already written.
+ */
public boolean isTypeWritten();
+/**
+ * Callback called when type of the message is written.
+ */
public void onTypeWritten();
+/**
+ * Gets current message state.
+ *
+ * @return State.
+ */
public int state();
+/**
+ * Increments state.
+ */
public void incrementState();
+/**
+ * Callback called before inner message is written.
+ */
public void beforeInnerMessageWrite();
+/**
+ * Callback called after inner message is written.
+ *
+ * @param finished Whether message was fully written.
+ */
public void afterInnerMessageWrite(boolean finished);
+/**
+ * Resets this writer.
+ */
public void reset();
}
[36/50] [abbrv] incubator-ignite git commit: Ignite-9655-merge - Fixing tests, commented test according to the ticket.
Ignite-9655-merge - Fixing tests, commented test according to the ticket.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e0ccef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e0ccef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e0ccef9
Branch: refs/heads/sprint-1-start-nodes
Commit: 4e0ccef955138052e87ce5f63e85a9b94fcab0b0
Parents: aa83f60
Author: Alexey Goncharuk
Authored: Sun Feb 15 00:05:06 2015 -0800
Committer: Alexey Goncharuk
Committed: Sun Feb 15 00:05:06 2015 -0800
--
.../internal/processors/cache/transactions/IgniteTxHandler.java| 2 +-
.../org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 640e492..600e0d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -506,7 +506,7 @@ public class IgniteTxHandler {
req.miniId(), new IgniteCheckedException("Transaction has been
already completed."));
try {
-ctx.io().send(nodeId, res, tx.ioPolicy());
+ctx.io().send(nodeId, res, req.system() ? UTILITY_CACHE_POOL :
SYSTEM_POOL);
}
catch (Throwable e) {
// Double-check.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
index 2852631..5c7581a 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
@@ -42,7 +42,7 @@ public class IgniteCacheRestartTestSuite extends TestSuite {
// The rest.
suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class);
-suite.addTestSuite(GridCachePutAllFailoverSelfTest.class);
+//suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); TODO
IGNITE-157
return suite;
}
[03/45] incubator-ignite git commit: # sprint-1: Build fix.
# sprint-1: Build fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f70ff5e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f70ff5e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f70ff5e3
Branch: refs/heads/ignite-sql-old
Commit: f70ff5e3415e3668a8da02ad3686e9b722ca5189
Parents: a7b2d72
Author: AKuznetsov
Authored: Sat Feb 14 17:55:39 2015 +0700
Committer: AKuznetsov
Committed: Sat Feb 14 17:55:39 2015 +0700
--
examples/pom.xml | 6 ++
modules/hadoop/pom.xml | 12 ++--
modules/indexing/pom.xml | 12 ++--
modules/spring/pom.xml | 12 ++--
4 files changed, 24 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f70ff5e3/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 717a7c7..70b0e2a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,6 +41,12 @@
org.apache.ignite
+jdk8-backport
+${ignite.version}
+
+
+
+org.apache.ignite
ignite-core
${ignite.version}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f70ff5e3/modules/hadoop/pom.xml
--
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 8856bf1..6f270ca 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -37,12 +37,6 @@
-org.apache.ignite
-jdk8-backport
-${ignite.version}
-
-
-
javax.cache
cache-api
1.0.0
@@ -50,6 +44,12 @@
org.apache.ignite
+jdk8-backport
+${ignite.version}
+
+
+
+org.apache.ignite
ignite-core
${ignite.version}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f70ff5e3/modules/indexing/pom.xml
--
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 9bca3e3..0125e83 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -37,12 +37,6 @@
-org.apache.ignite
-jdk8-backport
-${ignite.version}
-
-
-
javax.cache
cache-api
1.0.0
@@ -50,6 +44,12 @@
org.apache.ignite
+jdk8-backport
+${ignite.version}
+
+
+
+org.apache.ignite
ignite-core
${ignite.version}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f70ff5e3/modules/spring/pom.xml
--
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index cb12ab1..2b00c3e 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -37,18 +37,18 @@
-org.apache.ignite
-ignite-core
-${ignite.version}
-
-
-
javax.cache
cache-api
1.0.0
+org.apache.ignite
+ignite-core
+${ignite.version}
+
+
+
org.springframework
spring-core
${spring.version}
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-nio [deleted] 512ffc51e
[17/45] incubator-ignite git commit: ignite-242 Jdk8 moved to core
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1e649dc/modules/core/src/main/java/org/jdk8/backport/Striped64.java
--
diff --git a/modules/core/src/main/java/org/jdk8/backport/Striped64.java
b/modules/core/src/main/java/org/jdk8/backport/Striped64.java
new file mode 100644
index 000..e0e724d
--- /dev/null
+++ b/modules/core/src/main/java/org/jdk8/backport/Striped64.java
@@ -0,0 +1,370 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * Copyright © 1993, 2013, Oracle and/or its affiliates.
+ * All rights reserved.
+ */
+
+package org.jdk8.backport;
+
+import java.util.*;
+
+/**
+ * A package-local class holding common representation and mechanics
+ * for classes supporting dynamic striping on 64bit values. The class
+ * extends Number so that concrete subclasses must publicly do so.
+ */
+@SuppressWarnings("ALL")
+abstract class Striped64 extends Number {
+/*
+ * This class maintains a lazily-initialized table of atomically
+ * updated variables, plus an extra "base" field. The table size
+ * is a power of two. Indexing uses masked per-thread hash codes.
+ * Nearly all declarations in this class are package-private,
+ * accessed directly by subclasses.
+ *
+ * Table entries are of class Cell; a variant of AtomicLong padded
+ * to reduce cache contention on most processors. Padding is
+ * overkill for most Atomics because they are usually irregularly
+ * scattered in memory and thus don't interfere much with each
+ * other. But Atomic objects residing in arrays will tend to be
+ * placed adjacent to each other, and so will most often share
+ * cache lines (with a huge negative performance impact) without
+ * this precaution.
+ *
+ * In part because Cells are relatively large, we avoid creating
+ * them until they are needed. When there is no contention, all
+ * updates are made to the base field. Upon first contention (a
+ * failed CAS on base update), the table is initialized to size 2.
+ * The table size is doubled upon further contention until
+ * reaching the nearest power of two greater than or equal to the
+ * number of CPUS. Table slots remain empty (null) until they are
+ * needed.
+ *
+ * A single spinlock ("busy") is used for initializing and
+ * resizing the table, as well as populating slots with new Cells.
+ * There is no need for a blocking lock: When the lock is not
+ * available, threads try other slots (or the base). During these
+ * retries, there is increased contention and reduced locality,
+ * which is still better than alternatives.
+ *
+ * Per-thread hash codes are initialized to random values.
+ * Contention and/or table collisions are indicated by failed
+ * CASes when performing an update operation (see method
+ * retryUpdate). Upon a collision, if the table size is less than
+ * the capacity, it is doubled in size unless some other thread
+ * holds the lock. If a hashed slot is empty, and lock is
+ * available, a new Cell is created. Otherwise, if the slot
+ * exists, a CAS is tried. Retries proceed by "double hashing",
+ * using a secondary hash (Marsaglia XorShift) to try to find a
+ * free slot.
+ *
+ * The table size is capped because, when there are more threads
+ * than CPUs, supposing that each thread were bound to a CPU,
+ * there would exist a perfect hash function mapping threads to
+ * slots that eliminates collisions. When we reach capacity, we
+ * search for this mapping by randomly varying the has
[41/50] [abbrv] incubator-ignite git commit: Revert "ignite-nio - Removing message clone"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 2e6e728..387c027 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -183,7 +183,7 @@ public class GridDhtForceKeysRequest extends
GridCacheMessage implem
writer.incrementState();
case 4:
-if (!writer.writeCollection("keyBytes", keyBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeCollection("keyBytes", keyBytes,
Type.BYTE_ARR))
return false;
writer.incrementState();
@@ -222,7 +222,7 @@ public class GridDhtForceKeysRequest extends
GridCacheMessage implem
readState++;
case 4:
-keyBytes = reader.readCollection("keyBytes",
MessageFieldType.BYTE_ARR);
+keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 3c863fc..a20ce51 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -198,7 +198,7 @@ public class GridDhtForceKeysResponse extends
GridCacheMessage imple
writer.incrementState();
case 6:
-if (!writer.writeCollection("missedKeyBytes", missedKeyBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeCollection("missedKeyBytes", missedKeyBytes,
Type.BYTE_ARR))
return false;
writer.incrementState();
@@ -241,7 +241,7 @@ public class GridDhtForceKeysResponse extends
GridCacheMessage imple
readState++;
case 6:
-missedKeyBytes = reader.readCollection("missedKeyBytes",
MessageFieldType.BYTE_ARR);
+missedKeyBytes = reader.readCollection("missedKeyBytes",
Type.BYTE_ARR);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index 8867d47..25d5d19 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -205,7 +205,7 @@ public class GridDhtPartitionDemandMessage extends
GridCacheMessage
switch (writer.state()) {
case 3:
-if (!writer.writeCollection("parts", parts,
MessageFieldType.INT))
+if (!writer.writeCollection("parts", parts, Type.INT))
return false;
writer.incrementState();
@@ -254,7 +254,7 @@ public class GridDhtPartitionDemandMessage extends
GridCacheMessage
switch (readState) {
case 3:
-parts = reader.readCollection("parts", MessageFieldType.INT);
+parts = reader.readCollection("parts", Type.INT);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-i
[46/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-248' into sprint-1
Merge branch 'ignite-248' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c851305c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c851305c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c851305c Branch: refs/heads/sprint-1-start-nodes Commit: c851305c3599f5784f6749f8ecdc9f7808ffe5b4 Parents: a3cce25 d868865 Author: AKuznetsov Authored: Sun Feb 15 15:44:10 2015 +0700 Committer: AKuznetsov Committed: Sun Feb 15 15:44:10 2015 +0700 -- .../configuration/TransactionConfiguration.java | 7 +- .../apache/ignite/internal/visor/VisorJob.java | 3 +- .../internal/visor/VisorMultiNodeTask.java | 9 +- .../ignite/internal/visor/cache/VisorCache.java | 8 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../visor/cache/VisorCacheConfiguration.java| 18 --- .../visor/cache/VisorCacheDgcConfiguration.java | 97 .../visor/cache/VisorCacheLoadTask.java | 4 +- .../internal/visor/cache/VisorCacheMetrics.java | 18 +-- .../cache/VisorCacheStoreConfiguration.java | 7 +- .../VisorCacheWriteBehindConfiguration.java | 6 +- .../compute/VisorComputeMonitoringHolder.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 17 ++- .../visor/debug/VisorThreadLockInfo.java| 12 +- .../visor/debug/VisorThreadMonitorInfo.java | 6 +- .../event/VisorGridAuthenticationEvent.java | 10 +- .../event/VisorGridAuthorizationEvent.java | 10 +- .../visor/event/VisorGridDeploymentEvent.java | 10 +- .../visor/event/VisorGridDiscoveryEvent.java| 10 +- .../internal/visor/event/VisorGridEvent.java| 18 +-- .../internal/visor/event/VisorGridJobEvent.java | 30 ++-- .../event/VisorGridSecuritySessionEvent.java| 10 +- .../visor/event/VisorGridTaskEvent.java | 30 ++-- .../internal/visor/file/VisorFileBlock.java | 10 +- .../internal/visor/file/VisorFileBlockTask.java | 10 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 3 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 6 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 10 +- .../visor/igfs/VisorIgfsProfilerTask.java | 12 ++ .../VisorIgfsProfilerUniformityCounters.java| 19 ++- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../visor/log/VisorLogSearchResult.java | 20 +-- .../internal/visor/misc/VisorNopTask.java | 3 + .../visor/node/VisorAtomicConfiguration.java| 104 + .../visor/node/VisorBasicConfiguration.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 86 +++ .../visor/node/VisorGridConfiguration.java | 37 + .../visor/node/VisorIgfsConfiguration.java | 48 +++--- .../visor/node/VisorMetricsConfiguration.java | 10 +- .../node/VisorNodeDataCollectorJobResult.java | 67 ++-- .../visor/node/VisorNodeDataCollectorTask.java | 71 + .../node/VisorNodeDataCollectorTaskArg.java | 19 ++- .../node/VisorNodeDataCollectorTaskResult.java | 18 +-- .../node/VisorNodeEventsCollectorTask.java | 33 ++-- .../visor/node/VisorRestConfiguration.java | 6 +- .../visor/node/VisorSpisConfiguration.java | 9 +- .../node/VisorTransactionConfiguration.java | 153 +++ .../visor/query/VisorQueryCleanupTask.java | 2 +- .../internal/visor/query/VisorQueryTask.java| 4 +- .../streamer/VisorStreamerConfiguration.java| 6 +- .../visor/streamer/VisorStreamerMetrics.java| 6 +- .../internal/visor/util/VisorMimeTypes.java | 51 --- .../internal/visor/util/VisorTaskUtils.java | 48 +++--- .../commands/cache/VisorCacheCommand.scala | 5 - .../config/VisorConfigurationCommand.scala | 10 +- 55 files changed, 788 insertions(+), 463 deletions(-) --
[2/2] incubator-ignite git commit: # IGNITE-248 Cleanup code, added missing javadocs, fixed inspections warnings, added new properties to configurations.
# IGNITE-248 Cleanup code, added missing javadocs, fixed inspections warnings, added new properties to configurations. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c30477a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c30477a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c30477a Branch: refs/heads/ignite-248 Commit: 9c30477a2510012c38327659ff1a4a9ee888e42f Parents: f846f8a Author: AKuznetsov Authored: Sun Feb 15 12:32:19 2015 +0700 Committer: AKuznetsov Committed: Sun Feb 15 12:32:19 2015 +0700 -- .../configuration/TransactionConfiguration.java | 7 +- .../apache/ignite/internal/visor/VisorJob.java | 3 +- .../internal/visor/VisorMultiNodeTask.java | 9 +- .../ignite/internal/visor/cache/VisorCache.java | 8 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../visor/cache/VisorCacheConfiguration.java| 18 --- .../visor/cache/VisorCacheDgcConfiguration.java | 97 .../visor/cache/VisorCacheLoadTask.java | 4 +- .../internal/visor/cache/VisorCacheMetrics.java | 18 +-- .../cache/VisorCacheStoreConfiguration.java | 7 +- .../VisorCacheWriteBehindConfiguration.java | 6 +- .../compute/VisorComputeMonitoringHolder.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 17 ++- .../visor/debug/VisorThreadLockInfo.java| 12 +- .../visor/debug/VisorThreadMonitorInfo.java | 6 +- .../event/VisorGridAuthenticationEvent.java | 10 +- .../event/VisorGridAuthorizationEvent.java | 10 +- .../visor/event/VisorGridDeploymentEvent.java | 10 +- .../visor/event/VisorGridDiscoveryEvent.java| 10 +- .../internal/visor/event/VisorGridEvent.java| 18 +-- .../internal/visor/event/VisorGridJobEvent.java | 30 ++-- .../event/VisorGridSecuritySessionEvent.java| 10 +- .../visor/event/VisorGridTaskEvent.java | 30 ++-- .../internal/visor/file/VisorFileBlock.java | 10 +- .../internal/visor/file/VisorFileBlockTask.java | 10 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 3 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 6 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 10 +- .../visor/igfs/VisorIgfsProfilerTask.java | 12 ++ .../VisorIgfsProfilerUniformityCounters.java| 19 ++- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../visor/log/VisorLogSearchResult.java | 20 +-- .../internal/visor/misc/VisorNopTask.java | 3 + .../visor/node/VisorAtomicConfiguration.java| 104 + .../visor/node/VisorBasicConfiguration.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 86 +++ .../visor/node/VisorGridConfiguration.java | 37 + .../visor/node/VisorIgfsConfiguration.java | 48 +++--- .../visor/node/VisorMetricsConfiguration.java | 10 +- .../node/VisorNodeDataCollectorJobResult.java | 67 ++-- .../visor/node/VisorNodeDataCollectorTask.java | 71 + .../node/VisorNodeDataCollectorTaskArg.java | 19 ++- .../node/VisorNodeDataCollectorTaskResult.java | 18 +-- .../node/VisorNodeEventsCollectorTask.java | 33 ++-- .../visor/node/VisorRestConfiguration.java | 6 +- .../visor/node/VisorSpisConfiguration.java | 9 +- .../node/VisorTransactionConfiguration.java | 153 +++ .../visor/query/VisorQueryCleanupTask.java | 2 +- .../internal/visor/query/VisorQueryTask.java| 4 +- .../streamer/VisorStreamerConfiguration.java| 6 +- .../visor/streamer/VisorStreamerMetrics.java| 6 +- .../internal/visor/util/VisorMimeTypes.java | 51 --- .../internal/visor/util/VisorTaskUtils.java | 48 +++--- .../commands/cache/VisorCacheCommand.scala | 5 - .../config/VisorConfigurationCommand.scala | 10 +- 55 files changed, 788 insertions(+), 463 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c30477a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java index 13ac061..ecc21e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java @@ -19,15 +19,10 @@ package org.apache.ignite.configuration; import org.apache.ignite.transactions.*; -import java.io.*; - /** * Transactions configuration. */ -public class TransactionConfiguration implements Serial
[2/2] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Ignite-9655-merge - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa83f60f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa83f60f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa83f60f
Branch: refs/heads/ignite-9655-merge
Commit: aa83f60fecae61c7c7edf8a0bf2ac8799a143686
Parents: 387c24d
Author: Alexey Goncharuk
Authored: Sat Feb 14 23:49:08 2015 -0800
Committer: Alexey Goncharuk
Committed: Sat Feb 14 23:49:08 2015 -0800
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa83f60f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index ea95283..d081eaf 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -119,7 +119,6 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class);
suite.addTestSuite(GridCacheTtlManagerSelfTest.class);
suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class);
-//suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class);
suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class);
suite.addTestSuite(GridCacheAtomicNearCacheSelfTest.class);
@@ -145,6 +144,7 @@ public class IgniteCacheTestSuite extends TestSuite {
//suite.addTestSuite(GridCacheReplicatedTxExceptionSelfTest.class);
//suite.addTestSuite(GridCacheLocalTxExceptionSelfTest.class);
//suite.addTestSuite(GridCacheNearTxExceptionSelfTest.class);
+//suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
// Local cache.
suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
[33/49] incubator-ignite git commit: Fixed header.
Fixed header. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5dde825 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5dde825 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5dde825 Branch: refs/heads/sprint-1 Commit: d5dde825380af6f9a81837e89d9b07a4bc177282 Parents: 773c207 Author: Alexey Goncharuk Authored: Fri Feb 13 14:16:19 2015 -0800 Committer: Alexey Goncharuk Committed: Fri Feb 13 14:16:19 2015 -0800 -- .../IgniteClientAffinityAssignmentSelfTest.java | 22 +--- 1 file changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5dde825/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java index 7a7ccd1..abcb8dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java @@ -1,10 +1,18 @@ -/* @java.file.header */ - -/* __ ___ - * __ /___(_)__ /__ /__ (_)___ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.ignite.internal.processors.cache;
[34/49] incubator-ignite git commit: IGNITE-9655-Merge - Fixed group lock TX tests.
IGNITE-9655-Merge - Fixed group lock TX tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25980ba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25980ba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25980ba4
Branch: refs/heads/sprint-1
Commit: 25980ba4d0ffdd53073a251fd9961cc9a797b421
Parents: d5dde82
Author: Alexey Goncharuk
Authored: Fri Feb 13 17:29:36 2015 -0800
Committer: Alexey Goncharuk
Committed: Fri Feb 13 18:49:29 2015 -0800
--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 --
.../cache/distributed/near/GridNearTxPrepareFuture.java| 5 +
2 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25980ba4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 4c6af2c..e30cb40 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -464,8 +464,10 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundIdentityFutu
txEntry.cached(entry, txEntry.keyBytes());
}
-if (tx.optimistic() && txEntry.explicitVersion() == null)
-lockKeys.add(txEntry.txKey());
+if (tx.optimistic() && txEntry.explicitVersion() == null) {
+if (!tx.groupLock() || tx.groupLockKey().equals(entry.txKey()))
+lockKeys.add(txEntry.txKey());
+}
while (true) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25980ba4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index 4dd77bd..24ef9b5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -802,6 +802,11 @@ public final class GridNearTxPrepareFuture extends
GridCompoundIdentityFut
entry.nodeId(primary.id());
if (cacheCtx.isNear()) {
+if (entry.explicitVersion() == null) {
+if (!tx.groupLock() || tx.groupLockKey().equals(entry.txKey()))
+lockKeys.add(entry.txKey());
+}
+
while (true) {
try {
GridNearCacheEntry cached = (GridNearCacheEntry)entry.cached();
[26/50] [abbrv] incubator-ignite git commit: Revert "ignite-nio - Removing message clone"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 20f9cc3..5455a7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -348,7 +348,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
return false;
if (!writer.isTypeWritten()) {
-if (!writer.writeMessageType(directType()))
+if (!writer.writeByte(null, directType()))
return false;
writer.onTypeWritten();
@@ -356,55 +356,55 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
switch (writer.state()) {
case 24:
-if (!writer.writeField("accessTtl", accessTtl,
MessageFieldType.LONG))
+if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
case 25:
-if (!writer.writeField("invalidateEntries", invalidateEntries,
MessageFieldType.BIT_SET))
+if (!writer.writeBitSet("invalidateEntries",
invalidateEntries))
return false;
writer.incrementState();
case 26:
-if (!writer.writeField("miniId", miniId,
MessageFieldType.IGNITE_UUID))
+if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 27:
-if (!writer.writeCollectionField("nearKeyBytes", nearKeyBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeCollection("nearKeyBytes", nearKeyBytes,
MessageFieldType.BYTE_ARR))
return false;
writer.incrementState();
case 28:
-if (!writer.writeField("ownedBytes", ownedBytes,
MessageFieldType.BYTE_ARR))
+if (!writer.writeByteArray("ownedBytes", ownedBytes))
return false;
writer.incrementState();
case 29:
-if (!writer.writeField("preloadKeys", preloadKeys,
MessageFieldType.BIT_SET))
+if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
case 30:
-if (!writer.writeField("subjId", subjId,
MessageFieldType.UUID))
+if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 31:
-if (!writer.writeField("taskNameHash", taskNameHash,
MessageFieldType.INT))
+if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 32:
-if (!writer.writeField("topVer", topVer,
MessageFieldType.LONG))
+if (!writer.writeLong("topVer", topVer))
return false;
writer.incrementState();
@@ -423,7 +423,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
switch (readState) {
case 24:
-accessTtl = reader.readField("accessTtl",
MessageFieldType.LONG);
+accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
return false;
@@ -431,7 +431,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 25:
-invalidateEntries = reader.readField("invalidateEntries",
MessageFieldType.BIT_SET);
+invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
return false;
@@ -439,7 +439,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 26:
-miniId = reader.readField("miniId",
MessageFieldType.IGNITE_UUID);
+miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -447,7 +447,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
readState++;
case 27:
-nearKeyBytes = reader.readCollectionField("nearKeyBytes",
[15/28] incubator-ignite git commit: # ignite-sql-old - Fixed configs
# ignite-sql-old - Fixed configs Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7e7c18c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7e7c18c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7e7c18c Branch: refs/heads/sprint-1 Commit: e7e7c18c6b2916d1d512515cd1d24b2dc7b3d423 Parents: b42fdcd Author: Valentin Kulichenko Authored: Fri Feb 13 22:25:06 2015 -0800 Committer: Valentin Kulichenko Committed: Fri Feb 13 22:25:06 2015 -0800 -- examples/config/example-cache.xml| 2 +- modules/clients/src/test/resources/spring-cache.xml | 2 +- .../marshaller/optimized/optimized-classnames.properties | 2 +- .../core/src/test/webapp/META-INF/ignite-webapp-config.xml | 8 4 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7e7c18c/examples/config/example-cache.xml -- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 98f6f4f..ad8d5e8 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -141,7 +141,7 @@ - + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7e7c18c/modules/clients/src/test/resources/spring-cache.xml -- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index a9fe31a..6e93f4e 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -87,7 +87,7 @@ - + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7e7c18c/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties -- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties index bd27e00..41834c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties @@ -90,7 +90,7 @@ org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity$PartitionSetCom org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction$HashComparator org.apache.ignite.cache.hibernate.GridHibernateAccessStrategyAdapter$ClearKeyCallable -org.apache.ignite.cache.query.CacheQueryConfiguration +org.apache.ignite.configuration.CacheQueryConfiguration org.apache.ignite.cache.query.CacheQueryType org.apache.ignite.cache.query.QueryAffinityPredicate org.apache.ignite.cache.query.QueryContinuousPredicate http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7e7c18c/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml -- diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml index a254173..95ed478 100644 --- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml +++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml @@ -118,7 +118,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -243,7 +243,7 @@ - +
incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-9655-merge 16c3cceeb -> 911f33741 Ignite-9655-merge - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/911f3374 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/911f3374 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/911f3374 Branch: refs/heads/ignite-9655-merge Commit: 911f33741b53ff0d250bfa86b386f7d88ca4111a Parents: 16c3cce Author: Alexey Goncharuk Authored: Sat Feb 14 21:01:06 2015 -0800 Committer: Alexey Goncharuk Committed: Sat Feb 14 21:01:06 2015 -0800 -- .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911f3374/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index bcecc96..237c2a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -595,12 +595,12 @@ public final class GridDhtTxPrepareFuture extends GridCompoundIdentityFutu res.completedVersions(cctx.tm().committedVersions(min), cctx.tm().rolledbackVersions(min)); res.pending(localDhtPendingVersions(tx.writeEntries(), min)); + +tx.implicitSingleResult(ret); } res.filterFailedKeys(filterFailedKeys); -tx.implicitSingleResult(ret); - return res; }
[4/6] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca27b586/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index e304ce8..b07aa35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -268,7 +268,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequ
state.increment();
case 24:
-if (!writer.writeCollection("lastBackups", lastBackups,
UUID.class))
+if (!writer.writeCollection("lastBackups", lastBackups,
Type.UUID))
return false;
state.increment();
@@ -334,7 +334,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequ
readState++;
case 24:
-lastBackups = reader.readCollection("lastBackups", UUID.class);
+lastBackups = reader.readCollection("lastBackups", Type.UUID);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca27b586/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 6fb9259..94e179e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -275,7 +275,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareRes
state.increment();
case 12:
-if (!writer.writeCollection("invalidParts", invalidParts,
int.class))
+if (!writer.writeCollection("invalidParts", invalidParts,
Type.INT))
return false;
state.increment();
@@ -287,13 +287,13 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareRes
state.increment();
case 14:
-if (!writer.writeCollection("ownedValsBytes", ownedValsBytes,
byte[].class))
+if (!writer.writeCollection("ownedValsBytes", ownedValsBytes,
Type.BYTE_ARR))
return false;
state.increment();
case 15:
-if (!writer.writeCollection("pending", pending,
GridCacheVersion.class))
+if (!writer.writeCollection("pending", pending, Type.MSG))
return false;
state.increment();
@@ -329,7 +329,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareRes
readState++;
case 12:
-invalidParts = reader.readCollection("invalidParts",
int.class);
+invalidParts = reader.readCollection("invalidParts", Type.INT);
if (!reader.isLastRead())
return false;
@@ -345,7 +345,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareRes
readState++;
case 14:
-ownedValsBytes = reader.readCollection("ownedValsBytes",
byte[].class);
+ownedValsBytes = reader.readCollection("ownedValsBytes",
Type.BYTE_ARR);
if (!reader.isLastRead())
return false;
@@ -353,7 +353,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareRes
readState++;
case 15:
-pending = reader.readCollection("pending",
GridCacheVersion.class);
+pending = reader.readCollection("pending", Type.MSG);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca27b586/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/
[13/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/953e2437
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/953e2437
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/953e2437
Branch: refs/heads/sprint-1-start-nodes
Commit: 953e2437af01180840240451698973d37991784c
Parents: dd79c9b
Author: Valentin Kulichenko
Authored: Sat Feb 14 21:57:56 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 21:57:56 2015 -0800
--
.../codegen/CommunicationMessageCodeGenerator.java | 11 ---
1 file changed, 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/953e2437/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index d4bea1d..04ee8ea 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -42,12 +42,6 @@ public class CommunicationMessageCodeGenerator {
};
/** */
-private static final String[] EXCLUDED_PACKAGES = new String[] {
-"org.apache.ignite.internal.processors.rest.client.message",
-"org.apache.ignite.internal.processors.rest.protocols.tcp"
-};
-
-/** */
private static final String SRC_DIR = U.getIgniteHome() +
"/modules/core/src/main/java";
/** */
@@ -828,11 +822,6 @@ public class CommunicationMessageCodeGenerator {
if (path.endsWith(".class")) {
String clsName = path.substring(prefixLen, path.length() -
6).replace(File.separatorChar, '.');
-for (String excluded : EXCLUDED_PACKAGES) {
-if (clsName.startsWith(excluded))
-return;
-}
-
Class cls = Class.forName(clsName, false, ldr);
if (cls.getDeclaringClass() == null && cls.getEnclosingClass()
== null &&
[6/9] incubator-ignite git commit: Revert "ignite-nio - Removing message clone"
Revert "ignite-nio - Removing message clone" This reverts commit af8edc04c356be979e4e10c6ed3574c43a547dfa. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01689b1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01689b1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01689b1d Branch: refs/heads/ignite-nio Commit: 01689b1d576e02179c34eb1126b41b341c40eb52 Parents: 5085e46 Author: Valentin Kulichenko Authored: Sat Feb 14 23:19:33 2015 -0800 Committer: Valentin Kulichenko Committed: Sat Feb 14 23:19:33 2015 -0800 -- .../CommunicationMessageCodeGenerator.java | 2 +- .../ignite/internal/GridJobCancelRequest.java | 14 +- .../ignite/internal/GridJobExecuteRequest.java | 86 +++ .../ignite/internal/GridJobExecuteResponse.java | 30 +-- .../ignite/internal/GridJobSiblingsRequest.java | 10 +- .../internal/GridJobSiblingsResponse.java | 6 +- .../ignite/internal/GridTaskCancelRequest.java | 6 +- .../ignite/internal/GridTaskSessionRequest.java | 14 +- .../internal/direct/DirectMessageReader.java| 219 -- .../internal/direct/DirectMessageWriter.java| 179 --- .../checkpoint/GridCheckpointRequest.java | 14 +- .../managers/communication/GridIoMessage.java | 30 +-- .../communication/GridIoUserMessage.java| 30 +-- .../deployment/GridDeploymentInfoBean.java | 22 +- .../deployment/GridDeploymentRequest.java | 22 +- .../deployment/GridDeploymentResponse.java | 14 +- .../eventstorage/GridEventStorageMessage.java | 38 ++-- .../cache/GridCacheEvictionRequest.java | 14 +- .../cache/GridCacheEvictionResponse.java| 14 +- .../processors/cache/GridCacheMessage.java | 14 +- .../processors/cache/GridCacheValueBytes.java | 10 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 22 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 14 +- ...CachePessimisticCheckCommittedTxRequest.java | 30 +-- ...achePessimisticCheckCommittedTxResponse.java | 18 +- .../distributed/GridCacheTtlUpdateRequest.java | 26 +-- .../distributed/GridDistributedBaseMessage.java | 22 +- .../distributed/GridDistributedLockRequest.java | 66 +++--- .../GridDistributedLockResponse.java| 14 +- .../GridDistributedTxFinishRequest.java | 54 ++--- .../GridDistributedTxFinishResponse.java| 10 +- .../GridDistributedTxPrepareRequest.java| 58 ++--- .../GridDistributedTxPrepareResponse.java | 10 +- .../GridDistributedUnlockRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentResponse.java | 10 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++-- .../distributed/dht/GridDhtLockResponse.java| 18 +- .../distributed/dht/GridDhtTxFinishRequest.java | 54 ++--- .../dht/GridDhtTxFinishResponse.java| 6 +- .../dht/GridDhtTxPrepareRequest.java| 50 ++--- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../GridDhtAtomicDeferredUpdateResponse.java| 6 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 82 +++ .../dht/atomic/GridDhtAtomicUpdateResponse.java | 18 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +++ .../atomic/GridNearAtomicUpdateResponse.java| 46 ++-- .../dht/preloader/GridDhtForceKeysRequest.java | 18 +- .../dht/preloader/GridDhtForceKeysResponse.java | 18 +- .../GridDhtPartitionDemandMessage.java | 26 +-- .../preloader/GridDhtPartitionExchangeId.java | 14 +- .../GridDhtPartitionSupplyMessage.java | 26 +-- .../GridDhtPartitionsAbstractMessage.java | 10 +- .../preloader/GridDhtPartitionsFullMessage.java | 10 +- .../GridDhtPartitionsSingleMessage.java | 6 +- .../GridDhtPartitionsSingleRequest.java | 2 +- .../distributed/near/GridNearGetRequest.java| 46 ++-- .../distributed/near/GridNearGetResponse.java | 30 +-- .../distributed/near/GridNearLockRequest.java | 50 ++--- .../distributed/near/GridNearLockResponse.java | 22 +- .../near/GridNearTxFinishRequest.java | 26 +-- .../near/GridNearTxFinishResponse.java | 14 +- .../near/GridNearTxPrepareRequest.java | 34 +-- .../near/GridNearTxPrepareResponse.java | 26 +-- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 78 +++ .../cache/query/GridCacheQueryResponse.java | 26 +-- .../cache/version/GridCacheVersion.java | 18 +- .../clock/GridClockDeltaSnapshotMessage.java| 10 +- .../processors/clock/GridClockDeltaVersion.java | 10 +- .../continuous/GridContinuousMessage.java | 18 +- .../datal
[41/45] incubator-ignite git commit: ignite-sql-old - fixes
ignite-sql-old - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a50e0524
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a50e0524
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a50e0524
Branch: refs/heads/ignite-sql-old
Commit: a50e0524421dfa267488b8fa3b430c0e59f33ba8
Parents: 42e5786
Author: S.Vladykin
Authored: Sun Feb 15 05:08:02 2015 +0300
Committer: S.Vladykin
Committed: Sun Feb 15 05:08:02 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 111 +--
1 file changed, 76 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50e0524/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b4cfc09..1361b8b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -264,7 +264,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> query(Query filter, @Nullable ClusterGroup
grp) {
+private QueryCursor> doQuery(Query filter, @Nullable
ClusterGroup grp) {
final CacheQuery> qry;
final CacheQueryFuture> fut;
@@ -296,30 +296,27 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(new
GridCloseableIteratorAdapter>() {
-/** */
-Map.Entry cur;
+qry =
((GridCacheQueriesEx)delegate.queries()).createSqlQuery(q.getType(),
q.getSql());
-@Override protected Entry onNext() throws
IgniteCheckedException {
-if (!onHasNext())
-throw new NoSuchElementException();
+if (grp != null)
+qry.projection(grp);
-Map.Entry e = cur;
+qry.pageSize(q.getPageSize());
-cur = null;
+qry.enableDedup(false);
+qry.includeBackups(false);
-return new CacheEntryImpl<>(e.getKey(), e.getValue());
-}
-
-@Override protected boolean onHasNext() throws
IgniteCheckedException {
-return cur != null || (cur = fut.next()) != null;
-}
+fut = qry.execute(q.getArgs());
+}
+else
+throw new IgniteException("Unsupported query predicate: " +
filter);
-@Override protected void onClose() throws IgniteCheckedException {
-fut.cancel();
+return new QueryCursorImpl<>(new
ClIter,Cache.Entry>(fut) {
+@Override protected Cache.Entry convert(Map.Entry e) {
+return new CacheEntryImpl<>(e.getKey(), e.getValue());
}
});
}
@@ -387,7 +384,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter)qry, false);
-return query(qry, projection(false));
+return doQuery(qry, projection(false));
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -428,7 +422,17 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> q =
((GridCacheQueriesEx)delegate.queries()).createSqlFieldsQuery(qry.getSql(),
false);
+
+q.pageSize(qry.getPageSize());
+
+CacheQueryFuture> fut = q.execute(qry.getArgs());
+
+return new QueryCursorImpl<>(new ClIter, List>(fut) {
+@Override protected List convert(List row) {
+return row;
+}
+});
}
catch (Exception e) {
if (e instanceof CacheException)
@@ -446,9 +450,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalQuery(SqlQuery p) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
-//ctx.name(), p.getType(), p.getSql(), p.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
+ctx.name(), p.getType(), p.getSql(), p.getArgs()));
}
/**
@@ -456,9 +459,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalFieldsQuery(SqlFieldsQuery q) {
-return null; // TODO
-//new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
-//ctx.name(), q.getSql(), q.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocalFields(
+ctx.name(), q.getSql(), q.getArgs())
[4/4] incubator-ignite git commit: Merge branch 'ignite-248' into sprint-1
Merge branch 'ignite-248' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c851305c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c851305c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c851305c Branch: refs/heads/sprint-1 Commit: c851305c3599f5784f6749f8ecdc9f7808ffe5b4 Parents: a3cce25 d868865 Author: AKuznetsov Authored: Sun Feb 15 15:44:10 2015 +0700 Committer: AKuznetsov Committed: Sun Feb 15 15:44:10 2015 +0700 -- .../configuration/TransactionConfiguration.java | 7 +- .../apache/ignite/internal/visor/VisorJob.java | 3 +- .../internal/visor/VisorMultiNodeTask.java | 9 +- .../ignite/internal/visor/cache/VisorCache.java | 8 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../visor/cache/VisorCacheConfiguration.java| 18 --- .../visor/cache/VisorCacheDgcConfiguration.java | 97 .../visor/cache/VisorCacheLoadTask.java | 4 +- .../internal/visor/cache/VisorCacheMetrics.java | 18 +-- .../cache/VisorCacheStoreConfiguration.java | 7 +- .../VisorCacheWriteBehindConfiguration.java | 6 +- .../compute/VisorComputeMonitoringHolder.java | 7 +- .../internal/visor/debug/VisorThreadInfo.java | 17 ++- .../visor/debug/VisorThreadLockInfo.java| 12 +- .../visor/debug/VisorThreadMonitorInfo.java | 6 +- .../event/VisorGridAuthenticationEvent.java | 10 +- .../event/VisorGridAuthorizationEvent.java | 10 +- .../visor/event/VisorGridDeploymentEvent.java | 10 +- .../visor/event/VisorGridDiscoveryEvent.java| 10 +- .../internal/visor/event/VisorGridEvent.java| 18 +-- .../internal/visor/event/VisorGridJobEvent.java | 30 ++-- .../event/VisorGridSecuritySessionEvent.java| 10 +- .../visor/event/VisorGridTaskEvent.java | 30 ++-- .../internal/visor/file/VisorFileBlock.java | 10 +- .../internal/visor/file/VisorFileBlockTask.java | 10 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 3 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 6 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 10 +- .../visor/igfs/VisorIgfsProfilerTask.java | 12 ++ .../VisorIgfsProfilerUniformityCounters.java| 19 ++- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../visor/log/VisorLogSearchResult.java | 20 +-- .../internal/visor/misc/VisorNopTask.java | 3 + .../visor/node/VisorAtomicConfiguration.java| 104 + .../visor/node/VisorBasicConfiguration.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 86 +++ .../visor/node/VisorGridConfiguration.java | 37 + .../visor/node/VisorIgfsConfiguration.java | 48 +++--- .../visor/node/VisorMetricsConfiguration.java | 10 +- .../node/VisorNodeDataCollectorJobResult.java | 67 ++-- .../visor/node/VisorNodeDataCollectorTask.java | 71 + .../node/VisorNodeDataCollectorTaskArg.java | 19 ++- .../node/VisorNodeDataCollectorTaskResult.java | 18 +-- .../node/VisorNodeEventsCollectorTask.java | 33 ++-- .../visor/node/VisorRestConfiguration.java | 6 +- .../visor/node/VisorSpisConfiguration.java | 9 +- .../node/VisorTransactionConfiguration.java | 153 +++ .../visor/query/VisorQueryCleanupTask.java | 2 +- .../internal/visor/query/VisorQueryTask.java| 4 +- .../streamer/VisorStreamerConfiguration.java| 6 +- .../visor/streamer/VisorStreamerMetrics.java| 6 +- .../internal/visor/util/VisorMimeTypes.java | 51 --- .../internal/visor/util/VisorTaskUtils.java | 48 +++--- .../commands/cache/VisorCacheCommand.scala | 5 - .../config/VisorConfigurationCommand.scala | 10 +- 55 files changed, 788 insertions(+), 463 deletions(-) --
incubator-ignite git commit: ignite-nio - Removing message clone
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-nio f9f06c0e5 -> dcb4c7093
ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dcb4c709
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dcb4c709
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dcb4c709
Branch: refs/heads/ignite-nio
Commit: dcb4c70930787b74a0aa421982f3fac717e73ebc
Parents: f9f06c0
Author: Valentin Kulichenko
Authored: Sat Feb 14 19:45:14 2015 -0800
Committer: Valentin Kulichenko
Committed: Sat Feb 14 19:45:14 2015 -0800
--
.../CommunicationMessageCodeGenerator.java | 8 ++-
.../internal/direct/DirectByteBufferStream.java | 5 +-
.../internal/direct/DirectMessageReader.java| 4 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +-
.../distributed/near/GridNearLockRequest.java | 4 +-
.../distributed/near/GridNearLockResponse.java | 4 +-
.../communication/MessageAdapter.java | 55
.../extensions/communication/MessageReader.java | 3 +-
10 files changed, 42 insertions(+), 49 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
index 7ce89a7..a9846d1 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -674,8 +674,12 @@ public class CommunicationMessageCodeGenerator {
}
else if (BASE_CLS.isAssignableFrom(type))
returnFalseIfReadFailed(name, "reader.readMessage", field);
-else if (type.isArray())
-returnFalseIfReadFailed(name, "reader.readObjectArray", field,
"Type." + typeEnum(type.getComponentType()));
+else if (type.isArray()) {
+Class compType = type.getComponentType();
+
+returnFalseIfReadFailed(name, "reader.readObjectArray", field,
"Type." + typeEnum(compType),
+compType.getSimpleName() + ".class");
+}
else if (Collection.class.isAssignableFrom(type) &&
!Set.class.isAssignableFrom(type)) {
assert colItemType != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
index f503223..fed6a53 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java
@@ -967,10 +967,11 @@ public class DirectByteBufferStream {
/**
* @param itemType Component type.
+ * @param itemCls Component class.
* @return Array.
*/
@SuppressWarnings("unchecked")
-public T[] readObjectArray(MessageAdapter.Type itemType) {
+public T[] readObjectArray(MessageAdapter.Type itemType, Class
itemCls) {
if (readSize == -1) {
int size = readInt();
@@ -982,7 +983,7 @@ public class DirectByteBufferStream {
if (readSize >= 0) {
if (objArr == null)
-objArr = (Object[])Array.newInstance(itemType.clazz(),
readSize);
+objArr = (Object[])Array.newInstance(itemCls, readSize);
for (int i = readItems; i < readSize; i++) {
Object item = read(itemType);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcb4c709/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index 191c522..f52a4c8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMe
[12/28] incubator-ignite git commit: IGNITE-143 - Continuous queries refactoring (manual merge)
IGNITE-143 - Continuous queries refactoring (manual merge)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f649be2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f649be2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f649be2
Branch: refs/heads/sprint-1
Commit: 4f649be29a298c3950cd09b641fba450d7fd0241
Parents: 3b8f9a6
Author: Valentin Kulichenko
Authored: Fri Feb 13 16:47:03 2015 -0800
Committer: Valentin Kulichenko
Committed: Fri Feb 13 16:47:03 2015 -0800
--
.../datagrid/CacheContinuousQueryExample.java | 69 +-
.../cache/query/CacheContinuousQuery.java | 285 --
.../cache/query/CacheContinuousQueryEntry.java | 49 -
.../ignite/cache/query/ContinuousQuery.java | 234 +++--
.../org/apache/ignite/cache/query/Query.java| 9 +
.../ignite/events/CacheQueryExecutedEvent.java | 8 +-
.../ignite/events/CacheQueryReadEvent.java | 8 +-
.../processors/cache/CacheEntryEvent.java | 78 --
.../processors/cache/GridCacheContext.java | 6 +-
.../processors/cache/GridCacheMapEntry.java | 26 +-
.../processors/cache/GridCacheProcessor.java| 8 +-
.../processors/cache/GridCacheProjectionEx.java | 5 +
.../processors/cache/IgniteCacheProxy.java | 72 +-
.../CacheDataStructuresManager.java | 81 +-
.../processors/cache/query/CacheQueries.java| 10 -
.../cache/query/GridCacheQueriesImpl.java | 5 -
.../cache/query/GridCacheQueriesProxy.java | 12 -
.../continuous/CacheContinuousQueryEntry.java | 234 +
.../continuous/CacheContinuousQueryEvent.java | 87 ++
.../CacheContinuousQueryFilterEx.java | 31 +
.../continuous/CacheContinuousQueryHandler.java | 490 ++
.../CacheContinuousQueryListener.java | 47 +
.../continuous/CacheContinuousQueryManager.java | 664 ++
.../GridCacheContinuousQueryAdapter.java| 319 ---
.../GridCacheContinuousQueryEntry.java | 344 ---
.../GridCacheContinuousQueryFilterEx.java | 33 -
.../GridCacheContinuousQueryHandler.java| 571
.../GridCacheContinuousQueryListener.java | 41 -
.../GridCacheContinuousQueryManager.java| 784
.../processors/hadoop/GridHadoopJobId.java | 3 +-
.../service/GridServiceProcessor.java | 75 +-
.../optimized/optimized-classnames.properties | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 888 ---
...dCacheContinuousQueryReplicatedSelfTest.java | 95 +-
.../GridContinuousOperationsLoadTest.java | 54 +-
.../loadtests/hashmap/GridCacheTestContext.java | 2 +-
.../hadoop/jobtracker/GridHadoopJobTracker.java | 31 +-
37 files changed, 2181 insertions(+), 3581 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f649be2/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index ce05988..ec7a040 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -18,11 +18,11 @@
package org.apache.ignite.examples.datagrid;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.lang.*;
-import java.util.*;
+import javax.cache.*;
+import javax.cache.event.*;
/**
* This examples demonstrates continuous query API.
@@ -48,46 +48,51 @@ public class CacheContinuousQueryExample {
System.out.println();
System.out.println(">>> Cache continuous query example started.");
-GridCache cache = ignite.cache(CACHE_NAME);
+IgniteCache cache = ignite.jcache(CACHE_NAME);
// Clean up caches on all nodes before run.
-cache.clear(0);
+cache.clear();
int keyCnt = 20;
+// These entries will be queried by initial predicate.
for (int i = 0; i < keyCnt; i++)
-cache.putx(i, Integer.toString(i));
+cache.put(i, Integer.toString(i));
// Create new continuous query.
-try (CacheContinuousQuery qry =
cache.queries().createContinuousQuery()) {
-// Callback that is called locally when update notifications
are received.
-qry.localCallback(
-new IgniteBiPredicate
[07/28] incubator-ignite git commit: ignite-sql-old - rename
ignite-sql-old - rename Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb65ec55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb65ec55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb65ec55 Branch: refs/heads/sprint-1 Commit: cb65ec550fc3f89ac04f1eef09f31a8d4e206e21 Parents: 5cb1fb4 Author: S.Vladykin Authored: Sat Feb 14 01:31:32 2015 +0300 Committer: S.Vladykin Committed: Sat Feb 14 01:31:32 2015 +0300 -- .../datagrid/CachePopularNumbersExample.java| 2 +- .../examples/datagrid/CacheQueryExample.java| 2 +- .../starschema/CacheStarSchemaExample.java | 2 +- .../apache/ignite/cache/CacheProjection.java| 4 +- .../cache/query/CacheContinuousQuery.java | 1 + .../apache/ignite/cache/query/CacheQueries.java | 152 -- .../apache/ignite/cache/query/CacheQuery.java | 295 -- .../ignite/cache/query/CacheQueryFuture.java| 66 - .../ignite/cache/query/CacheQueryType.java | 47 --- .../apache/ignite/cache/query/QueryMetrics.java | 2 + .../cache/query/annotations/QuerySqlField.java | 2 +- .../cache/query/annotations/QueryTextField.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 1 + .../ignite/events/CacheQueryReadEvent.java | 1 + .../cache/CacheWeakQueryIteratorsHolder.java| 2 +- .../processors/cache/GridCacheAdapter.java | 1 - .../cache/GridCacheProjectionImpl.java | 1 - .../processors/cache/GridCacheProxyImpl.java| 1 - .../processors/cache/query/CacheQueries.java| 153 ++ .../processors/cache/query/CacheQuery.java | 296 +++ .../cache/query/CacheQueryFuture.java | 66 + .../processors/cache/query/CacheQueryType.java | 47 +++ .../query/GridCacheDistributedQueryManager.java | 1 - .../cache/query/GridCacheLocalQueryManager.java | 1 - .../cache/query/GridCacheQueriesEx.java | 1 - .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheQueryErrorFuture.java | 1 - .../query/GridCacheQueryFutureAdapter.java | 1 - .../cache/query/GridCacheQueryManager.java | 18 +- .../cache/query/GridCacheQueryType.java | 4 +- .../GridCacheContinuousQueryHandler.java| 1 + .../query/jdbc/GridCacheQueryJdbcTask.java | 1 - .../datastructures/GridCacheSetImpl.java| 1 - .../cache/GridCacheQueryCommandHandler.java | 1 - .../internal/visor/query/VisorQueryTask.java| 1 - .../internal/visor/query/VisorQueryUtils.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/GridCacheQueryIndexSelfTest.java | 2 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java| 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 2 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 1 - .../cache/GridCacheAbstractQuerySelfTest.java | 3 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 1 - .../cache/GridCacheQueryMetricsSelfTest.java| 1 + .../GridCacheQueryMultiThreadedSelfTest.java| 1 - ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 2 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 2 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 2 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 1 - .../local/GridCacheLocalQuerySelfTest.java | 2 +- .../query/h2/GridH2IndexRebuildTest.java| 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 1 - .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- .../cache/IgniteSqlQueryPutBenchmark.java | 2 +- 70 files changed, 617 insertions(+), 627 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb65ec55/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.j
[12/45] incubator-ignite git commit: #ignite examples: remove GridCache Api from MemcacheRestExample.
#ignite examples: remove GridCache Api from MemcacheRestExample.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40a95ccc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40a95ccc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40a95ccc
Branch: refs/heads/ignite-sql-old
Commit: 40a95ccca0988690d192b9a2a3d9a317efb39b49
Parents: 4d01989
Author: ivasilinets
Authored: Sat Feb 14 14:47:59 2015 +0300
Committer: ivasilinets
Committed: Sat Feb 14 14:47:59 2015 +0300
--
.../ignite/examples/misc/client/memcache/MemcacheRestExample.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40a95ccc/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
index c13b741..f48e6fb 100644
---
a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
@@ -19,7 +19,6 @@ package org.apache.ignite.examples.misc.client.memcache;
import net.spy.memcached.*;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import java.io.*;
import java.net.*;
@@ -50,7 +49,7 @@ public class MemcacheRestExample {
System.out.println();
System.out.println(">>> Memcache REST example started.");
-GridCache cache = ignite.cache(null);
+IgniteCache cache = ignite.jcache(null);
client = startMemcachedClient(host, port);
[16/49] incubator-ignite git commit: GG-9655 - Fixing tests after merge.
GG-9655 - Fixing tests after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9215a078
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9215a078
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9215a078
Branch: refs/heads/sprint-1
Commit: 9215a078875b1697a7cba600c00d3e5268ef37c1
Parents: 4fde8d3
Author: Alexey Goncharuk
Authored: Fri Jan 30 19:45:09 2015 -0800
Committer: Alexey Goncharuk
Committed: Fri Jan 30 19:45:09 2015 -0800
--
.../processors/cache/GridCacheReturn.java | 47
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../near/GridNearTxPrepareFuture.java | 5 +--
.../transactions/IgniteTxLocalAdapter.java | 30 ++---
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
6 files changed, 77 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9215a078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index cab1e36..09a566f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -44,6 +44,9 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
/** Success flag. */
private volatile boolean success;
+/** */
+private volatile boolean invokeRes;
+
/**
* Empty constructor.
*/
@@ -70,6 +73,19 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
}
/**
+ *
+ * @param v Value.
+ * @param success Success flag.
+ */
+public GridCacheReturn(V v, boolean success, boolean invokeRes) {
+assert !invokeRes || v instanceof Map;
+
+this.v = v;
+this.success = success;
+this.invokeRes = invokeRes;
+}
+
+/**
* @return Value.
*/
@Nullable public V value() {
@@ -86,6 +102,13 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
}
/**
+ * @return If return is invoke result.
+ */
+public boolean invokeResult() {
+return invokeRes;
+}
+
+/**
* @param v Value.
* @return This instance for chaining.
*/
@@ -134,6 +157,8 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
assert key != null;
assert res != null;
+invokeRes = true;
+
HashMap resMap = (HashMap)v;
if (resMap == null) {
@@ -145,6 +170,26 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
resMap.put(key, res);
}
+/**
+ * @param other Other result to merge with.
+ */
+public synchronized void mergeEntryProcessResults(GridCacheReturn
other) {
+assert invokeRes || v == null : "Invalid state to merge: " + this;
+assert other.invokeRes;
+
+invokeRes = true;
+
+HashMap resMap = (HashMap)v;
+
+if (resMap == null) {
+resMap = new HashMap<>();
+
+v = (V)resMap;
+}
+
+resMap.putAll((Map)other.v);
+}
+
/** {@inheritDoc} */
@Override public Object ggClassId() {
return GG_CLASS_ID;
@@ -154,6 +199,7 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeBoolean(success);
out.writeObject(v);
+out.writeBoolean(invokeRes);
}
/** {@inheritDoc} */
@@ -161,6 +207,7 @@ public class GridCacheReturn implements Externalizable,
IgniteOptimizedMarsha
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
success = in.readBoolean();
v = (V)in.readObject();
+invokeRes = in.readBoolean();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9215a078/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dis
[03/50] [abbrv] incubator-ignite git commit: ignite-nio - Removing message clone
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 9bdf4bd..f12cedc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -350,11 +350,7 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest
/** {@inheritDoc} */
@SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
@Override public MessageAdapter clone() {
-GridDhtTxFinishRequest _clone = new GridDhtTxFinishRequest();
-
-clone0(_clone);
-
-return _clone;
+throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
@@ -382,96 +378,99 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest
/** {@inheritDoc} */
@SuppressWarnings("all")
@Override public boolean writeTo(ByteBuffer buf) {
+MessageWriteState state = MessageWriteState.get();
+MessageWriter writer = state.writer();
+
writer.setBuffer(buf);
if (!super.writeTo(buf))
return false;
-if (!typeWritten) {
+if (!state.isTypeWritten()) {
if (!writer.writeByte(null, directType()))
return false;
-typeWritten = true;
+state.setTypeWritten();
}
-switch (state) {
+switch (state.index()) {
case 21:
if (!writer.writeEnum("isolation", isolation))
return false;
-state++;
+state.increment();
case 22:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
-state++;
+state.increment();
case 23:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
-state++;
+state.increment();
case 24:
if (!writer.writeMessage("nearTtls", nearTtls))
return false;
-state++;
+state.increment();
case 25:
if (!writer.writeCollection("nearWritesBytes",
nearWritesBytes, byte[].class))
return false;
-state++;
+state.increment();
case 26:
if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
return false;
-state++;
+state.increment();
case 27:
if (!writer.writeCollection("pendingVers", pendingVers,
GridCacheVersion.class))
return false;
-state++;
+state.increment();
case 28:
if (!writer.writeUuid("subjId", subjId))
return false;
-state++;
+state.increment();
case 29:
if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
return false;
-state++;
+state.increment();
case 30:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
-state++;
+state.increment();
case 31:
if (!writer.writeLong("topVer", topVer))
return false;
-state++;
+state.increment();
case 32:
if (!writer.writeMessage("ttls", ttls))
return false;
-state++;
+state.increment();
case 33:
if (!writer.writeMessage("writeVer", writeVer))
return false;
-state++;
+state.increment();
}
@@ -486,14 +485,14 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest
if (!super.readFrom(buf))
return false;
-switch (state) {
+switch (readState) {
case 21:
isolation = reader.readEnum("isolation",
IgniteTxIsolation.class);
if (!reader.isLastRead())
return false;
-state++;
+readState++;
case 22:
miniId = read
