You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/07/20 10:34:01 UTC
[1/4] ignite git commit: Fixes after merge
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 4cbcbab54 -> a205d42c8
Fixes after merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abd1c74b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abd1c74b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abd1c74b
Branch: refs/heads/ignite-1232
Commit: abd1c74bda776896a8ba8096965f0c0c8aa9f955
Parents: c9a0b8c
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Jul 20 12:25:29 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Jul 20 12:25:29 2016 +0300
----------------------------------------------------------------------
.../platform/dotnet/PlatformDotNetConfigurationClosure.java | 5 -----
.../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 1 -
.../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 3 ---
3 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index 0b00804..cb9696c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -23,20 +23,15 @@ import org.apache.ignite.binary.BinaryBasicIdMapper;
import org.apache.ignite.binary.BinaryBasicNameMapper;
import org.apache.ignite.binary.BinaryIdMapper;
import org.apache.ignite.binary.BinaryNameMapper;
-import org.apache.ignite.cache.affinity.AffinityFunction;
-import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.PlatformConfiguration;
import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.internal.binary.BinaryRawReaderEx;
import org.apache.ignite.internal.binary.BinaryRawWriterEx;
import org.apache.ignite.internal.binary.BinaryReaderExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure;
-import org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction;
import org.apache.ignite.internal.processors.platform.lifecycle.PlatformLifecycleBean;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 9373f35..5c10612 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -63,7 +63,6 @@
<Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" />
<Compile Include="Cache\Affinity\AffinityFunctionTest.cs" />
<Compile Include="Cache\CacheConfigurationTest.cs" />
- <Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" />
<Compile Include="Cache\CacheDynamicStartTest.cs" />
<Compile Include="Cache\CacheNearTest.cs" />
<Compile Include="Cache\CacheTestAsyncWrapper.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index f6569b1..b0adf61 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -175,10 +175,7 @@
<Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" />
<Compile Include="Impl\Common\ObjectInfoHolder.cs" />
<Compile Include="Impl\Common\Platform.cs" />
- <Compile Include="Impl\Cache\Affinity\AffinityFunctionSerializer.cs" />
- <Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" />
<Compile Include="Impl\Cache\Event\JavaCacheEntryEventFilter.cs" />
- <Compile Include="Impl\Common\ObjectInfoHolder.cs" />
<Compile Include="Impl\Common\PlatformJavaObjectFactoryProxy.cs" />
<Compile Include="Compute\ComputeExecutionRejectedException.cs" />
<Compile Include="Compute\ComputeJobAdapter.cs" />
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a205d42c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a205d42c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a205d42c
Branch: refs/heads/ignite-1232
Commit: a205d42c8e16d328e1091cb623746c43ef5d7a3c
Parents: 4cbcbab 7079c18
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 20 13:33:29 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 20 13:33:29 2016 +0300
----------------------------------------------------------------------
.../platform/dotnet/PlatformDotNetConfigurationClosure.java | 5 -----
.../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 1 -
.../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 3 ---
.../internal/processors/schedule/GridScheduleSelfTest.java | 8 +++++++-
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[2/4] ignite git commit: fixed compilation under Java 7
Posted by sb...@apache.org.
fixed compilation under Java 7
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac266a79
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac266a79
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac266a79
Branch: refs/heads/ignite-1232
Commit: ac266a79845d6df94ce4dbc8a867dc7e06f685e3
Parents: 869db21
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 20 13:31:05 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 20 13:31:05 2016 +0300
----------------------------------------------------------------------
.../internal/processors/schedule/GridScheduleSelfTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac266a79/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
index b2463b4..f0860f2 100644
--- a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
+++ b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
@@ -336,7 +336,13 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoNextExecutionTime() throws Exception {
- SchedulerFuture<Integer> future = grid(0).scheduler().scheduleLocal(() -> 1, "{55} 53 3/5 * * *");
+ Callable<Integer> run = new Callable<Integer>() {
+ @Override public Integer call() {
+ return 1;
+ }
+ };
+
+ SchedulerFuture<Integer> future = grid(0).scheduler().scheduleLocal(run, "{55} 53 3/5 * * *");
try {
future.get();
[3/4] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7079c18a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7079c18a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7079c18a
Branch: refs/heads/ignite-1232
Commit: 7079c18a6950dcbb6c9ff54c70caddfbc2090f8b
Parents: ac266a7 abd1c74
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 20 13:31:47 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 20 13:31:47 2016 +0300
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 7 +-
assembly/LICENSE_HADOOP | 7 +-
examples/pom-standalone-lgpl.xml | 6 +-
examples/pom-standalone.xml | 6 +-
examples/pom.xml | 6 +-
examples/schema-import/pom-standalone.xml | 6 +-
examples/schema-import/pom.xml | 6 +-
modules/cassandra/pom.xml | 2 +-
modules/core/pom.xml | 6 +-
.../ignite/cache/query/ContinuousQuery.java | 47 +++++--
.../processors/cache/IgniteCacheProxy.java | 3 +-
.../continuous/CacheContinuousQueryManager.java | 9 +-
.../PlatformAffinityFunctionTarget.java | 8 +-
.../cache/affinity/PlatformAffinityUtils.java | 5 +
...ridCacheContinuousQueryAbstractSelfTest.java | 47 +++++++
modules/flume/README.txt | 2 +-
modules/kafka/README.txt | 4 +-
.../platforms/cpp/jni/include/ignite/jni/java.h | 8 +-
modules/platforms/cpp/jni/src/java.cpp | 20 +--
.../Apache.Ignite.Core.Tests.csproj | 3 +
.../Affinity/AffinityFunctionSpringTest.cs | 104 +++++++-------
.../Cache/CacheConfigurationTest.cs | 1 +
.../Config/Cache/Affinity/affinity-function.xml | 2 +-
.../Cache/Affinity/affinity-function2.xml | 49 +++++++
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 2 +-
.../Apache.Ignite.Core.Tests/TestRunner.cs | 2 +-
.../Apache.Ignite.Core.csproj | 13 +-
.../Cache/Affinity/Fair/FairAffinityFunction.cs | 1 +
.../Cache/Affinity/Fair/Package-Info.cs | 26 ++++
.../Cache/Affinity/Package-Info.cs | 26 ++++
.../Cache/Affinity/Rendezvous/Package-Info.cs | 26 ++++
.../Rendezvous/RendezvousAffinityFunction.cs | 1 +
.../Cache/Configuration/Package-Info.cs | 26 ++++
.../Cache/Eviction/Package-Info.cs | 26 ++++
.../Communication/Package-Info.cs | 26 ++++
.../Communication/Tcp/Package-Info.cs | 26 ++++
.../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +-
.../Impl/Binary/BinaryReaderExtensions.cs | 2 +-
.../Impl/Cache/Affinity/AffinityFunctionBase.cs | 140 +++++++++++++++++++
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 2 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 11 +-
parent/pom.xml | 1 +
42 files changed, 601 insertions(+), 122 deletions(-)
----------------------------------------------------------------------