incubator-ignite git commit: ignite-929
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-929 a91171558 -> bb3f4b535
ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb3f4b53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb3f4b53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb3f4b53
Branch: refs/heads/ignite-929
Commit: bb3f4b535bdb50344722a39b86e0bb5eeb803154
Parents: a911715
Author: Anton Vinogradov
Authored: Thu Jun 11 10:11:15 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Jun 11 10:11:15 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheGateway.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb3f4b53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 713a159..5170c6d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -40,7 +40,7 @@ public class GridCacheGateway {
private volatile boolean stopped;
/** Client counter. */
-private volatile AtomicInteger clients;
+private final AtomicInteger clients = new AtomicInteger(0);
/** */
private GridSpinReadWriteLock rwLock = new GridSpinReadWriteLock();
@@ -52,8 +52,6 @@ public class GridCacheGateway {
assert ctx != null;
this.ctx = ctx;
-
-clients = new AtomicInteger(0);
}
/**
@@ -246,6 +244,8 @@ public class GridCacheGateway {
*/
public void block() {
stopped = true;
+
+clients.decrementAndGet();
}
/**
[26/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389-ipc
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389-ipc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d8643c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d8643c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d8643c0 Branch: refs/heads/ignite-484-1 Commit: 1d8643c0b93786f7eeff82bb56b64e6df53b3697 Parents: a329e90 c9f7291 Author: Alexey Goncharuk Authored: Thu Jun 4 11:09:30 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 11:09:30 2015 -0700 -- .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java| 3 + .../managers/communication/GridIoManager.java | 117 .../processors/cache/GridCacheContext.java | 3 - .../dht/GridClientPartitionTopology.java| 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java| 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java| 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 3 + .../ignite/spi/discovery/tcp/ServerImpl.java| 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ...niteDynamicCacheWithConfigStartSelfTest.java | 35 +-- .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java| 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java| 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java| 5 +- .../processors/hadoop/HadoopTasksV2Test.java| 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 48 files changed, 1358 insertions(+), 299 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java --
[41/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-389' into ignite-389
Merge remote-tracking branch 'origin/ignite-389' into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/079bcc68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/079bcc68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/079bcc68 Branch: refs/heads/ignite-484-1 Commit: 079bcc681343899e6ee7b0848ed57614d610ef55 Parents: f129d08 b812c0f Author: avinogradov Authored: Tue Jun 9 15:11:56 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:11:56 2015 +0300 -- ...CacheScanPartitionQueryFallbackSelfTest.java | 20 1 file changed, 16 insertions(+), 4 deletions(-) --
[44/50] incubator-ignite git commit: IGNITE-389 - Fixing tests.
IGNITE-389 - 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/71f29e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71f29e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71f29e98
Branch: refs/heads/ignite-484-1
Commit: 71f29e98e2ea571e437206a3712b7261e086e1db
Parents: 3417215
Author: Alexey Goncharuk
Authored: Wed Jun 10 13:22:15 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 13:22:15 2015 -0700
--
.../ignite/internal/processors/query/GridQueryIndexing.java | 4 +++-
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 +--
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 7 ---
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 4 ++--
4 files changed, 14 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index cc0916a..7fcc284 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -58,9 +58,11 @@ public interface GridQueryIndexing {
*
* @param cctx Cache context.
* @param qry Query.
+ * @param keepCacheObjects If {@code true}, cache objects representation
will be preserved.
* @return Cursor.
*/
-public Iterable> queryTwoStep(GridCacheContext cctx,
GridCacheTwoStepQuery qry);
+public Iterable> queryTwoStep(GridCacheContext cctx,
GridCacheTwoStepQuery qry,
+boolean keepCacheObjects);
/**
* Parses SQL query into two step query and executes it.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/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 1be2a36..e187713 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
@@ -546,9 +546,12 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
throw new IllegalStateException("Failed to execute query (grid is
stopping).");
try {
+GridCacheContext cacheCtx =
ctx.cache().internalCache(space).context();
+
return idx.queryTwoStep(
-ctx.cache().internalCache(space).context(),
-qry);
+cacheCtx,
+qry,
+cacheCtx.keepPortable());
}
finally {
busyLock.leaveBusy();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 6ec329f..5e27c24 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -771,10 +771,11 @@ public class IgniteH2Indexing implements
GridQueryIndexing {
}
/** {@inheritDoc} */
-@Override public Iterable> queryTwoStep(final
GridCacheContext cctx, final GridCacheTwoStepQuery qry) {
+@Override public Iterable> queryTwoStep(final
GridCacheContext cctx, final GridCacheTwoStepQuery qry,
+final boolean keepCacheObj) {
return new Iterable>() {
@Override public Iterator> iterator() {
-return rdcQryExec.query(cctx, qry);
+return rdcQryExec.query(cctx, qry, keepCacheObj);
}
};
}
@@ -872,7 +873,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
twoStepQry.pageSize(qry.getPageSize());
-QueryCursorImpl> cursor
[18/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7158fb6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7158fb6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7158fb6a
Branch: refs/heads/ignite-484-1
Commit: 7158fb6a4ff7b9db3afda73f75376ad3285c556c
Parents: d6f9b64
Author: sboikov
Authored: Tue Jun 2 15:57:16 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 15:57:16 2015 +0300
--
.../GridTcpCommunicationSpiMultithreadedSelfTest.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7158fb6a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 5d25299..dc7f344 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -62,8 +62,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
private static final Collection spiRsrcs = new
ArrayList<>();
/** SPIs */
-private static final Map> spis =
-new ConcurrentHashMap<>();
+private static final Map> spis = new
ConcurrentHashMap<>();
/** Listeners. */
private static final Map lsnrs = new HashMap<>();
@@ -85,13 +84,20 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
/**
* @param useShmem Use shared mem.
*/
-public GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
+protected GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
super(false);
this.useShmem = useShmem;
}
/**
+ *
+ */
+public GridTcpCommunicationSpiMultithreadedSelfTest() {
+this(false);
+}
+
+/**
* Accumulating listener.
*/
@SuppressWarnings({"deprecation"})
[17/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6f9b647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6f9b647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6f9b647
Branch: refs/heads/ignite-484-1
Commit: d6f9b647ab92d822aebbef06315ccb0af41f8238
Parents: 39ce1cb
Author: sboikov
Authored: Tue Jun 2 15:39:12 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 15:39:12 2015 +0300
--
modules/core/pom.xml | 1 -
.../tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f9b647/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 370fe69..8c37a4f 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -129,7 +129,6 @@
org.gridgain
ignite-shmem
1.0.0
-test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f9b647/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 9909d76..5d25299 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -85,7 +85,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
/**
* @param useShmem Use shared mem.
*/
-protected GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
+public GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
super(false);
this.useShmem = useShmem;
[47/50] incubator-ignite git commit: #IGNITE-389 - Minor
#IGNITE-389 - Minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89a4f7c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89a4f7c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89a4f7c5
Branch: refs/heads/ignite-484-1
Commit: 89a4f7c569e3f50d1623d461756e8a0bc2c1dd13
Parents: f149c82
Author: Alexey Goncharuk
Authored: Wed Jun 10 15:59:15 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 15:59:15 2015 -0700
--
.../internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89a4f7c5/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index 5b3274d..d4ae147 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -163,7 +163,7 @@ public class IpcSharedMemoryNativeLoader {
}
}
catch (IgniteCheckedException ignore) {
-
+// No-op.
}
// Failed to find the library.
[07/50] incubator-ignite git commit: ignite-389 Avoid backups filtering in case of partition scan query
ignite-389 Avoid backups filtering in case of partition scan query
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d6bb532
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d6bb532
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d6bb532
Branch: refs/heads/ignite-484-1
Commit: 5d6bb532c7de35cfea7674b5fc1446e72a5fa985
Parents: f00a9e9
Author: agura
Authored: Thu May 28 18:30:08 2015 +0300
Committer: agura
Committed: Thu May 28 18:30:08 2015 +0300
--
.../apache/ignite/cache/query/ScanQuery.java| 12 +-
.../cache/query/GridCacheQueryAdapter.java | 122 +++
.../cache/query/GridCacheQueryManager.java | 9 +-
3 files changed, 28 insertions(+), 115 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d6bb532/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
index f56b0c7..e6b69bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
@@ -46,6 +46,11 @@ public final class ScanQuery extends
Query> {
this(null, null);
}
+/**
+ * Creates partition scan query returning all entries for given partition.
+ *
+ * @param part Partition.
+ */
public ScanQuery(int part) {
this(part, null);
}
@@ -62,9 +67,10 @@ public final class ScanQuery extends
Query> {
/**
* Create scan query with filter.
*
+ * @param part Partition.
* @param filter Filter. If {@code null} then all entries will be returned.
*/
-public ScanQuery(Integer part, @Nullable IgniteBiPredicate filter) {
+public ScanQuery(@Nullable Integer part, @Nullable IgniteBiPredicate
filter) {
setPartition(part);
setFilter(filter);
}
@@ -96,7 +102,7 @@ public final class ScanQuery extends
Query> {
*
* @return Partition number or {@code null}.
*/
-public Integer getPartition() {
+@Nullable public Integer getPartition() {
return part;
}
@@ -106,7 +112,7 @@ public final class ScanQuery extends
Query> {
*
* @param part Partition number over which this query should iterate.
*/
-public void setPartition(Integer part) {
+public void setPartition(@Nullable Integer part) {
this.part = part;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d6bb532/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 6574f0a..2f32faa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -26,14 +26,15 @@ import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.query.*;
+import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.security.*;
+
import org.jetbrains.annotations.*;
import java.util.*;
-import java.util.concurrent.*;
import static
org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*;
@@ -457,7 +458,7 @@ public class GridCacheQueryAdapter implements
CacheQuery {
return (CacheQueryFuture)(loc ? qryMgr.queryFieldsLocal(bean) :
qryMgr.queryFieldsDistributed(bean, nodes));
else if (type == SCAN && part != null && nodes.size() > 1)
-return new CacheQueryFallbackFuture(nodes, bean, qryMgr);
+return new CacheQueryFallbackFuture<>(nodes, bean, qryMgr);
else
return (CacheQueryFuture)(loc ? qryMgr.queryLocal(bean) :
qryMgr.queryDistributed(bean, nodes));
}
@@ -524,9 +525,10 @@ public class GridCacheQueryAdapter implements
CacheQuery {
/**
* Wrapper for queries with fallback.
*/
-private static class CacheQueryFallbackFuture extends
[02/50] incubator-ignite git commit: #IGNITE-389 - Partition scan review and fixes.w
#IGNITE-389 - Partition scan review and fixes.w
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d72b040c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d72b040c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d72b040c
Branch: refs/heads/ignite-484-1
Commit: d72b040ccc4718852747d42152a448b9653f2c3f
Parents: 381c169
Author: Alexey Goncharuk
Authored: Tue May 26 12:08:10 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue May 26 12:08:10 2015 -0700
--
.../apache/ignite/cache/query/ScanQuery.java| 39 +++-
.../processors/cache/IgniteCacheProxy.java | 3 +-
.../cache/query/GridCacheQueryAdapter.java | 5 ++-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 11 +++---
.../org/apache/ignite/spark/IgniteRDD.scala | 6 ++-
5 files changed, 55 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d72b040c/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
index 688eb2e..f56b0c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java
@@ -36,11 +36,18 @@ public final class ScanQuery extends
Query> {
/** */
private IgniteBiPredicate filter;
+/** */
+private Integer part;
+
/**
* Create scan query returning all entries.
*/
public ScanQuery() {
-this(null);
+this(null, null);
+}
+
+public ScanQuery(int part) {
+this(part, null);
}
/**
@@ -49,6 +56,16 @@ public final class ScanQuery extends
Query> {
* @param filter Filter. If {@code null} then all entries will be returned.
*/
public ScanQuery(@Nullable IgniteBiPredicate filter) {
+this(null, filter);
+}
+
+/**
+ * Create scan query with filter.
+ *
+ * @param filter Filter. If {@code null} then all entries will be returned.
+ */
+public ScanQuery(Integer part, @Nullable IgniteBiPredicate filter) {
+setPartition(part);
setFilter(filter);
}
@@ -73,6 +90,26 @@ public final class ScanQuery extends
Query> {
return this;
}
+/**
+ * Gets partition number over which this query should iterate. Will return
{@code null} if partition was not
+ * set. In this case query will iterate over all partitions in the cache.
+ *
+ * @return Partition number or {@code null}.
+ */
+public Integer getPartition() {
+return part;
+}
+
+/**
+ * Sets partition number over which this query should iterate. If {@code
null}, query will iterate over
+ * all partitions in the cache. Must be in the range [0, N) where N is
partition number in the cache.
+ *
+ * @param part Partition number over which this query should iterate.
+ */
+public void setPartition(Integer part) {
+this.part = part;
+}
+
/** {@inheritDoc} */
@Override public ScanQuery setPageSize(int pageSize) {
return (ScanQuery)super.setPageSize(pageSize);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d72b040c/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 0009127..176543b 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
@@ -353,7 +353,8 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter p = ((ScanQuery)filter).getFilter();
-qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL,
null, isKeepPortable);
+qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL,
((ScanQuery)filter).getPartition(),
+isKeepPortable);
if (grp != null)
qry.projection(grp);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d72b040c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/
[22/50] incubator-ignite git commit: 389-3
389-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa3bb636 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa3bb636 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa3bb636 Branch: refs/heads/ignite-484-1 Commit: aa3bb6361663ef4397b79321046c37f310376f5f Parents: bae1804 Author: avinogradov Authored: Wed Jun 3 13:44:03 2015 +0300 Committer: avinogradov Committed: Wed Jun 3 13:44:03 2015 +0300 -- assembly/dependencies-fabric.xml| 1 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 +++ .../scalar-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark-2.10/licenses/apache-2.0.txt | 202 +++ .../spark-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark/licenses/apache-2.0.txt | 202 +++ modules/spark/licenses/scala-bsd-license.txt| 18 ++ 7 files changed, 661 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3bb636/assembly/dependencies-fabric.xml -- diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml index a294243..c6668f6 100644 --- a/assembly/dependencies-fabric.xml +++ b/assembly/dependencies-fabric.xml @@ -113,6 +113,7 @@ org.apache.ignite:ignite-examples org.apache.ignite:ignite-indexing org.apache.ignite:ignite-visor-console +org.apache.ignite:ignite-visor-console_2.10 org.apache.ignite:ignite-visor-plugins org.apache.ignite:ignite-visor-trial org.apache.ignite:ignite-hadoop http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3bb636/modules/scalar-2.10/licenses/apache-2.0.txt -- diff --git a/modules/scalar-2.10/licenses/apache-2.0.txt b/modules/scalar-2.10/licenses/apache-2.0.txt new file mode 100644 index 000..d645695 --- /dev/null +++ b/modules/scalar-2.10/licenses/apache-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in t
[24/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ee51ba0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ee51ba0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ee51ba0 Branch: refs/heads/ignite-484-1 Commit: 7ee51ba05dc65148835e1491b91a23695c940d12 Parents: 2aa1ace 97d0bc1 Author: Alexey Goncharuk Authored: Wed Jun 3 15:18:44 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 3 15:18:44 2015 -0700 -- assembly/dependencies-visor-console.xml |3 + .../hibernate/CacheHibernatePersonStore.java| 202 +--- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java| 180 +-- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java| 128 +++ .../store/spring/CacheSpringStoreExample.java | 143 +++ .../datagrid/store/spring/package-info.java | 22 + .../ignite/cache/eviction/EvictableEntry.java |7 + .../ignite/cache/eviction/EvictionPolicy.java |2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java| 38 + .../eviction/random/RandomEvictionPolicy.java | 10 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../apache/ignite/cache/query/QueryMetrics.java |6 +- .../apache/ignite/cache/store/CacheStore.java |2 + .../ignite/cache/store/CacheStoreSession.java | 22 + .../cache/store/CacheStoreSessionListener.java | 133 +++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++ .../configuration/CacheConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 38 +- .../managers/communication/GridIoManager.java | 12 +- .../discovery/GridDiscoveryManager.java |4 +- .../cache/CacheEvictableEntryImpl.java | 31 + .../processors/cache/CacheMetricsImpl.java |4 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../processors/cache/GridCacheProcessor.java| 12 +- .../cache/GridCacheSharedContext.java | 47 +- .../processors/cache/GridCacheUtils.java| 54 + .../cache/distributed/dht/GridDhtGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +- .../GridDhtPartitionsExchangeFuture.java| 46 +- .../dht/preloader/GridDhtPreloader.java |9 +- .../local/atomic/GridLocalAtomicCache.java | 25 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/store/CacheOsStoreManager.java|1 - .../cache/store/CacheStoreManager.java |7 +- .../store/GridCacheStoreManagerAdapter.java | 202 +++- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++- .../processors/query/GridQueryProcessor.java| 311 -- .../spi/discovery/tcp/TcpDiscoverySpi.java |2 +- ...cheStoreSessionListenerAbstractSelfTest.java | 315 ++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 27 + .../cache/GridCacheAbstractMetricsSelfTest.java | 48 +- .../GridCacheConcurrentTxMultiNodeTest.java |8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java |5 +- .../cache/GridCacheReloadSelfTest.java |6 +- .../cache/IgniteCachePeekModesAbstractTest.java |5 +- .../IgniteCrossCacheTxStoreSelfTest.java| 147 ++- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java |6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java| 32 + ...ePartitionedMultiThreadedPutGetSelfTest.java |6 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java |2 +- .../cache/eviction/EvictionAbstractTest.java| 1056 ++ .../GridCacheBatchEvictUnswapSelfTest.java |5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java |5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 .../GridCacheEvictionTouchSelfTest.java | 22 +- .../cache/eviction/GridCacheMockEntry.jav
[32/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1552a4b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1552a4b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1552a4b2 Branch: refs/heads/ignite-484-1 Commit: 1552a4b2474bc92ed3aa654c2a477cf444d88e0a Parents: fa97def 0fa2853 Author: Alexey Goncharuk Authored: Mon Jun 8 15:27:35 2015 -0700 Committer: Alexey Goncharuk Committed: Mon Jun 8 15:27:35 2015 -0700 -- DEVNOTES.txt| 42 +- .../java/org/apache/ignite/IgniteCache.java | 16 + .../apache/ignite/internal/IgniteKernal.java| 28 +- .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/MarshallerContextAdapter.java | 36 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/GridDiscoveryManager.java | 28 +- .../affinity/GridAffinityProcessor.java | 23 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheAdapter.java | 21 +- .../processors/cache/GridCacheContext.java | 13 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java| 37 +- .../processors/cache/GridCacheProxyImpl.java| 14 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../processors/cache/IgniteCacheProxy.java | 23 + .../processors/cache/IgniteInternalCache.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 22 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java| 50 +- .../transactions/IgniteTxLocalAdapter.java | 28 + .../cache/transactions/IgniteTxManager.java | 3 - .../datastreamer/DataStreamerImpl.java | 92 ++- .../datastructures/DataStructuresProcessor.java | 107 +++- .../processors/igfs/IgfsMetaManager.java| 2 +- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../IgniteTxRollbackCheckedException.java | 9 + .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java| 554 --- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java| 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 27 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 443 --- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java| 3 - .../ignite/spi/discovery/tcp/ServerImpl.java| 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +- ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++ .../GridCacheExAbstractFullApiSelfTest.java | 103 .../IgniteCountDownLatchAbstractSelfTest.java | 102 .../GridCacheExColocatedFullApiSelfTest.java| 33 -- .../near/GridCacheExNearFullApiSelfTest.java| 39 -- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../IgniteCacheClientNearCacheExpiryTest.java | 103 .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../local/GridCacheExLocalFullApiSelfTest.java | 30 - .../DataStreamerMultiThreadedSelfTest.java | 59 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 .../internal/util/nio/GridNioSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../IgniteMessagingWithClientTest.java | 2 + .../GridTcpCommunicationSpiAbstractTest.java| 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java| 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + .../IgniteCacheFullApiSelfTestSuite.java| 6 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java |
[49/50] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.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/51bf4b15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51bf4b15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51bf4b15 Branch: refs/heads/ignite-484-1 Commit: 51bf4b1565a263a919635ab34f09f8673d8e42c9 Parents: b5db559 89a4f7c Author: S.Vladykin Authored: Thu Jun 11 10:00:07 2015 +0300 Committer: S.Vladykin Committed: Thu Jun 11 10:00:07 2015 +0300 -- DEVNOTES.txt| 6 + assembly/dependencies-fabric.xml| 1 + examples/pom.xml| 34 ++ modules/core/pom.xml| 1 - .../apache/ignite/cache/query/ScanQuery.java| 45 +- .../configuration/CacheConfiguration.java | 1 - .../processors/cache/GridCacheAdapter.java | 15 +- .../processors/cache/GridCacheProcessor.java| 30 +- .../processors/cache/GridCacheSwapManager.java | 55 ++- .../processors/cache/IgniteCacheProxy.java | 11 +- .../processors/cache/QueryCursorImpl.java | 23 +- .../distributed/dht/GridDhtLocalPartition.java | 7 + .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheQueryAdapter.java | 147 ++- .../cache/query/GridCacheQueryManager.java | 209 ++ .../cache/query/GridCacheQueryRequest.java | 47 ++- .../processors/cache/query/QueryCursorEx.java | 8 + .../datastructures/GridCacheSetImpl.java| 4 +- .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java| 18 +- .../service/GridServiceProcessor.java | 2 +- .../ignite/internal/util/GridJavaProcess.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../shmem/IpcSharedMemoryClientEndpoint.java| 2 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 151 ++- .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- .../util/nio/GridShmemCommunicationClient.java | 146 +++ .../communication/tcp/TcpCommunicationSpi.java | 415 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../cache/GridCacheAbstractFullApiSelfTest.java | 15 + .../cache/IgniteDynamicCacheStartSelfTest.java | 19 + .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 112 +++-- .../ipc/shmem/IgfsSharedMemoryTestServer.java | 2 + .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +- .../LoadWithCorruptedLibFileTestRunner.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../IpcSharedMemoryBenchmarkWriter.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + modules/hadoop/pom.xml | 1 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 7 + .../processors/query/h2/IgniteH2Indexing.java | 44 +- .../h2/twostep/GridReduceQueryExecutor.java | 23 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 408 ++ .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 77 +++- .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/scalar-2.10/README.txt | 4 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 + .../scalar-2.10/licenses/scala-bsd-license.txt |
[28/50] incubator-ignite git commit: IGNITE-389 - IPC checked and API improvements.
IGNITE-389 - IPC checked and API improvements.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b51f99e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b51f99e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b51f99e
Branch: refs/heads/ignite-484-1
Commit: 6b51f99e72eb11af25403f8ec50087c03b1f1fb7
Parents: 1d8643c
Author: Alexey Goncharuk
Authored: Thu Jun 4 19:19:36 2015 -0700
Committer: Alexey Goncharuk
Committed: Thu Jun 4 19:19:36 2015 -0700
--
.../ignite/internal/util/IgniteUtils.java | 4 +-
.../shmem/IpcSharedMemoryClientEndpoint.java| 2 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 150 +--
.../shmem/IpcSharedMemoryServerEndpoint.java| 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../LoadWithCorruptedLibFileTestRunner.java | 2 +-
.../IpcSharedMemoryBenchmarkReader.java | 2 +-
.../IpcSharedMemoryBenchmarkWriter.java | 2 +-
.../hadoop/HadoopAbstractSelfTest.java | 1 +
.../org/apache/ignite/spark/IgniteContext.scala | 19 ++-
.../org/apache/ignite/spark/IgniteRDD.scala | 8 +-
13 files changed, 171 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 0932212..9016b10 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9025,11 +9025,11 @@ public abstract class IgniteUtils {
hasShmem = false;
else {
try {
-IpcSharedMemoryNativeLoader.load();
+IpcSharedMemoryNativeLoader.load(null);
hasShmem = true;
}
-catch (IgniteCheckedException e) {
+catch (IgniteCheckedException ignore) {
hasShmem = false;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
index 27a234f..c935c4a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
@@ -112,7 +112,7 @@ public class IpcSharedMemoryClientEndpoint implements
IpcEndpoint {
boolean clear = true;
try {
-IpcSharedMemoryNativeLoader.load();
+IpcSharedMemoryNativeLoader.load(log);
sock.connect(new InetSocketAddress("127.0.0.1", port), timeout);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index dc00ca6..8c345f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.util.ipc.shmem;
import org.apache.ignite.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -25,6 +26,8 @@ import java.net.*;
import java.nio.channels.*;
import java.security.*;
import java.util.*;
+import java.util.jar.*;
+import java.util.zip.*;
import static org.apache.ignite.internal.IgniteVersionUtils.*;
@@ -36,6 +39,9 @@ public class IpcSharedMemoryNativeLoader {
/** Library name base. */
private static final String LIB_NAME_BASE = "i
[29/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-389' into ignite-389
Merge remote-tracking branch 'origin/ignite-389' into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c2d381c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c2d381c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c2d381c Branch: refs/heads/ignite-484-1 Commit: 0c2d381c830443b169bb7a1e4745356eebf78ef8 Parents: 7ee51ba 4d36d12 Author: Alexey Goncharuk Authored: Thu Jun 4 19:21:43 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:21:43 2015 -0700 -- DEVNOTES.txt| 6 + assembly/dependencies-fabric.xml| 1 + examples/config/example-ignite.xml | 4 +- examples/pom.xml| 34 +++ modules/scalar-2.10/README.txt | 4 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 + .../scalar-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/scalar-2.10/pom.xml | 197 modules/spark-2.10/README.txt | 4 + modules/spark-2.10/licenses/apache-2.0.txt | 202 + .../spark-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark-2.10/pom.xml | 120 modules/spark/licenses/apache-2.0.txt | 202 + modules/spark/licenses/scala-bsd-license.txt| 18 ++ modules/spark/pom.xml | 22 +- .../spark/examples/java/ColocationTest.java | 89 ++ .../examples/java/ExampleConfiguration.java | 31 ++ .../examples/java/IgniteProcessExample.java | 80 + .../spark/examples/java/IgniteStoreExample.java | 68 + .../spark/examples/java/package-info.java | 21 ++ .../org/apache/ignite/spark/IgniteRDD.scala | 10 +- .../apache/ignite/spark/JavaIgniteContext.scala | 63 .../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 ++ .../ignite/spark/examples/ColocationTest.scala | 5 +- .../spark/impl/JavaIgniteAbstractRDD.scala | 34 +++ .../ignite/spark/JavaIgniteRDDSelfTest.java | 298 +++ modules/visor-console-2.10/README.txt | 4 + modules/visor-console-2.10/pom.xml | 174 +++ parent/pom.xml | 4 + pom.xml | 21 +- 30 files changed, 2037 insertions(+), 16 deletions(-) --
[39/50] incubator-ignite git commit: Merge branch 'ignite-389' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-389' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b812c0f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b812c0f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b812c0f1 Branch: refs/heads/ignite-484-1 Commit: b812c0f165162a94f766bf8e4e12beb7e8170e5d Parents: 9fca6b5 79ae323 Author: agura Authored: Tue Jun 9 14:43:14 2015 +0300 Committer: agura Committed: Tue Jun 9 14:43:14 2015 +0300 -- modules/hadoop/pom.xml| 1 + modules/spark-2.10/README.txt | 4 modules/spark/README.txt | 4 3 files changed, 5 insertions(+), 4 deletions(-) --
[04/50] incubator-ignite git commit: Merge branch 'ignite-921' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-921' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a7dd02f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a7dd02f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a7dd02f
Branch: refs/heads/ignite-484-1
Commit: 5a7dd02f540c98312bc120c2566ba0db94f7a570
Parents: 9bb71ba b58bb12
Author: Alexey Goncharuk
Authored: Wed May 27 09:40:17 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed May 27 09:40:17 2015 -0700
--
dev-tools/slurp.sh | 10 +
dev-tools/src/main/groovy/jiraslurp.groovy | 9 +-
.../cache/query/GridCacheQueryAdapter.java | 200 -
...CacheScanPartitionQueryFallbackSelfTest.java | 213 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
5 files changed, 429 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a7dd02f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 9ab8c4f,05198a4..1f7b736
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@@ -487,14 -508,13 +508,16 @@@ public class GridCacheQueryAdapter i
@Nullable final ClusterGroup prj, @Nullable final Integer part) {
assert cctx != null;
+final List owners = part == null ? null :
+cctx.topology().owners(part,
cctx.affinity().affinityTopologyVersion());
+
return F.view(CU.allNodes(cctx), new P1() {
@Override public boolean apply(ClusterNode n) {
+ AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
+
return cctx.discovery().cacheAffinityNode(n, cctx.name()) &&
(prj == null || prj.node(n.id()) != null) &&
-(part == null || cctx.affinity().primary(n,
part.intValue(), topVer));
+(part == null || owners.contains(n));
}
});
}
[10/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-389' into ignite-389
Merge remote-tracking branch 'origin/ignite-389' into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41afb372 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41afb372 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41afb372 Branch: refs/heads/ignite-484-1 Commit: 41afb3727844e1ccd3f5a2fd16ac33f9c884a0b9 Parents: 37a7679 29dc722 Author: Alexey Goncharuk Authored: Fri May 29 08:47:07 2015 -0700 Committer: Alexey Goncharuk Committed: Fri May 29 08:47:07 2015 -0700 -- ...CacheScanPartitionQueryFallbackSelfTest.java | 335 ++- 1 file changed, 259 insertions(+), 76 deletions(-) --
[09/50] incubator-ignite git commit: #IGNITE-389 - More functions on API.
#IGNITE-389 - More functions on 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/37a7679d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37a7679d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37a7679d
Branch: refs/heads/ignite-484-1
Commit: 37a7679df3fd05473840482d0e5c2c9483d02b2a
Parents: 5d6bb53
Author: Alexey Goncharuk
Authored: Fri May 29 08:46:52 2015 -0700
Committer: Alexey Goncharuk
Committed: Fri May 29 08:46:52 2015 -0700
--
.../org/apache/ignite/spark/IgniteContext.scala | 13
.../org/apache/ignite/spark/IgniteRDD.scala | 32 +++-
2 files changed, 44 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37a7679d/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index a73405b..5b649db 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -23,6 +23,14 @@ import org.apache.ignite.{Ignition, Ignite}
import org.apache.ignite.configuration.{CacheConfiguration,
IgniteConfiguration}
import org.apache.spark.SparkContext
+/**
+ * Ignite context.
+ *
+ * @param sparkContext Spark context.
+ * @param cfgF Configuration factory.
+ * @tparam K Key type.
+ * @tparam V Value type.
+ */
class IgniteContext[K, V](
@scala.transient val sparkContext: SparkContext,
cfgF: () => IgniteConfiguration
@@ -61,4 +69,9 @@ class IgniteContext[K, V](
}
}
+def close() = {
+val igniteCfg = cfgF()
+
+Ignition.stop(igniteCfg.getGridName, false)
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37a7679d/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
index 30efa7a..358fcd4 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
@@ -29,12 +29,27 @@ import org.apache.spark.{TaskContext, Partition}
import scala.collection.JavaConversions._
+/**
+ * Ignite RDD. Represents Ignite cache as Spark RDD abstraction.
+ *
+ * @param ic Ignite context to use.
+ * @param cacheName Cache name.
+ * @param cacheCfg Cache configuration.
+ * @tparam K Key type.
+ * @tparam V Value type.
+ */
class IgniteRDD[K, V] (
ic: IgniteContext[K, V],
cacheName: String,
cacheCfg: CacheConfiguration[K, V]
) extends IgniteAbstractRDD[(K, V), K, V] (ic, cacheName, cacheCfg) {
-
+/**
+ * Computes iterator based on given partition.
+ *
+ * @param part Partition to use.
+ * @param context Task context.
+ * @return Partition iterator.
+ */
override def compute(part: Partition, context: TaskContext): Iterator[(K,
V)] = {
val cache = ensureCache()
@@ -49,6 +64,11 @@ class IgniteRDD[K, V] (
})
}
+/**
+ * Gets partitions for the given cache RDD.
+ *
+ * @return Partitions.
+ */
override protected def getPartitions: Array[Partition] = {
ensureCache()
@@ -57,6 +77,12 @@ class IgniteRDD[K, V] (
(0 until parts).map(new IgnitePartition(_)).toArray
}
+/**
+ * Gets prefferred locations for the given partition.
+ *
+ * @param split Split partition.
+ * @return
+ */
override protected def getPreferredLocations(split: Partition):
Seq[String] = {
ensureCache()
@@ -129,6 +155,10 @@ class IgniteRDD[K, V] (
})
}
+def clear(): Unit = {
+ensureCache().removeAll()
+}
+
private def affinityKeyFunc(value: V, node: ClusterNode): Object = {
IgniteUuid.randomUuid()
}
[33/50] incubator-ignite git commit: #IGNITE-389 - Javadoc and API cleanup.
#IGNITE-389 - Javadoc and API cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d1e5342
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d1e5342
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d1e5342
Branch: refs/heads/ignite-484-1
Commit: 3d1e5342f32f56d2479ec7971e8fe2f4adfbf468
Parents: 1552a4b
Author: Alexey Goncharuk
Authored: Mon Jun 8 16:03:34 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 16:03:34 2015 -0700
--
.../spark/examples/java/ColocationTest.java | 89
.../examples/java/ExampleConfiguration.java | 31 ---
.../examples/java/IgniteProcessExample.java | 80 --
.../spark/examples/java/IgniteStoreExample.java | 68 ---
.../spark/examples/java/package-info.java | 21 -
.../org/apache/ignite/spark/IgniteContext.scala | 30 ++-
.../org/apache/ignite/spark/IgniteRDD.scala | 41 +++--
.../ignite/spark/examples/ColocationTest.scala | 39 -
.../spark/examples/ExampleConfiguration.scala | 41 -
.../spark/examples/IgniteProcessExample.scala | 52
.../spark/examples/IgniteStoreExample.scala | 41 -
11 files changed, 62 insertions(+), 471 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d1e5342/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
--
diff --git
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
deleted file mode 100644
index 20d6e88..000
---
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
+++ /dev/null
@@ -1,89 +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.spark.examples.java;
-
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spark.*;
-import org.apache.spark.*;
-import org.apache.spark.api.java.*;
-import org.apache.spark.api.java.function.*;
-
-import scala.Tuple2;
-
-import java.util.*;
-
-/**
- * Colocation test example.
- */
-public class ColocationTest {
-/** Keys count. */
-private static final int KEYS_CNT = 1;
-
-/** To pair function. */
-private static final IgniteClosure>
TO_PAIR_F =
-new IgniteClosure>() {
-@Override public Tuple2 apply(Integer i) {
-return new Tuple2<>(i, i);
-}
-};
-
-/** To value function. */
-private static final Function, Integer>
TO_VALUE_F =
-new Function, Integer>() {
-/** {@inheritDoc} */
-@Override public Integer call(Tuple2 t) throws
Exception {
-return t._2();
-}
-};
-
-/** Sum function. */
-private static final Function2 SUM_F = new
Function2() {
-public Integer call(Integer x, Integer y) {
-return x + y;
-}
-};
-
-/**
- * @param args Args.
- */
-public static void main(String[] args) {
-SparkConf conf = new SparkConf();
-
-conf.setAppName("Colocation test");
-
-JavaSparkContext sc = new JavaSparkContext(conf);
-
-JavaIgniteContext ignite = new
JavaIgniteContext<>(sc, new ExampleConfiguration());
-
-JavaIgniteRDD cache =
ignite.fromCache("partitioned");
-
-List seq = F.range(0, KEYS_CNT + 1);
-
-JavaPairRDD rdd =
sc.parallelizePairs(F.transformList(seq, TO_PAIR_F), 48);
-
-cache.savePairs(rdd);
-
-int sum = (KEYS_CNT * KEYS_CNT - KEYS_CNT) / 2;
-
-// Execute parallel sum.
-System.out.println("Local sum: " + sum);
-
-System.out.println("Distributed sum: " + cache.map(TO_VALUE_F).fold(0,
SUM_F));
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d
[38/50] incubator-ignite git commit: ignite-389 Partition scan fallback test fixed
ignite-389 Partition scan fallback test fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fca6b50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fca6b50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fca6b50
Branch: refs/heads/ignite-484-1
Commit: 9fca6b5005a6f5ddd16af936c6445748b398ed39
Parents: 7e8f648
Author: agura
Authored: Tue Jun 9 14:42:49 2015 +0300
Committer: agura
Committed: Tue Jun 9 14:42:49 2015 +0300
--
...CacheScanPartitionQueryFallbackSelfTest.java | 20
1 file changed, 16 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fca6b50/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index dfa7296..b7f5fa8 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -31,6 +31,8 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
@@ -47,6 +49,9 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
/** Keys count. */
private static final int KEYS_CNT = 5000;
+/** Ip finder. */
+private static final TcpDiscoveryVmIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
/** Backups. */
private int backups;
@@ -75,6 +80,13 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+cfg.setClientMode(clientMode);
+
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setIpFinder(IP_FINDER);
+discoSpi.setForceServerMode(true);
+cfg.setDiscoverySpi(discoSpi);
+
cfg.setCommunicationSpi(commSpiFactory.create());
CacheConfiguration ccfg = defaultCacheConfiguration();
@@ -85,8 +97,6 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
cfg.setCacheConfiguration(ccfg);
-cfg.setClientMode(clientMode);
-
return cfg;
}
@@ -183,6 +193,7 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
if (!test.get()) {
candidates.addAll(localPartitions(ignite1));
+
candidates.retainAll(localPartitions(ignite2));
}
@@ -195,8 +206,9 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
awaitPartitionMapExchange();
if (!test.get()) {
-Set parts = localPartitions(ignite1);
-candidates.removeAll(parts);
+candidates.removeAll(localPartitions(ignite1));
+
+F.retain(candidates, false,
localPartitions(ignite2));
}
latch.countDown();
[36/50] incubator-ignite git commit: IGNITE-389 - Rebuilt message.
IGNITE-389 - Rebuilt message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e8f6485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e8f6485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e8f6485
Branch: refs/heads/ignite-484-1
Commit: 7e8f6485a61c7dbdb6cc1675777366f274e6
Parents: 224cbcb
Author: Alexey Goncharuk
Authored: Mon Jun 8 17:59:00 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 17:59:00 2015 -0700
--
.../cache/query/GridCacheQueryRequest.java | 40 ++--
1 file changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e8f6485/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 7577954..2113e7a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -112,7 +112,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
private int taskHash;
/** Partition. */
-private Integer part;
+private int part;
/**
* Required by {@link Externalizable}
@@ -218,7 +218,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
this.clause = clause;
this.clsName = clsName;
this.keyValFilter = keyValFilter;
-this.part = part;
+this.part = part == null ? -1 : part;
this.rdc = rdc;
this.trans = trans;
this.pageSize = pageSize;
@@ -426,7 +426,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
* @return partition.
*/
@Nullable public Integer partition() {
-return part;
+return part == -1 ? null : part;
}
/** {@inheritDoc} */
@@ -523,40 +523,41 @@ public class GridCacheQueryRequest extends
GridCacheMessage implements GridCache
writer.incrementState();
case 16:
-if (!writer.writeByteArray("rdcBytes", rdcBytes))
+if (!writer.writeInt("part", part))
return false;
writer.incrementState();
case 17:
-if (!writer.writeUuid("subjId", subjId))
+if (!writer.writeByteArray("rdcBytes", rdcBytes))
return false;
writer.incrementState();
case 18:
-if (!writer.writeInt("taskHash", taskHash))
+if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 19:
-if (!writer.writeByteArray("transBytes", transBytes))
+if (!writer.writeInt("taskHash", taskHash))
return false;
writer.incrementState();
case 20:
-if (!writer.writeByte("type", type != null ?
(byte)type.ordinal() : -1))
+if (!writer.writeByteArray("transBytes", transBytes))
return false;
writer.incrementState();
case 21:
-if (!writer.writeInt("part", part != null ? part : -1))
+if (!writer.writeByte("type", type != null ?
(byte)type.ordinal() : -1))
return false;
writer.incrementState();
+
}
return true;
@@ -678,7 +679,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 16:
-rdcBytes = reader.readByteArray("rdcBytes");
+part = reader.readInt("part");
if (!reader.isLastRead())
return false;
@@ -686,7 +687,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 17:
-subjId = reader.readUuid("subjId");
+rdcBytes = reader.readByteArray("rdcBytes");
if (!reader.isLastRead())
return false;
@@ -694,7 +695,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 18:
-
[08/50] incubator-ignite git commit: ignite-389 Partition scan query fallback test
ignite-389 Partition scan query fallback 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/29dc7221
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29dc7221
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29dc7221
Branch: refs/heads/ignite-484-1
Commit: 29dc7221c12db1e39a17de4471a8c5ebed4b8709
Parents: 5d6bb53
Author: agura
Authored: Fri May 29 16:28:34 2015 +0300
Committer: agura
Committed: Fri May 29 16:28:34 2015 +0300
--
...CacheScanPartitionQueryFallbackSelfTest.java | 335 ++-
1 file changed, 259 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29dc7221/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index 31336e6..dfa7296 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -21,8 +21,10 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
@@ -32,15 +34,17 @@ import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
/**
* Tests partition scan query fallback.
*/
public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractTest {
/** Grid count. */
-private static final int GRID_CNT = 5;
+private static final int GRID_CNT = 3;
-/** Kys count. */
+/** Keys count. */
private static final int KEYS_CNT = 5000;
/** Backups. */
@@ -49,20 +53,29 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
/** Cache mode. */
private CacheMode cacheMode;
-/** Fallback. */
-private boolean fallback;
+/** Client mode. */
+private volatile boolean clientMode;
-/** Primary node id. */
-private static volatile UUID expNodeId;
+/** Expected first node ID. */
+private static UUID expNodeId;
-/** Fail node id. */
-private static volatile UUID failNodeId;
+/** Expected fallback node ID. */
+private static UUID expFallbackNodeId;
+
+/** Communication SPI factory. */
+private CommunicationSpiFactory commSpiFactory;
+
+/** Latch. */
+private static CountDownLatch latch;
+
+/** Test entries. */
+private Map> entries = new HashMap<>();
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-cfg.setCommunicationSpi(new TestCommunicationSpi());
+cfg.setCommunicationSpi(commSpiFactory.create());
CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setCacheMode(cacheMode);
@@ -72,142 +85,312 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
cfg.setCacheConfiguration(ccfg);
+cfg.setClientMode(clientMode);
+
return cfg;
}
/**
+ * Scan should perform on the local node.
+ *
* @throws Exception If failed.
*/
-public void testPrimary() throws Exception {
+public void testScanLocal() throws Exception {
cacheMode = CacheMode.PARTITIONED;
backups = 0;
-failNodeId = null;
-fallback = false;
+commSpiFactory = new TestLocalCommunicationSpiFactory();
-doTestScanPartition();
+try {
+Ignite ignite = startGrids(GRID_CNT);
+
+IgniteCacheProxy cache = fillCache(ignite);
+
+int part = anyLocalPartition(cache.context());
+
+CacheQuery> qry =
cache.context().queries().createScanQuery(null, part, false);
+
+doTestScanQuery(qry);
+}
+
[40/50] incubator-ignite git commit: GG-10406
GG-10406 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f129d08c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f129d08c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f129d08c Branch: refs/heads/ignite-484-1 Commit: f129d08c6855ca6e720ebb3bb1ea76357f54aef6 Parents: 79ae323 Author: avinogradov Authored: Tue Jun 9 15:11:27 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:11:27 2015 +0300 -- modules/spark-2.10/README.txt | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f129d08c/modules/spark-2.10/README.txt -- diff --git a/modules/spark-2.10/README.txt b/modules/spark-2.10/README.txt new file mode 100644 index 000..29d3930 --- /dev/null +++ b/modules/spark-2.10/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Spark Module +--- + +Apache Ignite Spark module to be build with Scala 2.10.
[12/50] incubator-ignite git commit: #IGNITE-389 - More functions on API.
#IGNITE-389 - More functions on 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/c527a044
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c527a044
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c527a044
Branch: refs/heads/ignite-484-1
Commit: c527a04471bd4d263a346ee27a5dbef6c98a5894
Parents: 8503dec
Author: Alexey Goncharuk
Authored: Fri May 29 16:29:33 2015 -0700
Committer: Alexey Goncharuk
Committed: Fri May 29 16:29:33 2015 -0700
--
.../org/apache/ignite/spark/IgniteContext.scala | 6 +++---
.../scala/org/apache/ignite/spark/IgniteRDD.scala | 16
.../ignite/spark/examples/ColocationTest.scala | 2 +-
.../ignite/spark/examples/IgniteStoreExample.scala | 2 +-
.../ignite/spark/impl/IgniteQueryIterator.scala | 2 +-
.../org/apache/ignite/spark/impl/IgniteSqlRDD.scala | 2 +-
.../org/apache/ignite/spark/IgniteRddSpec.scala | 10 +-
7 files changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c527a044/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index 5b649db..6259665 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -33,7 +33,7 @@ import org.apache.spark.SparkContext
*/
class IgniteContext[K, V](
@scala.transient val sparkContext: SparkContext,
-cfgF: () => IgniteConfiguration
+cfgF: () ⇒ IgniteConfiguration
) extends Serializable {
def this(
sc: SparkContext,
@@ -57,14 +57,14 @@ class IgniteContext[K, V](
Ignition.ignite(igniteCfg.getGridName)
}
catch {
-case e: Exception =>
+case e: Exception ⇒
try {
igniteCfg.setClientMode(true)
Ignition.start(igniteCfg)
}
catch {
-case e: Exception => Ignition.ignite(igniteCfg.getGridName)
+case e: Exception ⇒
Ignition.ignite(igniteCfg.getGridName)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c527a044/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
index 358fcd4..f286b58 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
@@ -59,7 +59,7 @@ class IgniteRDD[K, V] (
val it: java.util.Iterator[Cache.Entry[K, V]] =
cache.query(qry).iterator()
-new IgniteQueryIterator[Cache.Entry[K, V], (K, V)](it, entry => {
+new IgniteQueryIterator[Cache.Entry[K, V], (K, V)](it, entry ⇒ {
(entry.getKey, entry.getValue)
})
}
@@ -95,7 +95,7 @@ class IgniteRDD[K, V] (
qry.setArgs(args.map(_.asInstanceOf[Object]):_*)
-new IgniteSqlRDD[(K, V), Cache.Entry[K, V], K, V](ic, cacheName,
cacheCfg, qry, entry => (entry.getKey, entry.getValue))
+new IgniteSqlRDD[(K, V), Cache.Entry[K, V], K, V](ic, cacheName,
cacheCfg, qry, entry ⇒ (entry.getKey, entry.getValue))
}
def sql(sql: String, args: Any*): RDD[Seq[Any]] = {
@@ -103,11 +103,11 @@ class IgniteRDD[K, V] (
qry.setArgs(args.map(_.asInstanceOf[Object]):_*)
-new IgniteSqlRDD[Seq[Any], java.util.List[_], K, V](ic, cacheName,
cacheCfg, qry, list => list)
+new IgniteSqlRDD[Seq[Any], java.util.List[_], K, V](ic, cacheName,
cacheCfg, qry, list ⇒ list)
}
def saveValues(rdd: RDD[V]) = {
-rdd.foreachPartition(it => {
+rdd.foreachPartition(it ⇒ {
val ig = ic.ignite()
ensureCache()
@@ -119,7 +119,7 @@ class IgniteRDD[K, V] (
val streamer = ig.dataStreamer[Object, V](cacheName)
try {
-it.foreach(value => {
+it.foreach(value ⇒ {
val key = affinityKeyFunc(value, node.orNull)
streamer.addData(key, value)
@@ -131,8 +131,8 @@ class IgniteRDD[K, V] (
})
}
-def saveTuples(rdd: RDD[(K, V)]) = {
-rdd.foreachPartition(it => {
+def savePairs(rdd: RDD[(K, V)]) = {
+r
[45/50] incubator-ignite git commit: #IGNITE-389 - Readme.
#IGNITE-389 - Readme. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9926fb89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9926fb89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9926fb89 Branch: refs/heads/ignite-484-1 Commit: 9926fb89001e9115c1ea5105c4733208d426b08d Parents: 71f29e9 Author: Alexey Goncharuk Authored: Wed Jun 10 15:56:26 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 15:56:26 2015 -0700 -- modules/spark/README.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9926fb89/modules/spark/README.txt -- diff --git a/modules/spark/README.txt b/modules/spark/README.txt index 5678441..589a050 100644 --- a/modules/spark/README.txt +++ b/modules/spark/README.txt @@ -1,4 +1,8 @@ Apache Ignite Spark Module --- -Apache Ignite Spark module. +Apache Ignite provides an implementation of Spark RDD abstraction which enables easy access to Ignite caches. +Ignite RDD does not keep it's state in the memory of the Spark application and provides a view of the corresponding +Ignite cache. Depending on the chosen deployment mode this state may exist only during the lifespan of the Spark +application (embedded mode) or may exist outside of the Spark application (standalone mode), allowing seamless +sharing of the state between multiple Spark jobs. \ No newline at end of file
[37/50] incubator-ignite git commit: GG-10406
GG-10406 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79ae3230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79ae3230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79ae3230 Branch: refs/heads/ignite-484-1 Commit: 79ae3230cd36866452959a42ba1b9b60bd83a122 Parents: 7e8f648 Author: avinogradov Authored: Tue Jun 9 12:54:03 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 12:54:03 2015 +0300 -- modules/hadoop/pom.xml| 1 + modules/spark-2.10/README.txt | 4 modules/spark/README.txt | 4 3 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index fe11389..4c57df3 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -96,6 +96,7 @@ org.gridgain ignite-shmem +test 1.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/spark-2.10/README.txt -- diff --git a/modules/spark-2.10/README.txt b/modules/spark-2.10/README.txt deleted file mode 100644 index 29d3930..000 --- a/modules/spark-2.10/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -Apache Ignite Spark Module - -Apache Ignite Spark module to be build with Scala 2.10. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/spark/README.txt -- diff --git a/modules/spark/README.txt b/modules/spark/README.txt new file mode 100644 index 000..5678441 --- /dev/null +++ b/modules/spark/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Spark Module +--- + +Apache Ignite Spark module.
[03/50] incubator-ignite git commit: #IGNITE-389 - Tests.
#IGNITE-389 - 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/9bb71baf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9bb71baf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9bb71baf
Branch: refs/heads/ignite-484-1
Commit: 9bb71bafe9de67bed80de372756b832696d5f0f8
Parents: d72b040
Author: Alexey Goncharuk
Authored: Wed May 27 00:08:03 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed May 27 00:08:03 2015 -0700
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 15 ++
modules/spark/pom.xml | 49 ++--
.../org/apache/ignite/spark/IgniteContext.scala | 2 +-
.../org/apache/ignite/spark/IgniteRDD.scala | 16 +-
.../spark/examples/IgniteProcessExample.scala | 8 +-
.../spark/examples/IgniteStoreExample.scala | 7 +-
.../apache/ignite/spark/impl/IgniteSqlRDD.scala | 4 +-
.../scala/org/apache/ignite/spark/Entity.scala | 28 +++
.../org/apache/ignite/spark/IgniteRddSpec.scala | 241 +++
9 files changed, 334 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bb71baf/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 70d8f9c..87f58bfb 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
@@ -353,6 +353,21 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
}
/**
+ * @throws Exception If failed.
+ */
+public void testRemoveAllSkipStore() throws Exception {
+IgniteCache jcache = jcache();
+
+jcache.putAll(F.asMap("1", 1, "2", 2, "3", 3));
+
+jcache.withSkipStore().removeAll();
+
+assertEquals((Integer)1, jcache.get("1"));
+assertEquals((Integer)2, jcache.get("2"));
+assertEquals((Integer)3, jcache.get("3"));
+}
+
+/**
* @throws IgniteCheckedException If failed.
*/
public void testAtomicOps() throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bb71baf/modules/spark/pom.xml
--
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index aeae234..dc01c76 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
ignite-spark
-1.0.6-SNAPSHOT
+1.0.7-SNAPSHOT
@@ -47,11 +47,21 @@
test-jar
test
+
+
+org.apache.ignite
+ignite-indexing
+${project.version}
+test-jar
+test
+
+
org.scala-lang
scala-library
2.10.4
+
org.apache.spark
spark-core_2.10
@@ -67,21 +77,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+org.scalatest
+scalatest_2.10
+2.2.2
+test
+
+
+org.scala-lang
+scala-library
+
+
+
+
+
+org.apache.ignite
+ignite-indexing
+${project.version}
+test
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bb71baf/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index 9d9f9a7..a73405b 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -31,7 +31,7 @@ class IgniteContext[K, V](
sc: SparkContext,
springUrl: String
) {
-this(sc, () => IgnitionEx.loadConfiguration(springUrl).get1())
+
[14/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0157d4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0157d4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0157d4e
Branch: refs/heads/ignite-484-1
Commit: d0157d4ef6091105245aee8d2e6698028ce3b95f
Parents: f8910f6
Author: Alexey Goncharuk
Authored: Mon Jun 1 15:18:40 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 1 15:18:40 2015 -0700
--
.../ignite/internal/processors/service/GridServiceProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0157d4e/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 2e31b69..aeb48f7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -932,7 +932,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
GridCacheQueryManager qryMgr = cache.context().queries();
-CacheQuery> qry =
qryMgr.createScanQuery(p, false);
+CacheQuery> qry =
qryMgr.createScanQuery(p, null, false);
qry.keepAll(false);
[30/50] incubator-ignite git commit: Merge branch ignite-sprint-5 into ignite-389
Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5872b7f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5872b7f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5872b7f2 Branch: refs/heads/ignite-484-1 Commit: 5872b7f20064fb19d682ae2204ce83c4c9a58183 Parents: 0c2d381 c9f7291 Author: Alexey Goncharuk Authored: Thu Jun 4 19:22:20 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:22:20 2015 -0700 -- .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java| 3 + .../managers/communication/GridIoManager.java | 117 .../processors/cache/GridCacheContext.java | 3 - .../dht/GridClientPartitionTopology.java| 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java| 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java| 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 3 + .../ignite/spi/discovery/tcp/ServerImpl.java| 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ...niteDynamicCacheWithConfigStartSelfTest.java | 35 +-- .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java| 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java| 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java| 5 +- .../processors/hadoop/HadoopTasksV2Test.java| 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 48 files changed, 1358 insertions(+), 299 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5872b7f2/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5872b7f2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java --
[34/50] incubator-ignite git commit: IGNITE-389 - Fixing shmem tests.
IGNITE-389 - Fixing shmem 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/2c3acf0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c3acf0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c3acf0e
Branch: refs/heads/ignite-484-1
Commit: 2c3acf0e7747fee9bc565b74670e43d9858c5387
Parents: 3d1e534
Author: Alexey Goncharuk
Authored: Mon Jun 8 16:27:31 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 16:27:31 2015 -0700
--
.../java/org/apache/ignite/internal/util/GridJavaProcess.java | 2 +-
.../ignite/internal/util/nio/GridShmemCommunicationClient.java | 5 -
.../internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java | 2 ++
3 files changed, 3 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index 42fe089..4946eb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -138,7 +138,7 @@ public final class GridJavaProcess {
procCommands.add(javaBin);
procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs);
-if (!jvmArgs.contains("-cp") && !jvmArgs.contains("-classpath")) {
+if (jvmArgs == null || (!jvmArgs.contains("-cp") &&
!jvmArgs.contains("-classpath"))) {
String classpath = System.getProperty("java.class.path");
String sfcp = System.getProperty("surefire.test.class.path");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/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 f3dc46f..e05c37a 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
@@ -140,11 +140,6 @@ public class GridShmemCommunicationClient extends
GridAbstractCommunicationClien
}
/** {@inheritDoc} */
-@Override public void flushIfNeeded(long timeout) throws IOException {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridShmemCommunicationClient.class, this,
super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
index 1a8fd10..e220031 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
@@ -49,6 +49,8 @@ public class IgfsSharedMemoryTestServer {
srv.start();
+System.out.println("IPC shared memory server endpoint started");
+
IpcEndpoint clientEndpoint = srv.accept();
is = clientEndpoint.inputStream();
[42/50] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/980bf759 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/980bf759 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/980bf759 Branch: refs/heads/ignite-484-1 Commit: 980bf759e96954577e7a0b8662d7e6a63b6a4d2f Parents: 079bcc6 928be42 Author: Alexey Goncharuk Authored: Wed Jun 10 00:05:47 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 00:05:47 2015 -0700 -- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../managers/indexing/GridIndexingManager.java | 4 - .../affinity/GridAffinityAssignment.java| 12 ++ .../affinity/GridAffinityAssignmentCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../GridDhtPartitionsExchangeFuture.java| 14 ++- .../continuous/GridContinuousProcessor.java | 2 + .../util/nio/GridNioDelimitedBuffer.java| 2 +- .../visor/node/VisorNodeDataCollectorTask.java | 9 +- .../node/VisorNodeDataCollectorTaskResult.java | 17 +-- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../internal/visor/query/VisorQueryJob.java | 11 +- .../internal/visor/query/VisorQueryTask.java| 3 +- .../visor/util/VisorExceptionWrapper.java | 81 ++ .../internal/visor/util/VisorTaskUtils.java | 10 ++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +- .../continuous/GridEventConsumeSelfTest.java| 7 +- .../nio/GridNioDelimitedBufferSelfTest.java | 112 +++ .../util/nio/GridNioDelimitedBufferTest.java| 112 --- .../stream/socket/SocketStreamerSelfTest.java | 29 ++--- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteStreamSelfTestSuite.java | 39 +++ .../testsuites/IgniteStreamTestSuite.java | 39 --- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 62 +- 25 files changed, 395 insertions(+), 207 deletions(-) --
[50/50] incubator-ignite git commit: ignite-484-1 - compilation
ignite-484-1 - compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d340fe72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d340fe72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d340fe72
Branch: refs/heads/ignite-484-1
Commit: d340fe72a99deab268dc019f6eaf474702f408b8
Parents: 51bf4b1
Author: S.Vladykin
Authored: Thu Jun 11 10:04:22 2015 +0300
Committer: S.Vladykin
Committed: Thu Jun 11 10:04:22 2015 +0300
--
.../h2/twostep/GridReduceQueryExecutor.java | 26 +++-
1 file changed, 20 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d340fe72/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 3d2ae46..343a439 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.query.h2.twostep;
import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
@@ -38,7 +37,7 @@ import org.apache.ignite.marshaller.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.h2.command.*;
import org.h2.command.ddl.*;
-import org.h2.command.dml.Query;
+import org.h2.command.dml.*;
import org.h2.engine.*;
import org.h2.expression.*;
import org.h2.index.*;
@@ -395,9 +394,10 @@ public class GridReduceQueryExecutor {
/**
* @param cctx Cache context.
* @param qry Query.
+ * @param keepPortable Keep portable.
* @return Cursor.
*/
-public QueryCursor> query(GridCacheContext cctx,
GridCacheTwoStepQuery qry, boolean keepPortable) {
+public Iterator> query(GridCacheContext cctx,
GridCacheTwoStepQuery qry, boolean keepPortable) {
for (;;) {
long qryReqId = reqIdGen.incrementAndGet();
@@ -501,7 +501,6 @@ public class GridReduceQueryExecutor {
retry = true;
// If remote node asks us to retry then we have
outdated full partition map.
-// TODO is this correct way to wait for a new map??
h2.awaitForReadyTopologyVersion((AffinityTopologyVersion)state);
}
}
@@ -534,7 +533,7 @@ public class GridReduceQueryExecutor {
continue;
}
-return new QueryCursorImpl<>(new
GridQueryCacheObjectsIterator(new Iter(res), cctx, cctx.keepPortable()));
+return new GridQueryCacheObjectsIterator(new Iter(res), cctx,
keepPortable);
}
catch (IgniteCheckedException | RuntimeException e) {
U.closeQuiet(r.conn);
@@ -687,7 +686,22 @@ public class GridReduceQueryExecutor {
}
}
-return new QueryCursorImpl<>(new GridQueryCacheObjectsIterator(new
Iter(res), cctx, cctx.keepPortable()));
+// Filter nodes where not all the replicated caches loaded.
+for (String extraSpace : extraSpaces) {
+GridCacheContext extraCctx = cacheContext(extraSpace);
+
+if (!extraCctx.isReplicated())
+continue;
+
+Set dataNodes =
owningReplicatedDataNodes(extraCctx);
+
+for (Set partLoc : partLocs) {
+partLoc.retainAll(dataNodes);
+
+if (partLoc.isEmpty())
+return null; // Retry.
+}
+}
}
// Collect the final partitions mapping.
[48/50] incubator-ignite git commit: ignite-484-1 - group partition reservation minor
ignite-484-1 - group partition reservation minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b5db5597
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b5db5597
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b5db5597
Branch: refs/heads/ignite-484-1
Commit: b5db5597c53261cc06470f44955eede0e6cde6d3
Parents: 2bd3321
Author: S.Vladykin
Authored: Thu Jun 11 09:21:15 2015 +0300
Committer: S.Vladykin
Committed: Thu Jun 11 09:21:15 2015 +0300
--
.../processors/cache/distributed/dht/GridDhtLocalPartition.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5db5597/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index e858e42..3cee866 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -521,7 +521,7 @@ public class GridDhtLocalPartition implements
Comparable,
if (state.getReference() == RENTING && state.getStamp() == 0 &&
!groupReserved())
clearAll();
-if (map.isEmpty() && state.compareAndSet(RENTING, EVICTED, 0, 0)) {
+if (map.isEmpty() && state.compareAndSet(RENTING, EVICTED, 0, 0) &&
!groupReserved()) {
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
[21/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10.
# IGNITE-956: Added support for scala-2.10.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bae1804e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bae1804e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bae1804e
Branch: refs/heads/ignite-484-1
Commit: bae1804ece3eb677c7f3e2c01c8566486af83c7d
Parents: ccd6825
Author: AKuznetsov
Authored: Wed Jun 3 16:29:06 2015 +0700
Committer: AKuznetsov
Committed: Wed Jun 3 16:29:06 2015 +0700
--
modules/scalar-2.10/pom.xml| 202
modules/spark-2.10/pom.xml | 18 +++
modules/visor-console-2.10/pom.xml | 96 +--
3 files changed, 176 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bae1804e/modules/scalar-2.10/pom.xml
--
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index b51c1b3..23eb13e 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -83,106 +83,106 @@
-
-
-net.alchim31.maven
-scala-maven-plugin
-
-
-scaladoc
-prepare-package
-
-doc
-
-
-Ignite Scalar
-Ignite Scalar
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.7
-
-
-org.apache.ignite
-ignite-tools
-${project.version}
-
-
-
-
-scaladoc-postprocessing
-
-run
-
-prepare-package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
src="package.html"
-
src=org/apache/ignite/scalar/scalar$.html
-
-
-
-
-
location.replace("package.html")
-
location.replace("org/apache/ignite/scalar/scalar$.html")
-
-
-
-
-
docs.scala-lang.org/overviews/scaladoc/usage.html#members
-
docs.scala-lang.org/overviews/scaladoc/interface.html
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+../scalar/src/main/scala
+
+**/*.scala
+
+
+
+
+
+
+../scalar/src/test/scala
+
+**/*.scala
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[05/50] incubator-ignite git commit: ignite-389 Change fallback nodes order: local first
ignite-389 Change fallback nodes order: local first
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d151244e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d151244e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d151244e
Branch: refs/heads/ignite-484-1
Commit: d151244ee95ad2bba986136561e2326a434c3b5b
Parents: 5a7dd02
Author: agura
Authored: Wed May 27 22:16:28 2015 +0300
Committer: agura
Committed: Wed May 27 22:16:28 2015 +0300
--
.../cache/query/GridCacheQueryAdapter.java | 132 ++-
...CacheScanPartitionQueryFallbackSelfTest.java | 2 +-
2 files changed, 72 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d151244e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 1f7b736..6574f0a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -41,6 +41,13 @@ import static
org.apache.ignite.internal.processors.cache.query.GridCacheQueryTy
* Query adapter.
*/
public class GridCacheQueryAdapter implements CacheQuery {
+/** Is local node predicate. */
+private static final IgnitePredicate IS_LOC_NODE = new
IgnitePredicate() {
+@Override public boolean apply(ClusterNode n) {
+return n.isLocal();
+}
+};
+
/** */
private final GridCacheContext cctx;
@@ -449,24 +456,10 @@ public class GridCacheQueryAdapter implements
CacheQuery {
if (type == SQL_FIELDS || type == SPI)
return (CacheQueryFuture)(loc ? qryMgr.queryFieldsLocal(bean) :
qryMgr.queryFieldsDistributed(bean, nodes));
-else {
-final CacheQueryFuture fut =
-(CacheQueryFuture)(loc ? qryMgr.queryLocal(bean) :
qryMgr.queryDistributed(bean, nodes));
-
-if (type == SCAN && part != null) {
-assert nodes.size() == 1;
-
-final Queue backups = new LinkedList<>(
-cctx.affinity().backups(part,
cctx.affinity().affinityTopologyVersion()));
-
-if (F.isEmpty(backups))
-return fut;
-
-return new CacheQueryFallbackFuture<>(backups, bean, qryMgr,
fut);
-}
-
-return fut;
-}
+else if (type == SCAN && part != null && nodes.size() > 1)
+return new CacheQueryFallbackFuture(nodes, bean, qryMgr);
+else
+return (CacheQueryFuture)(loc ? qryMgr.queryLocal(bean) :
qryMgr.queryDistributed(bean, nodes));
}
/**
@@ -484,7 +477,7 @@ public class GridCacheQueryAdapter implements
CacheQuery {
return Collections.singletonList(cctx.localNode());
case REPLICATED:
-if (prj != null)
+if (prj != null || partition() != null)
return nodes(cctx, prj, partition());
return cctx.affinityNode() ?
@@ -508,12 +501,13 @@ public class GridCacheQueryAdapter implements
CacheQuery {
@Nullable final ClusterGroup prj, @Nullable final Integer part) {
assert cctx != null;
-final List owners = part == null ? null :
-cctx.topology().owners(part,
cctx.affinity().affinityTopologyVersion());
+final AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
+
+final Set owners =
+part == null ? Collections.emptySet() : new
HashSet<>(cctx.topology().owners(part, topVer));
return F.view(CU.allNodes(cctx), new P1() {
@Override public boolean apply(ClusterNode n) {
-AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
return cctx.discovery().cacheAffinityNode(n, cctx.name()) &&
(prj == null || prj.node(n.id()) != null) &&
@@ -532,10 +526,10 @@ public class GridCacheQueryAdapter implements
CacheQuery {
*/
private static class CacheQueryFallbackFuture extends
GridCacheQueryFutureAdapter {
/** Target. */
-private GridCacheQueryFutureAdapter target;
+private GridCacheQueryFutureAdapter fut;
/** Backups. */
-private final Queue backups;
+private final Queue nodes;
/** Bean. *
[06/50] incubator-ignite git commit: #IGNITE-389 - Adding test, fixing colocation.
#IGNITE-389 - Adding test, fixing colocation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f00a9e99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f00a9e99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f00a9e99
Branch: refs/heads/ignite-484-1
Commit: f00a9e9980aefeba2d80969730552e5c5651f1c6
Parents: d151244
Author: Alexey Goncharuk
Authored: Wed May 27 23:30:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed May 27 23:30:49 2015 -0700
--
modules/spark/pom.xml | 8
.../org/apache/ignite/spark/IgniteRDD.scala | 8 ++--
.../ignite/spark/examples/ColocationTest.scala | 40
3 files changed, 45 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f00a9e99/modules/spark/pom.xml
--
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index dc01c76..84055d6 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -49,14 +49,6 @@
-org.apache.ignite
-ignite-indexing
-${project.version}
-test-jar
-test
-
-
-
org.scala-lang
scala-library
2.10.4
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f00a9e99/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
index ee0e9b3..30efa7a 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
@@ -23,6 +23,7 @@ import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.configuration.CacheConfiguration
import org.apache.ignite.lang.IgniteUuid
import org.apache.ignite.spark.impl.{IgniteAbstractRDD, IgniteSqlRDD,
IgnitePartition, IgniteQueryIterator}
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode
import org.apache.spark.rdd.RDD
import org.apache.spark.{TaskContext, Partition}
@@ -37,9 +38,9 @@ class IgniteRDD[K, V] (
override def compute(part: Partition, context: TaskContext): Iterator[(K,
V)] = {
val cache = ensureCache()
-val qry: ScanQuery[K, V] = new ScanQuery[K, V]()
+val qry: ScanQuery[K, V] = new ScanQuery[K, V](part.index)
-qry.setPartition(part.index)
+val partNodes =
ic.ignite().affinity(cache.getName).mapPartitionToPrimaryAndBackups(part.index)
val it: java.util.Iterator[Cache.Entry[K, V]] =
cache.query(qry).iterator()
@@ -59,7 +60,8 @@ class IgniteRDD[K, V] (
override protected def getPreferredLocations(split: Partition):
Seq[String] = {
ensureCache()
-
ic.ignite().affinity(cacheName).mapPartitionToPrimaryAndBackups(split.index).map(_.addresses()).flatten.toList
+
ic.ignite().affinity(cacheName).mapPartitionToPrimaryAndBackups(split.index)
+
.map(_.asInstanceOf[TcpDiscoveryNode].socketAddresses()).flatten.map(_.getHostName).toList
}
def objectSql(typeName: String, sql: String, args: Any*): RDD[(K, V)] = {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f00a9e99/modules/spark/src/main/scala/org/apache/ignite/spark/examples/ColocationTest.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/examples/ColocationTest.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/examples/ColocationTest.scala
new file mode 100644
index 000..a0814fa
--- /dev/null
+++
b/modules/spark/src/main/scala/org/apache/ignite/spark/examples/ColocationTest.scala
@@ -0,0 +1,40 @@
+/*
+ * 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
[43/50] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/34172158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/34172158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/34172158 Branch: refs/heads/ignite-484-1 Commit: 341721582e8788b78c6f84947b38fd5fa380e1e8 Parents: 980bf75 2454eb5 Author: Alexey Goncharuk Authored: Wed Jun 10 13:20:27 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 13:20:27 2015 -0700 -- .../client/memcache/MemcacheRestExample.java| 32 ++-- .../java/org/apache/ignite/IgniteCache.java | 25 ++- .../apache/ignite/IgniteSystemProperties.java | 3 + .../discovery/DiscoveryCustomMessage.java | 6 + .../discovery/GridDiscoveryManager.java | 32 .../affinity/GridAffinityAssignmentCache.java | 8 +- .../cache/DynamicCacheChangeBatch.java | 19 ++- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/IgniteInternalCache.java | 27 +-- .../continuous/AbstractContinuousMessage.java | 9 + .../internal/visor/query/VisorQueryJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 16 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../distributed/IgniteCacheManyClientsTest.java | 169 +++ .../DataStreamerMultinodeCreateCacheTest.java | 6 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + 19 files changed, 305 insertions(+), 65 deletions(-) --
[27/50] incubator-ignite git commit: ignite-948 Add Java API for Ignite RDD
ignite-948 Add Java API for Ignite RDD
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d36d123
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d36d123
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d36d123
Branch: refs/heads/ignite-484-1
Commit: 4d36d12361b78aa79517addce2a33fd772a0201e
Parents: ac9dd30
Author: agura
Authored: Tue Jun 2 01:09:17 2015 +0300
Committer: agura
Committed: Thu Jun 4 22:15:42 2015 +0300
--
examples/config/example-ignite.xml | 4 +-
modules/spark/pom.xml | 14 +
.../spark/examples/java/ColocationTest.java | 89 ++
.../examples/java/ExampleConfiguration.java | 31 ++
.../examples/java/IgniteProcessExample.java | 80 +
.../spark/examples/java/IgniteStoreExample.java | 68 +
.../spark/examples/java/package-info.java | 21 ++
.../org/apache/ignite/spark/IgniteRDD.scala | 10 +-
.../apache/ignite/spark/JavaIgniteContext.scala | 63
.../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 ++
.../ignite/spark/examples/ColocationTest.scala | 5 +-
.../spark/impl/JavaIgniteAbstractRDD.scala | 34 +++
.../ignite/spark/JavaIgniteRDDSelfTest.java | 298 +++
parent/pom.xml | 4 +
14 files changed, 811 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/examples/config/example-ignite.xml
--
diff --git a/examples/config/example-ignite.xml
b/examples/config/example-ignite.xml
index e746e59..dcb2ba8 100644
--- a/examples/config/example-ignite.xml
+++ b/examples/config/example-ignite.xml
@@ -30,14 +30,16 @@
http://www.springframework.org/schema/util/spring-util.xsd";>
+
+
+-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/modules/spark/pom.xml
--
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index c22a52b..8900a10 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -87,6 +87,20 @@
${project.version}
test
+
+
+org.springframework
+spring-beans
+${spring.version}
+test
+
+
+
+org.springframework
+spring-context
+${spring.version}
+test
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
--
diff --git
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
new file mode 100644
index 000..20d6e88
--- /dev/null
+++
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.spark.examples.java;
+
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spark.*;
+import org.apache.spark.*;
+import org.apache.spark.api.java.*;
+import org.apache.spark.api.java.function.*;
+
+import scala.Tuple2;
+
+import java.util.*;
+
+/**
+ * Colocation test example.
+ */
+public class ColocationTest {
+/** Keys count. */
+private static final int KEYS_CNT = 1;
+
+/** To pair function. */
+private static final IgniteClosure>
TO_PAIR_F =
+new IgniteClosure>() {
+@Override public Tuple2 apply(Integer i) {
+return new Tu
[23/50] incubator-ignite git commit: 389-3
389-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac9dd30f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac9dd30f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac9dd30f Branch: refs/heads/ignite-484-1 Commit: ac9dd30f640ccb1ca4708578437f090a41546cd7 Parents: aa3bb63 Author: avinogradov Authored: Wed Jun 3 16:59:16 2015 +0300 Committer: avinogradov Committed: Wed Jun 3 16:59:16 2015 +0300 -- modules/scalar-2.10/pom.xml | 9 + modules/spark-2.10/pom.xml | 2 ++ 2 files changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac9dd30f/modules/scalar-2.10/pom.xml -- diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml index 23eb13e..e3d6125 100644 --- a/modules/scalar-2.10/pom.xml +++ b/modules/scalar-2.10/pom.xml @@ -83,6 +83,8 @@ +../scalar/src/main/scala + ../scalar/src/main/scala @@ -101,6 +103,13 @@ + + +net.alchim31.maven +scala-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac9dd30f/modules/spark-2.10/pom.xml -- diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml index 2cf0af5..2547f7c 100644 --- a/modules/spark-2.10/pom.xml +++ b/modules/spark-2.10/pom.xml @@ -90,6 +90,8 @@ +../spark/src/main/scala + ../spark/src/main/scala
[11/50] incubator-ignite git commit: #IGNITE-389 - More functions on API.
#IGNITE-389 - More functions on 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/8503dec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8503dec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8503dec1
Branch: refs/heads/ignite-484-1
Commit: 8503dec1135755d4068f7538a044df7edbacdacc
Parents: 41afb37
Author: Alexey Goncharuk
Authored: Fri May 29 10:58:12 2015 -0700
Committer: Alexey Goncharuk
Committed: Fri May 29 10:58:12 2015 -0700
--
.../org/apache/ignite/spark/examples/IgniteProcessExample.scala | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8503dec1/modules/spark/src/main/scala/org/apache/ignite/spark/examples/IgniteProcessExample.scala
--
diff --git
a/modules/spark/src/main/scala/org/apache/ignite/spark/examples/IgniteProcessExample.scala
b/modules/spark/src/main/scala/org/apache/ignite/spark/examples/IgniteProcessExample.scala
index e1d3326..db8b5a3 100644
---
a/modules/spark/src/main/scala/org/apache/ignite/spark/examples/IgniteProcessExample.scala
+++
b/modules/spark/src/main/scala/org/apache/ignite/spark/examples/IgniteProcessExample.scala
@@ -17,7 +17,6 @@
package org.apache.ignite.spark.examples
-import org.apache.ignite.configuration.CacheConfiguration
import org.apache.ignite.spark.IgniteContext
import org.apache.spark.rdd.RDD
import org.apache.spark.{SparkContext, SparkConf}
@@ -47,8 +46,6 @@ object IgniteProcessExample {
// SQL query
ignite.fromCache("indexed").objectSql("Person", "age > ? and
organizationId = ?", 20, 12).collect()
-ignite.fromCache(new CacheConfiguration[Object, String]("ad"))
-
// SQL fields query
val sqlRes: RDD[Seq[Any]] = ignite.fromCache("indexed").sql("select
name, age from Person where age > ?", 20)
}
[16/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39ce1cbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39ce1cbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39ce1cbf
Branch: refs/heads/ignite-484-1
Commit: 39ce1cbfe190a709c6a2711e42160727fb01ce02
Parents: 104a13f
Author: sboikov
Authored: Tue Jun 2 14:37:42 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 14:37:42 2015 +0300
--
.../loadtests/communication/GridIoManagerBenchmark0.java | 1 +
.../ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java | 7 +++
.../ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 +++
3 files changed, 15 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ce1cbf/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
index 422d608..ea5b716 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
@@ -455,6 +455,7 @@ public class GridIoManagerBenchmark0 extends
GridCommonAbstractTest {
spi.setTcpNoDelay(true);
spi.setConnectionBufferSize(0);
+spi.setSharedMemoryPort(-1);
info("Comm SPI: " + spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ce1cbf/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
index 7cea968..a89e586 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.hadoop.fs.v2.*;
import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -197,6 +198,12 @@ public class IgniteHadoopFileSystemHandshakeSelfTest
extends IgfsCommonAbstractT
cfg.setDiscoverySpi(discoSpi);
+TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
+
+commSpi.setSharedMemoryPort(-1);
+
+cfg.setCommunicationSpi(commSpi);
+
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
metaCacheCfg.setName("replicated");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ce1cbf/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
index 2c17ba9..6773366 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.util.ipc.shmem.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -86,6 +87,12 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends
IgfsCommonAbstractTe
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED,
EVT_JOB_MAPPED);
+TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
+
+commSpi.setSharedMemoryPort(-1);
+
+cfg.setCommunicationSpi(commSpi);
+
cnt++;
return cfg;
[19/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2aa1ace0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2aa1ace0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2aa1ace0
Branch: refs/heads/ignite-484-1
Commit: 2aa1ace0cdbf0fbbbcd5893958bddb7869742ce0
Parents: d0157d4
Author: Alexey Goncharuk
Authored: Tue Jun 2 19:34:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue Jun 2 19:34:49 2015 -0700
--
.../processors/cache/IgniteCacheProxy.java | 8 +-
.../processors/cache/QueryCursorImpl.java | 23 ++--
.../processors/cache/query/QueryCursorEx.java | 8 ++
.../processors/query/GridQueryIndexing.java | 2 +-
.../processors/query/GridQueryProcessor.java| 13 ++-
...niteDynamicCacheWithConfigStartSelfTest.java | 108 +++
.../processors/query/h2/IgniteH2Indexing.java | 43 +---
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 12 ++-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 23
modules/spark/pom.xml | 18 ++--
.../org/apache/ignite/spark/IgniteContext.scala | 3 +
.../org/apache/ignite/spark/IgniteRDD.scala | 68 ++--
.../spark/examples/IgniteProcessExample.scala | 2 +-
.../org/apache/ignite/spark/IgniteRddSpec.scala | 38 +++
15 files changed, 291 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aa1ace0/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 176543b..b3914e5 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
@@ -497,10 +497,14 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter)queryContinuous((ContinuousQuery)qry, qry.isLocal());
if (qry instanceof SqlQuery) {
-SqlQuery p = (SqlQuery)qry;
+final SqlQuery p = (SqlQuery)qry;
if (isReplicatedDataNode() || ctx.isLocal() || qry.isLocal())
-return (QueryCursor)new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(ctx, p));
+return (QueryCursor)new QueryCursorImpl<>(new
Iterable>() {
+@Override public Iterator>
iterator() {
+return ctx.kernalContext().query().queryLocal(ctx, p);
+}
+});
return
(QueryCursor)ctx.kernalContext().query().queryTwoStep(ctx, p);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aa1ace0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
index 7cb9efc..d68c377 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
@@ -27,6 +27,9 @@ import java.util.*;
* Query cursor implementation.
*/
public class QueryCursorImpl implements QueryCursorEx {
+/** Query executor. */
+private Iterable iterExec;
+
/** */
private Iterator iter;
@@ -34,18 +37,18 @@ public class QueryCursorImpl implements QueryCursorEx
{
private boolean iterTaken;
/** */
-private Collection fieldsMeta;
+private List fieldsMeta;
/**
- * @param iter Iterator.
+ * @param iterExec Query executor.
*/
-public QueryCursorImpl(Iterator iter) {
-this.iter = iter;
+public QueryCursorImpl(Iterable iterExec) {
+this.iterExec = iterExec;
}
/** {@inheritDoc} */
@Override public Iterator iterator() {
-if (iter == null)
+if (iter == null && iterTaken)
throw new IgniteException("Cursor is closed.");
if (iterTaken)
@@ -53,12 +56,16 @@ public class QueryCursorImpl implements QueryCursorEx
{
iterTaken = true;
+iter = iterExec.iterator();
+
+assert iter != null;
+
ret
[35/50] incubator-ignite git commit: IGNITE-389 - Fixing tests.
IGNITE-389 - 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/224cbcb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/224cbcb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/224cbcb1
Branch: refs/heads/ignite-484-1
Commit: 224cbcb1fbd283a3015b73fecfbf364cc2670ff1
Parents: 2c3acf0
Author: Alexey Goncharuk
Authored: Mon Jun 8 17:41:33 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 17:41:33 2015 -0700
--
examples/config/example-ignite.xml | 4 +---
.../internal/processors/cache/query/GridCacheQueryAdapter.java | 1 +
.../internal/processors/datastructures/GridCacheSetImpl.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/examples/config/example-ignite.xml
--
diff --git a/examples/config/example-ignite.xml
b/examples/config/example-ignite.xml
index dcb2ba8..e746e59 100644
--- a/examples/config/example-ignite.xml
+++ b/examples/config/example-ignite.xml
@@ -30,16 +30,14 @@
http://www.springframework.org/schema/util/spring-util.xsd";>
-
--->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index eaf7515..5b82c34 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -123,6 +123,7 @@ public class GridCacheQueryAdapter implements
CacheQuery {
boolean keepPortable) {
assert cctx != null;
assert type != null;
+assert part == null || part >= 0;
this.cctx = cctx;
this.type = type;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index c0e763f..f74fe95 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -114,7 +114,7 @@ public class GridCacheSetImpl extends
AbstractCollection implements Ignite
}
CacheQuery qry = new GridCacheQueryAdapter<>(ctx, SET, null, null,
-new GridSetQueryPredicate<>(id, collocated), -1, false, false);
+new GridSetQueryPredicate<>(id, collocated), null, false,
false);
Collection nodes =
dataNodes(ctx.affinity().affinityTopologyVersion());
[31/50] incubator-ignite git commit: Merge branch 'ignite-389-ipc' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-389-ipc' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa97def4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa97def4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa97def4 Branch: refs/heads/ignite-484-1 Commit: fa97def49403967db9ec8b6afdc3f18160b31ce3 Parents: 5872b7f 6b51f99 Author: Alexey Goncharuk Authored: Thu Jun 4 19:25:37 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:25:37 2015 -0700 -- modules/core/pom.xml| 1 - .../ignite/internal/util/IgniteUtils.java | 4 +- .../shmem/IpcSharedMemoryClientEndpoint.java| 2 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 150 ++- .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- .../util/nio/GridShmemCommunicationClient.java | 151 +++ .../communication/tcp/TcpCommunicationSpi.java | 414 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +- .../LoadWithCorruptedLibFileTestRunner.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../IpcSharedMemoryBenchmarkWriter.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 7 + .../org/apache/ignite/spark/IgniteContext.scala | 19 +- .../org/apache/ignite/spark/IgniteRDD.scala | 8 +- 33 files changed, 889 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa97def4/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala --
[13/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8910f6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8910f6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8910f6b Branch: refs/heads/ignite-484-1 Commit: f8910f6bcfe415b33558055a63445e20cacf7981 Parents: c527a04 541b1e0 Author: Alexey Goncharuk Authored: Mon Jun 1 15:04:05 2015 -0700 Committer: Alexey Goncharuk Committed: Mon Jun 1 15:04:05 2015 -0700 -- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 18 +- dev-tools/gradlew | 163 +- dev-tools/slurp.sh |2 +- dev-tools/src/main/groovy/jiraslurp.groovy | 100 +- examples/pom.xml|2 +- modules/aop/pom.xml |2 +- modules/aws/pom.xml |2 +- modules/clients/pom.xml |2 +- modules/cloud/pom.xml |2 +- modules/codegen/pom.xml |2 +- modules/core/pom.xml|2 +- .../src/main/java/org/apache/ignite/Ignite.java |8 +- .../java/org/apache/ignite/IgniteServices.java |5 +- .../main/java/org/apache/ignite/Ignition.java | 18 +- .../org/apache/ignite/cache/CacheMetrics.java | 187 +- .../org/apache/ignite/cluster/ClusterNode.java | 24 +- .../configuration/CacheConfiguration.java | 27 +- .../configuration/IgniteConfiguration.java | 10 +- .../org/apache/ignite/igfs/IgfsUserContext.java | 119 + .../igfs/secondary/IgfsSecondaryFileSystem.java |7 + .../ignite/internal/ClusterMetricsSnapshot.java | 14 + .../internal/GridEventConsumeHandler.java | 100 +- .../ignite/internal/GridKernalContext.java |5 + .../ignite/internal/GridKernalContextImpl.java |5 + .../apache/ignite/internal/IgniteKernal.java| 27 +- .../org/apache/ignite/internal/IgnitionEx.java | 22 +- .../ignite/internal/MarshallerContextImpl.java |2 +- .../internal/events/DiscoveryCustomEvent.java | 18 +- .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +- .../managers/discovery/CustomEventListener.java | 31 + .../discovery/CustomMessageWrapper.java | 63 + .../discovery/DiscoveryCustomMessage.java | 48 + .../discovery/GridDiscoveryManager.java | 214 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../processors/cache/CacheMetricsImpl.java | 367 +- .../cache/CacheMetricsMXBeanImpl.java | 100 + .../processors/cache/CacheMetricsSnapshot.java | 380 +- .../cache/DynamicCacheChangeBatch.java | 20 +- .../cache/DynamicCacheDescriptor.java |2 + .../processors/cache/GridCacheAdapter.java | 29 +- .../cache/GridCacheAffinityManager.java | 14 + .../cache/GridCacheConcurrentMap.java | 21 +- .../processors/cache/GridCacheContext.java |6 +- .../processors/cache/GridCacheEntryEx.java |6 + .../processors/cache/GridCacheGateway.java |2 +- .../processors/cache/GridCacheIoManager.java|8 +- .../processors/cache/GridCacheMapEntry.java |5 + .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 71 +- .../processors/cache/GridCachePreloader.java|6 +- .../cache/GridCachePreloaderAdapter.java| 11 +- .../processors/cache/GridCacheProcessor.java| 74 +- .../processors/cache/GridCacheProxyImpl.java| 12 + .../cache/GridCacheSharedContext.java |1 + .../processors/cache/GridCacheSwapManager.java | 118 +- .../processors/cache/GridCacheUtils.java| 234 +- .../processors/cache/IgniteInternalCache.java |5 + .../cache/affinity/GridCacheAffinityImpl.java | 10 +- .../CacheDataStructuresManager.java |2 +- .../distributed/GridDistributedCacheEntry.java |7 - .../distributed/GridDistributedTxMapping.java | 17 + .../dht/GridClientPartitionTopology.java|8 +- .../dht/GridDhtAssignmentFetchFuture.java |4 +- .../distributed/dht/GridDhtCacheAdapter.java| 27 +- .../distributed/dht/GridDhtCacheEntry.java |6 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 +- .../distributed/dht/GridDhtTxLocalAdapter.java |8 +- .../distributed/dht/GridDhtTxPrepareFuture.java |3 +- .../dht/atomic/GridD
[01/50] incubator-ignite git commit: ignite-921 Create scan query able to iterate over single partition
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-484-1 2bd332115 -> d340fe72a
ignite-921 Create scan query able to iterate over single partition
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b58bb122
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b58bb122
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b58bb122
Branch: refs/heads/ignite-484-1
Commit: b58bb122da1d4c196b8125a28a4c1df33a9fc82f
Parents: 982235b
Author: agura
Authored: Mon May 25 20:26:04 2015 +0300
Committer: agura
Committed: Tue May 26 21:18:49 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 15 +-
.../processors/cache/GridCacheSwapManager.java | 55 -
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 7 +
.../processors/cache/query/CacheQuery.java | 2 +-
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheQueryAdapter.java | 228 ++-
.../cache/query/GridCacheQueryManager.java | 200 +---
.../cache/query/GridCacheQueryRequest.java | 31 ++-
.../datastructures/GridCacheSetImpl.java| 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 112 ++---
...CacheScanPartitionQueryFallbackSelfTest.java | 213 +
.../cache/IgniteCacheAbstractQuerySelfTest.java | 53 -
.../IgniteCacheQuerySelfTestSuite.java | 2 +
16 files changed, 795 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b58bb122/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 d390037..d7cec9e 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
@@ -1317,8 +1317,8 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache loadedKeys = new
GridConcurrentHashSet<>();
-IgniteInternalFuture readFut =
-readThroughAllAsync(absentKeys, true, skipVals, null, subjId,
taskName, new CI2() {
+IgniteInternalFuture readFut =
readThroughAllAsync(absentKeys, true, skipVals, null,
+subjId, taskName, new CI2() {
/** Version for all loaded entries. */
private GridCacheVersion nextVer = ctx.versions().next();
@@ -1948,7 +1948,8 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache getAndPutAsync0(final K key, final V val,
@Nullable final CacheEntryPredicate... filter) {
+public IgniteInternalFuture getAndPutAsync0(final K key, final V val,
+@Nullable final CacheEntryPredicate... filter) {
A.notNull(key, "key", val, "val");
if (keyCheck)
@@ -3117,7 +3118,8 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache keys,
long timeout) throws IgniteCheckedException {
+@Override public boolean lockAll(@Nullable Collection keys,
long timeout)
+throws IgniteCheckedException {
if (F.isEmpty(keys))
return true;
@@ -3689,7 +3691,7 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache> fut =
ctx0.queries().createScanQuery(null, ctx.keepPortable())
+CacheQueryFuture> fut =
ctx0.queries().createScanQuery(null, null, ctx.keepPortable())
.keepAll(false)
.execute();
@@ -3918,7 +3920,8 @@ public abstract class GridCacheAdapter implements
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b58bb122/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index eb82218..e4b1cbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -1211,7 +1211,7 @@ public class GridCacheSwapManager extends
GridCacheManagerAdapt
[15/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/104a13fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/104a13fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/104a13fd
Branch: refs/heads/ignite-484-1
Commit: 104a13fd2118804e42b5035df4340d7374c36e82
Parents: 1dbdd42
Author: sboikov
Authored: Tue Jun 2 14:25:08 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 14:25:08 2015 +0300
--
.../util/nio/GridShmemCommunicationClient.java | 151 +++
.../communication/tcp/TcpCommunicationSpi.java | 414 ++-
.../tcp/TcpCommunicationSpiMBean.java | 8 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 1 +
.../spi/GridTcpSpiForwardingSelfTest.java | 1 +
.../GridTcpCommunicationSpiAbstractTest.java| 13 +
...mmunicationSpiConcurrentConnectSelfTest.java | 4 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 11 +-
...pCommunicationSpiMultithreadedShmemTest.java | 28 ++
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 +
...GridTcpCommunicationSpiRecoverySelfTest.java | 1 +
.../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++
.../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 +
.../IgniteSpiCommunicationSelfTestSuite.java| 2 +
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 +
...oopSecondaryFileSystemConfigurationTest.java | 14 +
.../hadoop/HadoopAbstractSelfTest.java | 6 +
17 files changed, 695 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/104a13fd/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
new file mode 100644
index 000..f3dc46f
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
@@ -0,0 +1,151 @@
+/*
+ * 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.util.nio;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+
+/**
+ *
+ */
+public class GridShmemCommunicationClient extends
GridAbstractCommunicationClient {
+/** */
+private final IpcSharedMemoryClientEndpoint shmem;
+
+/** */
+private final ByteBuffer writeBuf;
+
+/** */
+private final MessageFormatter formatter;
+
+/**
+ * @param metricsLsnr Metrics listener.
+ * @param port Shared memory IPC server port.
+ * @param connTimeout Connection timeout.
+ * @param log Logger.
+ * @param formatter Message formatter.
+ * @throws IgniteCheckedException If failed.
+ */
+public GridShmemCommunicationClient(GridNioMetricsListener metricsLsnr,
+int port,
+long connTimeout,
+IgniteLogger log,
+MessageFormatter formatter)
+throws IgniteCheckedException
+{
+super(metricsLsnr);
+
+assert metricsLsnr != null;
+assert port > 0 && port < 0x;
+assert connTimeout >= 0;
+
+shmem = new IpcSharedMemoryClientEndpoint(port, (int)connTimeout, log);
+
+writeBuf = ByteBuffer.allocate(8 << 10);
+
+writeBuf.order(ByteOrder.nativeOrder());
+
+this.formatter = formatter;
+}
+
+/** {@inheritDoc} */
+@Override public synchronized void
doHandshake(IgniteInClosure2X handshakeC)
+throws IgniteCheckedException {
+handshakeC.applyx(shmem.inputStream(), shmem.outputStream());
+}
+
+/**
[25/50] incubator-ignite git commit: Merge branch 'ignite-970' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389-ipc
Merge branch 'ignite-970' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389-ipc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a329e901 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a329e901 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a329e901 Branch: refs/heads/ignite-484-1 Commit: a329e901d47419d5ab5e1db55dee6d2001f9d66e Parents: 7ee51ba 7158fb6 Author: Alexey Goncharuk Authored: Wed Jun 3 15:22:36 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 3 15:22:36 2015 -0700 -- modules/core/pom.xml| 1 - .../util/nio/GridShmemCommunicationClient.java | 151 +++ .../communication/tcp/TcpCommunicationSpi.java | 414 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 6 + 21 files changed, 718 insertions(+), 21 deletions(-) --
[20/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10.
# IGNITE-956: Added support for scala-2.10.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd68253
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd68253
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd68253
Branch: refs/heads/ignite-484-1
Commit: ccd682536ce6cde4a7e947a1ffc000b50a2c2f63
Parents: 2aa1ace
Author: AKuznetsov
Authored: Wed Jun 3 16:06:19 2015 +0700
Committer: AKuznetsov
Committed: Wed Jun 3 16:06:19 2015 +0700
--
DEVNOTES.txt | 6 +
examples/pom.xml | 34 ++
modules/scalar-2.10/README.txt| 4 +
modules/scalar-2.10/pom.xml | 188 +
modules/spark-2.10/README.txt | 4 +
modules/spark-2.10/pom.xml| 100 +++
modules/spark/pom.xml | 8 +-
modules/visor-console-2.10/README.txt | 4 +
modules/visor-console-2.10/pom.xml| 156
pom.xml | 21 +++-
10 files changed, 518 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/DEVNOTES.txt
--
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 1562dc4..8cc759c 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions
Without LGPL dependencies (default):
mvn clean package -DskipTests
+Without LGPL dependencies and Scala 2.10:
+ mvn clean package -DskipTests -Dscala-2.10
+
With LGPL dependencies:
mvn clean package -DskipTests -Prelease,lgpl
+With LGPL dependencies and Scala 2.10:
+ mvn clean package -DskipTests -Prelease,lgpl -Dscala-2.10
+
Look for incubator-ignite--bin.zip in ./target/bin directory.
NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 2b2bfeb..960df9c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -173,6 +173,40 @@
+scala-2.10
+
+
+
+org.apache.ignite
+ignite-scalar_2.10
+${project.version}
+
+
+
+org.scalatest
+scalatest_2.10
+2.2.2
+test
+
+
+org.scala-lang
+scala-library
+
+
+
+
+
+
+
+
+net.alchim31.maven
+scala-maven-plugin
+
+
+
+
+
+
java8-examples
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/README.txt
--
diff --git a/modules/scalar-2.10/README.txt b/modules/scalar-2.10/README.txt
new file mode 100644
index 000..535a193
--- /dev/null
+++ b/modules/scalar-2.10/README.txt
@@ -0,0 +1,4 @@
+Apache Ignite Scalar Module
+---
+
+Apache Ignite Scalar module to be build with Scala 2.10.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/pom.xml
--
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
new file mode 100644
index 000..b51c1b3
--- /dev/null
+++ b/modules/scalar-2.10/pom.xml
@@ -0,0 +1,188 @@
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+
+org.apache.ignite
+ignite-parent
+1
+../../parent
+
+
+ignite-scalar_2.10
+1.1.1-SNAPSHOT
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+
+
+
+org.scala-lang
+scala-library
+2.10.4
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+test-jar
+test
+
+
+
+org.apache.ignite
+ignite-spring
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-indexing
+
[46/50] incubator-ignite git commit: #IGNITE-389 - Minor
#IGNITE-389 - Minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f149c820
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f149c820
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f149c820
Branch: refs/heads/ignite-484-1
Commit: f149c8205191a5437bf6532807c2a1b275b67b88
Parents: 9926fb8
Author: Alexey Goncharuk
Authored: Wed Jun 10 15:58:58 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 15:58:58 2015 -0700
--
.../internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f149c820/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index 8c345f8..5b3274d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -142,7 +142,8 @@ public class IpcSharedMemoryNativeLoader {
return;
try {
-U.quietAndWarn(log, "Failed to load 'igniteshmem' library from
classpath. Will try to load it from IGNITE_HOME.");
+if (log != null)
+LT.warn(log, null, "Failed to load 'igniteshmem' library
from classpath. Will try to load it from IGNITE_HOME.");
String igniteHome = X.resolveIgniteHome();
[27/50] incubator-ignite git commit: IGNITE-389 - Fixing tests.
IGNITE-389 - 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/224cbcb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/224cbcb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/224cbcb1
Branch: refs/heads/ignite-998
Commit: 224cbcb1fbd283a3015b73fecfbf364cc2670ff1
Parents: 2c3acf0
Author: Alexey Goncharuk
Authored: Mon Jun 8 17:41:33 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 17:41:33 2015 -0700
--
examples/config/example-ignite.xml | 4 +---
.../internal/processors/cache/query/GridCacheQueryAdapter.java | 1 +
.../internal/processors/datastructures/GridCacheSetImpl.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/examples/config/example-ignite.xml
--
diff --git a/examples/config/example-ignite.xml
b/examples/config/example-ignite.xml
index dcb2ba8..e746e59 100644
--- a/examples/config/example-ignite.xml
+++ b/examples/config/example-ignite.xml
@@ -30,16 +30,14 @@
http://www.springframework.org/schema/util/spring-util.xsd";>
-
--->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index eaf7515..5b82c34 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -123,6 +123,7 @@ public class GridCacheQueryAdapter implements
CacheQuery {
boolean keepPortable) {
assert cctx != null;
assert type != null;
+assert part == null || part >= 0;
this.cctx = cctx;
this.type = type;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index c0e763f..f74fe95 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -114,7 +114,7 @@ public class GridCacheSetImpl extends
AbstractCollection implements Ignite
}
CacheQuery qry = new GridCacheQueryAdapter<>(ctx, SET, null, null,
-new GridSetQueryPredicate<>(id, collocated), -1, false, false);
+new GridSetQueryPredicate<>(id, collocated), null, false,
false);
Collection nodes =
dataNodes(ctx.affinity().affinityTopologyVersion());
[28/50] incubator-ignite git commit: IGNITE-389 - Rebuilt message.
IGNITE-389 - Rebuilt message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e8f6485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e8f6485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e8f6485
Branch: refs/heads/ignite-998
Commit: 7e8f6485a61c7dbdb6cc1675777366f274e6
Parents: 224cbcb
Author: Alexey Goncharuk
Authored: Mon Jun 8 17:59:00 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 17:59:00 2015 -0700
--
.../cache/query/GridCacheQueryRequest.java | 40 ++--
1 file changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e8f6485/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 7577954..2113e7a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -112,7 +112,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
private int taskHash;
/** Partition. */
-private Integer part;
+private int part;
/**
* Required by {@link Externalizable}
@@ -218,7 +218,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
this.clause = clause;
this.clsName = clsName;
this.keyValFilter = keyValFilter;
-this.part = part;
+this.part = part == null ? -1 : part;
this.rdc = rdc;
this.trans = trans;
this.pageSize = pageSize;
@@ -426,7 +426,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
* @return partition.
*/
@Nullable public Integer partition() {
-return part;
+return part == -1 ? null : part;
}
/** {@inheritDoc} */
@@ -523,40 +523,41 @@ public class GridCacheQueryRequest extends
GridCacheMessage implements GridCache
writer.incrementState();
case 16:
-if (!writer.writeByteArray("rdcBytes", rdcBytes))
+if (!writer.writeInt("part", part))
return false;
writer.incrementState();
case 17:
-if (!writer.writeUuid("subjId", subjId))
+if (!writer.writeByteArray("rdcBytes", rdcBytes))
return false;
writer.incrementState();
case 18:
-if (!writer.writeInt("taskHash", taskHash))
+if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 19:
-if (!writer.writeByteArray("transBytes", transBytes))
+if (!writer.writeInt("taskHash", taskHash))
return false;
writer.incrementState();
case 20:
-if (!writer.writeByte("type", type != null ?
(byte)type.ordinal() : -1))
+if (!writer.writeByteArray("transBytes", transBytes))
return false;
writer.incrementState();
case 21:
-if (!writer.writeInt("part", part != null ? part : -1))
+if (!writer.writeByte("type", type != null ?
(byte)type.ordinal() : -1))
return false;
writer.incrementState();
+
}
return true;
@@ -678,7 +679,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 16:
-rdcBytes = reader.readByteArray("rdcBytes");
+part = reader.readInt("part");
if (!reader.isLastRead())
return false;
@@ -686,7 +687,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 17:
-subjId = reader.readUuid("subjId");
+rdcBytes = reader.readByteArray("rdcBytes");
if (!reader.isLastRead())
return false;
@@ -694,7 +695,7 @@ public class GridCacheQueryRequest extends GridCacheMessage
implements GridCache
reader.incrementState();
case 18:
-
[45/50] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/34172158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/34172158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/34172158 Branch: refs/heads/ignite-998 Commit: 341721582e8788b78c6f84947b38fd5fa380e1e8 Parents: 980bf75 2454eb5 Author: Alexey Goncharuk Authored: Wed Jun 10 13:20:27 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 13:20:27 2015 -0700 -- .../client/memcache/MemcacheRestExample.java| 32 ++-- .../java/org/apache/ignite/IgniteCache.java | 25 ++- .../apache/ignite/IgniteSystemProperties.java | 3 + .../discovery/DiscoveryCustomMessage.java | 6 + .../discovery/GridDiscoveryManager.java | 32 .../affinity/GridAffinityAssignmentCache.java | 8 +- .../cache/DynamicCacheChangeBatch.java | 19 ++- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/IgniteInternalCache.java | 27 +-- .../continuous/AbstractContinuousMessage.java | 9 + .../internal/visor/query/VisorQueryJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 16 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../distributed/IgniteCacheManyClientsTest.java | 169 +++ .../DataStreamerMultinodeCreateCacheTest.java | 6 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + 19 files changed, 305 insertions(+), 65 deletions(-) --
[04/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6f9b647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6f9b647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6f9b647
Branch: refs/heads/ignite-998
Commit: d6f9b647ab92d822aebbef06315ccb0af41f8238
Parents: 39ce1cb
Author: sboikov
Authored: Tue Jun 2 15:39:12 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 15:39:12 2015 +0300
--
modules/core/pom.xml | 1 -
.../tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f9b647/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 370fe69..8c37a4f 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -129,7 +129,6 @@
org.gridgain
ignite-shmem
1.0.0
-test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f9b647/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 9909d76..5d25299 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -85,7 +85,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
/**
* @param useShmem Use shared mem.
*/
-protected GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
+public GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
super(false);
this.useShmem = useShmem;
[47/50] incubator-ignite git commit: #IGNITE-389 - Readme.
#IGNITE-389 - Readme. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9926fb89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9926fb89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9926fb89 Branch: refs/heads/ignite-998 Commit: 9926fb89001e9115c1ea5105c4733208d426b08d Parents: 71f29e9 Author: Alexey Goncharuk Authored: Wed Jun 10 15:56:26 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 15:56:26 2015 -0700 -- modules/spark/README.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9926fb89/modules/spark/README.txt -- diff --git a/modules/spark/README.txt b/modules/spark/README.txt index 5678441..589a050 100644 --- a/modules/spark/README.txt +++ b/modules/spark/README.txt @@ -1,4 +1,8 @@ Apache Ignite Spark Module --- -Apache Ignite Spark module. +Apache Ignite provides an implementation of Spark RDD abstraction which enables easy access to Ignite caches. +Ignite RDD does not keep it's state in the memory of the Spark application and provides a view of the corresponding +Ignite cache. Depending on the chosen deployment mode this state may exist only during the lifespan of the Spark +application (embedded mode) or may exist outside of the Spark application (standalone mode), allowing seamless +sharing of the state between multiple Spark jobs. \ No newline at end of file
[22/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea215003 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea215003 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea215003 Branch: refs/heads/ignite-998 Commit: ea21500336c6d0df5a563eb662367cce7aca0705 Parents: 0fc2d73 8467a3c Author: avinogradov Authored: Mon Jun 8 12:59:05 2015 +0300 Committer: avinogradov Committed: Mon Jun 8 12:59:05 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 7 +- .../apache/ignite/internal/IgniteKernal.java| 2 + .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../internal/MarshallerContextAdapter.java | 36 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheContext.java | 13 + .../processors/cache/GridCacheProcessor.java| 37 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 + .../transactions/IgniteTxLocalAdapter.java | 28 ++ .../IgniteTxRollbackCheckedException.java | 9 + ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++ .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 13 files changed, 476 insertions(+), 12 deletions(-) --
[34/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea41b307 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea41b307 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea41b307 Branch: refs/heads/ignite-998 Commit: ea41b307722cd7794f64491937f648547d3aade1 Parents: d0e4729 e3fe8ce Author: avinogradov Authored: Tue Jun 9 15:25:37 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:25:37 2015 +0300 -- DEVNOTES.txt| 42 +- .../apache/ignite/internal/IgniteKernal.java| 28 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/GridDiscoveryManager.java | 28 +- .../affinity/GridAffinityAssignment.java| 12 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../processors/cache/GridCacheAdapter.java | 4 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java| 64 ++- .../cache/transactions/IgniteTxManager.java | 3 - .../datastructures/DataStructuresProcessor.java | 107 +++- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java| 554 --- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../visor/node/VisorNodeDataCollectorTask.java | 9 +- .../node/VisorNodeDataCollectorTaskResult.java | 17 +- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../internal/visor/query/VisorQueryJob.java | 11 +- .../internal/visor/query/VisorQueryTask.java| 3 +- .../visor/util/VisorExceptionWrapper.java | 81 +++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 33 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 438 --- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java| 3 - .../ignite/spi/discovery/tcp/ServerImpl.java| 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +- .../IgniteCountDownLatchAbstractSelfTest.java | 102 .../IgniteCacheClientNearCacheExpiryTest.java | 103 .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../continuous/GridEventConsumeSelfTest.java| 7 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 .../internal/util/nio/GridNioSelfTest.java | 2 +- .../GridTcpCommunicationSpiAbstractTest.java| 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java| 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../cache/GridCacheOffheapIndexGetSelfTest.java | 62 ++- 55 files changed, 1264 insertions(+), 1259 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea41b307/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java --
[44/50] incubator-ignite git commit: # ignite-sprint-5 increased affinity history size
# ignite-sprint-5 increased affinity history size
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2454eb58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2454eb58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2454eb58
Branch: refs/heads/ignite-998
Commit: 2454eb58ae60718f8fcf55eccb7a4fc7016e0bcf
Parents: addc91b
Author: sboikov
Authored: Wed Jun 10 17:43:02 2015 +0300
Committer: sboikov
Committed: Wed Jun 10 17:43:02 2015 +0300
--
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../affinity/GridAffinityAssignmentCache.java | 5 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../distributed/IgniteCacheManyClientsTest.java | 169 +++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
5 files changed, 178 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2454eb58/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 439ea2d..b166f39 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -337,6 +337,9 @@ public final class IgniteSystemProperties {
*/
public static final String IGNITE_SQL_MERGE_TABLE_MAX_SIZE =
"IGNITE_SQL_MERGE_TABLE_MAX_SIZE";
+/** Maximum size for affinity assignment history. */
+public static final String IGNITE_AFFINITY_HISTORY_SIZE =
"IGNITE_AFFINITY_HISTORY_SIZE";
+
/**
* Enforces singleton.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2454eb58/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 47f222e..6989385 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -408,9 +408,10 @@ public class GridAffinityAssignmentCache {
throw new IllegalStateException("Getting affinity for topology
version earlier than affinity is " +
"calculated [locNodeId=" + ctx.localNodeId() +
", cache=" + cacheName +
-", history=" + affCache.keySet() +
", topVer=" + topVer +
-", head=" + head.get().topologyVersion() + ']');
+", head=" + head.get().topologyVersion() +
+", history=" + affCache.keySet() +
+']');
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2454eb58/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 3236bb5..3df45cb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -59,7 +59,7 @@ public class GridCachePartitionExchangeManager extends
GridCacheSharedMana
private static final int EXCHANGE_HISTORY_SIZE = 1000;
/** Cleanup history size. */
-public static final int EXCH_FUT_CLEANUP_HISTORY_SIZE = 10;
+public static final int EXCH_FUT_CLEANUP_HISTORY_SIZE =
getInteger(IGNITE_AFFINITY_HISTORY_SIZE, 100);
/** Atomic reference for pending timeout object. */
private AtomicReference pendingResend = new
AtomicReference<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2454eb58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/
[06/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2aa1ace0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2aa1ace0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2aa1ace0
Branch: refs/heads/ignite-998
Commit: 2aa1ace0cdbf0fbbbcd5893958bddb7869742ce0
Parents: d0157d4
Author: Alexey Goncharuk
Authored: Tue Jun 2 19:34:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue Jun 2 19:34:49 2015 -0700
--
.../processors/cache/IgniteCacheProxy.java | 8 +-
.../processors/cache/QueryCursorImpl.java | 23 ++--
.../processors/cache/query/QueryCursorEx.java | 8 ++
.../processors/query/GridQueryIndexing.java | 2 +-
.../processors/query/GridQueryProcessor.java| 13 ++-
...niteDynamicCacheWithConfigStartSelfTest.java | 108 +++
.../processors/query/h2/IgniteH2Indexing.java | 43 +---
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 12 ++-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 23
modules/spark/pom.xml | 18 ++--
.../org/apache/ignite/spark/IgniteContext.scala | 3 +
.../org/apache/ignite/spark/IgniteRDD.scala | 68 ++--
.../spark/examples/IgniteProcessExample.scala | 2 +-
.../org/apache/ignite/spark/IgniteRddSpec.scala | 38 +++
15 files changed, 291 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aa1ace0/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 176543b..b3914e5 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
@@ -497,10 +497,14 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter)queryContinuous((ContinuousQuery)qry, qry.isLocal());
if (qry instanceof SqlQuery) {
-SqlQuery p = (SqlQuery)qry;
+final SqlQuery p = (SqlQuery)qry;
if (isReplicatedDataNode() || ctx.isLocal() || qry.isLocal())
-return (QueryCursor)new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(ctx, p));
+return (QueryCursor)new QueryCursorImpl<>(new
Iterable>() {
+@Override public Iterator>
iterator() {
+return ctx.kernalContext().query().queryLocal(ctx, p);
+}
+});
return
(QueryCursor)ctx.kernalContext().query().queryTwoStep(ctx, p);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aa1ace0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
index 7cb9efc..d68c377 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/QueryCursorImpl.java
@@ -27,6 +27,9 @@ import java.util.*;
* Query cursor implementation.
*/
public class QueryCursorImpl implements QueryCursorEx {
+/** Query executor. */
+private Iterable iterExec;
+
/** */
private Iterator iter;
@@ -34,18 +37,18 @@ public class QueryCursorImpl implements QueryCursorEx
{
private boolean iterTaken;
/** */
-private Collection fieldsMeta;
+private List fieldsMeta;
/**
- * @param iter Iterator.
+ * @param iterExec Query executor.
*/
-public QueryCursorImpl(Iterator iter) {
-this.iter = iter;
+public QueryCursorImpl(Iterable iterExec) {
+this.iterExec = iterExec;
}
/** {@inheritDoc} */
@Override public Iterator iterator() {
-if (iter == null)
+if (iter == null && iterTaken)
throw new IgniteException("Cursor is closed.");
if (iterTaken)
@@ -53,12 +56,16 @@ public class QueryCursorImpl implements QueryCursorEx
{
iterTaken = true;
+iter = iterExec.iterator();
+
+assert iter != null;
+
retur
[12/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ee51ba0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ee51ba0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ee51ba0 Branch: refs/heads/ignite-998 Commit: 7ee51ba05dc65148835e1491b91a23695c940d12 Parents: 2aa1ace 97d0bc1 Author: Alexey Goncharuk Authored: Wed Jun 3 15:18:44 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 3 15:18:44 2015 -0700 -- assembly/dependencies-visor-console.xml |3 + .../hibernate/CacheHibernatePersonStore.java| 202 +--- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java| 180 +-- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java| 128 +++ .../store/spring/CacheSpringStoreExample.java | 143 +++ .../datagrid/store/spring/package-info.java | 22 + .../ignite/cache/eviction/EvictableEntry.java |7 + .../ignite/cache/eviction/EvictionPolicy.java |2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java| 38 + .../eviction/random/RandomEvictionPolicy.java | 10 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../apache/ignite/cache/query/QueryMetrics.java |6 +- .../apache/ignite/cache/store/CacheStore.java |2 + .../ignite/cache/store/CacheStoreSession.java | 22 + .../cache/store/CacheStoreSessionListener.java | 133 +++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++ .../configuration/CacheConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 38 +- .../managers/communication/GridIoManager.java | 12 +- .../discovery/GridDiscoveryManager.java |4 +- .../cache/CacheEvictableEntryImpl.java | 31 + .../processors/cache/CacheMetricsImpl.java |4 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../processors/cache/GridCacheProcessor.java| 12 +- .../cache/GridCacheSharedContext.java | 47 +- .../processors/cache/GridCacheUtils.java| 54 + .../cache/distributed/dht/GridDhtGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +- .../GridDhtPartitionsExchangeFuture.java| 46 +- .../dht/preloader/GridDhtPreloader.java |9 +- .../local/atomic/GridLocalAtomicCache.java | 25 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/store/CacheOsStoreManager.java|1 - .../cache/store/CacheStoreManager.java |7 +- .../store/GridCacheStoreManagerAdapter.java | 202 +++- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++- .../processors/query/GridQueryProcessor.java| 311 -- .../spi/discovery/tcp/TcpDiscoverySpi.java |2 +- ...cheStoreSessionListenerAbstractSelfTest.java | 315 ++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 27 + .../cache/GridCacheAbstractMetricsSelfTest.java | 48 +- .../GridCacheConcurrentTxMultiNodeTest.java |8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java |5 +- .../cache/GridCacheReloadSelfTest.java |6 +- .../cache/IgniteCachePeekModesAbstractTest.java |5 +- .../IgniteCrossCacheTxStoreSelfTest.java| 147 ++- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java |6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java| 32 + ...ePartitionedMultiThreadedPutGetSelfTest.java |6 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java |2 +- .../cache/eviction/EvictionAbstractTest.java| 1056 ++ .../GridCacheBatchEvictUnswapSelfTest.java |5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java |5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 .../GridCacheEvictionTouchSelfTest.java | 22 +- .../cache/eviction/GridCacheMockEntry.java
[49/50] incubator-ignite git commit: #IGNITE-389 - Minor
#IGNITE-389 - Minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89a4f7c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89a4f7c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89a4f7c5
Branch: refs/heads/ignite-998
Commit: 89a4f7c569e3f50d1623d461756e8a0bc2c1dd13
Parents: f149c82
Author: Alexey Goncharuk
Authored: Wed Jun 10 15:59:15 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 15:59:15 2015 -0700
--
.../internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89a4f7c5/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index 5b3274d..d4ae147 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -163,7 +163,7 @@ public class IpcSharedMemoryNativeLoader {
}
}
catch (IgniteCheckedException ignore) {
-
+// No-op.
}
// Failed to find the library.
[16/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98176fea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98176fea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98176fea Branch: refs/heads/ignite-998 Commit: 98176feadbe117eb248134f2cb6244d1b1ded63a Parents: 2eeb326 c9f7291 Author: Anton Vinogradov Authored: Thu Jun 4 22:46:06 2015 +0300 Committer: Anton Vinogradov Committed: Thu Jun 4 22:46:06 2015 +0300 -- .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java| 3 + .../managers/communication/GridIoManager.java | 117 .../processors/cache/GridCacheContext.java | 3 - .../dht/GridClientPartitionTopology.java| 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java| 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java| 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 3 + .../ignite/spi/discovery/tcp/ServerImpl.java| 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ...niteDynamicCacheWithConfigStartSelfTest.java | 97 +++ .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java| 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java| 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java| 5 +- .../processors/hadoop/HadoopTasksV2Test.java| 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 48 files changed, 1443 insertions(+), 276 deletions(-) --
[48/50] incubator-ignite git commit: #IGNITE-389 - Minor
#IGNITE-389 - Minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f149c820
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f149c820
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f149c820
Branch: refs/heads/ignite-998
Commit: f149c8205191a5437bf6532807c2a1b275b67b88
Parents: 9926fb8
Author: Alexey Goncharuk
Authored: Wed Jun 10 15:58:58 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 15:58:58 2015 -0700
--
.../internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f149c820/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index 8c345f8..5b3274d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -142,7 +142,8 @@ public class IpcSharedMemoryNativeLoader {
return;
try {
-U.quietAndWarn(log, "Failed to load 'igniteshmem' library from
classpath. Will try to load it from IGNITE_HOME.");
+if (log != null)
+LT.warn(log, null, "Failed to load 'igniteshmem' library
from classpath. Will try to load it from IGNITE_HOME.");
String igniteHome = X.resolveIgniteHome();
[21/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fc2d738 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fc2d738 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fc2d738 Branch: refs/heads/ignite-998 Commit: 0fc2d7384966fc13b7ba6f3e6adfc91068c489c9 Parents: 98176fe ab20fd9 Author: avinogradov Authored: Fri Jun 5 21:38:02 2015 +0300 Committer: avinogradov Committed: Fri Jun 5 21:38:02 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 11 ++ .../affinity/GridAffinityProcessor.java | 23 - .../processors/cache/GridCacheAdapter.java | 17 ++- .../processors/cache/GridCacheProxyImpl.java| 14 ++- .../processors/cache/IgniteCacheProxy.java | 23 + .../processors/cache/IgniteInternalCache.java | 11 +- .../datastreamer/DataStreamerImpl.java | 92 - .../processors/igfs/IgfsMetaManager.java| 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java| 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 ++-- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++ .../GridCacheExAbstractFullApiSelfTest.java | 103 --- .../GridCacheExColocatedFullApiSelfTest.java| 33 -- .../near/GridCacheExNearFullApiSelfTest.java| 39 --- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../local/GridCacheExLocalFullApiSelfTest.java | 30 -- .../DataStreamerMultiThreadedSelfTest.java | 59 --- .../IgniteMessagingWithClientTest.java | 2 + .../IgniteCacheFullApiSelfTestSuite.java| 6 -- 22 files changed, 309 insertions(+), 314 deletions(-) --
[18/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-389' into ignite-389
Merge remote-tracking branch 'origin/ignite-389' into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c2d381c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c2d381c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c2d381c Branch: refs/heads/ignite-998 Commit: 0c2d381c830443b169bb7a1e4745356eebf78ef8 Parents: 7ee51ba 4d36d12 Author: Alexey Goncharuk Authored: Thu Jun 4 19:21:43 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:21:43 2015 -0700 -- DEVNOTES.txt| 6 + assembly/dependencies-fabric.xml| 1 + examples/config/example-ignite.xml | 4 +- examples/pom.xml| 34 +++ modules/scalar-2.10/README.txt | 4 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 + .../scalar-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/scalar-2.10/pom.xml | 197 modules/spark-2.10/README.txt | 4 + modules/spark-2.10/licenses/apache-2.0.txt | 202 + .../spark-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark-2.10/pom.xml | 120 modules/spark/licenses/apache-2.0.txt | 202 + modules/spark/licenses/scala-bsd-license.txt| 18 ++ modules/spark/pom.xml | 22 +- .../spark/examples/java/ColocationTest.java | 89 ++ .../examples/java/ExampleConfiguration.java | 31 ++ .../examples/java/IgniteProcessExample.java | 80 + .../spark/examples/java/IgniteStoreExample.java | 68 + .../spark/examples/java/package-info.java | 21 ++ .../org/apache/ignite/spark/IgniteRDD.scala | 10 +- .../apache/ignite/spark/JavaIgniteContext.scala | 63 .../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 ++ .../ignite/spark/examples/ColocationTest.scala | 5 +- .../spark/impl/JavaIgniteAbstractRDD.scala | 34 +++ .../ignite/spark/JavaIgniteRDDSelfTest.java | 298 +++ modules/visor-console-2.10/README.txt | 4 + modules/visor-console-2.10/pom.xml | 174 +++ parent/pom.xml | 4 + pom.xml | 21 +- 30 files changed, 2037 insertions(+), 16 deletions(-) --
[01/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-998 46e6c48ee -> 4ab301d2f
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0157d4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0157d4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0157d4e
Branch: refs/heads/ignite-998
Commit: d0157d4ef6091105245aee8d2e6698028ce3b95f
Parents: f8910f6
Author: Alexey Goncharuk
Authored: Mon Jun 1 15:18:40 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 1 15:18:40 2015 -0700
--
.../ignite/internal/processors/service/GridServiceProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0157d4e/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 2e31b69..aeb48f7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -932,7 +932,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
GridCacheQueryManager qryMgr = cache.context().queries();
-CacheQuery> qry =
qryMgr.createScanQuery(p, false);
+CacheQuery> qry =
qryMgr.createScanQuery(p, null, false);
qry.keepAll(false);
[46/50] incubator-ignite git commit: IGNITE-389 - Fixing tests.
IGNITE-389 - 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/71f29e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71f29e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71f29e98
Branch: refs/heads/ignite-998
Commit: 71f29e98e2ea571e437206a3712b7261e086e1db
Parents: 3417215
Author: Alexey Goncharuk
Authored: Wed Jun 10 13:22:15 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Jun 10 13:22:15 2015 -0700
--
.../ignite/internal/processors/query/GridQueryIndexing.java | 4 +++-
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 +--
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 7 ---
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 4 ++--
4 files changed, 14 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index cc0916a..7fcc284 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -58,9 +58,11 @@ public interface GridQueryIndexing {
*
* @param cctx Cache context.
* @param qry Query.
+ * @param keepCacheObjects If {@code true}, cache objects representation
will be preserved.
* @return Cursor.
*/
-public Iterable> queryTwoStep(GridCacheContext cctx,
GridCacheTwoStepQuery qry);
+public Iterable> queryTwoStep(GridCacheContext cctx,
GridCacheTwoStepQuery qry,
+boolean keepCacheObjects);
/**
* Parses SQL query into two step query and executes it.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/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 1be2a36..e187713 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
@@ -546,9 +546,12 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
throw new IllegalStateException("Failed to execute query (grid is
stopping).");
try {
+GridCacheContext cacheCtx =
ctx.cache().internalCache(space).context();
+
return idx.queryTwoStep(
-ctx.cache().internalCache(space).context(),
-qry);
+cacheCtx,
+qry,
+cacheCtx.keepPortable());
}
finally {
busyLock.leaveBusy();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f29e98/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 6ec329f..5e27c24 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -771,10 +771,11 @@ public class IgniteH2Indexing implements
GridQueryIndexing {
}
/** {@inheritDoc} */
-@Override public Iterable> queryTwoStep(final
GridCacheContext cctx, final GridCacheTwoStepQuery qry) {
+@Override public Iterable> queryTwoStep(final
GridCacheContext cctx, final GridCacheTwoStepQuery qry,
+final boolean keepCacheObj) {
return new Iterable>() {
@Override public Iterator> iterator() {
-return rdcQryExec.query(cctx, qry);
+return rdcQryExec.query(cctx, qry, keepCacheObj);
}
};
}
@@ -872,7 +873,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
twoStepQry.pageSize(qry.getPageSize());
-QueryCursorImpl> cursor =
[33/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-389' into ignite-389
Merge remote-tracking branch 'origin/ignite-389' into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/079bcc68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/079bcc68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/079bcc68 Branch: refs/heads/ignite-998 Commit: 079bcc681343899e6ee7b0848ed57614d610ef55 Parents: f129d08 b812c0f Author: avinogradov Authored: Tue Jun 9 15:11:56 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:11:56 2015 +0300 -- ...CacheScanPartitionQueryFallbackSelfTest.java | 20 1 file changed, 16 insertions(+), 4 deletions(-) --
[07/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10.
# IGNITE-956: Added support for scala-2.10.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd68253
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd68253
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd68253
Branch: refs/heads/ignite-998
Commit: ccd682536ce6cde4a7e947a1ffc000b50a2c2f63
Parents: 2aa1ace
Author: AKuznetsov
Authored: Wed Jun 3 16:06:19 2015 +0700
Committer: AKuznetsov
Committed: Wed Jun 3 16:06:19 2015 +0700
--
DEVNOTES.txt | 6 +
examples/pom.xml | 34 ++
modules/scalar-2.10/README.txt| 4 +
modules/scalar-2.10/pom.xml | 188 +
modules/spark-2.10/README.txt | 4 +
modules/spark-2.10/pom.xml| 100 +++
modules/spark/pom.xml | 8 +-
modules/visor-console-2.10/README.txt | 4 +
modules/visor-console-2.10/pom.xml| 156
pom.xml | 21 +++-
10 files changed, 518 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/DEVNOTES.txt
--
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 1562dc4..8cc759c 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions
Without LGPL dependencies (default):
mvn clean package -DskipTests
+Without LGPL dependencies and Scala 2.10:
+ mvn clean package -DskipTests -Dscala-2.10
+
With LGPL dependencies:
mvn clean package -DskipTests -Prelease,lgpl
+With LGPL dependencies and Scala 2.10:
+ mvn clean package -DskipTests -Prelease,lgpl -Dscala-2.10
+
Look for incubator-ignite--bin.zip in ./target/bin directory.
NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 2b2bfeb..960df9c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -173,6 +173,40 @@
+scala-2.10
+
+
+
+org.apache.ignite
+ignite-scalar_2.10
+${project.version}
+
+
+
+org.scalatest
+scalatest_2.10
+2.2.2
+test
+
+
+org.scala-lang
+scala-library
+
+
+
+
+
+
+
+
+net.alchim31.maven
+scala-maven-plugin
+
+
+
+
+
+
java8-examples
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/README.txt
--
diff --git a/modules/scalar-2.10/README.txt b/modules/scalar-2.10/README.txt
new file mode 100644
index 000..535a193
--- /dev/null
+++ b/modules/scalar-2.10/README.txt
@@ -0,0 +1,4 @@
+Apache Ignite Scalar Module
+---
+
+Apache Ignite Scalar module to be build with Scala 2.10.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/pom.xml
--
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
new file mode 100644
index 000..b51c1b3
--- /dev/null
+++ b/modules/scalar-2.10/pom.xml
@@ -0,0 +1,188 @@
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+
+org.apache.ignite
+ignite-parent
+1
+../../parent
+
+
+ignite-scalar_2.10
+1.1.1-SNAPSHOT
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+
+
+
+org.scala-lang
+scala-library
+2.10.4
+
+
+
+org.apache.ignite
+ignite-core
+${project.version}
+test-jar
+test
+
+
+
+org.apache.ignite
+ignite-spring
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-indexing
+
[02/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/104a13fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/104a13fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/104a13fd
Branch: refs/heads/ignite-998
Commit: 104a13fd2118804e42b5035df4340d7374c36e82
Parents: 1dbdd42
Author: sboikov
Authored: Tue Jun 2 14:25:08 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 14:25:08 2015 +0300
--
.../util/nio/GridShmemCommunicationClient.java | 151 +++
.../communication/tcp/TcpCommunicationSpi.java | 414 ++-
.../tcp/TcpCommunicationSpiMBean.java | 8 +
.../IgniteCacheMessageRecoveryAbstractTest.java | 1 +
.../spi/GridTcpSpiForwardingSelfTest.java | 1 +
.../GridTcpCommunicationSpiAbstractTest.java| 13 +
...mmunicationSpiConcurrentConnectSelfTest.java | 4 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 11 +-
...pCommunicationSpiMultithreadedShmemTest.java | 28 ++
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 +
...GridTcpCommunicationSpiRecoverySelfTest.java | 1 +
.../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++
.../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 +
.../IgniteSpiCommunicationSelfTestSuite.java| 2 +
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 +
...oopSecondaryFileSystemConfigurationTest.java | 14 +
.../hadoop/HadoopAbstractSelfTest.java | 6 +
17 files changed, 695 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/104a13fd/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
new file mode 100644
index 000..f3dc46f
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java
@@ -0,0 +1,151 @@
+/*
+ * 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.util.nio;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+
+/**
+ *
+ */
+public class GridShmemCommunicationClient extends
GridAbstractCommunicationClient {
+/** */
+private final IpcSharedMemoryClientEndpoint shmem;
+
+/** */
+private final ByteBuffer writeBuf;
+
+/** */
+private final MessageFormatter formatter;
+
+/**
+ * @param metricsLsnr Metrics listener.
+ * @param port Shared memory IPC server port.
+ * @param connTimeout Connection timeout.
+ * @param log Logger.
+ * @param formatter Message formatter.
+ * @throws IgniteCheckedException If failed.
+ */
+public GridShmemCommunicationClient(GridNioMetricsListener metricsLsnr,
+int port,
+long connTimeout,
+IgniteLogger log,
+MessageFormatter formatter)
+throws IgniteCheckedException
+{
+super(metricsLsnr);
+
+assert metricsLsnr != null;
+assert port > 0 && port < 0x;
+assert connTimeout >= 0;
+
+shmem = new IpcSharedMemoryClientEndpoint(port, (int)connTimeout, log);
+
+writeBuf = ByteBuffer.allocate(8 << 10);
+
+writeBuf.order(ByteOrder.nativeOrder());
+
+this.formatter = formatter;
+}
+
+/** {@inheritDoc} */
+@Override public synchronized void
doHandshake(IgniteInClosure2X handshakeC)
+throws IgniteCheckedException {
+handshakeC.applyx(shmem.inputStream(), shmem.outputStream());
+}
+
+/** {
[10/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2eeb3263 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2eeb3263 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2eeb3263 Branch: refs/heads/ignite-998 Commit: 2eeb3263878185c1b229c80b1403b4e3f9b6bef0 Parents: 2b8163b 97d0bc1 Author: avinogradov Authored: Wed Jun 3 13:55:03 2015 +0300 Committer: avinogradov Committed: Wed Jun 3 13:55:03 2015 +0300 -- assembly/dependencies-visor-console.xml |3 + .../hibernate/CacheHibernatePersonStore.java| 202 +--- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java| 180 +-- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java| 128 +++ .../store/spring/CacheSpringStoreExample.java | 143 +++ .../datagrid/store/spring/package-info.java | 22 + .../ignite/cache/eviction/EvictableEntry.java |7 + .../ignite/cache/eviction/EvictionPolicy.java |2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java| 38 + .../eviction/random/RandomEvictionPolicy.java | 10 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../apache/ignite/cache/query/QueryMetrics.java |6 +- .../apache/ignite/cache/store/CacheStore.java |2 + .../ignite/cache/store/CacheStoreSession.java | 22 + .../cache/store/CacheStoreSessionListener.java | 133 +++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++ .../configuration/CacheConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 38 +- .../org/apache/ignite/internal/IgnitionEx.java |2 +- .../managers/communication/GridIoManager.java | 12 +- .../discovery/GridDiscoveryManager.java |4 +- .../cache/CacheEvictableEntryImpl.java | 31 + .../processors/cache/CacheMetricsImpl.java |4 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../processors/cache/GridCacheProcessor.java| 12 +- .../cache/GridCacheSharedContext.java | 47 +- .../processors/cache/GridCacheUtils.java| 54 + .../cache/distributed/dht/GridDhtGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +- .../GridDhtPartitionsExchangeFuture.java| 46 +- .../dht/preloader/GridDhtPreloader.java |9 +- .../local/atomic/GridLocalAtomicCache.java | 25 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/store/CacheOsStoreManager.java|1 - .../cache/store/CacheStoreManager.java |7 +- .../store/GridCacheStoreManagerAdapter.java | 202 +++- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++- .../processors/query/GridQueryProcessor.java| 305 +++-- .../spi/discovery/tcp/TcpDiscoverySpi.java |2 +- ...cheStoreSessionListenerAbstractSelfTest.java | 315 ++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 27 + .../cache/GridCacheAbstractMetricsSelfTest.java | 48 +- .../GridCacheConcurrentTxMultiNodeTest.java |8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java |5 +- .../cache/GridCacheReloadSelfTest.java |6 +- .../cache/IgniteCachePeekModesAbstractTest.java |5 +- .../IgniteCrossCacheTxStoreSelfTest.java| 147 ++- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java |6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java| 32 + ...ePartitionedMultiThreadedPutGetSelfTest.java |6 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java |2 +- .../cache/eviction/EvictionAbstractTest.java| 1056 ++ .../GridCacheBatchEvictUnswapSelfTest.java |5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java |5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 .../GridCacheEvictionTouchSe
[15/50] incubator-ignite git commit: ignite-948 Add Java API for Ignite RDD
ignite-948 Add Java API for Ignite RDD
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d36d123
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d36d123
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d36d123
Branch: refs/heads/ignite-998
Commit: 4d36d12361b78aa79517addce2a33fd772a0201e
Parents: ac9dd30
Author: agura
Authored: Tue Jun 2 01:09:17 2015 +0300
Committer: agura
Committed: Thu Jun 4 22:15:42 2015 +0300
--
examples/config/example-ignite.xml | 4 +-
modules/spark/pom.xml | 14 +
.../spark/examples/java/ColocationTest.java | 89 ++
.../examples/java/ExampleConfiguration.java | 31 ++
.../examples/java/IgniteProcessExample.java | 80 +
.../spark/examples/java/IgniteStoreExample.java | 68 +
.../spark/examples/java/package-info.java | 21 ++
.../org/apache/ignite/spark/IgniteRDD.scala | 10 +-
.../apache/ignite/spark/JavaIgniteContext.scala | 63
.../org/apache/ignite/spark/JavaIgniteRDD.scala | 99 ++
.../ignite/spark/examples/ColocationTest.scala | 5 +-
.../spark/impl/JavaIgniteAbstractRDD.scala | 34 +++
.../ignite/spark/JavaIgniteRDDSelfTest.java | 298 +++
parent/pom.xml | 4 +
14 files changed, 811 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/examples/config/example-ignite.xml
--
diff --git a/examples/config/example-ignite.xml
b/examples/config/example-ignite.xml
index e746e59..dcb2ba8 100644
--- a/examples/config/example-ignite.xml
+++ b/examples/config/example-ignite.xml
@@ -30,14 +30,16 @@
http://www.springframework.org/schema/util/spring-util.xsd";>
+
+
+-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/modules/spark/pom.xml
--
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index c22a52b..8900a10 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -87,6 +87,20 @@
${project.version}
test
+
+
+org.springframework
+spring-beans
+${spring.version}
+test
+
+
+
+org.springframework
+spring-context
+${spring.version}
+test
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d36d123/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
--
diff --git
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
new file mode 100644
index 000..20d6e88
--- /dev/null
+++
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.spark.examples.java;
+
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spark.*;
+import org.apache.spark.*;
+import org.apache.spark.api.java.*;
+import org.apache.spark.api.java.function.*;
+
+import scala.Tuple2;
+
+import java.util.*;
+
+/**
+ * Colocation test example.
+ */
+public class ColocationTest {
+/** Keys count. */
+private static final int KEYS_CNT = 1;
+
+/** To pair function. */
+private static final IgniteClosure>
TO_PAIR_F =
+new IgniteClosure>() {
+@Override public Tuple2 apply(Integer i) {
+return new Tupl
[50/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-998
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-998 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ab301d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ab301d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ab301d2 Branch: refs/heads/ignite-998 Commit: 4ab301d2f0505ee3a67978392827dcccea60a58b Parents: 46e6c48 89a4f7c Author: sboikov Authored: Thu Jun 11 10:19:02 2015 +0300 Committer: sboikov Committed: Thu Jun 11 10:19:02 2015 +0300 -- DEVNOTES.txt| 6 + assembly/dependencies-fabric.xml| 1 + examples/pom.xml| 34 ++ .../client/memcache/MemcacheRestExample.java| 32 +- modules/core/pom.xml| 1 - .../java/org/apache/ignite/IgniteCache.java | 25 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../apache/ignite/cache/query/ScanQuery.java| 45 +- .../configuration/CacheConfiguration.java | 1 - .../affinity/GridAffinityAssignmentCache.java | 8 +- .../processors/cache/GridCacheAdapter.java | 15 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java| 30 +- .../processors/cache/GridCacheSwapManager.java | 55 ++- .../processors/cache/IgniteCacheProxy.java | 11 +- .../processors/cache/IgniteInternalCache.java | 27 +- .../processors/cache/QueryCursorImpl.java | 23 +- .../distributed/dht/GridDhtLocalPartition.java | 7 + .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheQueryAdapter.java | 147 ++- .../cache/query/GridCacheQueryManager.java | 209 ++ .../cache/query/GridCacheQueryRequest.java | 47 ++- .../processors/cache/query/QueryCursorEx.java | 8 + .../datastructures/GridCacheSetImpl.java| 4 +- .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java| 18 +- .../service/GridServiceProcessor.java | 2 +- .../ignite/internal/util/GridJavaProcess.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../shmem/IpcSharedMemoryClientEndpoint.java| 2 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 151 ++- .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- .../util/nio/GridShmemCommunicationClient.java | 146 +++ .../communication/tcp/TcpCommunicationSpi.java | 415 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 15 + .../cache/IgniteDynamicCacheStartSelfTest.java | 19 + .../distributed/IgniteCacheManyClientsTest.java | 169 .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 112 +++-- .../ipc/shmem/IgfsSharedMemoryTestServer.java | 2 + .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +- .../LoadWithCorruptedLibFileTestRunner.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../IpcSharedMemoryBenchmarkWriter.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../ignite/testframework/GridTestUtils.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + modules/hadoop/pom.xml | 1 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 7 + .../processors/query/h2/IgniteH2Indexing.java | 44 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 408 +++
[41/50] incubator-ignite git commit: # ignite-sprint-5 NPE in RoundRobinGlobalLoadBalancer
# ignite-sprint-5 NPE in RoundRobinGlobalLoadBalancer
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/308b0c0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/308b0c0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/308b0c0c
Branch: refs/heads/ignite-998
Commit: 308b0c0c9cfff7f8615cbeedd2e0ccfa8288407b
Parents: 8f455a9
Author: sboikov
Authored: Wed Jun 10 16:30:29 2015 +0300
Committer: sboikov
Committed: Wed Jun 10 16:30:29 2015 +0300
--
.../spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/308b0c0c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
index 8dba0db..a47a17f 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinGlobalLoadBalancer.java
@@ -45,7 +45,7 @@ class RoundRobinGlobalLoadBalancer {
private final IgniteLogger log;
/** Current snapshot of nodes which participated in load balancing. */
-private volatile GridNodeList nodeList = new GridNodeList(0, null);
+private volatile GridNodeList nodeList = new GridNodeList(0, new
ArrayList(0));
/** Mutex for updating current topology. */
private final Object mux = new Object();
[29/50] incubator-ignite git commit: GG-10406
GG-10406 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79ae3230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79ae3230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79ae3230 Branch: refs/heads/ignite-998 Commit: 79ae3230cd36866452959a42ba1b9b60bd83a122 Parents: 7e8f648 Author: avinogradov Authored: Tue Jun 9 12:54:03 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 12:54:03 2015 +0300 -- modules/hadoop/pom.xml| 1 + modules/spark-2.10/README.txt | 4 modules/spark/README.txt | 4 3 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/hadoop/pom.xml -- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index fe11389..4c57df3 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -96,6 +96,7 @@ org.gridgain ignite-shmem +test 1.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/spark-2.10/README.txt -- diff --git a/modules/spark-2.10/README.txt b/modules/spark-2.10/README.txt deleted file mode 100644 index 29d3930..000 --- a/modules/spark-2.10/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -Apache Ignite Spark Module - -Apache Ignite Spark module to be build with Scala 2.10. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ae3230/modules/spark/README.txt -- diff --git a/modules/spark/README.txt b/modules/spark/README.txt new file mode 100644 index 000..5678441 --- /dev/null +++ b/modules/spark/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Spark Module +--- + +Apache Ignite Spark module.
[05/50] incubator-ignite git commit: # ignite-970
# ignite-970
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7158fb6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7158fb6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7158fb6a
Branch: refs/heads/ignite-998
Commit: 7158fb6a4ff7b9db3afda73f75376ad3285c556c
Parents: d6f9b64
Author: sboikov
Authored: Tue Jun 2 15:57:16 2015 +0300
Committer: sboikov
Committed: Tue Jun 2 15:57:16 2015 +0300
--
.../GridTcpCommunicationSpiMultithreadedSelfTest.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7158fb6a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 5d25299..dc7f344 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -62,8 +62,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
private static final Collection spiRsrcs = new
ArrayList<>();
/** SPIs */
-private static final Map> spis =
-new ConcurrentHashMap<>();
+private static final Map> spis = new
ConcurrentHashMap<>();
/** Listeners. */
private static final Map lsnrs = new HashMap<>();
@@ -85,13 +84,20 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest
extends GridSpiAbstrac
/**
* @param useShmem Use shared mem.
*/
-public GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
+protected GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) {
super(false);
this.useShmem = useShmem;
}
/**
+ *
+ */
+public GridTcpCommunicationSpiMultithreadedSelfTest() {
+this(false);
+}
+
+/**
* Accumulating listener.
*/
@SuppressWarnings({"deprecation"})
[31/50] incubator-ignite git commit: Merge branch 'ignite-389' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-389' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b812c0f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b812c0f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b812c0f1 Branch: refs/heads/ignite-998 Commit: b812c0f165162a94f766bf8e4e12beb7e8170e5d Parents: 9fca6b5 79ae323 Author: agura Authored: Tue Jun 9 14:43:14 2015 +0300 Committer: agura Committed: Tue Jun 9 14:43:14 2015 +0300 -- modules/hadoop/pom.xml| 1 + modules/spark-2.10/README.txt | 4 modules/spark/README.txt | 4 3 files changed, 5 insertions(+), 4 deletions(-) --
[24/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1552a4b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1552a4b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1552a4b2 Branch: refs/heads/ignite-998 Commit: 1552a4b2474bc92ed3aa654c2a477cf444d88e0a Parents: fa97def 0fa2853 Author: Alexey Goncharuk Authored: Mon Jun 8 15:27:35 2015 -0700 Committer: Alexey Goncharuk Committed: Mon Jun 8 15:27:35 2015 -0700 -- DEVNOTES.txt| 42 +- .../java/org/apache/ignite/IgniteCache.java | 16 + .../apache/ignite/internal/IgniteKernal.java| 28 +- .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/MarshallerContextAdapter.java | 36 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/GridDiscoveryManager.java | 28 +- .../affinity/GridAffinityProcessor.java | 23 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheAdapter.java | 21 +- .../processors/cache/GridCacheContext.java | 13 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java| 37 +- .../processors/cache/GridCacheProxyImpl.java| 14 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../processors/cache/IgniteCacheProxy.java | 23 + .../processors/cache/IgniteInternalCache.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 22 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java| 50 +- .../transactions/IgniteTxLocalAdapter.java | 28 + .../cache/transactions/IgniteTxManager.java | 3 - .../datastreamer/DataStreamerImpl.java | 92 ++- .../datastructures/DataStructuresProcessor.java | 107 +++- .../processors/igfs/IgfsMetaManager.java| 2 +- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../IgniteTxRollbackCheckedException.java | 9 + .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java| 554 --- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java| 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 27 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 443 --- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java| 3 - .../ignite/spi/discovery/tcp/ServerImpl.java| 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +- ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++ .../GridCacheExAbstractFullApiSelfTest.java | 103 .../IgniteCountDownLatchAbstractSelfTest.java | 102 .../GridCacheExColocatedFullApiSelfTest.java| 33 -- .../near/GridCacheExNearFullApiSelfTest.java| 39 -- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../IgniteCacheClientNearCacheExpiryTest.java | 103 .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../local/GridCacheExLocalFullApiSelfTest.java | 30 - .../DataStreamerMultiThreadedSelfTest.java | 59 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 .../internal/util/nio/GridNioSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../IgniteMessagingWithClientTest.java | 2 + .../GridTcpCommunicationSpiAbstractTest.java| 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java| 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + .../IgniteCacheFullApiSelfTestSuite.java| 6 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java |
[19/50] incubator-ignite git commit: Merge branch ignite-sprint-5 into ignite-389
Merge branch ignite-sprint-5 into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5872b7f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5872b7f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5872b7f2 Branch: refs/heads/ignite-998 Commit: 5872b7f20064fb19d682ae2204ce83c4c9a58183 Parents: 0c2d381 c9f7291 Author: Alexey Goncharuk Authored: Thu Jun 4 19:22:20 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:22:20 2015 -0700 -- .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java| 3 + .../managers/communication/GridIoManager.java | 117 .../processors/cache/GridCacheContext.java | 3 - .../dht/GridClientPartitionTopology.java| 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java| 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java| 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 3 + .../ignite/spi/discovery/tcp/ServerImpl.java| 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ...niteDynamicCacheWithConfigStartSelfTest.java | 35 +-- .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java| 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java| 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java| 5 +- .../processors/hadoop/HadoopTasksV2Test.java| 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 48 files changed, 1358 insertions(+), 299 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5872b7f2/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5872b7f2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java --
[39/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-gg-10299' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-gg-10299' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f455a9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f455a9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f455a9e Branch: refs/heads/ignite-998 Commit: 8f455a9ee27144adc2f3fe7cd8c5516d3da15fed Parents: eb415ba 2796bcc Author: avinogradov Authored: Wed Jun 10 14:09:05 2015 +0300 Committer: avinogradov Committed: Wed Jun 10 14:09:05 2015 +0300 -- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../test/java/org/apache/ignite/testframework/GridTestUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[09/50] incubator-ignite git commit: 389-3
389-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa3bb636 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa3bb636 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa3bb636 Branch: refs/heads/ignite-998 Commit: aa3bb6361663ef4397b79321046c37f310376f5f Parents: bae1804 Author: avinogradov Authored: Wed Jun 3 13:44:03 2015 +0300 Committer: avinogradov Committed: Wed Jun 3 13:44:03 2015 +0300 -- assembly/dependencies-fabric.xml| 1 + modules/scalar-2.10/licenses/apache-2.0.txt | 202 +++ .../scalar-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark-2.10/licenses/apache-2.0.txt | 202 +++ .../spark-2.10/licenses/scala-bsd-license.txt | 18 ++ modules/spark/licenses/apache-2.0.txt | 202 +++ modules/spark/licenses/scala-bsd-license.txt| 18 ++ 7 files changed, 661 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3bb636/assembly/dependencies-fabric.xml -- diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml index a294243..c6668f6 100644 --- a/assembly/dependencies-fabric.xml +++ b/assembly/dependencies-fabric.xml @@ -113,6 +113,7 @@ org.apache.ignite:ignite-examples org.apache.ignite:ignite-indexing org.apache.ignite:ignite-visor-console +org.apache.ignite:ignite-visor-console_2.10 org.apache.ignite:ignite-visor-plugins org.apache.ignite:ignite-visor-trial org.apache.ignite:ignite-hadoop http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3bb636/modules/scalar-2.10/licenses/apache-2.0.txt -- diff --git a/modules/scalar-2.10/licenses/apache-2.0.txt b/modules/scalar-2.10/licenses/apache-2.0.txt new file mode 100644 index 000..d645695 --- /dev/null +++ b/modules/scalar-2.10/licenses/apache-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the
[37/50] incubator-ignite git commit: # sprint-5 minor
# sprint-5 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b056f0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b056f0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b056f0b
Branch: refs/heads/ignite-998
Commit: 2b056f0bfea7efced660ccb47e7dfd5968e137d8
Parents: eeae5b7
Author: Yakov Zhdanov
Authored: Wed Jun 10 14:04:03 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Jun 10 14:04:03 2015 +0300
--
.../client/memcache/MemcacheRestExample.java| 32 ++--
1 file changed, 16 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b056f0b/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 877dadd..a15afd7 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
@@ -85,22 +85,22 @@ public class MemcacheRestExample {
// Check that cache is empty.
System.out.println(">>> Current cache size: " + cache.size() + "
(expected: 0).");
-// Create atomic long.
-IgniteAtomicLong l = ignite.atomicLong("atomicLong", 10, true);
-
-// Increment atomic long by 5 using Memcache client.
-if (client.incr("atomicLong", 5, 0) == 15)
-System.out.println(">>> Successfully incremented atomic long
by 5.");
-
-// Increment atomic long using Ignite API and check that value is
correct.
-System.out.println(">>> New atomic long value: " +
l.incrementAndGet() + " (expected: 16).");
-
-// Decrement atomic long by 3 using Memcache client.
-if (client.decr("atomicLong", 3, 0) == 13)
-System.out.println(">>> Successfully decremented atomic long
by 3.");
-
-// Decrement atomic long using Ignite API and check that value is
correct.
-System.out.println(">>> New atomic long value: " +
l.decrementAndGet() + " (expected: 12).");
+// Create atomic long and close it after test is done.
+try (IgniteAtomicLong l = ignite.atomicLong("atomicLong", 10,
true)) {
+// Increment atomic long by 5 using Memcache client.
+if (client.incr("atomicLong", 5, 0) == 15)
+System.out.println(">>> Successfully incremented atomic
long by 5.");
+
+// Increment atomic long using Ignite API and check that value
is correct.
+System.out.println(">>> New atomic long value: " +
l.incrementAndGet() + " (expected: 16).");
+
+// Decrement atomic long by 3 using Memcache client.
+if (client.decr("atomicLong", 3, 0) == 13)
+System.out.println(">>> Successfully decremented atomic
long by 3.");
+
+// Decrement atomic long using Ignite API and check that value
is correct.
+System.out.println(">>> New atomic long value: " +
l.decrementAndGet() + " (expected: 12).");
+}
}
finally {
if (client != null)
[32/50] incubator-ignite git commit: GG-10406
GG-10406 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f129d08c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f129d08c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f129d08c Branch: refs/heads/ignite-998 Commit: f129d08c6855ca6e720ebb3bb1ea76357f54aef6 Parents: 79ae323 Author: avinogradov Authored: Tue Jun 9 15:11:27 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:11:27 2015 +0300 -- modules/spark-2.10/README.txt | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f129d08c/modules/spark-2.10/README.txt -- diff --git a/modules/spark-2.10/README.txt b/modules/spark-2.10/README.txt new file mode 100644 index 000..29d3930 --- /dev/null +++ b/modules/spark-2.10/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Spark Module +--- + +Apache Ignite Spark module to be build with Scala 2.10.
[17/50] incubator-ignite git commit: IGNITE-389 - IPC checked and API improvements.
IGNITE-389 - IPC checked and API improvements.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b51f99e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b51f99e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b51f99e
Branch: refs/heads/ignite-998
Commit: 6b51f99e72eb11af25403f8ec50087c03b1f1fb7
Parents: 1d8643c
Author: Alexey Goncharuk
Authored: Thu Jun 4 19:19:36 2015 -0700
Committer: Alexey Goncharuk
Committed: Thu Jun 4 19:19:36 2015 -0700
--
.../ignite/internal/util/IgniteUtils.java | 4 +-
.../shmem/IpcSharedMemoryClientEndpoint.java| 2 +-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 150 +--
.../shmem/IpcSharedMemoryServerEndpoint.java| 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../LoadWithCorruptedLibFileTestRunner.java | 2 +-
.../IpcSharedMemoryBenchmarkReader.java | 2 +-
.../IpcSharedMemoryBenchmarkWriter.java | 2 +-
.../hadoop/HadoopAbstractSelfTest.java | 1 +
.../org/apache/ignite/spark/IgniteContext.scala | 19 ++-
.../org/apache/ignite/spark/IgniteRDD.scala | 8 +-
13 files changed, 171 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 0932212..9016b10 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9025,11 +9025,11 @@ public abstract class IgniteUtils {
hasShmem = false;
else {
try {
-IpcSharedMemoryNativeLoader.load();
+IpcSharedMemoryNativeLoader.load(null);
hasShmem = true;
}
-catch (IgniteCheckedException e) {
+catch (IgniteCheckedException ignore) {
hasShmem = false;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
index 27a234f..c935c4a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java
@@ -112,7 +112,7 @@ public class IpcSharedMemoryClientEndpoint implements
IpcEndpoint {
boolean clear = true;
try {
-IpcSharedMemoryNativeLoader.load();
+IpcSharedMemoryNativeLoader.load(log);
sock.connect(new InetSocketAddress("127.0.0.1", port), timeout);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b51f99e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index dc00ca6..8c345f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.util.ipc.shmem;
import org.apache.ignite.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -25,6 +26,8 @@ import java.net.*;
import java.nio.channels.*;
import java.security.*;
import java.util.*;
+import java.util.jar.*;
+import java.util.zip.*;
import static org.apache.ignite.internal.IgniteVersionUtils.*;
@@ -36,6 +39,9 @@ public class IpcSharedMemoryNativeLoader {
/** Library name base. */
private static final String LIB_NAME_BASE = "ign
[36/50] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/980bf759 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/980bf759 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/980bf759 Branch: refs/heads/ignite-998 Commit: 980bf759e96954577e7a0b8662d7e6a63b6a4d2f Parents: 079bcc6 928be42 Author: Alexey Goncharuk Authored: Wed Jun 10 00:05:47 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 10 00:05:47 2015 -0700 -- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../managers/indexing/GridIndexingManager.java | 4 - .../affinity/GridAffinityAssignment.java| 12 ++ .../affinity/GridAffinityAssignmentCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../GridDhtPartitionsExchangeFuture.java| 14 ++- .../continuous/GridContinuousProcessor.java | 2 + .../util/nio/GridNioDelimitedBuffer.java| 2 +- .../visor/node/VisorNodeDataCollectorTask.java | 9 +- .../node/VisorNodeDataCollectorTaskResult.java | 17 +-- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../internal/visor/query/VisorQueryJob.java | 11 +- .../internal/visor/query/VisorQueryTask.java| 3 +- .../visor/util/VisorExceptionWrapper.java | 81 ++ .../internal/visor/util/VisorTaskUtils.java | 10 ++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +- .../continuous/GridEventConsumeSelfTest.java| 7 +- .../nio/GridNioDelimitedBufferSelfTest.java | 112 +++ .../util/nio/GridNioDelimitedBufferTest.java| 112 --- .../stream/socket/SocketStreamerSelfTest.java | 29 ++--- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteStreamSelfTestSuite.java | 39 +++ .../testsuites/IgniteStreamTestSuite.java | 39 --- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 62 +- 25 files changed, 395 insertions(+), 207 deletions(-) --
[38/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5_
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5_ Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb415ba8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb415ba8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb415ba8 Branch: refs/heads/ignite-998 Commit: eb415ba89513d50f6b690e79d3d99186c057f2e1 Parents: 2b056f0 af120a7 Author: Yakov Zhdanov Authored: Wed Jun 10 14:04:18 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jun 10 14:04:18 2015 +0300 -- .../ignite/internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/internal/visor/util/VisorTaskUtils.java | 16 +--- 2 files changed, 6 insertions(+), 12 deletions(-) --
[14/50] incubator-ignite git commit: IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389-ipc
IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389-ipc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d8643c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d8643c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d8643c0 Branch: refs/heads/ignite-998 Commit: 1d8643c0b93786f7eeff82bb56b64e6df53b3697 Parents: a329e90 c9f7291 Author: Alexey Goncharuk Authored: Thu Jun 4 11:09:30 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 11:09:30 2015 -0700 -- .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java| 3 + .../managers/communication/GridIoManager.java | 117 .../processors/cache/GridCacheContext.java | 3 - .../dht/GridClientPartitionTopology.java| 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java| 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../processors/hadoop/HadoopTaskContext.java| 14 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 3 + .../ignite/spi/discovery/tcp/ServerImpl.java| 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ...niteDynamicCacheWithConfigStartSelfTest.java | 35 +-- .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 164 +++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java| 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java| 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java| 5 +- .../processors/hadoop/HadoopTasksV2Test.java| 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 48 files changed, 1358 insertions(+), 299 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8643c0/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java --
[11/50] incubator-ignite git commit: 389-3
389-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac9dd30f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac9dd30f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac9dd30f Branch: refs/heads/ignite-998 Commit: ac9dd30f640ccb1ca4708578437f090a41546cd7 Parents: aa3bb63 Author: avinogradov Authored: Wed Jun 3 16:59:16 2015 +0300 Committer: avinogradov Committed: Wed Jun 3 16:59:16 2015 +0300 -- modules/scalar-2.10/pom.xml | 9 + modules/spark-2.10/pom.xml | 2 ++ 2 files changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac9dd30f/modules/scalar-2.10/pom.xml -- diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml index 23eb13e..e3d6125 100644 --- a/modules/scalar-2.10/pom.xml +++ b/modules/scalar-2.10/pom.xml @@ -83,6 +83,8 @@ +../scalar/src/main/scala + ../scalar/src/main/scala @@ -101,6 +103,13 @@ + + +net.alchim31.maven +scala-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac9dd30f/modules/spark-2.10/pom.xml -- diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml index 2cf0af5..2547f7c 100644 --- a/modules/spark-2.10/pom.xml +++ b/modules/spark-2.10/pom.xml @@ -90,6 +90,8 @@ +../spark/src/main/scala + ../spark/src/main/scala
[35/50] incubator-ignite git commit: ignite-10299
ignite-10299 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2796bcc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2796bcc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2796bcc9 Branch: refs/heads/ignite-998 Commit: 2796bcc9c9abea0257c10cd1f90b48d46dcf9fc5 Parents: ea41b30 Author: avinogradov Authored: Tue Jun 9 15:29:34 2015 +0300 Committer: avinogradov Committed: Tue Jun 9 15:29:34 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySpi.java | 52 1 file changed, 21 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2796bcc9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index dab81ec..e4ef744 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -18,44 +18,34 @@ package org.apache.ignite.spi.discovery.tcp; import org.apache.ignite.*; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.configuration.AddressResolver; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteInterruptedCheckedException; -import org.apache.ignite.internal.util.GridConcurrentSkipListSet; -import org.apache.ignite.internal.util.io.GridByteArrayOutputStream; -import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.internal.util.typedef.internal.LT; -import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.lang.IgniteProductVersion; -import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.jdk.JdkMarshaller; -import org.apache.ignite.resources.IgniteInstanceResource; -import org.apache.ignite.resources.LoggerResource; +import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.internal.util.io.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.marshaller.jdk.*; +import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.discovery.*; -import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; -import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryStatistics; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.discovery.tcp.internal.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.discovery.tcp.messages.*; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.*; import java.io.*; import java.net.*; import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.*; +import java.util.concurrent.atomic.*; /** * Discovery SPI implementation that uses TCP/IP for node discovery.
[43/50] incubator-ignite git commit: # ignite-sprint-5 more info in error message
# ignite-sprint-5 more info in error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/addc91b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/addc91b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/addc91b6
Branch: refs/heads/ignite-998
Commit: addc91b6518c4982d3410e3989b7d43c4db6e0c1
Parents: 8e26c48
Author: sboikov
Authored: Wed Jun 10 16:38:21 2015 +0300
Committer: sboikov
Committed: Wed Jun 10 16:38:21 2015 +0300
--
.../processors/affinity/GridAffinityAssignmentCache.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/addc91b6/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index c46490e..47f222e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -406,7 +406,10 @@ public class GridAffinityAssignmentCache {
if (cache == null) {
throw new IllegalStateException("Getting affinity for topology
version earlier than affinity is " +
-"calculated [locNodeId=" + ctx.localNodeId() + ", topVer="
+ topVer +
+"calculated [locNodeId=" + ctx.localNodeId() +
+", cache=" + cacheName +
+", history=" + affCache.keySet() +
+", topVer=" + topVer +
", head=" + head.get().topologyVersion() + ']');
}
}
[42/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e26c48a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e26c48a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e26c48a Branch: refs/heads/ignite-998 Commit: 8e26c48a5c838edbf3815c5585a69d03e5b4da9c Parents: 308b0c0 6a15596 Author: sboikov Authored: Wed Jun 10 16:30:57 2015 +0300 Committer: sboikov Committed: Wed Jun 10 16:30:57 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 25 +- .../processors/cache/IgniteInternalCache.java | 27 ++-- 2 files changed, 32 insertions(+), 20 deletions(-) --
[13/50] incubator-ignite git commit: Merge branch 'ignite-970' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389-ipc
Merge branch 'ignite-970' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389-ipc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a329e901 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a329e901 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a329e901 Branch: refs/heads/ignite-998 Commit: a329e901d47419d5ab5e1db55dee6d2001f9d66e Parents: 7ee51ba 7158fb6 Author: Alexey Goncharuk Authored: Wed Jun 3 15:22:36 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Jun 3 15:22:36 2015 -0700 -- modules/core/pom.xml| 1 - .../util/nio/GridShmemCommunicationClient.java | 151 +++ .../communication/tcp/TcpCommunicationSpi.java | 414 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 6 + 21 files changed, 718 insertions(+), 21 deletions(-) --
[40/50] incubator-ignite git commit: #sberb-25: IgniteCache.removeAll ignores tx timeout - add JavaDoc for IgniteCache.removeAll
#sberb-25: IgniteCache.removeAll ignores tx timeout - add JavaDoc for
IgniteCache.removeAll
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a155962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a155962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a155962
Branch: refs/heads/ignite-998
Commit: 6a1559623ed587bd793e922e762b5ec76af024ad
Parents: 8f455a9
Author: ivasilinets
Authored: Wed Jun 10 15:40:49 2015 +0300
Committer: ivasilinets
Committed: Wed Jun 10 15:40:49 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 25 +-
.../processors/cache/IgniteInternalCache.java | 27 ++--
2 files changed, 32 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a155962/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 a54adc9..2b97e55 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.configuration.*;
+import javax.cache.event.*;
import javax.cache.expiry.*;
import javax.cache.integration.*;
import javax.cache.processor.*;
@@ -378,7 +379,29 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
@IgniteAsyncSupported
@Override public void removeAll(Set keys);
-/** {@inheritDoc} */
+/**
+ * Removes all of the mappings from this cache.
+ *
+ * The order that the individual entries are removed is undefined.
+ *
+ * For every mapping that exists the following are called:
+ *
+ * any registered {@link CacheEntryRemovedListener}s
+ * if the cache is a write-through cache, the {@link
CacheWriter}
+ *
+ * If the cache is empty, the {@link CacheWriter} is not called.
+ *
+ * This operation is not transactional. It calls broadcast closure that
+ * deletes all primary keys from remote nodes.
+ *
+ * This is potentially an expensive operation as listeners are invoked.
+ * Use {@link #clear()} to avoid this.
+ *
+ * @throws IllegalStateException if the cache is {@link #isClosed()}
+ * @throws CacheExceptionif there is a problem during the remove
+ * @see #clear()
+ * @see CacheWriter#deleteAll
+ */
@IgniteAsyncSupported
@Override public void removeAll();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a155962/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index d98379c..9972f92 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -1135,11 +1135,9 @@ public interface IgniteInternalCache extends
Iterable> {
public IgniteInternalFuture removeAsync(K key, V val);
/**
- * Removes given key mappings from cache for entries for which the
optionally passed in filters do
- * pass.
+ * Removes given key mappings from cache.
*
- * If write-through is enabled, the values will be removed from {@link
CacheStore}
- * via @link CacheStore#removeAll(Transaction, Collection)
method.
+ * If write-through is enabled, the values will be removed from {@link
CacheStore} via {@link IgniteDataStreamer}.
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
@@ -1150,11 +1148,9 @@ public interface IgniteInternalCache extends
Iterable> {
public void removeAll(@Nullable Collection keys) throws
IgniteCheckedException;
/**
- * Asynchronously removes given key mappings from cache for entries for
which the optionally
- * passed in filters do pass.
+ * Asynchronously removes given key mappings from cache for entries.
*
- * If write-through is enabled, the values will be removed from {@link
CacheStore}
- * via @link CacheStore#removeAll(Transaction, Collection)
method.
+ * If write-through is enabled, the values will be removed from {@link
CacheStore} via {@link
[25/50] incubator-ignite git commit: #IGNITE-389 - Javadoc and API cleanup.
#IGNITE-389 - Javadoc and API cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d1e5342
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d1e5342
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d1e5342
Branch: refs/heads/ignite-998
Commit: 3d1e5342f32f56d2479ec7971e8fe2f4adfbf468
Parents: 1552a4b
Author: Alexey Goncharuk
Authored: Mon Jun 8 16:03:34 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 16:03:34 2015 -0700
--
.../spark/examples/java/ColocationTest.java | 89
.../examples/java/ExampleConfiguration.java | 31 ---
.../examples/java/IgniteProcessExample.java | 80 --
.../spark/examples/java/IgniteStoreExample.java | 68 ---
.../spark/examples/java/package-info.java | 21 -
.../org/apache/ignite/spark/IgniteContext.scala | 30 ++-
.../org/apache/ignite/spark/IgniteRDD.scala | 41 +++--
.../ignite/spark/examples/ColocationTest.scala | 39 -
.../spark/examples/ExampleConfiguration.scala | 41 -
.../spark/examples/IgniteProcessExample.scala | 52
.../spark/examples/IgniteStoreExample.scala | 41 -
11 files changed, 62 insertions(+), 471 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d1e5342/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
--
diff --git
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
b/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
deleted file mode 100644
index 20d6e88..000
---
a/modules/spark/src/main/java/org/apache/ignite/spark/examples/java/ColocationTest.java
+++ /dev/null
@@ -1,89 +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.spark.examples.java;
-
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spark.*;
-import org.apache.spark.*;
-import org.apache.spark.api.java.*;
-import org.apache.spark.api.java.function.*;
-
-import scala.Tuple2;
-
-import java.util.*;
-
-/**
- * Colocation test example.
- */
-public class ColocationTest {
-/** Keys count. */
-private static final int KEYS_CNT = 1;
-
-/** To pair function. */
-private static final IgniteClosure>
TO_PAIR_F =
-new IgniteClosure>() {
-@Override public Tuple2 apply(Integer i) {
-return new Tuple2<>(i, i);
-}
-};
-
-/** To value function. */
-private static final Function, Integer>
TO_VALUE_F =
-new Function, Integer>() {
-/** {@inheritDoc} */
-@Override public Integer call(Tuple2 t) throws
Exception {
-return t._2();
-}
-};
-
-/** Sum function. */
-private static final Function2 SUM_F = new
Function2() {
-public Integer call(Integer x, Integer y) {
-return x + y;
-}
-};
-
-/**
- * @param args Args.
- */
-public static void main(String[] args) {
-SparkConf conf = new SparkConf();
-
-conf.setAppName("Colocation test");
-
-JavaSparkContext sc = new JavaSparkContext(conf);
-
-JavaIgniteContext ignite = new
JavaIgniteContext<>(sc, new ExampleConfiguration());
-
-JavaIgniteRDD cache =
ignite.fromCache("partitioned");
-
-List seq = F.range(0, KEYS_CNT + 1);
-
-JavaPairRDD rdd =
sc.parallelizePairs(F.transformList(seq, TO_PAIR_F), 48);
-
-cache.savePairs(rdd);
-
-int sum = (KEYS_CNT * KEYS_CNT - KEYS_CNT) / 2;
-
-// Execute parallel sum.
-System.out.println("Local sum: " + sum);
-
-System.out.println("Distributed sum: " + cache.map(TO_VALUE_F).fold(0,
SUM_F));
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d1e
[20/50] incubator-ignite git commit: Merge branch 'ignite-389-ipc' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-389-ipc' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa97def4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa97def4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa97def4 Branch: refs/heads/ignite-998 Commit: fa97def49403967db9ec8b6afdc3f18160b31ce3 Parents: 5872b7f 6b51f99 Author: Alexey Goncharuk Authored: Thu Jun 4 19:25:37 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Jun 4 19:25:37 2015 -0700 -- modules/core/pom.xml| 1 - .../ignite/internal/util/IgniteUtils.java | 4 +- .../shmem/IpcSharedMemoryClientEndpoint.java| 2 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 150 ++- .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- .../util/nio/GridShmemCommunicationClient.java | 151 +++ .../communication/tcp/TcpCommunicationSpi.java | 414 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../IgniteCacheMessageRecoveryAbstractTest.java | 1 + .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +- .../LoadWithCorruptedLibFileTestRunner.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../IpcSharedMemoryBenchmarkWriter.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 1 + .../spi/GridTcpSpiForwardingSelfTest.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java| 13 + ...mmunicationSpiConcurrentConnectSelfTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 ++ ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 + ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 + .../GridTcpCommunicationSpiShmemSelfTest.java | 38 ++ .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java| 2 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 13 + ...oopSecondaryFileSystemConfigurationTest.java | 14 + ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 + .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 + .../hadoop/HadoopAbstractSelfTest.java | 7 + .../org/apache/ignite/spark/IgniteContext.scala | 19 +- .../org/apache/ignite/spark/IgniteRDD.scala | 8 +- 33 files changed, 889 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa97def4/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala --
[30/50] incubator-ignite git commit: ignite-389 Partition scan fallback test fixed
ignite-389 Partition scan fallback test fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fca6b50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fca6b50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fca6b50
Branch: refs/heads/ignite-998
Commit: 9fca6b5005a6f5ddd16af936c6445748b398ed39
Parents: 7e8f648
Author: agura
Authored: Tue Jun 9 14:42:49 2015 +0300
Committer: agura
Committed: Tue Jun 9 14:42:49 2015 +0300
--
...CacheScanPartitionQueryFallbackSelfTest.java | 20
1 file changed, 16 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fca6b50/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index dfa7296..b7f5fa8 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -31,6 +31,8 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
@@ -47,6 +49,9 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
/** Keys count. */
private static final int KEYS_CNT = 5000;
+/** Ip finder. */
+private static final TcpDiscoveryVmIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
/** Backups. */
private int backups;
@@ -75,6 +80,13 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+cfg.setClientMode(clientMode);
+
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setIpFinder(IP_FINDER);
+discoSpi.setForceServerMode(true);
+cfg.setDiscoverySpi(discoSpi);
+
cfg.setCommunicationSpi(commSpiFactory.create());
CacheConfiguration ccfg = defaultCacheConfiguration();
@@ -85,8 +97,6 @@ public class CacheScanPartitionQueryFallbackSelfTest extends
GridCommonAbstractT
cfg.setCacheConfiguration(ccfg);
-cfg.setClientMode(clientMode);
-
return cfg;
}
@@ -183,6 +193,7 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
if (!test.get()) {
candidates.addAll(localPartitions(ignite1));
+
candidates.retainAll(localPartitions(ignite2));
}
@@ -195,8 +206,9 @@ public class CacheScanPartitionQueryFallbackSelfTest
extends GridCommonAbstractT
awaitPartitionMapExchange();
if (!test.get()) {
-Set parts = localPartitions(ignite1);
-candidates.removeAll(parts);
+candidates.removeAll(localPartitions(ignite1));
+
+F.retain(candidates, false,
localPartitions(ignite2));
}
latch.countDown();
[23/50] incubator-ignite git commit: ignite-10299
ignite-10299
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0e47298
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0e47298
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0e47298
Branch: refs/heads/ignite-998
Commit: d0e472987969cec87995dbb36887326b56bd7535
Parents: ea21500
Author: Anton Vinogradov
Authored: Tue Jun 9 01:11:28 2015 +0300
Committer: Anton Vinogradov
Committed: Tue Jun 9 01:11:28 2015 +0300
--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 54
1 file changed, 32 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0e47298/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 70bc9fb..48abcf4 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -18,34 +18,44 @@
package org.apache.ignite.spi.discovery.tcp;
import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.GridConcurrentSkipListSet;
+import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryStatistics;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import
org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder;
+import
org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
+import
org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
/**
* Discovery SPI implementation that uses TCP/IP for node discovery.
@@ -824,7 +834,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
/**
* @param srvPort Server port.
*/
-void initLocalNode(int srvPort, boolean addExtAddrAttr) {
+protected void initLocalNode(int srvPort, boolean addExtAddrA
[08/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10.
# IGNITE-956: Added support for scala-2.10.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bae1804e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bae1804e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bae1804e
Branch: refs/heads/ignite-998
Commit: bae1804ece3eb677c7f3e2c01c8566486af83c7d
Parents: ccd6825
Author: AKuznetsov
Authored: Wed Jun 3 16:29:06 2015 +0700
Committer: AKuznetsov
Committed: Wed Jun 3 16:29:06 2015 +0700
--
modules/scalar-2.10/pom.xml| 202
modules/spark-2.10/pom.xml | 18 +++
modules/visor-console-2.10/pom.xml | 96 +--
3 files changed, 176 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bae1804e/modules/scalar-2.10/pom.xml
--
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index b51c1b3..23eb13e 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -83,106 +83,106 @@
-
-
-net.alchim31.maven
-scala-maven-plugin
-
-
-scaladoc
-prepare-package
-
-doc
-
-
-Ignite Scalar
-Ignite Scalar
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.7
-
-
-org.apache.ignite
-ignite-tools
-${project.version}
-
-
-
-
-scaladoc-postprocessing
-
-run
-
-prepare-package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
src="package.html"
-
src=org/apache/ignite/scalar/scalar$.html
-
-
-
-
-
location.replace("package.html")
-
location.replace("org/apache/ignite/scalar/scalar$.html")
-
-
-
-
-
docs.scala-lang.org/overviews/scaladoc/usage.html#members
-
docs.scala-lang.org/overviews/scaladoc/interface.html
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+../scalar/src/main/scala
+
+**/*.scala
+
+
+
+
+
+
+../scalar/src/test/scala
+
+**/*.scala
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[26/50] incubator-ignite git commit: IGNITE-389 - Fixing shmem tests.
IGNITE-389 - Fixing shmem 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/2c3acf0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c3acf0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c3acf0e
Branch: refs/heads/ignite-998
Commit: 2c3acf0e7747fee9bc565b74670e43d9858c5387
Parents: 3d1e534
Author: Alexey Goncharuk
Authored: Mon Jun 8 16:27:31 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon Jun 8 16:27:31 2015 -0700
--
.../java/org/apache/ignite/internal/util/GridJavaProcess.java | 2 +-
.../ignite/internal/util/nio/GridShmemCommunicationClient.java | 5 -
.../internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java | 2 ++
3 files changed, 3 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index 42fe089..4946eb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -138,7 +138,7 @@ public final class GridJavaProcess {
procCommands.add(javaBin);
procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs);
-if (!jvmArgs.contains("-cp") && !jvmArgs.contains("-classpath")) {
+if (jvmArgs == null || (!jvmArgs.contains("-cp") &&
!jvmArgs.contains("-classpath"))) {
String classpath = System.getProperty("java.class.path");
String sfcp = System.getProperty("surefire.test.class.path");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/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 f3dc46f..e05c37a 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
@@ -140,11 +140,6 @@ public class GridShmemCommunicationClient extends
GridAbstractCommunicationClien
}
/** {@inheritDoc} */
-@Override public void flushIfNeeded(long timeout) throws IOException {
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridShmemCommunicationClient.class, this,
super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3acf0e/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
index 1a8fd10..e220031 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IgfsSharedMemoryTestServer.java
@@ -49,6 +49,8 @@ public class IgfsSharedMemoryTestServer {
srv.start();
+System.out.println("IPC shared memory server endpoint started");
+
IpcEndpoint clientEndpoint = srv.accept();
is = clientEndpoint.inputStream();
