[27/50] [abbrv] ignite git commit: ignite-1732 Fixed test to catch IgniteClientDisconnectedException.
ignite-1732 Fixed test to catch IgniteClientDisconnectedException. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/712e62bd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/712e62bd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/712e62bd Branch: refs/heads/ignite-1282 Commit: 712e62bd241cecac969d022461fc048453b3db6b Parents: c2d4d1d Author: sboikovAuthored: Fri Nov 27 13:12:55 2015 +0300 Committer: sboikov Committed: Fri Nov 27 13:12:55 2015 +0300 -- .../dht/IgniteAtomicLongChangingTopologySelfTest.java| 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/712e62bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java index a8d5801..56bc760 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReferenceArray; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; +import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteSet; import org.apache.ignite.configuration.AtomicConfiguration; @@ -214,7 +215,12 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract while (System.currentTimeMillis() < stop) { log.info("Iteration: " + iter++); -c.apply(ignite); +try { +c.apply(ignite); +} +catch (IgniteClientDisconnectedException e) { +e.reconnectFuture().get(); +} } finished.set(true);
[44/50] [abbrv] ignite git commit: typo fix
typo fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb5d54a6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb5d54a6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb5d54a6 Branch: refs/heads/ignite-1282 Commit: fb5d54a6b7b737b9dbf93651a478ed3d7a21e340 Parents: 292de51 Author: Anton VinogradovAuthored: Fri Nov 27 19:51:11 2015 +0300 Committer: Anton Vinogradov Committed: Fri Nov 27 19:51:11 2015 +0300 -- RELEASE_NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb5d54a6/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 42258f7..4985edb 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -10,7 +10,7 @@ Apache Ignite In-Memory Data Fabric 1.5 * Added IgniteSemaphore data structure. * Added MQTT Streamer. * Fixed failover for continuous queries. -* Fixed compilation and runtime errors under OpnJDK and IBM JDK. +* Fixed compilation and runtime errors under OpenJDK and IBM JDK. * Fixed Integer.size limitation for cache. * Fixed and improved cache types configuration. * Fixed cache rebalancing.
[42/50] [abbrv] ignite git commit: ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed
ignite-2020 GridProjectionLocalJobMultipleArgumentsSelfTest fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3cb64e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3cb64e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3cb64e3 Branch: refs/heads/ignite-1282 Commit: f3cb64e375ff97a35b25ec0687b7d599f212afbd Parents: 6312737 Author: aguraAuthored: Fri Nov 27 17:26:20 2015 +0300 Committer: agura Committed: Fri Nov 27 17:39:46 2015 +0300 -- .../GridProjectionLocalJobMultipleArgumentsSelfTest.java | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f3cb64e3/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java index 58ff1fb..356e002 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionLocalJobMultipleArgumentsSelfTest.java @@ -43,7 +43,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ -private static Collection ids; +private static Collection ids; /** */ private static AtomicInteger res; @@ -90,7 +90,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA for (int i : F.asList(1, 2, 3)) { res.add(grid().compute().affinityCall(null, i, new IgniteCallable() { @Override public Integer call() { -ids.add(System.identityHashCode(this)); +ids.add(this); return 10; } @@ -108,7 +108,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA for (int i : F.asList(1, 2, 3)) { grid().compute().affinityRun(null, i, new IgniteRunnable() { @Override public void run() { -ids.add(System.identityHashCode(this)); +ids.add(this); res.addAndGet(10); } @@ -125,8 +125,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA public void testCall() throws Exception { Collection res = grid().compute().apply(new C1 () { @Override public Integer apply(Integer arg) { - -ids.add(System.identityHashCode(this)); +ids.add(this); return 10 + arg; } @@ -144,7 +143,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA Collection res = grid().compute().apply(new C1 () { @Override public Integer apply(Integer arg) { -ids.add(System.identityHashCode(this)); +ids.add(this); return 10 + arg; }
[22/50] [abbrv] ignite git commit: IGNITE-1956: Added binary enums support.
http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs index 99af56d..e50279c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IBinaryTypeDescriptor.cs @@ -30,74 +30,52 @@ namespace Apache.Ignite.Core.Impl.Binary /// /// Type. /// -Type Type -{ -get; -} +Type Type { get; } /// /// Type ID. /// -int TypeId -{ -get; -} +int TypeId { get; } /// /// Type name. /// -string TypeName -{ -get; -} +string TypeName { get; } /// /// User type flag. /// -bool UserType -{ -get; -} +bool UserType { get; } /// /// Whether to cache deserialized value in IBinaryObject /// -bool KeepDeserialized -{ -get; -} +bool KeepDeserialized { get; } /// /// Name converter. /// -IBinaryNameMapper NameMapper -{ -get; -} +IBinaryNameMapper NameMapper { get; } /// /// Mapper. /// -IBinaryIdMapper IdMapper -{ -get; -} +IBinaryIdMapper IdMapper { get; } /// /// Serializer. /// -IBinarySerializer Serializer -{ -get; -} +IBinarySerializer Serializer { get; } /// /// Affinity key field name. /// -string AffinityKeyFieldName -{ -get; -} +string AffinityKeyFieldName { get; } + +/// +/// Gets a value indicating whether this descriptor represents an enum type. +/// +bool IsEnum { get; } /// /// Write type structure. http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs deleted file mode 100644 index ecc6807..000 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/IgniteBinary.cs +++ /dev/null @@ -1,192 +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. - */ - -namespace Apache.Ignite.Core.Impl.Binary -{ -using System; -using System.Collections.Generic; -using System.IO; -using Apache.Ignite.Core.Binary; -using Apache.Ignite.Core.Common; -using Apache.Ignite.Core.Impl.Binary.IO; -using Apache.Ignite.Core.Impl.Common; - -/// -/// Binary implementation. -/// -internal class IgniteBinary : IIgniteBinary -{ -/** Owning grid. */ -private readonly Marshaller _marsh; - -/// -/// Constructor. -/// -/// Marshaller. -internal IgniteBinary(Marshaller marsh) -{ -_marsh = marsh; -} - -/** */ -public T ToBinary(object obj) -{ -if (obj is IBinaryObject) -return (T)obj; - -IBinaryStream stream = new BinaryHeapStream(1024); - -// Serialize. -BinaryWriter writer = _marsh.StartMarshal(stream); - -try -{ -writer.Write(obj); -} -finally -{ -// Save metadata. -_marsh.FinishMarshal(writer); -} - -// Deserialize. -stream.Seek(0, SeekOrigin.Begin); - -return
[23/50] [abbrv] ignite git commit: IGNITE-1956: Added binary enums support.
http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs index ea472eb..373e173 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs @@ -80,24 +80,13 @@ namespace Apache.Ignite.Core.Tests.Binary new BinaryTypeConfiguration(typeof (BuilderCollection)), new BinaryTypeConfiguration(typeof (BuilderCollectionItem)), new BinaryTypeConfiguration(typeof (DecimalHolder)), -new BinaryTypeConfiguration(TypeEmpty) +new BinaryTypeConfiguration(TypeEmpty), +new BinaryTypeConfiguration(typeof(TestEnumRegistered)) }, DefaultIdMapper = new IdMapper() }, JvmClasspath = TestUtils.CreateTestClasspath(), -JvmOptions = new List -{ -"-ea", -"-Xcheck:jni", -"-Xms4g", -"-Xmx4g", -"-DIGNITE_QUIET=false", -"-Xnoagent", -"-Djava.compiler=NONE", -"-Xdebug", - "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005", -"-XX:+HeapDumpOnOutOfMemoryError" -}, +JvmOptions = TestUtils.TestJavaOptions(), SpringConfigUrl = "config\\binary.xml" }; @@ -198,7 +187,7 @@ namespace Apache.Ignite.Core.Tests.Binary DateTime date = DateTime.Now.ToUniversalTime(); Guid guid = Guid.NewGuid(); -IIgniteBinary api = _grid.GetBinary(); +IBinary api = _grid.GetBinary(); // 1. Primitives. Assert.AreEqual(1, api.ToBinary((byte)1)); @@ -216,7 +205,8 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual("a", api.ToBinary("a")); Assert.AreEqual(date, api.ToBinary(date)); Assert.AreEqual(guid, api.ToBinary(guid)); -Assert.AreEqual(TestEnum.One, api.ToBinary(TestEnum.One)); +Assert.AreEqual(TestEnumRegistered.One, api.ToBinary(TestEnumRegistered.One) +.Deserialize()); // 3. Arrays. Assert.AreEqual(new byte[] { 1 }, api.ToBinary(new byte[] { 1 })); @@ -233,7 +223,9 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(new[] { "a" }, api.ToBinary (new[] { "a" })); Assert.AreEqual(new[] { date }, api.ToBinary (new[] { date })); Assert.AreEqual(new[] { guid }, api.ToBinary (new[] { guid })); -Assert.AreEqual(new[] { TestEnum.One }, api.ToBinary (new[] { TestEnum.One })); +Assert.AreEqual(new[] { TestEnumRegistered.One}, +api.ToBinary (new[] { TestEnumRegistered.One}) +.Select(x => x.Deserialize()).ToArray()); // 4. Objects. IBinaryObject binObj = api.ToBinary(new ToBinary(1)); @@ -816,7 +808,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(new[] { "str" }, binObj.GetField ("fStrArr")); Assert.AreEqual(new[] { nDate }, binObj.GetField ("fDateArr")); Assert.AreEqual(new[] { nGuid }, binObj.GetField ("fGuidArr")); -Assert.AreEqual(new[] { TestEnum.One }, binObj.GetField ("fEnumArr")); +Assert.AreEqual(new[] {TestEnum.One}, binObj.GetField ("fEnumArr")); StringDateGuidEnum obj = binObj.Deserialize(); @@ -839,7 +831,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(new[] { "str" }, builder.GetField ("fStrArr")); Assert.AreEqual(new[] { nDate }, builder.GetField ("fDateArr")); Assert.AreEqual(new[] { nGuid }, builder.GetField ("fGuidArr")); -Assert.AreEqual(new[] { TestEnum.One }, builder.GetField ("fEnumArr")); +Assert.AreEqual(new[] {TestEnum.One}, builder.GetField ("fEnumArr")); // Check reassemble. binObj = builder.Build(); @@ -851,7 +843,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(new[] { "str" }, binObj.GetField ("fStrArr")); Assert.AreEqual(new[] { nDate }, binObj.GetField ("fDateArr")); Assert.AreEqual(new[] { nGuid },
[40/50] [abbrv] ignite git commit: Disabled peer class loading in test.
Disabled peer class loading in test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b01be3a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b01be3a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b01be3a Branch: refs/heads/ignite-1282 Commit: 9b01be3ae237befe94574cfe32f3375ee45ff1ec Parents: 3080f61 Author: sboikovAuthored: Fri Nov 27 16:49:07 2015 +0300 Committer: sboikov Committed: Fri Nov 27 16:49:07 2015 +0300 -- .../distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9b01be3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java index 56bc760..74cb9ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java @@ -93,6 +93,8 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract cfg.setClientMode(client); +cfg.setPeerClassLoadingEnabled(false); + return cfg; }
[07/50] [abbrv] ignite git commit: Ssl suite
Ssl suite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f200400 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f200400 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f200400 Branch: refs/heads/ignite-1282 Commit: 2f200400940c9ef1bec5b4490f2cb192fbc0fcfe Parents: a0e414e Author: Anton VinogradovAuthored: Thu Nov 26 19:23:35 2015 +0300 Committer: Anton Vinogradov Committed: Thu Nov 26 19:23:35 2015 +0300 -- .../spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2f200400/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java index 3324fcc..fe84c67 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java @@ -27,6 +27,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * */ +//Can fail as described at https://issues.apache.org/jira/browse/IGNITE-1924 public class IgniteCacheSslStartStopSelfTest extends IgniteCachePutRetryAbstractSelfTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
[35/50] [abbrv] ignite git commit: Add README.txt for jms11, mqtt and zookeeper modules.
Add README.txt for jms11, mqtt and zookeeper modules. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/722fe14a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/722fe14a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/722fe14a Branch: refs/heads/ignite-1282 Commit: 722fe14a6814a9cdbfea1cbfe53598ba5ed8ea8f Parents: 95ab231 Author: Raul KripalaniAuthored: Fri Nov 27 11:54:32 2015 + Committer: Raul Kripalani Committed: Fri Nov 27 11:54:32 2015 + -- modules/jms11/README.txt | 29 + modules/mqtt/README.txt | 29 + modules/zookeeper/README.txt | 29 + 3 files changed, 87 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/jms11/README.txt -- diff --git a/modules/jms11/README.txt b/modules/jms11/README.txt new file mode 100644 index 000..3f0d213 --- /dev/null +++ b/modules/jms11/README.txt @@ -0,0 +1,29 @@ +Apache Ignite JMS 1.1 Module + + +Apache Ignite JMS 1.1 module provides a streamer to consume JMS queue and topic messages into +Apache Ignite caches. + +Importing Apache Ignite JMS 1.1 Module In Maven Project + + +If you are using Maven to manage dependencies of your project, you can add the JMS 1.1 module +dependency like this (replace '${ignite.version}' with actual Ignite version you are +interested in): + +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;> +... + +... + +org.apache.ignite +ignite-jms11 +${ignite.version} + +... + +... + http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/mqtt/README.txt -- diff --git a/modules/mqtt/README.txt b/modules/mqtt/README.txt new file mode 100644 index 000..62a1589 --- /dev/null +++ b/modules/mqtt/README.txt @@ -0,0 +1,29 @@ +Apache Ignite MQTT Module +- + +Apache Ignite MQTT module provides a streamer to consume MQTT topic messages into +Apache Ignite caches. + +Importing Apache Ignite MQTT Module In Maven Project + + +If you are using Maven to manage dependencies of your project, you can add the MQTT module +dependency like this (replace '${ignite.version}' with actual Ignite version you are +interested in): + +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;> +... + +... + +org.apache.ignite +ignite-mqtt +${ignite.version} + +... + +... + http://git-wip-us.apache.org/repos/asf/ignite/blob/722fe14a/modules/zookeeper/README.txt -- diff --git a/modules/zookeeper/README.txt b/modules/zookeeper/README.txt new file mode 100644 index 000..6d400ad --- /dev/null +++ b/modules/zookeeper/README.txt @@ -0,0 +1,29 @@ +Apache Ignite ZooKeeper Module +-- + +Apache Ignite ZooKeeper module provides a TCP Discovery IP Finder that uses a ZooKeeper +directory to locate other Ignite nodes to connect to. + +Importing Apache Ignite ZooKeeper Module In Maven Project +- + +If you are using Maven to manage dependencies of your project, you can add the ZooKeeper +module dependency like this (replace '${ignite.version}' with actual Ignite version you +are interested in): + +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;> +... + +... + +org.apache.ignite +ignite-zookeeper +${ignite.version} + +... + +... +
[30/50] [abbrv] ignite git commit: IGNITE-2017: Added top-level platforms readme.
IGNITE-2017: Added top-level platforms readme. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28063931 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28063931 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28063931 Branch: refs/heads/ignite-1282 Commit: 280639319757723bf9f273546b7c0d2b79575d40 Parents: e1db30a Author: vozerov-gridgainAuthored: Fri Nov 27 13:21:40 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 13:21:40 2015 +0300 -- assembly/release-fabric-base.xml | 9 + modules/platforms/README.txt | 6 ++ 2 files changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/assembly/release-fabric-base.xml -- diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml index d3e75ba..65903ee 100644 --- a/assembly/release-fabric-base.xml +++ b/assembly/release-fabric-base.xml @@ -69,6 +69,15 @@ + + +modules/platforms +/platforms + +README.txt + + + modules/platforms/dotnet http://git-wip-us.apache.org/repos/asf/ignite/blob/28063931/modules/platforms/README.txt -- diff --git a/modules/platforms/README.txt b/modules/platforms/README.txt new file mode 100644 index 000..6268a88 --- /dev/null +++ b/modules/platforms/README.txt @@ -0,0 +1,6 @@ +Apache Ignite Platforms +== + +Contains integrations with other platforms, most notably: + * Apache Ignite.NET + * Apache Ignite C++ \ No newline at end of file
[50/50] [abbrv] ignite git commit: Fixing metadata update under changing topology.
Fixing metadata update under changing topology. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ef7fb60 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ef7fb60 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ef7fb60 Branch: refs/heads/ignite-1282 Commit: 6ef7fb604f6e56e9ea72d3ef6d6ce199564c1c41 Parents: ee5d9fd Author: Alexey GoncharukAuthored: Sat Nov 28 15:56:22 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 28 15:56:22 2015 +0300 -- .../internal/portable/BinaryEnumObjectImpl.java | 2 +- .../internal/portable/BinaryReaderExImpl.java | 6 +- .../internal/portable/BinaryWriterExImpl.java | 10 +- .../internal/portable/PortableContext.java | 31 ++- .../ignite/internal/portable/PortableUtils.java | 10 +- .../builder/BinaryObjectBuilderImpl.java| 2 +- .../portable/builder/PortableBuilderEnum.java | 2 +- .../builder/PortableEnumArrayLazyValue.java | 2 +- .../builder/PortableObjectArrayLazyValue.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java| 17 +- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +- .../cache/transactions/IgniteTxManager.java | 22 +- .../portable/BinaryMarshallerSelfTest.java | 2 +- ...yMetadataUpdateChangingTopologySelfTest.java | 245 +++ .../replicated/GridReplicatedTxPreloadTest.java | 6 + .../IgnitePortableObjectsTestSuite.java | 2 + 18 files changed, 425 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef7fb60/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java index e13c076..467d767 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java @@ -110,7 +110,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public T deserialize() throws BinaryObjectException { -Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null); +Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null, true); return BinaryEnumCache.get(cls, ord); } http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef7fb60/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java index 3cc2fbe..b9f851c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java @@ -234,7 +234,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina int off = in.position(); // Registers class by type ID, at least locally if the cache is not ready yet. -typeId = ctx.descriptorForClass(PortableUtils.doReadClass(in, ctx, ldr, typeId0)).typeId(); +typeId = ctx.descriptorForClass(PortableUtils.doReadClass(in, ctx, ldr, typeId0), false).typeId(); int clsNameLen = in.position() - off; @@ -277,7 +277,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina * @return Descriptor. */ PortableClassDescriptor descriptor() { -return ctx.descriptorForTypeId(userType, typeId, ldr); +return ctx.descriptorForTypeId(userType, typeId, ldr, true); } /** @@ -1427,7 +1427,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina break; case OBJ: -PortableClassDescriptor desc = ctx.descriptorForTypeId(userType, typeId, ldr); +PortableClassDescriptor desc = ctx.descriptorForTypeId(userType, typeId, ldr, true); streamPosition(dataStart);
[10/50] [abbrv] ignite git commit: IGNITE-1537 Fixed near optimistic TX future to avoid early completion.
IGNITE-1537 Fixed near optimistic TX future to avoid early completion. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de08cd55 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de08cd55 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de08cd55 Branch: refs/heads/ignite-1282 Commit: de08cd554e75db0df06a5438da5012ebf6c7ad09 Parents: 895760e Author: sboikovAuthored: Fri Nov 27 08:40:16 2015 +0300 Committer: sboikov Committed: Fri Nov 27 08:40:16 2015 +0300 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 92 .../near/GridNearOptimisticTxPrepareFuture.java | 57 ++-- ...ridNearOptimisticTxPrepareFutureAdapter.java | 70 +++ .../cache/local/GridLocalCacheEntry.java| 6 ++ .../transactions/IgniteTxLocalAdapter.java | 2 +- .../util/future/GridCompoundFuture.java | 2 +- 7 files changed, 123 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/de08cd55/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index c55bead..1d418ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -417,7 +417,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/de08cd55/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java index 144070c..916c7ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java @@ -39,12 +39,10 @@ import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTx import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; -import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException; import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException; import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException; -import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; @@ -76,7 +74,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim /** */ @GridToStringExclude -private KeyLockFuture keyLockFut = new KeyLockFuture(); +private KeyLockFuture keyLockFut; /** */ @GridToStringExclude @@ -134,7 +132,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim } } -keyLockFut.onKeyLocked(entry.txKey()); +if (keyLockFut != null) +keyLockFut.onKeyLocked(entry.txKey()); return true; } @@ -189,7 +188,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim err.compareAndSet(null, e); -keyLockFut.onDone(e); +if (keyLockFut != null) +keyLockFut.onDone(e); } /** {@inheritDoc} */ @@ -210,7 +210,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends
[16/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_ Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9f22aba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9f22aba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9f22aba Branch: refs/heads/ignite-1282 Commit: e9f22aba2801636a3c8747dde143b9ceefeb669a Parents: a8edb1e 2d62bbb Author: Yakov ZhdanovAuthored: Fri Nov 27 11:34:04 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Nov 27 11:34:04 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 2 +- .../internal/GridMultipleJobsSelfTest.java | 7 ++ .../IgniteClientReconnectCacheTest.java | 26 3 files changed, 24 insertions(+), 11 deletions(-) --
[03/50] [abbrv] ignite git commit: Improved and enabled GridCacheStopSelfTest.
Improved and enabled GridCacheStopSelfTest. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/722aacfd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/722aacfd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/722aacfd Branch: refs/heads/ignite-1282 Commit: 722aacfdfb9a89ad8696c73f896c2e0643eaa86d Parents: c584cca Author: sboikovAuthored: Thu Nov 26 16:41:59 2015 +0300 Committer: sboikov Committed: Thu Nov 26 16:41:59 2015 +0300 -- .../distributed/dht/GridDhtLockFuture.java | 1 + .../near/GridNearTxFinishFuture.java| 14 +- .../processors/cache/GridCacheStopSelfTest.java | 143 +-- 3 files changed, 140 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/722aacfd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 491ccd2..2b5d5a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -728,6 +728,7 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture * Completeness callback. * * @param success {@code True} if lock was acquired. + * @param stopping {@code True} if node is stopping. * @return {@code True} if complete by this operation. */ private boolean onComplete(boolean success, boolean stopping) { http://git-wip-us.apache.org/repos/asf/ignite/blob/722aacfd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index f76fc96..291c88a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -25,6 +25,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.NodeStoppingException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -203,6 +204,9 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu boolean marked = tx.setRollbackOnly(); +if (err instanceof NodeStoppingException) +return super.onDone(null, err); + if (err instanceof IgniteTxRollbackCheckedException) { if (marked) { try { @@ -241,13 +245,13 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu } } -if (tx.onePhaseCommit()) { -boolean commit = this.commit && err == null; +if (tx.onePhaseCommit()) { +boolean commit = this.commit && err == null; -finishOnePhase(commit); +finishOnePhase(commit); -tx.tmFinish(commit); -} +tx.tmFinish(commit); +} if (super.onDone(tx0, err)) { if (error() instanceof IgniteTxHeuristicCheckedException) { http://git-wip-us.apache.org/repos/asf/ignite/blob/722aacfd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index 59c899d..a34857f 100644 ---
[24/50] [abbrv] ignite git commit: IGNITE-1956: Added binary enums support.
IGNITE-1956: Added binary enums support. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/663e78dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/663e78dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/663e78dc Branch: refs/heads/ignite-1282 Commit: 663e78dc65dcf6d8369f13ef8bf6c4aeacb6299d Parents: 30c9b8d Author: vozerov-gridgainAuthored: Fri Nov 27 12:37:27 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 12:37:27 2015 +0300 -- .../java/org/apache/ignite/IgniteBinary.java| 9 + .../org/apache/ignite/binary/BinaryObject.java | 8 + .../org/apache/ignite/binary/BinaryType.java| 7 + .../ignite/binary/BinaryTypeConfiguration.java | 21 + .../communication/GridIoMessageFactory.java | 8 +- .../internal/portable/BinaryEnumObjectImpl.java | 311 + .../internal/portable/BinaryMetadata.java | 16 +- .../internal/portable/BinaryObjectExImpl.java | 5 + .../internal/portable/BinaryObjectImpl.java | 3 - .../internal/portable/BinaryTypeImpl.java | 9 +- .../internal/portable/BinaryWriteMode.java | 3 + .../internal/portable/BinaryWriterExImpl.java | 19 + .../portable/PortableClassDescriptor.java | 23 +- .../internal/portable/PortableContext.java | 39 +- .../ignite/internal/portable/PortableUtils.java | 147 +- .../builder/BinaryObjectBuilderImpl.java| 2 +- .../builder/PortableBuilderSerializer.java | 10 +- .../internal/processors/cache/CacheObject.java | 3 + .../processors/cache/CacheObjectContext.java| 19 + .../portable/CacheObjectBinaryProcessor.java| 11 +- .../CacheObjectBinaryProcessorImpl.java | 18 +- .../cache/portable/IgniteBinaryImpl.java| 12 + .../processors/cacheobject/NoOpBinary.java | 5 + .../platform/PlatformContextImpl.java | 53 ++- .../transactions/PlatformTransactions.java | 4 +- .../platform/utils/PlatformUtils.java | 1 + .../PlatformDotNetBinaryTypeConfiguration.java | 23 + .../internal/portable/BinaryEnumsSelfTest.java | 446 +++ .../portable/BinaryMarshallerSelfTest.java | 37 +- .../platform/PlatformComputeEchoTask.java | 4 +- .../IgnitePortableObjectsTestSuite.java | 2 + .../impl/binary/binary_type_updater_impl.cpp| 4 +- .../Binary/BinaryBuilderSelfTest.cs | 97 ++-- .../Binary/BinarySelfTest.cs| 48 +- .../Cache/CacheAbstractTest.cs | 17 +- .../Compute/ComputeApiTest.cs | 6 + .../Config/Compute/compute-grid1.xml| 3 +- .../Config/native-client-test-cache-store.xml | 1 + .../Services/ServiceProxyTest.cs| 22 +- .../Apache.Ignite.Core.csproj | 5 +- .../Binary/BinaryTypeConfiguration.cs | 16 +- .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 136 ++ .../Apache.Ignite.Core/Binary/IBinaryObject.cs | 23 +- .../Apache.Ignite.Core/Binary/IBinaryType.cs| 13 + .../Apache.Ignite.Core/Binary/IIgniteBinary.cs | 120 - .../dotnet/Apache.Ignite.Core/IIgnite.cs| 6 +- .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 216 + .../Impl/Binary/BinaryEnum.cs | 134 ++ .../Impl/Binary/BinaryFullTypeDescriptor.cs | 14 +- .../Impl/Binary/BinaryObject.cs | 29 ++ .../Impl/Binary/BinaryObjectBuilder.cs | 44 +- .../Impl/Binary/BinaryReader.cs | 51 ++- .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 34 +- .../Impl/Binary/BinaryUtils.cs | 96 ++-- .../Impl/Binary/BinaryWriter.cs | 104 +++-- .../Impl/Binary/IBinaryTypeDescriptor.cs| 50 +-- .../Impl/Binary/IgniteBinary.cs | 192 .../Impl/Binary/Marshaller.cs | 88 ++-- .../Impl/Binary/Metadata/BinaryType.cs | 184 .../Impl/Binary/Metadata/BinaryTypeHolder.cs| 34 +- .../Binary/Structure/BinaryStructureTracker.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs| 11 +- .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 2 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 11 +- .../Impl/Transactions/TransactionsImpl.cs | 4 +- .../examples/Config/example-cache-query.xml | 9 +- .../dotnet/examples/Config/example-cache.xml| 9 +- 68 files changed, 2354 insertions(+), 765 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/663e78dc/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java -- diff --git
[43/50] [abbrv] ignite git commit: Fixing binary objects tests.
Fixing binary objects tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/292de51c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/292de51c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/292de51c Branch: refs/heads/ignite-1282 Commit: 292de51c75dfd696459ef6569ee49beb8e7b10ec Parents: f3cb64e Author: Alexey GoncharukAuthored: Fri Nov 27 18:34:56 2015 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 27 18:34:56 2015 +0300 -- .../ignite/cache/CacheKeyConfiguration.java | 19 ++ .../internal/portable/BinaryObjectExImpl.java | 5 +- .../portable/PortableClassDescriptor.java | 3 +- .../processors/cache/CacheLazyEntry.java| 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheContext.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../GridCacheInternalKeyImpl.java | 2 +- .../portable/BinaryMarshallerSelfTest.java | 64 ++ ...niteCacheCopyOnReadDisabledAbstractTest.java | 2 + .../dht/GridCacheDhtInternalEntrySelfTest.java | 203 --- .../near/GridCacheNearTxForceKeyTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 71 --- .../testsuites/IgniteCacheTestSuite2.java | 2 - 15 files changed, 147 insertions(+), 250 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java index 767b44c..f117847 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java @@ -18,6 +18,8 @@ package org.apache.ignite.cache; import java.io.Serializable; +import java.lang.reflect.Field; +import org.apache.ignite.cache.affinity.AffinityKeyMapped; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -41,6 +43,23 @@ public class CacheKeyConfiguration implements Serializable { } /** + * @param keyCls Key class. + */ +public CacheKeyConfiguration(Class keyCls) { +typeName = keyCls.getName(); + +for (; keyCls != Object.class && keyCls != null; keyCls = keyCls.getSuperclass()) { +for (Field f : keyCls.getDeclaredFields()) { +if (f.getAnnotation(AffinityKeyMapped.class) != null) { +affKeyFieldName = f.getName(); + +return; +} +} +} +} + +/** * Creates cache key configuration with given type name and affinity field name. * * @param typeName Type name. http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java index 2ea71ec..a32329a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java @@ -164,6 +164,7 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx { */ private String toString(BinaryReaderHandles ctx, IdentityHashMap handles) { int idHash = System.identityHashCode(this); +int hash = hashCode(); BinaryType meta; @@ -175,14 +176,14 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx { } if (meta == null) -return BinaryObject.class.getSimpleName() + " [hash=" + idHash + ", typeId=" + typeId() + ']'; +return BinaryObject.class.getSimpleName() + " [idHash=" + idHash + ", hash=" + hash + ", typeId=" + typeId() + ']'; handles.put(this, idHash); SB buf = new SB(meta.typeName()); if (meta.fieldNames() != null) { -buf.a(" [hash=").a(idHash); +buf.a(" [idHash=").a(idHash).a(", hash=").a(hash); for (String name : meta.fieldNames()) { Object val = field(ctx, name);
[12/50] [abbrv] ignite git commit: Relaxed assert for now to avoid hangs in tests, to be fixed properly later.
Relaxed assert for now to avoid hangs in tests, to be fixed properly later. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96efa387 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96efa387 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96efa387 Branch: refs/heads/ignite-1282 Commit: 96efa387e21b8d749800bb3e661faec630e10896 Parents: de08cd5 Author: sboikovAuthored: Fri Nov 27 10:09:09 2015 +0300 Committer: sboikov Committed: Fri Nov 27 10:09:09 2015 +0300 -- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/96efa387/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 2c85b87..865f73f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -4070,7 +4070,7 @@ class ServerImpl extends TcpDiscoveryImpl { } if (node != null) { -assert !node.isLocal() : msg; +assert !node.isLocal() || !msg.verified() : msg; synchronized (mux) { failedNodes.add(node);
[46/50] [abbrv] ignite git commit: Fixing tests
Fixing tests Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a95f88d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a95f88d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a95f88d Branch: refs/heads/ignite-1282 Commit: 6a95f88d4cea59d70dd02628b23be976dcb9f6d9 Parents: 0c03b91 Author: Yakov ZhdanovAuthored: Fri Nov 27 20:40:05 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Nov 27 20:40:05 2015 +0300 -- .../cache/eviction/random/RandomEvictionPolicySelfTest.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6a95f88d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java index 9d781eb..af04cdc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java @@ -92,7 +92,11 @@ public class RandomEvictionPolicySelfTest extends info("Stats [cntr=" + i + ", total=" + runs + ']'); } -assert g.cache(null).size() <= max; +int size = g.cache(null).size(); + +info("Cache size: " + size); + +assert size <= (max * 1.2) : size; // Add 20% room for random evictions. info(policy(0)); } @@ -354,4 +358,4 @@ public class RandomEvictionPolicySelfTest extends @Override protected void checkPolicies() { // No-op. } -} \ No newline at end of file +}
[39/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56aeea3d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56aeea3d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56aeea3d Branch: refs/heads/ignite-1282 Commit: 56aeea3d1f519229ad7ce80992a23bf367ef72c1 Parents: fc10b3e e519c2f Author: vozerov-gridgainAuthored: Fri Nov 27 16:48:28 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 16:48:28 2015 +0300 -- .../hibernate/CacheHibernatePersonStore.java| 4 +- .../hibernate/CacheHibernateStoreExample.java | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../apache/ignite/examples/binary/Address.java | 72 - .../apache/ignite/examples/binary/Employee.java | 93 --- .../ignite/examples/binary/EmployeeKey.java | 93 --- .../ignite/examples/binary/Organization.java| 93 --- .../examples/binary/OrganizationType.java | 32 ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 22 +-- .../examples/datagrid/CacheQueryExample.java| 161 --- .../ignite/examples/datagrid/store/Person.java | 154 -- .../store/auto/CacheAutoStoreExample.java | 4 +- .../auto/CacheAutoStoreLoadDataExample.java | 4 +- .../datagrid/store/auto/CacheConfig.java| 6 +- .../store/dummy/CacheDummyPersonStore.java | 12 +- .../store/dummy/CacheDummyStoreExample.java | 4 +- .../store/jdbc/CacheJdbcPersonStore.java| 18 +-- .../store/jdbc/CacheJdbcStoreExample.java | 4 +- .../store/spring/CacheSpringPersonStore.java| 10 +- .../store/spring/CacheSpringStoreExample.java | 4 +- .../ignite/examples/model/Organization.java | 55 +++ .../apache/ignite/examples/model/Person.java| 120 ++ .../ignite/examples/model/binary/Address.java | 72 + .../ignite/examples/model/binary/Employee.java | 93 +++ .../examples/model/binary/EmployeeKey.java | 93 +++ .../examples/model/binary/Organization.java | 93 +++ .../examples/model/binary/OrganizationType.java | 32 .../examples/ScalarCacheQueryExample.scala | 66 ++-- 30 files changed, 651 insertions(+), 777 deletions(-) --
[06/50] [abbrv] ignite git commit: Ssl suite
Ssl suite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0e414eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0e414eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0e414eb Branch: refs/heads/ignite-1282 Commit: a0e414eb1695e2c43d6f4f782ba4bee64682789c Parents: ec81696 Author: Anton VinogradovAuthored: Thu Nov 26 19:01:14 2015 +0300 Committer: Anton Vinogradov Committed: Thu Nov 26 19:01:14 2015 +0300 -- .../IgniteCacheFailoverTestSuite3.java | 6 --- .../IgniteCacheFailoverTestSuiteSsl.java| 41 2 files changed, 41 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 1f94f9e..4b04c05 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -21,8 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; /** * Test suite. @@ -39,10 +37,6 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite { suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class); suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class); -// Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809. -if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65")) -suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); - return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a0e414eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java new file mode 100644 index 000..99a1463 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuiteSsl.java @@ -0,0 +1,41 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; + +/** + * Test suite. + */ +public class IgniteCacheFailoverTestSuiteSsl extends TestSuite { +/** + * @return Ignite Cache Failover test suite. + * @throws Exception Thrown in case of the failure. + */ +public static TestSuite suite() throws Exception { +TestSuite suite = new TestSuite("Cache Failover Test Suite SSL"); + +// Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809. +if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65")) +suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class); + +return suite; +} +}
[48/50] [abbrv] ignite git commit: Fixed GridCacheBinaryObjects*Test's.
Fixed GridCacheBinaryObjects*Test's. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a822d81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a822d81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a822d81 Branch: refs/heads/ignite-1282 Commit: 8a822d81adf3a903b84daf17a11e642309576528 Parents: a2cdc73 Author: Tikhonov NikolayAuthored: Fri Nov 27 22:30:06 2015 +0300 Committer: Tikhonov Nikolay Committed: Fri Nov 27 22:51:04 2015 +0300 -- .../ignite/internal/processors/cache/CacheObjectContext.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8a822d81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index b99c99f..fe650f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -220,6 +220,8 @@ import org.apache.ignite.internal.util.typedef.F; private Collection unwrapPortables(ArrayList col, boolean keepPortable, boolean cpy) { int size = col.size(); +col = new ArrayList<>(col); + for (int i = 0; i < size; i++) { Object o = col.get(i);
[13/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e706216a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e706216a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e706216a Branch: refs/heads/ignite-1282 Commit: e706216a5b2540f9f258dd41e49e98b4fac575a0 Parents: 96efa38 19680d6 Author: sboikovAuthored: Fri Nov 27 10:09:48 2015 +0300 Committer: sboikov Committed: Fri Nov 27 10:09:48 2015 +0300 -- .../org/apache/ignite/internal/GridMultipleJobsSelfTest.java | 7 +++ 1 file changed, 7 insertions(+) --
[04/50] [abbrv] ignite git commit: debugging slowdowns
debugging slowdowns Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f50f4094 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f50f4094 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f50f4094 Branch: refs/heads/ignite-1282 Commit: f50f4094a037715af2d543d1a89101d05b0020f5 Parents: 722aacf Author: Yakov ZhdanovAuthored: Thu Nov 26 17:50:16 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Nov 26 17:50:16 2015 +0300 -- RELEASE_NOTES.txt | 17 + 1 file changed, 17 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f50f4094/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index cd0c2a2..70adf28 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,23 @@ Apache Ignite Release Notes === +Apache Ignite In-Memory Data Fabric 1.5 +--- +* Massive performance improvements for cache operations and SQL. +* Added new binary cache object marshalling implementation. +* Added Ignite.NET In-Memory Data Fabric. +* Added Ignite.C++ In-Memory Data Fabric. +* Added IgniteSemaphore data structure. +* Added MQTT Streamer. +* Fixed failover for continuous queries. +* Fixed compilation and runtime errors under OpnJDK and IBM JDK. +* Fixed Integer.size limitation for cache. +* Fixed and improved cache types configuration. +* Fixed cache rebalancing. +* Many stability and fault-tolerance fixes. + +Complete list of closed issues: https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20fixVersion%20%3D%201.5%20AND%20status%20%3D%20closed + Apache Ignite In-Memory Data Fabric 1.4 --- * Added SSL support to communication and discovery.
[41/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6312737a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6312737a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6312737a Branch: refs/heads/ignite-1282 Commit: 6312737a72b95efb417019ea13f9a811b9f3adf4 Parents: 9b01be3 56aeea3 Author: sboikovAuthored: Fri Nov 27 16:54:42 2015 +0300 Committer: sboikov Committed: Fri Nov 27 16:54:42 2015 +0300 -- .../hibernate/CacheHibernatePersonStore.java| 4 +- .../hibernate/CacheHibernateStoreExample.java | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../apache/ignite/examples/binary/Address.java | 72 - .../apache/ignite/examples/binary/Employee.java | 93 --- .../ignite/examples/binary/EmployeeKey.java | 93 --- .../ignite/examples/binary/Organization.java| 93 --- .../examples/binary/OrganizationType.java | 32 ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 22 +-- .../examples/datagrid/CacheQueryExample.java| 161 --- .../ignite/examples/datagrid/store/Person.java | 154 -- .../store/auto/CacheAutoStoreExample.java | 4 +- .../auto/CacheAutoStoreLoadDataExample.java | 4 +- .../datagrid/store/auto/CacheConfig.java| 6 +- .../store/dummy/CacheDummyPersonStore.java | 12 +- .../store/dummy/CacheDummyStoreExample.java | 4 +- .../store/jdbc/CacheJdbcPersonStore.java| 18 +-- .../store/jdbc/CacheJdbcStoreExample.java | 4 +- .../store/spring/CacheSpringPersonStore.java| 10 +- .../store/spring/CacheSpringStoreExample.java | 4 +- .../ignite/examples/model/Organization.java | 55 +++ .../apache/ignite/examples/model/Person.java| 120 ++ .../ignite/examples/model/binary/Address.java | 72 + .../ignite/examples/model/binary/Employee.java | 93 +++ .../examples/model/binary/EmployeeKey.java | 93 +++ .../examples/model/binary/Organization.java | 93 +++ .../examples/model/binary/OrganizationType.java | 32 .../examples/ScalarCacheQueryExample.scala | 66 ++-- .../processors/query/h2/IgniteH2Indexing.java | 24 ++- 31 files changed, 667 insertions(+), 785 deletions(-) --
[19/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30c9b8db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30c9b8db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30c9b8db Branch: refs/heads/ignite-1282 Commit: 30c9b8dbdff3f635525c4d8a3d6442ef2e87b754 Parents: 60d9ddc bde1d1d Author: Anton VinogradovAuthored: Fri Nov 27 12:29:42 2015 +0300 Committer: Anton Vinogradov Committed: Fri Nov 27 12:29:42 2015 +0300 -- modules/yarn/pom.xml | 6 +++--- .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +-- 2 files changed, 12 insertions(+), 5 deletions(-) --
[08/50] [abbrv] ignite git commit: Fixing examples.
Fixing examples. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df9658bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df9658bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df9658bf Branch: refs/heads/ignite-1282 Commit: df9658bf9e77427290e0f548532f5d7dc61c1e18 Parents: 2f20040 Author: Alexey GoncharukAuthored: Thu Nov 26 19:10:39 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 19:32:46 2015 +0300 -- .../ComputeFibonacciContinuationExample.java| 15 ++- .../computegrid/ComputeTaskMapExample.java | 6 +- .../computegrid/ComputeTaskSplitExample.java| 4 +- .../examples/messaging/MessagingExample.java| 18 +-- .../examples/misc/springbean/spring-bean.xml| 7 -- .../testsuites/IgniteExamplesSelfTestSuite.java | 4 +- .../portable/GridPortableMarshaller.java| 3 + .../internal/portable/PortableContext.java | 10 +- .../ignite/internal/portable/PortableUtils.java | 7 ++ .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/query/GridQueryProcessor.java| 8 ++ .../sharedfs/SharedFsCheckpointSpi.java | 14 ++- .../session/GridSessionCheckpointSelfTest.java | 16 +++ ...ObjectsCacheDataStructuresSelfTestSuite.java | 33 + ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 34 ++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 33 + .../IgniteBinaryObjectsCacheTestSuite3.java | 33 + .../IgniteBinaryObjectsCacheTestSuite4.java | 33 + ...IgniteBinaryObjectsComputeGridTestSuite.java | 33 + .../cache/IgniteCacheNoClassQuerySelfTest.java | 122 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 21 files changed, 402 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/df9658bf/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java index 706ec18..6642e9d 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java @@ -42,7 +42,9 @@ import org.jetbrains.annotations.Nullable; * performing the distributed recursive calculation of {@code 'Fibonacci'} * numbers on the cluster. Continuations * functionality is exposed via {@link ComputeJobContext#holdcc()} and - * {@link ComputeJobContext#callcc()} method calls in {@link ComputeFibonacciContinuationExample.FibonacciClosure} class. + * {@link ComputeJobContext#callcc()} method calls in + * {@link org.apache.ignite.examples.computegrid.ComputeFibonacciContinuationExample.ContinuationFibonacciClosure} + * class. * * Remote nodes should always be started with special configuration file which * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}. @@ -76,7 +78,8 @@ public final class ComputeFibonacciContinuationExample { long start = System.currentTimeMillis(); -BigInteger fib = ignite.compute(ignite.cluster().forPredicate(nodeFilter)).apply(new FibonacciClosure(nodeFilter), N); +BigInteger fib = ignite.compute(ignite.cluster().forPredicate(nodeFilter)).apply( +new ContinuationFibonacciClosure(nodeFilter), N); long duration = System.currentTimeMillis() - start; @@ -93,7 +96,7 @@ public final class ComputeFibonacciContinuationExample { /** * Closure to execute. */ -private static class FibonacciClosure implements IgniteClosure { +private static class ContinuationFibonacciClosure implements IgniteClosure { /** Future for spawned task. */ private IgniteFuture fut1; @@ -114,7 +117,7 @@ public final class ComputeFibonacciContinuationExample { /** * @param nodeFilter Predicate to filter nodes. */ -FibonacciClosure(IgnitePredicate nodeFilter) { +ContinuationFibonacciClosure(IgnitePredicate nodeFilter) { this.nodeFilter = nodeFilter; } @@ -143,7 +146,7 @@ public final class ComputeFibonacciContinuationExample { // If future is not cached in node-local-map, cache it. if (fut1 == null) { -compute.apply(new FibonacciClosure(nodeFilter), n - 1); +
[17/50] [abbrv] ignite git commit: IGNITE-1195 Fixed hadoop build.
IGNITE-1195 Fixed hadoop build. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bde1d1db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bde1d1db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bde1d1db Branch: refs/heads/ignite-1282 Commit: bde1d1db3592f74e9e46ca6af57b55adc8b96c1f Parents: e9f22ab Author: nikolay_tikhonovAuthored: Fri Nov 27 12:18:16 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Nov 27 12:18:16 2015 +0300 -- modules/yarn/pom.xml | 6 +++--- .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +-- 2 files changed, 12 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/pom.xml -- diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml index 2b758dc..d1f6390 100644 --- a/modules/yarn/pom.xml +++ b/modules/yarn/pom.xml @@ -35,20 +35,20 @@ http://ignite.apache.org -2.7.0 +2.7.0 org.apache.hadoop hadoop-yarn-client -${hadoop.version} +${hadoop-yarn.version} org.apache.hadoop hadoop-common -${hadoop.version} +${hadoop-yarn.version} http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1d1db/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java -- diff --git a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java index 2173701..97f6a12 100644 --- a/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java +++ b/modules/yarn/src/test/java/org/apache/ignite/yarn/IgniteApplicationMasterSelfTest.java @@ -382,8 +382,15 @@ public class IgniteApplicationMasterSelfTest extends TestCase { return 0; } -/** {@inheritDoc} */ -@Override public void updateBlacklist(List blacklistAdditions, List blacklistRemovals) { +/** + * Update application's blacklist with addition or removal resources. + * + * @param blacklistAdditions list of resources which should be added to the + *application blacklist + * @param blacklistRemovals list of resources which should be removed from the + *application blacklist + */ +public void updateBlacklist(List blacklistAdditions, List blacklistRemovals) { // No-op. } }
[21/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2d4d1d2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2d4d1d2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2d4d1d2 Branch: refs/heads/ignite-1282 Commit: c2d4d1d2e180b0c22bf289166bb9b4ca902e257a Parents: 41fe469 30c9b8d Author: sboikovAuthored: Fri Nov 27 12:33:33 2015 +0300 Committer: sboikov Committed: Fri Nov 27 12:33:33 2015 +0300 -- modules/flume/README.txt| 44 +--- modules/yarn/pom.xml| 6 +-- .../yarn/IgniteApplicationMasterSelfTest.java | 11 - 3 files changed, 22 insertions(+), 39 deletions(-) --
[31/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91f3f875 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91f3f875 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91f3f875 Branch: refs/heads/ignite-1282 Commit: 91f3f87524acb278726e6d6f1e27d4cfdc56a15a Parents: 2806393 857c63e Author: vozerov-gridgainAuthored: Fri Nov 27 13:21:59 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 13:21:59 2015 +0300 -- ...gniteAtomicLongChangingTopologySelfTest.java | 8 +- modules/jms11/licenses/apache-2.0.txt | 202 +++ modules/kafka/README.txt| 32 +++ modules/mqtt/licenses/apache-2.0.txt| 202 +++ modules/zookeeper/licenses/apache-2.0.txt | 202 +++ 5 files changed, 645 insertions(+), 1 deletion(-) --
[20/50] [abbrv] ignite git commit: Fixed hang in data structures failover tests.
Fixed hang in data structures failover tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41fe4695 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41fe4695 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41fe4695 Branch: refs/heads/ignite-1282 Commit: 41fe46953af80304e05c76007df3c30b8d681742 Parents: e9f22ab Author: sboikovAuthored: Fri Nov 27 12:33:14 2015 +0300 Committer: sboikov Committed: Fri Nov 27 12:33:14 2015 +0300 -- .../CacheDataStructuresManager.java | 45 .../datastructures/DataStructuresProcessor.java | 20 + ...gniteAtomicLongChangingTopologySelfTest.java | 30 ++--- 3 files changed, 53 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/41fe4695/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 431be1e..ec787f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -383,7 +383,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { if (create) { hdr = new GridCacheSetHeader(IgniteUuid.randomUuid(), collocated); -GridCacheSetHeader old = retryPutIfAbsent(cache, key, hdr); +GridCacheSetHeader old = (GridCacheSetHeader)cache.getAndPutIfAbsent(key, hdr); if (old != null) hdr = old; @@ -493,6 +493,12 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { continue; } +else if (!pingNodes(nodes)) { +if (log.isDebugEnabled()) +log.debug("RemoveSetData job failed and set data node left, will retry: " + e); + +continue; +} else throw e; } @@ -510,6 +516,12 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { continue; } +else if (!pingNodes(nodes)) { +if (log.isDebugEnabled()) +log.debug("RemoveSetData job failed and set data node left, will retry: " + e); + +continue; +} else throw e; } @@ -526,6 +538,20 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { } /** + * @param nodes Nodes to ping. + * @return {@code True} if was able to ping all nodes. + * @throws IgniteCheckedException If failed/ + */ +private boolean pingNodes(Collection nodes) throws IgniteCheckedException { +for (ClusterNode node : nodes) { +if (!cctx.discovery().pingNode(node.id())) +return false; +} + +return true; +} + +/** * @param key Set item key. * @param rmv {@code True} if item was removed. */ @@ -562,23 +588,6 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { /** * @param cache Cache. - * @param key Key. - * @param val Value. - * @throws IgniteCheckedException If failed. - * @return Previous value. - */ -@SuppressWarnings("unchecked") -@Nullable private T retryPutIfAbsent(final IgniteInternalCache cache, final Object key, final T val) -throws IgniteCheckedException { -return DataStructuresProcessor.retry(log, new Callable() { -@Nullable @Override public T call() throws Exception { -return (T)cache.getAndPutIfAbsent(key, val); -} -}); -} - -/** - * @param cache Cache. * @param keys Keys to remove. * @throws IgniteCheckedException If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/41fe4695/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java -- diff --git
[36/50] [abbrv] ignite git commit: Fixed IgniteTxRemoteState to properly process invalid partitions.
Fixed IgniteTxRemoteState to properly process invalid partitions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3080f61a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3080f61a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3080f61a Branch: refs/heads/ignite-1282 Commit: 3080f61ae9ca1481d65f18f7a84f8bbc9d682f79 Parents: 722fe14 Author: sboikovAuthored: Fri Nov 27 15:24:32 2015 +0300 Committer: sboikov Committed: Fri Nov 27 15:24:32 2015 +0300 -- .../cache/distributed/dht/GridDhtTxRemote.java | 15 +--- .../IgniteTxRemoteSingleStateImpl.java | 16 ++--- .../cache/transactions/IgniteTxRemoteState.java | 5 .../transactions/IgniteTxRemoteStateImpl.java | 24 4 files changed, 37 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java index e0929ad..85a5759 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -279,20 +279,7 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { @Override public void addInvalidPartition(GridCacheContext cacheCtx, int part) { super.addInvalidPartition(cacheCtx, part); -Map writeMap = txState.writeMap(); - -for (Iterator it = writeMap.values().iterator(); it.hasNext();) { -IgniteTxEntry e = it.next(); - -GridCacheEntryEx cached = e.cached(); - -if (cached != null) { -if (cached.partition() == part) -it.remove(); -} -else if (cacheCtx.affinity().partition(e.key()) == part) -it.remove(); -} +txState.invalidPartition(part); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java index 90af517..a68006b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java @@ -65,15 +65,7 @@ public class IgniteTxRemoteSingleStateImpl extends IgniteTxRemoteStateAdapter { /** {@inheritDoc} */ @Override public Set writeSet() { -if (entry != null) { -HashSet set = new HashSet<>(3, 0.75f); - -set.add(entry.txKey()); - -return set; -} -else -return Collections.emptySet(); +return entry != null ? Collections.singleton(entry.txKey()) : Collections.emptySet(); } /** {@inheritDoc} */ @@ -113,6 +105,12 @@ public class IgniteTxRemoteSingleStateImpl extends IgniteTxRemoteStateAdapter { } /** {@inheritDoc} */ +@Override public void invalidPartition(int part) { +if (entry != null && entry.context().affinity().partition(entry.key()) == part) +entry = null; +} + +/** {@inheritDoc} */ public String toString() { return S.toString(IgniteTxRemoteSingleStateImpl.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/3080f61a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java index b8290a1..77fc97e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteState.java +++
[49/50] [abbrv] ignite git commit: Use TcpDiscoveryVmIpFinder.
Use TcpDiscoveryVmIpFinder. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee5d9fd8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee5d9fd8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee5d9fd8 Branch: refs/heads/ignite-1282 Commit: ee5d9fd8beb3d6bf29ee2e932d4c1fe374e6dffc Parents: 8a822d8 Author: sboikovAuthored: Sat Nov 28 15:01:57 2015 +0300 Committer: sboikov Committed: Sat Nov 28 15:01:57 2015 +0300 -- .../GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee5d9fd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java index f1e427b..321194f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryReader; import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.LongAdder8; @@ -50,6 +53,9 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC */ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extends GridCommonAbstractTest { /** */ +private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + +/** */ private static final int THREAD_CNT = 64; /** */ @@ -59,6 +65,8 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); + CacheConfiguration cacheCfg = new CacheConfiguration(); cacheCfg.setCacheMode(cacheMode());
[05/50] [abbrv] ignite git commit: Minor change to release notes.
Minor change to release notes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec816967 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec816967 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec816967 Branch: refs/heads/ignite-1282 Commit: ec8169675b4f7360becca0d8abbd300371238f52 Parents: f50f409 Author: vozerov-gridgainAuthored: Thu Nov 26 17:57:48 2015 +0300 Committer: vozerov-gridgain Committed: Thu Nov 26 17:57:48 2015 +0300 -- RELEASE_NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ec816967/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 70adf28..42258f7 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -3,10 +3,10 @@ Apache Ignite Release Notes Apache Ignite In-Memory Data Fabric 1.5 --- +* Ignite.NET: Initial Release. +* Ignite C++: Initial Release. * Massive performance improvements for cache operations and SQL. * Added new binary cache object marshalling implementation. -* Added Ignite.NET In-Memory Data Fabric. -* Added Ignite.C++ In-Memory Data Fabric. * Added IgniteSemaphore data structure. * Added MQTT Streamer. * Fixed failover for continuous queries.
[38/50] [abbrv] ignite git commit: IGNITE-2009: Fixed leak in cached SQL queries.
IGNITE-2009: Fixed leak in cached SQL queries. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc10b3e4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc10b3e4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc10b3e4 Branch: refs/heads/ignite-1282 Commit: fc10b3e40fadd7ad792aaea63fe270c6413c5068 Parents: 3080f61 Author: vozerov-gridgainAuthored: Fri Nov 27 16:48:01 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 16:48:01 2015 +0300 -- .../processors/query/h2/IgniteH2Indexing.java | 24 +--- 1 file changed, 16 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fc10b3e4/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 cc452c1..1437a16 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 @@ -49,6 +49,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.cache.Cache; import javax.cache.CacheException; @@ -255,7 +256,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { set(c); // Reset statement cache when new connection is created. -stmtCache.get().clear(); +stmtCache.remove(Thread.currentThread()); } return c; @@ -280,12 +281,8 @@ public class IgniteH2Indexing implements GridQueryIndexing { /** */ private volatile GridKernalContext ctx; -/** */ -private final ThreadLocal stmtCache = new ThreadLocal() { -@Override protected StatementCache initialValue() { -return new StatementCache(PREPARED_STMT_CACHE_SIZE); -} -}; +/** Statement cache. */ +private final ConcurrentHashMap stmtCache = new ConcurrentHashMap<>(); /** */ private final GridBoundedConcurrentLinkedHashMap , TwoStepCachedQuery> twoStepCache = @@ -313,7 +310,18 @@ public class IgniteH2Indexing implements GridQueryIndexing { */ private PreparedStatement prepareStatement(Connection c, String sql, boolean useStmtCache) throws SQLException { if (useStmtCache) { -StatementCache cache = stmtCache.get(); +Thread curThread = Thread.currentThread(); + +StatementCache cache = stmtCache.get(curThread); + +if (cache == null) { +StatementCache cache0 = new StatementCache(PREPARED_STMT_CACHE_SIZE); + +cache = stmtCache.putIfAbsent(curThread, cache0); + +if (cache == null) +cache = cache0; +} PreparedStatement stmt = cache.get(sql);
[11/50] [abbrv] ignite git commit: Disable shared memory for the hung test.
Disable shared memory for the hung test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19680d6d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19680d6d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19680d6d Branch: refs/heads/ignite-1282 Commit: 19680d6dbabe843f4db009c0aa5380178e62d5ef Parents: de08cd5 Author: Alexey GoncharukAuthored: Fri Nov 27 09:27:32 2015 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 27 09:27:32 2015 +0300 -- .../org/apache/ignite/internal/GridMultipleJobsSelfTest.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/19680d6d/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java index d5f6287..a975e2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -97,6 +98,12 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest { c.setCacheConfiguration(cc); } +TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + +commSpi.setSharedMemoryPort(-1); + +c.setCommunicationSpi(commSpi); + return c; }
[18/50] [abbrv] ignite git commit: IGNITE-529: Fixed README
IGNITE-529: Fixed README Signed-off-by: Anton VinogradovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60d9ddc0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d9ddc0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d9ddc0 Branch: refs/heads/ignite-1282 Commit: 60d9ddc091d17fa2b246b0525b54d772345c3d11 Parents: e9f22ab Author: shtykh_roman Authored: Thu Nov 26 11:40:48 2015 +0900 Committer: Anton Vinogradov Committed: Fri Nov 27 12:28:50 2015 +0300 -- modules/flume/README.txt | 44 ++- 1 file changed, 10 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/60d9ddc0/modules/flume/README.txt -- diff --git a/modules/flume/README.txt b/modules/flume/README.txt index 5b574e3..bf7e0ff 100644 --- a/modules/flume/README.txt +++ b/modules/flume/README.txt @@ -1,42 +1,18 @@ -Apache Ignite Flume Streamer Module - +Apache Ignite Flume Sink Module +--- -Apache Ignite Flume Streamer module provides streaming from Flume to Ignite cache. - -To enable Flume Streamer module when starting a standalone node, move 'optional/ignite-Flume' folder to -'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will -be added to classpath in this case. - -Importing Ignite Flume Streamer Module In Maven Project -- - -If you are using Maven to manage dependencies of your project, you can add JCL module -dependency like this (replace '${ignite.version}' with actual Ignite version you are -interested in): - -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;> -... - -... - -org.apache.ignite -ignite-Flume -${ignite.version} - -... - -... - +IgniteSink is a Flume sink that extracts Events from an associated Flume channel and injects into an Ignite cache. +Flume 1.6.0 is supported. +IgniteSink, which can be found in 'optional/ignite-flume', and its dependencies have to be included in the agent's classpath, +as described in the following subsection, before starting the Flume agent. ## Setting up and running 1. Create a transformer by implementing EventTransformer interface. -2. Build it and copy to ${FLUME_HOME}/plugins.d/ignite-sink/lib. -3. Copy other Ignite-related jar files to ${FLUME_HOME}/plugins.d/ignite-sink/libext to have them as shown below. +2. Create 'ignite' directory inside plugins.d directory which is located in ${FLUME_HOME}. If the plugins.d directory is not there, create it. +3. Build it and copy to ${FLUME_HOME}/plugins.d/ignite-sink/lib. +4. Copy other Ignite-related jar files from Apache Ignite distribution to ${FLUME_HOME}/plugins.d/ignite-sink/libext to have them as shown below. ``` plugins.d/ @@ -46,7 +22,7 @@ plugins.d/ `-- libext |-- cache-api-1.0.0.jar |-- ignite-core-x.x.x.jar -|-- ignite-flume-x.x.x.jar +|-- ignite-flume-x.x.x.jar <-- IgniteSink |-- ignite-spring-x.x.x.jar |-- spring-aop-4.1.0.RELEASE.jar |-- spring-beans-4.1.0.RELEASE.jar
[2/2] ignite git commit: IGNITE-1702 - Merged fix.
IGNITE-1702 - Merged fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c6e117fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c6e117fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c6e117fe Branch: refs/heads/ignite-1282 Commit: c6e117fe63a1d1ad7a2b247c658ec479ba0ba5fc Parents: 784ea7c Author: Alexey GoncharukAuthored: Sat Nov 28 16:28:22 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 28 16:28:22 2015 +0300 -- .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 37 +++- .../dht/atomic/GridDhtAtomicCache.java | 5 +- .../distributed/near/GridNearLockFuture.java| 7 - .../cache/transactions/IgniteTxHandler.java | 6 +- .../CachePutEventListenerErrorSelfTest.java | 180 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 8 files changed, 232 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c6e117fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index c4a90b1..9a0d778 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -201,9 +201,17 @@ public final class GridDhtTxFinishFuture extends GridCompoundIdentityFutur Throwable e = this.err.get(); -if (super.onDone(tx, e != null ? e : err)) { +if (e == null && commit) +e = this.tx.commitError(); + +Throwable finishErr = e != null ? e : err; + +if (super.onDone(tx, finishErr)) { +if (finishErr == null) +finishErr = this.tx.commitError(); + // Always send finish reply. -this.tx.sendFinishReply(commit, error()); +this.tx.sendFinishReply(commit, finishErr); // Don't forget to clean up. cctx.mvcc().removeFuture(futId); http://git-wip-us.apache.org/repos/asf/ignite/blob/c6e117fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 2330a95..534a560 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -822,7 +822,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { /** * @return {@code True} if transaction is finished on prepare step. */ -protected final boolean commitOnPrepare() { +public final boolean commitOnPrepare() { return onePhaseCommit() && !near() && !nearOnOriginatingNode; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c6e117fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 1d418ea..34addfa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -58,6 +58,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.dr.GridDrType;
[3/3] ignite git commit: Fixing metadata update under changing topology. This closes #280
Fixing metadata update under changing topology. This closes #280 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59ee87e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59ee87e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59ee87e1 Branch: refs/heads/ignite-1.5 Commit: 59ee87e17d4cb4cc1232dd883e2f708552139c13 Parents: ba28eaf Author: Alexey GoncharukAuthored: Sat Nov 28 18:42:26 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 28 18:42:26 2015 +0300 -- .../internal/portable/BinaryEnumObjectImpl.java | 2 +- .../internal/portable/BinaryObjectImpl.java | 10 +- .../internal/portable/BinaryReaderExImpl.java | 6 +- .../internal/portable/BinaryWriterExImpl.java | 10 +- .../internal/portable/PortableContext.java | 31 ++- .../ignite/internal/portable/PortableUtils.java | 10 +- .../builder/BinaryObjectBuilderImpl.java| 2 +- .../portable/builder/PortableBuilderEnum.java | 2 +- .../builder/PortableEnumArrayLazyValue.java | 2 +- .../builder/PortableObjectArrayLazyValue.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java| 51 .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 37 ++- .../dht/atomic/GridDhtAtomicCache.java | 5 +- .../colocated/GridDhtColocatedLockFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java| 24 +- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +- .../portable/CacheObjectPortableContext.java| 3 +- .../cache/transactions/IgniteTxHandler.java | 6 +- .../cache/transactions/IgniteTxManager.java | 22 +- .../portable/BinaryMarshallerSelfTest.java | 2 +- .../CachePutEventListenerErrorSelfTest.java | 180 ++ .../GridCacheOnCopyFlagAbstractSelfTest.java| 14 +- ...yMetadataUpdateChangingTopologySelfTest.java | 245 +++ .../replicated/GridReplicatedTxPreloadTest.java | 6 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 100 +--- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../IgnitePortableObjectsTestSuite.java | 2 + 30 files changed, 791 insertions(+), 163 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59ee87e1/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java index e13c076..467d767 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryEnumObjectImpl.java @@ -110,7 +110,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public T deserialize() throws BinaryObjectException { -Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null); +Class cls = PortableUtils.resolveClass(ctx, typeId, clsName, null, true); return BinaryEnumCache.get(cls, ord); } http://git-wip-us.apache.org/repos/asf/ignite/blob/59ee87e1/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java index 87a03dc..cf5a659 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java @@ -127,7 +127,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern @Nullable @Override public T value(CacheObjectContext ctx, boolean cpy) { Object obj0 = obj; -if (obj0 == null || cpy) +if (obj0 == null || (cpy && needCopy(ctx))) obj0 = deserializeValue(ctx); return (T)obj0; @@ -561,6 +561,14 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern } /** + * @param ctx Context. + * @return {@code True} need to copy value returned to user. + */ +private boolean needCopy(CacheObjectContext ctx) { +return ctx.copyOnGet() &&
[1/3] ignite git commit: Fixing binary objects tests.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 a5d999319 -> 59ee87e17 Fixing binary objects tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87cbc194 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87cbc194 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87cbc194 Branch: refs/heads/ignite-1.5 Commit: 87cbc1945343b2d0e4667362dba0514c831ca2b5 Parents: 8a822d8 Author: Alexey GoncharukAuthored: Sat Nov 28 14:07:29 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 28 14:07:29 2015 +0300 -- .../java/org/apache/ignite/examples/model/Organization.java | 7 +++ .../main/java/org/apache/ignite/examples/model/Person.java| 7 +++ .../main/java/org/apache/ignite/internal/IgniteKernal.java| 5 ++--- .../org/apache/ignite/internal/portable/BinaryMarshaller.java | 2 -- .../cache/IgniteCacheAbstractFieldsQuerySelfTest.java | 4 ++-- .../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java | 5 - 6 files changed, 18 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/examples/src/main/java/org/apache/ignite/examples/model/Organization.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java index 3881719..3dcaa44 100644 --- a/examples/src/main/java/org/apache/ignite/examples/model/Organization.java +++ b/examples/src/main/java/org/apache/ignite/examples/model/Organization.java @@ -38,6 +38,13 @@ public class Organization implements Serializable { public String name; /** + * Default empty constructor. + */ +public Organization() { +// No-op. +} + +/** * Create organization. * * @param name Organization name. http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/examples/src/main/java/org/apache/ignite/examples/model/Person.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/model/Person.java b/examples/src/main/java/org/apache/ignite/examples/model/Person.java index 616cf6a..5ccda51 100644 --- a/examples/src/main/java/org/apache/ignite/examples/model/Person.java +++ b/examples/src/main/java/org/apache/ignite/examples/model/Person.java @@ -59,6 +59,13 @@ public class Person implements Serializable { private transient AffinityKey key; /** + * Default empty constructor. + */ +public Person() { +// No-op. +} + +/** * Constructs person record. * * @param org Organization. http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 68d48c9..05b1997 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1192,9 +1192,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0) perf.add("Disable grid events (remove 'includeEventTypes' from configuration)"); -if (BinaryMarshaller.available() && !(cfg.getMarshaller() instanceof BinaryMarshaller)) -perf.add("Enable binary marshaller (set 'marshaller' to " + -BinaryMarshaller.class.getSimpleName() + ')'); +if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || !(cfg.getMarshaller() instanceof BinaryMarshaller))) +perf.add("Use default binary marshaller (do not set 'marshaller' explicitly)"); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/87cbc194/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java index 759d802..bfaae74 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java @@ -33,8 +33,6 @@ import sun.misc.Unsafe; /** * Implementation of
[2/3] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba28eaf3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba28eaf3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba28eaf3 Branch: refs/heads/ignite-1.5 Commit: ba28eaf3808a412036043e419ffeab040afe1486 Parents: 87cbc19 a5d9993 Author: Alexey GoncharukAuthored: Sat Nov 28 18:39:59 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 28 18:39:59 2015 +0300 -- .../portable/builder/BinaryObjectBuilderImpl.java | 12 +--- ...CacheBinaryObjectsAbstractMultiThreadedSelfTest.java | 8 2 files changed, 17 insertions(+), 3 deletions(-) --
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1.5.1 [created] 59f372669
ignite git commit: Fixing binary objects tests.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 f3cb64e37 -> 292de51c7 Fixing binary objects tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/292de51c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/292de51c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/292de51c Branch: refs/heads/ignite-1.5 Commit: 292de51c75dfd696459ef6569ee49beb8e7b10ec Parents: f3cb64e Author: Alexey GoncharukAuthored: Fri Nov 27 18:34:56 2015 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 27 18:34:56 2015 +0300 -- .../ignite/cache/CacheKeyConfiguration.java | 19 ++ .../internal/portable/BinaryObjectExImpl.java | 5 +- .../portable/PortableClassDescriptor.java | 3 +- .../processors/cache/CacheLazyEntry.java| 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheContext.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../GridCacheInternalKeyImpl.java | 2 +- .../portable/BinaryMarshallerSelfTest.java | 64 ++ ...niteCacheCopyOnReadDisabledAbstractTest.java | 2 + .../dht/GridCacheDhtInternalEntrySelfTest.java | 203 --- .../near/GridCacheNearTxForceKeyTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 71 --- .../testsuites/IgniteCacheTestSuite2.java | 2 - 15 files changed, 147 insertions(+), 250 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java index 767b44c..f117847 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheKeyConfiguration.java @@ -18,6 +18,8 @@ package org.apache.ignite.cache; import java.io.Serializable; +import java.lang.reflect.Field; +import org.apache.ignite.cache.affinity.AffinityKeyMapped; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -41,6 +43,23 @@ public class CacheKeyConfiguration implements Serializable { } /** + * @param keyCls Key class. + */ +public CacheKeyConfiguration(Class keyCls) { +typeName = keyCls.getName(); + +for (; keyCls != Object.class && keyCls != null; keyCls = keyCls.getSuperclass()) { +for (Field f : keyCls.getDeclaredFields()) { +if (f.getAnnotation(AffinityKeyMapped.class) != null) { +affKeyFieldName = f.getName(); + +return; +} +} +} +} + +/** * Creates cache key configuration with given type name and affinity field name. * * @param typeName Type name. http://git-wip-us.apache.org/repos/asf/ignite/blob/292de51c/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java index 2ea71ec..a32329a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectExImpl.java @@ -164,6 +164,7 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx { */ private String toString(BinaryReaderHandles ctx, IdentityHashMap handles) { int idHash = System.identityHashCode(this); +int hash = hashCode(); BinaryType meta; @@ -175,14 +176,14 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx { } if (meta == null) -return BinaryObject.class.getSimpleName() + " [hash=" + idHash + ", typeId=" + typeId() + ']'; +return BinaryObject.class.getSimpleName() + " [idHash=" + idHash + ", hash=" + hash + ", typeId=" + typeId() + ']'; handles.put(this, idHash); SB buf = new SB(meta.typeName()); if (meta.fieldNames() != null) { -buf.a(" [hash=").a(idHash); +buf.a(" [idHash=").a(idHash).a(", hash=").a(hash); for (String name : meta.fieldNames()) { Object val = field(ctx, name);
ignite git commit: Fixed performance suggestions.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 923fea865 -> 0b61333a3 Fixed performance suggestions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b61333a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b61333a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b61333a Branch: refs/heads/ignite-1.5 Commit: 0b61333a34be7fac8309ce050aa383f757f6187e Parents: 923fea8 Author: Alexey GoncharukAuthored: Sun Nov 29 17:11:08 2015 +0300 Committer: Alexey Goncharuk Committed: Sun Nov 29 17:11:08 2015 +0300 -- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 05b1997..87ccf93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0) perf.add("Disable grid events (remove 'includeEventTypes' from configuration)"); -if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || !(cfg.getMarshaller() instanceof BinaryMarshaller))) +if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && !(cfg.getMarshaller() instanceof BinaryMarshaller))) perf.add("Use default binary marshaller (do not set 'marshaller' explicitly)"); }
[2/2] ignite git commit: Corrected performance suggestions.
Corrected performance suggestions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/180c4596 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/180c4596 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/180c4596 Branch: refs/heads/ignite-1.5.1 Commit: 180c45964c8eb2d4a1c2bb39cc70932c92b574fa Parents: af8b145 0b61333 Author: Alexey GoncharukAuthored: Sun Nov 29 17:13:53 2015 +0300 Committer: Alexey Goncharuk Committed: Sun Nov 29 17:13:53 2015 +0300 -- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] ignite git commit: Fixed performance suggestions.
Repository: ignite Updated Branches: refs/heads/ignite-1.5.1 af8b14589 -> 180c45964 Fixed performance suggestions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b61333a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b61333a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b61333a Branch: refs/heads/ignite-1.5.1 Commit: 0b61333a34be7fac8309ce050aa383f757f6187e Parents: 923fea8 Author: Alexey GoncharukAuthored: Sun Nov 29 17:11:08 2015 +0300 Committer: Alexey Goncharuk Committed: Sun Nov 29 17:11:08 2015 +0300 -- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 05b1997..87ccf93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0) perf.add("Disable grid events (remove 'includeEventTypes' from configuration)"); -if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || !(cfg.getMarshaller() instanceof BinaryMarshaller))) +if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && !(cfg.getMarshaller() instanceof BinaryMarshaller))) perf.add("Use default binary marshaller (do not set 'marshaller' explicitly)"); }
ignite git commit: ignite-1282 - Fixing tests.
Repository: ignite Updated Branches: refs/heads/ignite-1282 22326cc9e -> 9c1b7656a ignite-1282 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c1b7656 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c1b7656 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c1b7656 Branch: refs/heads/ignite-1282 Commit: 9c1b7656a39496f03950158bc7fc2305eacdc6d1 Parents: 22326cc Author: Alexey GoncharukAuthored: Wed Nov 25 12:25:47 2015 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 25 12:25:47 2015 +0300 -- .../builder/BinaryObjectBuilderImpl.java| 9 ++ .../processors/query/GridQueryProcessor.java| 26 +++-- .../portable/BinaryObjectBuilderSelfTest.java | 30 .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- 4 files changed, 51 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9c1b7656/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java index b2fb7d8..d330c72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java @@ -31,7 +31,6 @@ import org.apache.ignite.internal.portable.PortableContext; import org.apache.ignite.internal.portable.PortableSchema; import org.apache.ignite.internal.portable.PortableSchemaRegistry; import org.apache.ignite.internal.portable.PortableUtils; -import org.apache.ignite.internal.util.GridArgumentCheck; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; @@ -492,15 +491,15 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder { } /** {@inheritDoc} */ -@Override public BinaryObjectBuilder setField(String name, Object val) { -GridArgumentCheck.notNull(val, name); +@Override public BinaryObjectBuilder setField(String name, Object val0) { +Object val = val0 == null ? new PortableValueWithType(PortableUtils.typeByClass(Object.class), null) : val0; if (assignedVals == null) assignedVals = new LinkedHashMap<>(); Object oldVal = assignedVals.put(name, val); -if (oldVal instanceof PortableValueWithType) { +if (oldVal instanceof PortableValueWithType && val0 != null) { ((PortableValueWithType)oldVal).value(val); assignedVals.put(name, oldVal); @@ -514,8 +513,6 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder { if (assignedVals == null) assignedVals = new LinkedHashMap<>(); -//int fldId = ctx.fieldId(typeId, fldName); - assignedVals.put(name, new PortableValueWithType(PortableUtils.typeByClass(type), val)); return this; http://git-wip-us.apache.org/repos/asf/ignite/blob/9c1b7656/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 c560e4e..90bb9a6 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 @@ -1546,28 +1546,36 @@ public class GridQueryProcessor extends GridProcessorAdapter { bld.setCharAt(3, Character.toUpperCase(bld.charAt(3))); -String[] mtdNames = new String[] {bld.toString(), prop}; - ClassProperty tmp = null; -for (String mtdName : mtdNames) { +try { +tmp = new ClassProperty(cls.getMethod(bld.toString()), key, alias); +} +catch (NoSuchMethodException ignore) { +// No-op. +} + +if (tmp == null) { try { -tmp = new ClassProperty(cls.getMethod(mtdName), key, alias); +tmp = new ClassProperty(cls.getDeclaredField(prop), key, alias); } -catch (NoSuchMethodException ignore) {
[2/4] ignite git commit: IGNITE-1988 - Exception for explicit lock inside a transaction
IGNITE-1988 - Exception for explicit lock inside a transaction Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d29cb7f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d29cb7f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d29cb7f Branch: refs/heads/ignite-1282 Commit: 4d29cb7f87aafa505807f4b10cddd0264cdac85f Parents: c23cda1 Author: Valentin KulichenkoAuthored: Tue Nov 24 16:23:05 2015 -0800 Committer: Valentin Kulichenko Committed: Tue Nov 24 16:23:05 2015 -0800 -- .../processors/cache/CacheLockImpl.java | 18 - .../colocated/GridDhtColocatedLockFuture.java | 8 ++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++- 3 files changed, 61 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4d29cb7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java index 2e8dc9b..ae7b42e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java @@ -69,6 +69,8 @@ class CacheLockImpl implements Lock { CacheOperationContext prev = gate.enter(opCtx); try { +checkTx(); + delegate.lockAll(keys, 0); incrementLockCounter(); @@ -102,6 +104,8 @@ class CacheLockImpl implements Lock { CacheOperationContext prev = gate.enter(opCtx); try { +checkTx(); + boolean res = delegate.lockAll(keys, -1); if (res) @@ -128,6 +132,8 @@ class CacheLockImpl implements Lock { CacheOperationContext prev = gate.enter(opCtx); try { +checkTx(); + IgniteInternalFuture fut = delegate.lockAllAsync(keys, unit.toMillis(time)); try { @@ -198,8 +204,18 @@ class CacheLockImpl implements Lock { throw new UnsupportedOperationException(); } +/** + * Verifies there is no ongoing user transaction. + * + * @throws CacheException + */ +private void checkTx() throws CacheException { +if (delegate.context().tm().inUserTx()) +throw new CacheException("Explicit lock can't be acquired within a transaction."); +} + /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheLockImpl.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/4d29cb7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 7e6ce89..ecdf641 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -296,10 +296,6 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture GridCacheMvccCandidate cand = cctx.mvcc().explicitLock(threadId, txKey); if (inTx()) { -IgniteTxEntry txEntry = tx.entry(txKey); - -txEntry.cached(entry); - if (cand != null) { if (!tx.implicit()) throw new IgniteCheckedException("Cannot access key within transaction if lock is " + @@ -308,6 +304,10 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture return null; } else { +IgniteTxEntry txEntry = tx.entry(txKey); + +txEntry.cached(entry); + // Check transaction entries (corresponding tx entries must be enlisted in transaction). cand = new GridCacheMvccCandidate(entry, cctx.localNodeId(),
[1/2] ignite git commit: ignite-1.5 - Fixing tests.
Repository: ignite Updated Branches: refs/heads/ignite-1282 76803923d -> 8e1d6c0e8 ignite-1.5 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/385668b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/385668b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/385668b3 Branch: refs/heads/ignite-1282 Commit: 385668b3bd9a77f87c11e39a7d915a54a48e39be Parents: 7680392 Author: Alexey GoncharukAuthored: Tue Nov 24 19:34:35 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 24 19:34:35 2015 +0300 -- .../ignite/internal/NodeStoppingException.java | 35 .../processors/cache/GridCacheIoManager.java| 4 +++ .../processors/cache/GridCacheMvccManager.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 19 ++- .../CacheObjectBinaryProcessorImpl.java | 6 ++-- 5 files changed, 54 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java new file mode 100644 index 000..164983a --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java @@ -0,0 +1,35 @@ +/* + * 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; + +import org.apache.ignite.IgniteCheckedException; + +/** + * + */ +public class NodeStoppingException extends IgniteCheckedException { +/** */ +private static final long serialVersionUID = 0L; + +/** + * @param msg Exception message. + */ +public NodeStoppingException(String msg) { +super(msg); +} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 7b1d749..f7fe5bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; @@ -1036,6 +1037,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { catch (IgniteCheckedException e) { cacheMsg.onClassError(e); } +catch (BinaryObjectException e) { +cacheMsg.onClassError(new IgniteCheckedException(e)); +} catch (Error e) { if (cacheMsg.ignoreClassErrors() && X.hasCause(e, NoClassDefFoundError.class, UnsupportedClassVersionError.class)) http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 2449df1..dbc6992 100644 ---
[2/2] ignite git commit: ignite-1282 - Fixing tests.
ignite-1282 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e1d6c0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e1d6c0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e1d6c0e Branch: refs/heads/ignite-1282 Commit: 8e1d6c0e8fad981fc48dd0d149fb1abf30b1a7da Parents: 385668b Author: Alexey GoncharukAuthored: Tue Nov 24 21:39:17 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 24 21:39:17 2015 +0300 -- .../internal/portable/PortableContext.java | 11 ++ .../cache/affinity/GridCacheAffinityImpl.java | 3 ++- .../processors/query/GridQueryProcessor.java| 22 +-- .../GridPortableAffinityKeySelfTest.java| 12 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 23 5 files changed, 62 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8e1d6c0e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 1ff459e..765babc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -302,6 +302,17 @@ public class PortableContext implements Externalizable { for (TypeDescriptor desc : descs.descriptors()) { registerUserType(desc.clsName, desc.idMapper, desc.serializer, desc.affKeyFieldName); } + +BinaryInternalIdMapper dfltMapper = BinaryInternalIdMapper.create(globalIdMapper); + +// Put affinity field names for unconfigured types. +for (Map.Entry entry : affFields.entrySet()) { +String typeName = entry.getKey(); + +int typeId = dfltMapper.typeId(typeName); + +affKeyFieldNames.putIfAbsent(typeId, entry.getValue()); +} } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8e1d6c0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java index 33ab3f4..b9045e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; @@ -150,7 +151,7 @@ public class GridCacheAffinityImpl implements Affinity { @Override public Object affinityKey(K key) { A.notNull(key, "key"); -if (key instanceof CacheObject) +if (key instanceof CacheObject && !(key instanceof BinaryObject)) key = ((CacheObject)key).value(cctx.cacheObjectContext(), false); return cctx.config().getAffinityMapper().affinityKey(key); http://git-wip-us.apache.org/repos/asf/ignite/blob/8e1d6c0e/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 d0eeeb1..c560e4e 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 @@ -1540,18 +1540,26 @@ public class GridQueryProcessor extends GridProcessorAdapter { String alias = aliases.get(fullName.toString()); -ClassProperty tmp; +StringBuilder bld = new StringBuilder("get"); -try { -StringBuilder bld = new StringBuilder("get"); +bld.append(prop); + +bld.setCharAt(3,
ignite git commit: Check whether deferred update response affects performance.
Repository: ignite Updated Branches: refs/heads/ignite-no-deferred-res [created] 9f0d4988a Check whether deferred update response affects performance. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f0d4988 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f0d4988 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f0d4988 Branch: refs/heads/ignite-no-deferred-res Commit: 9f0d4988a776afc1d556985d6162d0ab76ba99f3 Parents: ef2007d Author: Alexey GoncharukAuthored: Wed Nov 25 16:15:04 2015 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 25 16:15:04 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 4 ++-- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f0d4988/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index cd76a56..c6fdf14 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1311,7 +1311,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { res.returnValue(retVal); -if (dhtFut != null) +if (dhtFut != null && ctx.config().getWriteSynchronizationMode() == FULL_SYNC) ctx.mvcc().addAtomicFuture(dhtFut.version(), dhtFut); } else @@ -2701,7 +2701,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { ctx.io().send(nodeId, res, ctx.ioPolicy()); else { // No failed keys and sync mode is not FULL_SYNC, thus sending deferred response. -sendDeferredUpdateResponse(nodeId, req.futureVersion()); +//sendDeferredUpdateResponse(nodeId, req.futureVersion()); } } catch (ClusterTopologyCheckedException ignored) { http://git-wip-us.apache.org/repos/asf/ignite/blob/9f0d4988/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index e31af19..2269110 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -349,7 +349,8 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter /** {@inheritDoc} */ @Override public boolean onDone(@Nullable Void res, @Nullable Throwable err) { if (super.onDone(res, err)) { -cctx.mvcc().removeAtomicFuture(version()); +if (cctx.config().getWriteSynchronizationMode() == FULL_SYNC) +cctx.mvcc().removeAtomicFuture(version()); if (err != null) { if (!mappings.isEmpty()) {
ignite git commit: Check whether deferred update response affects performance.
Repository: ignite Updated Branches: refs/heads/ignite-no-deferred-res 9f0d4988a -> 24cbb4964 Check whether deferred update response affects performance. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24cbb496 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24cbb496 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24cbb496 Branch: refs/heads/ignite-no-deferred-res Commit: 24cbb49642309b7d062070f243014e040ba7708b Parents: 9f0d498 Author: Alexey GoncharukAuthored: Wed Nov 25 16:45:27 2015 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 25 16:45:27 2015 +0300 -- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 177 --- 1 file changed, 111 insertions(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/24cbb496/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 2269110..b837dd2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -84,6 +84,9 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter @GridToStringInclude private final Map mappings; +/** */ +private GridDhtAtomicUpdateRequest singleReq; + /** Entries with readers. */ private Map nearReadersEntries; @@ -129,7 +132,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter log = U.logger(cctx.kernalContext(), logRef, GridDhtAtomicUpdateFuture.class); keys = new ArrayList<>(updateReq.keys().size()); -mappings = U.newHashMap(updateReq.keys().size()); +mappings = updateReq.keys().size() == 1 ? U. newHashMap(updateReq.keys().size()) : null; boolean topLocked = updateReq.topologyLocked() || (updateReq.fastMap() && !updateReq.clientRequest()); @@ -161,22 +164,39 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter private boolean registerResponse(UUID nodeId) { int resCnt0; -GridDhtAtomicUpdateRequest req = mappings.get(nodeId); +Map map = mappings; -if (req != null) { -synchronized (this) { -if (req.onResponse()) { -resCnt0 = resCnt; +if (map != null) { +GridDhtAtomicUpdateRequest req = map.get(nodeId); + +if (req != null) { +synchronized (this) { +if (req.onResponse()) { +resCnt0 = resCnt; -resCnt0 += 1; +resCnt0 += 1; -resCnt = resCnt0; +resCnt = resCnt0; +} +else +return false; } -else -return false; + +if (resCnt0 == map.size()) +onDone(); + +return true; } +} +else { +boolean done = false; -if (resCnt0 == mappings.size()) +synchronized (this) { +if (singleReq.onResponse()) +done = true; +} + +if (done) onDone(); return true; @@ -241,7 +261,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter UUID nodeId = node.id(); if (!nodeId.equals(cctx.localNodeId())) { -GridDhtAtomicUpdateRequest updateReq = mappings.get(nodeId); +GridDhtAtomicUpdateRequest updateReq = mappings == null ? singleReq : mappings.get(nodeId); if (updateReq == null) { updateReq = new GridDhtAtomicUpdateRequest( @@ -258,7 +278,10 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter cctx.deploymentEnabled(), this.updateReq.keepBinary()); -mappings.put(nodeId, updateReq); +if (mappings != null) +mappings.put(nodeId, updateReq); +
ignite git commit: ignite-1282 - Fixing tests.
Repository: ignite Updated Branches: refs/heads/ignite-1282 9c1b7656a -> 809a44260 ignite-1282 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/809a4426 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/809a4426 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/809a4426 Branch: refs/heads/ignite-1282 Commit: 809a44260d10fb394767ebb1df66857c22cc8cbd Parents: 9c1b765 Author: Alexey GoncharukAuthored: Wed Nov 25 15:16:23 2015 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 25 15:16:23 2015 +0300 -- .../apache/ignite/cache/CacheTypeMetadata.java | 2 ++ .../processors/cache/GridCacheEventManager.java | 38 ++-- 2 files changed, 37 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/809a4426/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index 2b7205b..76dea6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@ -33,7 +33,9 @@ import org.apache.ignite.lang.IgniteBiTuple; /** * Cache type metadata need for configuration of indexes or automatic persistence. + * @deprecated Use {@link org.apache.ignite.cache.QueryEntity} instead. */ +@Deprecated public class CacheTypeMetadata implements Serializable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/809a4426/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index afca43b..7ff3a99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -39,6 +39,9 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_STOPPED; * Cache event manager. */ public class GridCacheEventManager extends GridCacheManagerAdapter { +/** Force keep binary flag. Will be set if event notification encountered exception during unmarshalling. */ +private boolean forceKeepBinary; + /** * Adds local event listener. * @@ -262,6 +265,35 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { "(try to increase topology history size configuration property of configured " + "discovery SPI): " + evtNodeId); +keepPortable = keepPortable || forceKeepBinary; + +Object key0; +Object val0; +Object oldVal0; + +try { +key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false); +val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, false); +oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, false); +} +catch (Exception e) { +if (!cctx.cacheObjectContext().processor().isPortableEnabled(cctx.config())) +throw e; + +if (log.isDebugEnabled()) +log.debug("Failed to unmarshall cache object value for the event notification: " + e); + +if (!forceKeepBinary) +LT.warn(log, null, "Failed to unmarshall cache object value for the event notification " + +"(all further notifications will keep binary object format)."); + +forceKeepBinary = true; + +key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, true, false); +val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, true, false); +oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, true, false); +} + cctx.gridEvents().record(new CacheEvent(cctx.name(), cctx.localNode(), evtNode, @@ -269,12 +301,12 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { type, part, cctx.isNear(), -
[05/12] ignite git commit: Fixed GridCacheLocalIsolatedNodesSelfTest and GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync tests.
Fixed GridCacheLocalIsolatedNodesSelfTest and GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/407bf939 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/407bf939 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/407bf939 Branch: refs/heads/ignite-1.5.1 Commit: 407bf939a8beae32108cdb60bfba3efe3cc8d7c1 Parents: 8e605e9 Author: Tikhonov NikolayAuthored: Mon Nov 30 16:49:14 2015 +0300 Committer: Tikhonov Nikolay Committed: Mon Nov 30 16:49:14 2015 +0300 -- .../GridCacheAbstractFullApiMultithreadedSelfTest.java | 9 +++-- .../cache/local/GridCacheLocalIsolatedNodesSelfTest.java| 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java index e89288f..5e43b2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; import java.util.Random; import java.util.Set; +import java.util.HashSet; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -341,12 +342,16 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid IgniteCache cacheAsync = cache.withAsync(); +Set ids = new HashSet<>(set); + cacheAsync.removeAll(rangeKeys(0, rnd)); cacheAsync.future().get(); -for (int i = 0; i < rnd; i++) -assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null; +for (int i = 0; i < rnd; i++) { +if (ids.contains(i)) +assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null; +} } }); } http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java index e6b66ca..53122c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java @@ -66,7 +66,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest assert !nid1.equals(nid3); // Local cache on first node only. -CacheConfiguration ccfg1 = new CacheConfiguration<>("A"); +CacheConfiguration ccfg1 = new CacheConfiguration<>("A1"); ccfg1.setCacheMode(LOCAL); ccfg1.setNodeFilter(new NodeIdFilter(nid1)); @@ -74,7 +74,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest c1.put("g1", "c1"); // Local cache on second node only. -CacheConfiguration ccfg2 = new CacheConfiguration<>("A"); +CacheConfiguration ccfg2 = new CacheConfiguration<>("A2"); ccfg2.setCacheMode(LOCAL); ccfg2.setNodeFilter(new NodeIdFilter(nid2)); @@ -82,7 +82,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest c2.put("g2", "c2"); // Local cache on third node only. -CacheConfiguration ccfg3 = new CacheConfiguration<>("A"); +CacheConfiguration ccfg3 = new CacheConfiguration<>("A3"); ccfg3.setCacheMode(LOCAL); ccfg3.setNodeFilter(new NodeIdFilter(nid3));
[01/12] ignite git commit: ignite-1924
Repository: ignite Updated Branches: refs/heads/ignite-1.5.1 cb5bd7c3f -> c7dd0edd1 ignite-1924 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb584d0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb584d0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb584d0 Branch: refs/heads/ignite-1.5.1 Commit: eeb584d070f72ab5457135ad15217316d75bba6a Parents: dc14ccc Author: Anton VinogradovAuthored: Mon Nov 30 14:49:29 2015 +0300 Committer: Anton Vinogradov Committed: Mon Nov 30 14:49:29 2015 +0300 -- .../spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb584d0/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java index fe84c67..12bd020 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java @@ -27,12 +27,12 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * */ -//Can fail as described at https://issues.apache.org/jira/browse/IGNITE-1924 public class IgniteCacheSslStartStopSelfTest extends IgniteCachePutRetryAbstractSelfTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); +fail("https://issues.apache.org/jira/browse/IGNITE-1924;); cfg.setSslContextFactory(GridTestUtils.sslFactory()); return cfg;
[06/12] ignite git commit: Fixed GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.testReaderTtlNoTx test.
Fixed GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest.testReaderTtlNoTx test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eed4b1c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eed4b1c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eed4b1c2 Branch: refs/heads/ignite-1.5.1 Commit: eed4b1c245d8a22d4e9ae2ce7200089025c8c5ae Parents: 407bf93 Author: Tikhonov NikolayAuthored: Mon Nov 30 17:09:15 2015 +0300 Committer: Tikhonov Nikolay Committed: Mon Nov 30 17:09:15 2015 +0300 -- .../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/eed4b1c2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index c4407fe..eaab103 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -413,7 +413,8 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio return true; } catch (GridCacheEntryRemovedException e) { -throw new RuntimeException(e); +// If e0.valueBytes() thrown this exception then entry has been removed. +return true; } } }, Math.min(ttl * 10, getTestTimeout(;
[03/12] ignite git commit: ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest.
ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0fcc1d18 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0fcc1d18 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0fcc1d18 Branch: refs/heads/ignite-1.5.1 Commit: 0fcc1d18f7d403588e2f018458b1d16c81ed131c Parents: c5304a9 Author: sboikovAuthored: Mon Nov 30 15:15:06 2015 +0300 Committer: sboikov Committed: Mon Nov 30 15:15:06 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0fcc1d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index b3155a7..4f15fa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -647,6 +647,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid prepareMarshalCacheObjects(nearVals, cctx); +prepareMarshalCacheObjects(prevVals, cctx); + if (forceTransformBackups) { // force addition of deployment info for entry processors if P2P is enabled globally. if (!addDepInfo && ctx.deploymentEnabled()) @@ -674,6 +676,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid finishUnmarshalCacheObjects(nearVals, cctx, ldr); +finishUnmarshalCacheObjects(prevVals, cctx, ldr); + if (forceTransformBackups) { entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr);
[04/12] ignite git commit: minor
minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e605e9f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e605e9f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e605e9f Branch: refs/heads/ignite-1.5.1 Commit: 8e605e9f33c99a4f8404bff3dd8902f4b08704da Parents: 0fcc1d1 Author: Yakov ZhdanovAuthored: Mon Nov 30 16:45:27 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 16:45:27 2015 +0300 -- .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8e605e9f/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index e58eb54..484ee87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -71,10 +71,10 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { // Grid config. IgniteConfiguration cfg = super.getConfiguration(); -cfg.setLocalHost("localhost"); +cfg.setLocalHost("127.0.0.1"); ConnectorConfiguration clnCfg = new ConnectorConfiguration(); -clnCfg.setHost("localhost"); +clnCfg.setHost("127.0.0.1"); cfg.setConnectorConfiguration(clnCfg); cfg.setDiscoverySpi(disco); @@ -239,4 +239,4 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { }); } } -} \ No newline at end of file +}
[12/12] ignite git commit: Merge branch ignite-1.5 into ignite-1.5.1
Merge branch ignite-1.5 into ignite-1.5.1 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7dd0edd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7dd0edd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7dd0edd Branch: refs/heads/ignite-1.5.1 Commit: c7dd0edd143018fd56005ec19a06681d985a89ec Parents: cb5bd7c 6260fc1 Author: Alexey GoncharukAuthored: Mon Nov 30 20:00:07 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 30 20:00:07 2015 +0300 -- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 + .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java| 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 7 +- .../tcp/IgniteCacheSslStartStopSelfTest.java| 2 +- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 ++-- 14 files changed, 137 insertions(+), 82 deletions(-) --
[10/12] ignite git commit: minor
minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcbc6d0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcbc6d0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcbc6d0e Branch: refs/heads/ignite-1.5.1 Commit: fcbc6d0e6c7042cb39abbc0b388a5f9ade958d95 Parents: 3d6973b Author: Yakov ZhdanovAuthored: Mon Nov 30 17:33:56 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 17:33:56 2015 +0300 -- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fcbc6d0e/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 8827a78..854ce95 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 @@ -44,7 +44,6 @@ import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocketFactory; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAuthenticationException; -import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; @@ -60,7 +59,6 @@ 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.IgniteCallable; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.lang.IgniteUuid;
[02/12] ignite git commit: ignite-530
ignite-530 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5304a94 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5304a94 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5304a94 Branch: refs/heads/ignite-1.5.1 Commit: c5304a94eb0676839acb0302efb1159430ee8cd9 Parents: eeb584d Author: Anton VinogradovAuthored: Mon Nov 30 15:12:07 2015 +0300 Committer: Anton Vinogradov Committed: Mon Nov 30 15:12:07 2015 +0300 -- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c5304a94/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java -- diff --git a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java index b458bed..e07aaec 100644 --- a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java +++ b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java @@ -17,16 +17,21 @@ package org.apache.ignite.stream.twitter; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import junit.framework.TestSuite; /** * Twitter streamer tests. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ -IgniteTwitterStreamerTest.class -}) -public class IgniteTwitterStreamerTestSuite { +public class IgniteTwitterStreamerTestSuite extends TestSuite { +/** + * @return Twitter streamer tests suite. + * @throws Exception If failed. + */ +public static TestSuite suite() throws Exception { +TestSuite suite = new TestSuite("Twitter streamed Test Suite"); +suite.addTestSuite(IgniteTwitterStreamerTest.class); + +return suite; +} }
[07/12] ignite git commit: Ignite-1.5 - Fixing tests.
Ignite-1.5 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d Branch: refs/heads/ignite-1.5.1 Commit: aee20d9d6822fd13fd437420b439ea18e99d0223 Parents: eed4b1c Author: Alexey GoncharukAuthored: Mon Nov 30 17:27:41 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 30 17:27:41 2015 +0300 -- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- 6 files changed, 104 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index fabbcb2..5e30bf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { "nodes: " + dep); } } -else if (log.isDebugEnabled()) -log.debug("Preserving deployment without node participants: " + dep); +else { +if (log.isDebugEnabled()) +log.debug("Preserving deployment without node participants: " + dep); +} +} +else { +if (log.isDebugEnabled()) +log.debug("Keeping deployment as it still has participants: " + dep); } -else if (log.isDebugEnabled()) -log.debug("Keeping deployment as it still has participants: " + dep); } if (deps.isEmpty()) http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 2b5d5a4..f0d2e15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture if (!success && !stopping) undoLocks(true); -if (tx != null) +boolean set = false; + +if (tx != null) { cctx.tm().txContext(tx); -if (err == null && !stopping) -loadMissingFromStore(); +set = cctx.tm().setTxTopologyHint(tx); +} + +try { +if (err == null && !stopping) +loadMissingFromStore(); +} +finally { +if (set) +cctx.tm().setTxTopologyHint(null); +} if (super.onDone(success, err)) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index b2f0f65..9f8bae3 100644 ---
[11/12] ignite git commit: 1.5.0-EA-SNAPSHOT
1.5.0-EA-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6260fc1f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6260fc1f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6260fc1f Branch: refs/heads/ignite-1.5.1 Commit: 6260fc1fc80cc77cc9a0ef776640845b979b27b3 Parents: fcbc6d0 Author: Ignite TeamcityAuthored: Mon Nov 30 19:42:45 2015 +0300 Committer: Ignite Teamcity Committed: Mon Nov 30 19:42:45 2015 +0300 -- examples/pom.xml | 5 ++--- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/camel/pom.xml | 5 ++--- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 4 ++-- modules/flume/pom.xml | 5 ++--- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 5 ++--- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac| 2 +- modules/platforms/cpp/examples/configure.ac| 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml| 5 ++--- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 6 ++ modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml| 2 +- 61
[09/12] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_ Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d6973b4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d6973b4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d6973b4 Branch: refs/heads/ignite-1.5.1 Commit: 3d6973b403e2cfe44c31d590a14a738ad37552e7 Parents: 776af1a aee20d9 Author: Yakov ZhdanovAuthored: Mon Nov 30 17:33:09 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 17:33:09 2015 +0300 -- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../communication/tcp/TcpCommunicationSpi.java | 12 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java| 6 +- 9 files changed, 116 insertions(+), 69 deletions(-) --
[08/12] ignite git commit: minor
minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/776af1a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/776af1a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/776af1a5 Branch: refs/heads/ignite-1.5.1 Commit: 776af1a5aade09174422de9b8f5d04f1ce50d458 Parents: 8e605e9 Author: Yakov ZhdanovAuthored: Mon Nov 30 17:32:59 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 17:32:59 2015 +0300 -- .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/776af1a5/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index 484ee87..740b166 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -62,6 +62,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); +disco.setJoinTimeout(5000); // Cache config. CacheConfiguration cacheCfg = defaultCacheConfiguration();
ignite git commit: Ignite-1.5 - Fixing tests.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 eed4b1c24 -> aee20d9d6 Ignite-1.5 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d Branch: refs/heads/ignite-1.5 Commit: aee20d9d6822fd13fd437420b439ea18e99d0223 Parents: eed4b1c Author: Alexey GoncharukAuthored: Mon Nov 30 17:27:41 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 30 17:27:41 2015 +0300 -- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- 6 files changed, 104 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index fabbcb2..5e30bf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { "nodes: " + dep); } } -else if (log.isDebugEnabled()) -log.debug("Preserving deployment without node participants: " + dep); +else { +if (log.isDebugEnabled()) +log.debug("Preserving deployment without node participants: " + dep); +} +} +else { +if (log.isDebugEnabled()) +log.debug("Keeping deployment as it still has participants: " + dep); } -else if (log.isDebugEnabled()) -log.debug("Keeping deployment as it still has participants: " + dep); } if (deps.isEmpty()) http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 2b5d5a4..f0d2e15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture if (!success && !stopping) undoLocks(true); -if (tx != null) +boolean set = false; + +if (tx != null) { cctx.tm().txContext(tx); -if (err == null && !stopping) -loadMissingFromStore(); +set = cctx.tm().setTxTopologyHint(tx); +} + +try { +if (err == null && !stopping) +loadMissingFromStore(); +} +finally { +if (set) +cctx.tm().setTxTopologyHint(null); +} if (super.onDone(success, err)) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
[01/14] ignite git commit: 1.5.0-EA-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1695 4d09d40dd -> d6bd423aa 1.5.0-EA-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6260fc1f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6260fc1f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6260fc1f Branch: refs/heads/ignite-1695 Commit: 6260fc1fc80cc77cc9a0ef776640845b979b27b3 Parents: fcbc6d0 Author: Ignite TeamcityAuthored: Mon Nov 30 19:42:45 2015 +0300 Committer: Ignite Teamcity Committed: Mon Nov 30 19:42:45 2015 +0300 -- examples/pom.xml | 5 ++--- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/camel/pom.xml | 5 ++--- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 4 ++-- modules/flume/pom.xml | 5 ++--- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 5 ++--- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac| 2 +- modules/platforms/cpp/examples/configure.ac| 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml| 5 ++--- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 6 ++ modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml
[11/14] ignite git commit: ignite-1.5 Skip message send on node stop.
ignite-1.5 Skip message send on node stop. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e7c532d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e7c532d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e7c532d Branch: refs/heads/ignite-1695 Commit: 3e7c532d83fc41b4c8439f30f4157d84bbc3fa08 Parents: 74054fb Author: sboikovAuthored: Tue Dec 1 15:22:28 2015 +0300 Committer: sboikov Committed: Tue Dec 1 15:22:28 2015 +0300 -- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3e7c532d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 20f12b6..728e792 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -861,8 +861,10 @@ public class GridDhtPartitionDemander { U.log(log, "Cancelled rebalancing from all nodes [cache=" + cctx.name() + ", topology=" + topologyVersion()); -for (UUID nodeId : remaining.keySet()) -cleanupRemoteContexts(nodeId); +if (!cctx.kernalContext().isStopping()) { +for (UUID nodeId : remaining.keySet()) +cleanupRemoteContexts(nodeId); +} remaining.clear(); @@ -920,7 +922,6 @@ public class GridDhtPartitionDemander { //Check remote node rebalancing API version. if (node.version().compareTo(GridDhtPreloader.REBALANCING_VER_2_SINCE) >= 0) { - GridDhtPartitionDemandMessage d = new GridDhtPartitionDemandMessage( -1/* remove supply context signal */, this.topologyVersion(), cctx.cacheId());
[05/14] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3492deae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3492deae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3492deae Branch: refs/heads/ignite-1695 Commit: 3492deaec670f9870c58cdf608cf77282d184f00 Parents: f5e9918 Author: sboikovAuthored: Tue Dec 1 12:15:55 2015 +0300 Committer: sboikov Committed: Tue Dec 1 12:19:14 2015 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 4 +-- .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++--- .../processors/cache/GridCacheAdapter.java | 8 + .../processors/cache/GridCacheContext.java | 37 .../GridCacheDefaultAffinityKeyMapper.java | 9 - .../processors/cache/GridCacheMapEntry.java | 6 +++- .../GridCachePartitionExchangeManager.java | 23 .../processors/cache/GridCachePreloader.java| 5 +++ .../cache/GridCachePreloaderAdapter.java| 7 +++- .../processors/cache/GridCacheProcessor.java| 14 +--- .../processors/cache/GridCacheProxyImpl.java| 12 +++ .../processors/cache/IgniteCacheProxy.java | 24 + .../processors/cache/IgniteInternalCache.java | 9 + .../dht/atomic/GridDhtAtomicCache.java | 4 +-- .../dht/preloader/GridDhtPartitionDemander.java | 17 + .../dht/preloader/GridDhtPreloader.java | 27 ++ .../CacheObjectBinaryProcessorImpl.java | 7 +++- .../cache/transactions/IgniteTxHandler.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 6 ++-- .../CachePutEventListenerErrorSelfTest.java | 35 ++ .../cache/GridCacheClearSelfTest.java | 9 +++-- ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++-- ...ObjectsCacheDataStructuresSelfTestSuite.java | 4 +++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 4 +++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite2.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite3.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite4.java | 4 +++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 +++ .../IgnitePortableCacheTestSuite.java | 1 - 30 files changed, 250 insertions(+), 95 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 889b25c..be06f85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -2057,7 +2057,7 @@ public class IgnitionEx { cache.setWriteSynchronizationMode(FULL_SYNC); cache.setAffinity(new RendezvousAffinityFunction(false, 100)); cache.setNodeFilter(CacheConfiguration.ALL_NODES); -cache.setRebalanceOrder(-1);//Prior to user caches. +cache.setRebalanceOrder(-2); //Prior to user caches. return cache; } @@ -2078,7 +2078,7 @@ public class IgnitionEx { ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setCacheMode(cfg.getCacheMode()); ccfg.setNodeFilter(CacheConfiguration.ALL_NODES); -ccfg.setRebalanceOrder(-1);//Prior to user caches. +ccfg.setRebalanceOrder(-1); //Prior to user caches. if (cfg.getCacheMode() == PARTITIONED) ccfg.setBackups(cfg.getBackups()); http://git-wip-us.apache.org/repos/asf/ignite/blob/3492deae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java index efd38f7..d244a16 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache; +import org.apache.ignite.Ignite; import org.apache.ignite.IgniteException; import
[03/14] ignite git commit: fixed version
fixed version Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f5e9918f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f5e9918f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f5e9918f Branch: refs/heads/ignite-1695 Commit: f5e9918f80c6535844fffdb4ce63399e233f7b00 Parents: ecb3cb4 Author: Yakov ZhdanovAuthored: Mon Nov 30 23:10:12 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 23:10:12 2015 +0300 -- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/common/configure.ac -- diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac index 229cb9d..8f53ea3 100644 --- a/modules/platforms/cpp/common/configure.ac +++ b/modules/platforms/cpp/common/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.0], [d...@ignite.apache.org], [ignite-common], [ignite.apache.org]) +AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite-common], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core-test/configure.ac -- diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac index 1612bea..14baf55 100644 --- a/modules/platforms/cpp/core-test/configure.ac +++ b/modules/platforms/cpp/core-test/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++ Test], [1.5.1.0], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++ Test], [1.5.0-EA], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/core/configure.ac -- diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac index 2733a46..f10eeb9 100644 --- a/modules/platforms/cpp/core/configure.ac +++ b/modules/platforms/cpp/core/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++], [1.5.1.0], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/examples/configure.ac -- diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac index 3ee5330..2d30028 100644 --- a/modules/platforms/cpp/examples/configure.ac +++ b/modules/platforms/cpp/examples/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Ingnite C++ examples],[1.5.1.0],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org]) +AC_INIT([Ingnite C++ examples],[1.5.0-EA],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/f5e9918f/modules/platforms/cpp/ignite/configure.ac -- diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac
[08/14] ignite git commit: ignite-1.5 Disabled shmem in test.
ignite-1.5 Disabled shmem in test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e11e4cb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e11e4cb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e11e4cb5 Branch: refs/heads/ignite-1695 Commit: e11e4cb5362899f9f5429cbb4683063ad036b8cd Parents: fb4ef34 Author: sboikovAuthored: Tue Dec 1 13:36:52 2015 +0300 Committer: sboikov Committed: Tue Dec 1 13:36:52 2015 +0300 -- .../ignite/internal/processors/cache/IgniteCacheAbstractTest.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e11e4cb5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 164ac66..7df72f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.lang.IgniteBiInClosure; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -88,6 +89,8 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + TcpDiscoverySpi disco = new TcpDiscoverySpi().setForceServerMode(true); disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
[13/14] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1695
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1695 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4bcc431c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4bcc431c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4bcc431c Branch: refs/heads/ignite-1695 Commit: 4bcc431ca501438351efea9ca50a256eae77ca2d Parents: 4d09d40 74f93b6 Author: Alexey GoncharukAuthored: Tue Dec 1 16:05:26 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Dec 1 16:05:26 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ examples/pom.xml| 5 ++- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 5 ++- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +-- .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++--- .../processors/cache/GridCacheAdapter.java | 8 + .../processors/cache/GridCacheContext.java | 37 .../GridCacheDefaultAffinityKeyMapper.java | 9 - .../processors/cache/GridCacheMapEntry.java | 6 +++- .../GridCachePartitionExchangeManager.java | 23 .../processors/cache/GridCachePreloader.java| 5 +++ .../cache/GridCachePreloaderAdapter.java| 7 +++- .../processors/cache/GridCacheProcessor.java| 14 +--- .../processors/cache/GridCacheProxyImpl.java| 12 +++ .../processors/cache/IgniteCacheProxy.java | 24 + .../processors/cache/IgniteInternalCache.java | 9 + .../dht/atomic/GridDhtAtomicCache.java | 4 +-- .../dht/preloader/GridDhtPartitionDemander.java | 32 ++--- .../dht/preloader/GridDhtPreloader.java | 27 ++ .../CacheObjectBinaryProcessorImpl.java | 7 +++- .../cache/transactions/IgniteTxHandler.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 10 +++--- .../core/src/main/resources/ignite.properties | 2 +- .../CachePutEventListenerErrorSelfTest.java | 35 ++ .../cache/GridCacheClearSelfTest.java | 9 +++-- ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++-- .../cache/IgniteCacheAbstractTest.java | 3 ++ ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++-- ...ObjectsCacheDataStructuresSelfTestSuite.java | 4 +++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 4 +++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite2.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite3.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite4.java | 4 +++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 +++ .../IgnitePortableCacheTestSuite.java | 1 - modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 4 +-- modules/flume/pom.xml | 5 ++- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 5 ++- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 12 +++ .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 6 ++-- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +-- .../Properties/AssemblyInfo.cs | 4 +--
[14/14] ignite git commit: Ignite-1695 - Fixed reading fields of dynamic type.
Ignite-1695 - Fixed reading fields of dynamic type. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6bd423a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6bd423a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6bd423a Branch: refs/heads/ignite-1695 Commit: d6bd423aa4438b4f80e88af91e602b7b48150237 Parents: 4bcc431 Author: Alexey GoncharukAuthored: Tue Dec 1 16:07:12 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Dec 1 16:07:12 2015 +0300 -- .../internal/portable/BinaryFieldAccessor.java | 83 +--- .../internal/portable/BinaryReaderExImpl.java | 11 +++ .../ignite/internal/util/IgniteUtils.java | 8 ++ .../portable/BinaryMarshallerSelfTest.java | 20 + 4 files changed, 111 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d6bd423a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java index 0eda375..eece245 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.portable; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.U; import sun.misc.Unsafe; import java.lang.reflect.Field; @@ -74,8 +75,41 @@ public abstract class BinaryFieldAccessor { case P_DOUBLE: return new DoublePrimitiveAccessor(field, id); +case BYTE: +case BOOLEAN: +case SHORT: +case CHAR: +case INT: +case LONG: +case FLOAT: +case DOUBLE: +case DECIMAL: +case STRING: +case UUID: +case DATE: +case TIMESTAMP: +case BYTE_ARR: +case SHORT_ARR: +case INT_ARR: +case LONG_ARR: +case FLOAT_ARR: +case DOUBLE_ARR: +case CHAR_ARR: +case BOOLEAN_ARR: +case DECIMAL_ARR: +case STRING_ARR: +case UUID_ARR: +case DATE_ARR: +case TIMESTAMP_ARR: +case ENUM_ARR: +case OBJECT_ARR: +case PORTABLE_OBJ: +case PORTABLE: +case EXTERNALIZABLE: +return new DefaultFinalClassAccessor(field, id, mode, false); + default: -return new DefaultAccessor(field, id, mode); +return new DefaultFinalClassAccessor(field, id, mode, !U.isFinal(field.getType())); } } @@ -389,10 +423,13 @@ public abstract class BinaryFieldAccessor { /** * Default accessor. */ -private static class DefaultAccessor extends BinaryFieldAccessor { +private static class DefaultFinalClassAccessor extends BinaryFieldAccessor { /** Target field. */ private final Field field; +/** Dynamic accessor flag. */ +private final boolean dynamic; + /** * Constructor. * @@ -400,12 +437,13 @@ public abstract class BinaryFieldAccessor { * @param id Field ID. * @param mode Mode. */ -public DefaultAccessor(Field field, int id, BinaryWriteMode mode) { +DefaultFinalClassAccessor(Field field, int id, BinaryWriteMode mode, boolean dynamic) { super(id, mode); assert field != null; this.field = field; +this.dynamic = dynamic; } /** {@inheritDoc} */ @@ -424,7 +462,7 @@ public abstract class BinaryFieldAccessor { throw new BinaryObjectException("Failed to get value for field: " + field, e); } -switch (mode) { +switch (mode(val)) { case BYTE: writer.writeByteField((Byte) val); @@ -609,6 +647,25 @@ public abstract class BinaryFieldAccessor { /** {@inheritDoc} */ @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException { +Object val = dynamic ? reader.readField(id) : readFixedType(reader); + +try { +if (val != null || !field.getType().isPrimitive()) +field.set(obj, val); +
[04/14] ignite git commit: Release notes update
Release notes update Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98303001 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98303001 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98303001 Branch: refs/heads/ignite-1695 Commit: 98303001684265b3677fb663e51c4a44b9fd1707 Parents: f5e9918 Author: Anton VinogradovAuthored: Tue Dec 1 11:18:40 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 11:18:40 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/98303001/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 4985edb..f7f48fa 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -9,6 +9,8 @@ Apache Ignite In-Memory Data Fabric 1.5 * Added new binary cache object marshalling implementation. * Added IgniteSemaphore data structure. * Added MQTT Streamer. +* Added Twitter Streamer. +* Added Ignite Sink (integration with Apache Flume). * Fixed failover for continuous queries. * Fixed compilation and runtime errors under OpenJDK and IBM JDK. * Fixed Integer.size limitation for cache.
[06/14] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b64100a3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b64100a3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b64100a3 Branch: refs/heads/ignite-1695 Commit: b64100a32029723e5cbc94dd09fde24f78143cc9 Parents: 3492dea 9830300 Author: sboikovAuthored: Tue Dec 1 12:19:47 2015 +0300 Committer: sboikov Committed: Tue Dec 1 12:19:47 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) --
[02/14] ignite git commit: fixed version
fixed version Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecb3cb44 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecb3cb44 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecb3cb44 Branch: refs/heads/ignite-1695 Commit: ecb3cb445bf3ec51a67768a08db5c601459ca1ce Parents: 6260fc1 Author: Yakov ZhdanovAuthored: Mon Nov 30 23:01:27 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Nov 30 23:01:27 2015 +0300 -- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 12 ++-- .../Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core/Properties/AssemblyInfo.cs | 6 +++--- .../dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/common/configure.ac -- diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac index 8f53ea3..229cb9d 100644 --- a/modules/platforms/cpp/common/configure.ac +++ b/modules/platforms/cpp/common/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite JNI bridge for C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite-common], [ignite.apache.org]) +AC_INIT([Apache Ignite JNI bridge for C++], [1.5.1.0], [d...@ignite.apache.org], [ignite-common], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/core-test/configure.ac -- diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac index 14baf55..1612bea 100644 --- a/modules/platforms/cpp/core-test/configure.ac +++ b/modules/platforms/cpp/core-test/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++ Test], [1.5.0-EA], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++ Test], [1.5.1.0], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/core/configure.ac -- diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac index f10eeb9..2733a46 100644 --- a/modules/platforms/cpp/core/configure.ac +++ b/modules/platforms/cpp/core/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++], [1.5.0-EA], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++], [1.5.1.0], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/examples/configure.ac -- diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac index 2d30028..3ee5330 100644 --- a/modules/platforms/cpp/examples/configure.ac +++ b/modules/platforms/cpp/examples/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Ingnite C++ examples],[1.5.0-EA],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org]) +AC_INIT([Ingnite C++ examples],[1.5.1.0],[d...@ignite.apache.org],[ignite-examples],[ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/ecb3cb44/modules/platforms/cpp/ignite/configure.ac -- diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac index 41d944c..70b5c82 100644 --- a/modules/platforms/cpp/ignite/configure.ac +++
[09/14] ignite git commit: ignite-1.5 Correction for commit 59f3726.
ignite-1.5 Correction for commit 59f3726. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c850ae47 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c850ae47 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c850ae47 Branch: refs/heads/ignite-1695 Commit: c850ae474e1d60bf4e927206b580af19e7f208bb Parents: e11e4cb Author: sboikovAuthored: Tue Dec 1 14:17:59 2015 +0300 Committer: sboikov Committed: Tue Dec 1 14:17:59 2015 +0300 -- .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c850ae47/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index e5885a6..09e4877 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -360,7 +360,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter clients.remove(id, rmv)) { rmv.forceClose(); -if (!isNodeStopping()) { +if (!stopping) { GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor(); if (recoveryData != null) { @@ -1761,7 +1761,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { -assert isNodeStopping(); +assert stopping; unregisterMBean();
[12/14] ignite git commit: ignite-1.5 Skip message send on node stop.
ignite-1.5 Skip message send on node stop. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74f93b65 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74f93b65 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74f93b65 Branch: refs/heads/ignite-1695 Commit: 74f93b650c40b8551b333dfbc486e549fc38f41e Parents: 3e7c532 Author: sboikovAuthored: Tue Dec 1 15:25:11 2015 +0300 Committer: sboikov Committed: Tue Dec 1 15:25:11 2015 +0300 -- .../dht/preloader/GridDhtPartitionDemander.java | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/74f93b65/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 728e792..eb9e97f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -283,7 +283,7 @@ public class GridDhtPartitionDemander { * @param force {@code True} if dummy reassign. * @param caches Rebalancing of these caches will be finished before this started. * @param cnt Counter. - * @throws IgniteCheckedException Exception + * @throws IgniteCheckedException If failed. */ Callable addAssignments(final GridDhtPreloaderAssignments assigns, boolean force, final Collection caches, int cnt) { @@ -741,7 +741,7 @@ public class GridDhtPartitionDemander { private static final long serialVersionUID = 1L; /** Should EVT_CACHE_REBALANCE_STOPPED event be sent of not. */ -private final boolean sendStoppedEvnt; +private final boolean sndStoppedEvnt; /** */ private final GridCacheContext cctx; @@ -770,6 +770,7 @@ public class GridDhtPartitionDemander { * @param cctx Context. * @param log Logger. * @param sentStopEvnt Stop event flag. + * @param updateSeq Update sequence. */ RebalanceFuture(GridDhtPreloaderAssignments assigns, GridCacheContext cctx, @@ -782,7 +783,7 @@ public class GridDhtPartitionDemander { this.topVer = assigns.topologyVersion(); this.cctx = cctx; this.log = log; -this.sendStoppedEvnt = sentStopEvnt; +this.sndStoppedEvnt = sentStopEvnt; this.updateSeq = updateSeq; } @@ -794,7 +795,7 @@ public class GridDhtPartitionDemander { this.topVer = null; this.cctx = null; this.log = null; -this.sendStoppedEvnt = false; +this.sndStoppedEvnt = false; this.updateSeq = -1; } @@ -1007,7 +1008,7 @@ public class GridDhtPartitionDemander { */ private void checkIsDone(boolean cancelled) { if (remaining.isEmpty()) { -if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED) && (!cctx.isReplicated() || sendStoppedEvnt)) +if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED) && (!cctx.isReplicated() || sndStoppedEvnt)) preloadEvent(EVT_CACHE_REBALANCE_STOPPED, exchFut.discoveryEvent()); if (log.isDebugEnabled()) @@ -1385,6 +1386,7 @@ public class GridDhtPartitionDemander { /** * @param node Node. * @param d D. + * @throws IgniteCheckedException If failed. */ public void run(ClusterNode node, GridDhtPartitionDemandMessage d) throws IgniteCheckedException { demandLock.readLock().lock();
[07/14] ignite git commit: ignite-1.5 Muted test
ignite-1.5 Muted test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb4ef34a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb4ef34a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb4ef34a Branch: refs/heads/ignite-1695 Commit: fb4ef34a5e0f7d70674d8cbe3522955ca420c61c Parents: b64100a Author: sboikovAuthored: Tue Dec 1 12:53:34 2015 +0300 Committer: sboikov Committed: Tue Dec 1 12:53:34 2015 +0300 -- ...ridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb4ef34a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java index cb40397..3122fe3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.configuration.CacheConfiguration; /** - * TODO: IGNITE-809. + * */ public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCacheMultinodeUpdateNearEnabledSelfTest { /** {@inheritDoc} */ @@ -36,4 +36,9 @@ public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCa return ccfg; } -} \ No newline at end of file + +/** {@inheritDoc} */ +@Override public void testInvoke() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-809;); +} +}
[10/14] ignite git commit: version fix
version fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74054fb0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74054fb0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74054fb0 Branch: refs/heads/ignite-1695 Commit: 74054fb04bba7e5b73c6c638c576d2344c5c6d2f Parents: c850ae4 Author: Anton VinogradovAuthored: Tue Dec 1 14:36:13 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 14:36:13 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml| 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml| 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 1b79525..c018e1e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.5.0-EA-SNAPSHOT +1.5.0-EA1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index ee6dc5e..d4eb3b3 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -35,7 +35,7 @@ ignite-schema-import-demo -1.5.0-EA-SNAPSHOT +1.5.0-EA1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index a2eb499..850af76 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.5.0-EA-SNAPSHOT +1.5.0-EA1-SNAPSHOT http://ignite.apache.org http://git-wip-us.apache.org/repos/asf/ignite/blob/74054fb0/modules/apache-license-gen/pom.xml
ignite git commit: IGNITE-1695 - Fixed writing polymorphic types.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 e0c970a5f -> 2564a556e IGNITE-1695 - Fixed writing polymorphic types. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2564a556 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2564a556 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2564a556 Branch: refs/heads/ignite-1.5 Commit: 2564a556e353269d4adc58160512ed9d0a5979b4 Parents: e0c970a Author: Alexey GoncharukAuthored: Tue Dec 1 17:37:41 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Dec 1 17:37:41 2015 +0300 -- .../internal/portable/BinaryFieldAccessor.java | 83 +++-- .../internal/portable/BinaryReaderExImpl.java | 11 ++ .../ignite/internal/util/IgniteUtils.java | 8 + .../portable/BinaryMarshallerSelfTest.java | 186 --- 4 files changed, 249 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2564a556/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java index 0eda375..eece245 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.portable; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.U; import sun.misc.Unsafe; import java.lang.reflect.Field; @@ -74,8 +75,41 @@ public abstract class BinaryFieldAccessor { case P_DOUBLE: return new DoublePrimitiveAccessor(field, id); +case BYTE: +case BOOLEAN: +case SHORT: +case CHAR: +case INT: +case LONG: +case FLOAT: +case DOUBLE: +case DECIMAL: +case STRING: +case UUID: +case DATE: +case TIMESTAMP: +case BYTE_ARR: +case SHORT_ARR: +case INT_ARR: +case LONG_ARR: +case FLOAT_ARR: +case DOUBLE_ARR: +case CHAR_ARR: +case BOOLEAN_ARR: +case DECIMAL_ARR: +case STRING_ARR: +case UUID_ARR: +case DATE_ARR: +case TIMESTAMP_ARR: +case ENUM_ARR: +case OBJECT_ARR: +case PORTABLE_OBJ: +case PORTABLE: +case EXTERNALIZABLE: +return new DefaultFinalClassAccessor(field, id, mode, false); + default: -return new DefaultAccessor(field, id, mode); +return new DefaultFinalClassAccessor(field, id, mode, !U.isFinal(field.getType())); } } @@ -389,10 +423,13 @@ public abstract class BinaryFieldAccessor { /** * Default accessor. */ -private static class DefaultAccessor extends BinaryFieldAccessor { +private static class DefaultFinalClassAccessor extends BinaryFieldAccessor { /** Target field. */ private final Field field; +/** Dynamic accessor flag. */ +private final boolean dynamic; + /** * Constructor. * @@ -400,12 +437,13 @@ public abstract class BinaryFieldAccessor { * @param id Field ID. * @param mode Mode. */ -public DefaultAccessor(Field field, int id, BinaryWriteMode mode) { +DefaultFinalClassAccessor(Field field, int id, BinaryWriteMode mode, boolean dynamic) { super(id, mode); assert field != null; this.field = field; +this.dynamic = dynamic; } /** {@inheritDoc} */ @@ -424,7 +462,7 @@ public abstract class BinaryFieldAccessor { throw new BinaryObjectException("Failed to get value for field: " + field, e); } -switch (mode) { +switch (mode(val)) { case BYTE: writer.writeByteField((Byte) val); @@ -609,6 +647,25 @@ public abstract class BinaryFieldAccessor { /** {@inheritDoc} */ @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException { +Object val = dynamic ? reader.readField(id) : readFixedType(reader); + +try { +if (val != null
[2/2] ignite git commit: Fixing getAnd* methods with binary marshaller.
Fixing getAnd* methods with binary marshaller. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae0ea3cf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae0ea3cf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae0ea3cf Branch: refs/heads/ignite-1282 Commit: ae0ea3cf9adcf73958cae9e9b8183cab907694de Parents: afcf0ab Author: Alexey GoncharukAuthored: Thu Nov 26 11:36:08 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 11:36:08 2015 +0300 -- .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +- .../transactions/IgniteTxLocalAdapter.java | 29 -- .../cache/GridCacheAbstractFullApiSelfTest.java | 97 3 files changed, 120 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ae0ea3cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 07111a1..513e6e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -324,7 +324,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter GridCacheReturn ret = (GridCacheReturn)res; Object retval = -res == null ? null : rawRetval ? ret : (this.retval || op == TRANSFORM) ? ret.value() : ret.success(); +res == null ? null : rawRetval ? ret : (this.retval || op == TRANSFORM) ? +cctx.unwrapPortableIfNeeded(ret.value(), keepBinary) : ret.success(); if (op == TRANSFORM && retval == null) retval = Collections.emptyMap(); http://git-wip-us.apache.org/repos/asf/ignite/blob/ae0ea3cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 7c6a1d4..b3ff3a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2932,6 +2932,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter KeyCacheObject cacheKey = cacheCtx.toCacheKeyObject(key); +boolean keepBinary = opCtx != null && opCtx.isKeepBinary(); + final IgniteInternalFuture loadFut = enlistWrite( cacheCtx, cacheKey, @@ -2945,7 +2947,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter ret, opCtx != null && opCtx.skipStore(), /*singleRmv*/false, -opCtx != null && opCtx.isKeepBinary()); +keepBinary); if (pessimistic()) { assert loadFut == null || loadFut.isDone() : loadFut; @@ -3009,7 +3011,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } } else -return optimisticPutFuture(loadFut, ret); +return optimisticPutFuture(cacheCtx, loadFut, ret, keepBinary); } catch (IgniteCheckedException e) { return new GridFinishedFuture(e); @@ -3099,6 +3101,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter CacheOperationContext opCtx = cacheCtx.operationContextPerCall(); +final boolean keepBinary = opCtx != null && opCtx.isKeepBinary(); + final IgniteInternalFuture loadFut = enlistWrite( cacheCtx, keySet, @@ -3115,7 +3119,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter null, opCtx != null && opCtx.skipStore(), false, -opCtx != null && opCtx.isKeepBinary()); +keepBinary); if (pessimistic()) { assert loadFut == null || loadFut.isDone() :
[1/2] ignite git commit: Fixing marshalToPortable and IgniteBiTuple
Repository: ignite Updated Branches: refs/heads/ignite-1282 809a44260 -> ae0ea3cf9 Fixing marshalToPortable and IgniteBiTuple Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afcf0ab5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afcf0ab5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afcf0ab5 Branch: refs/heads/ignite-1282 Commit: afcf0ab5e5d8e33351cf37790894c1d71ac6cc65 Parents: 809a442 Author: Alexey GoncharukAuthored: Thu Nov 26 09:21:50 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 09:21:50 2015 +0300 -- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/afcf0ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java index ba7d6f8..819b57e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java @@ -62,11 +62,13 @@ import org.apache.ignite.internal.util.lang.GridMapEntry; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; +import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.internal.portable.BinaryMarshaller; @@ -390,6 +392,15 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm return pArr; } +if (obj instanceof IgniteBiTuple) { +IgniteBiTuple tup = (IgniteBiTuple)obj; + +if (obj instanceof T2) +return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + +return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); +} + if (obj instanceof Collection) { Collection col = (Collection)obj;
[08/14] ignite git commit: IGNITE-2005: [Test failed] Ignite Java Client suite fails. This closes #264
IGNITE-2005: [Test failed] Ignite Java Client suite fails. This closes #264 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97270bf3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97270bf3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97270bf3 Branch: refs/heads/ignite-1282 Commit: 97270bf3ec5a220f44b21ba6fbaf254a9c0a6c08 Parents: b83f75e Author: Andrey GuraAuthored: Wed Nov 25 18:56:15 2015 +0300 Committer: Denis Magda Committed: Wed Nov 25 18:56:15 2015 +0300 -- .../ignite/internal/client/router/RouterFactorySelfTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/97270bf3/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java index d5eee7f..2e9e62a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java @@ -105,6 +105,8 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { } finally { GridRouterFactory.stopAllRouters(); + +stopAllGrids(); } } } \ No newline at end of file
[14/14] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7eea46d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7eea46d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7eea46d3 Branch: refs/heads/ignite-1282 Commit: 7eea46d3ebb4268acf7e095187f5f2194732b89d Parents: ae0ea3c d99fc8d Author: Alexey GoncharukAuthored: Thu Nov 26 11:39:19 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 11:39:19 2015 +0300 -- examples/pom.xml| 2 +- .../client/router/RouterFactorySelfTest.java| 2 + .../java/org/apache/ignite/IgniteCache.java | 23 ++ .../configuration/CacheConfiguration.java | 30 +++ .../internal/portable/BinaryReaderExImpl.java | 18 +- .../processors/cache/GridCacheAdapter.java | 156 - .../processors/cache/GridCacheProxyImpl.java| 61 + .../processors/cache/IgniteCacheProxy.java | 42 .../processors/cache/IgniteInternalCache.java | 47 +++- .../distributed/dht/GridDhtCacheAdapter.java| 7 +- .../distributed/near/GridNearCacheAdapter.java | 10 + .../cache/query/GridCacheSqlQuery.java | 42 .../cache/query/GridCacheTwoStepQuery.java | 35 ++- .../platform/PlatformContextImpl.java | 2 +- .../processors/query/GridQueryProcessor.java| 40 +--- .../processors/query/GridQueryProperty.java | 45 .../query/GridQueryTypeDescriptor.java | 6 + .../visor/cache/VisorCacheConfiguration.java| 4 +- .../cache/VisorCacheTypeFieldMetadata.java | 30 ++- .../visor/cache/VisorCacheTypeMetadata.java | 133 ++- .../ignite/resources/MBeanServerResource.java | 69 -- .../META-INF/classnames-jdk.properties | 2 + .../IgniteClientReconnectCacheTest.java | 7 + .../CacheDeferredDeleteSanitySelfTest.java | 98 .../cache/CacheStopAndDestroySelfTest.java | 8 +- ...eAbstractDataStructuresFailoverSelfTest.java | 3 + .../IgniteCollectionAbstractTest.java | 3 + .../IgniteCachePutRetryAbstractSelfTest.java| 2 + .../multijvm/IgniteCacheProcessProxy.java | 38 .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../query/h2/GridH2ResultSetIterator.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 227 --- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 69 +- .../query/h2/opt/GridH2TreeIndex.java | 98 +--- .../query/h2/sql/GridSqlQuerySplitter.java | 73 -- .../processors/query/h2/sql/GridSqlSelect.java | 27 +++ .../query/h2/twostep/GridMapQueryExecutor.java | 17 +- .../query/h2/twostep/GridMergeIndex.java| 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 14 ++ .../h2/twostep/GridReduceQueryExecutor.java | 117 +++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 69 +++--- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 +- ...PartitionedSnapshotEnabledQuerySelfTest.java | 28 +++ .../h2/GridIndexingSpiAbstractSelfTest.java | 19 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../Services/ServicesExample.cs | 4 + modules/scalar/pom.xml | 4 +- modules/spark/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- .../ignite-int-max-values-offheap-config.xml| 89 .../ignite-int-max-values-onheap-config.xml | 84 +++ .../ignite-int-max-values-swap-config.xml | 93 .../test-max-int-values-offheap.properties | 70 ++ .../test-max-int-values-onheap.properties | 70 ++ .../config/test-max-int-values-swap.properties | 69 ++ .../yardstick/cache/IntMaxValueEntriesTest.java | 135 +++ parent/pom.xml | 2 +- 58 files changed, 2071 insertions(+), 320 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/IgniteCache.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7eea46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[10/14] ignite git commit: Queries optimizations: - cache prepared statements and two-step queries - skip reduce query if possible - do not use index snapshots by default
Queries optimizations: - cache prepared statements and two-step queries - skip reduce query if possible - do not use index snapshots by default Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4af461a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4af461a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4af461a7 Branch: refs/heads/ignite-1282 Commit: 4af461a7f403fc0e4df13d23d0789eee49200b26 Parents: 3c42da8 Author: sboikovAuthored: Thu Nov 26 09:30:10 2015 +0300 Committer: sboikov Committed: Thu Nov 26 09:30:10 2015 +0300 -- .../configuration/CacheConfiguration.java | 30 +++ .../cache/query/GridCacheSqlQuery.java | 42 .../cache/query/GridCacheTwoStepQuery.java | 35 ++- .../processors/query/GridQueryProcessor.java| 40 +--- .../processors/query/GridQueryProperty.java | 45 .../query/GridQueryTypeDescriptor.java | 6 + .../query/h2/GridH2ResultSetIterator.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 227 --- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 69 +- .../query/h2/opt/GridH2TreeIndex.java | 98 +--- .../query/h2/sql/GridSqlQuerySplitter.java | 73 -- .../processors/query/h2/sql/GridSqlSelect.java | 27 +++ .../query/h2/twostep/GridMapQueryExecutor.java | 17 +- .../query/h2/twostep/GridMergeIndex.java| 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 14 ++ .../h2/twostep/GridReduceQueryExecutor.java | 117 +++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 69 +++--- ...PartitionedSnapshotEnabledQuerySelfTest.java | 28 +++ .../h2/GridIndexingSpiAbstractSelfTest.java | 19 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 21 files changed, 776 insertions(+), 213 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4af461a7/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index e87346f..e2bf912 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -373,6 +373,9 @@ public class CacheConfiguration extends MutableConfiguration { /** */ private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE; +/** */ +private boolean snapshotableIdx; + /** Copy on read flag. */ private boolean cpOnRead = DFLT_COPY_ON_READ; @@ -463,6 +466,7 @@ public class CacheConfiguration extends MutableConfiguration { rebalancePoolSize = cc.getRebalanceThreadPoolSize(); rebalanceTimeout = cc.getRebalanceTimeout(); rebalanceThrottle = cc.getRebalanceThrottle(); +snapshotableIdx = cc.isSnapshotableIndex(); sqlEscapeAll = cc.isSqlEscapeAll(); sqlFuncCls = cc.getSqlFunctionClasses(); sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize(); @@ -1900,6 +1904,32 @@ public class CacheConfiguration extends MutableConfiguration { } /** + * Gets flag indicating whether SQL indexes should support snapshots. + * + * @return {@code True} if SQL indexes should support snapshots. + */ +public boolean isSnapshotableIndex() { +return snapshotableIdx; +} + +/** + * Sets flag indicating whether SQL indexes should support snapshots. + * + * Default value is {@code false}. + * + * Note that this flag is ignored if indexes are stored in offheap memory, + * for offheap indexes snapshots are always enabled. + * + * @param snapshotableIdx {@code True} if SQL indexes should support snapshots. + * @return {@code this} for chaining. + */ +public CacheConfiguration setSnapshotableIndex(boolean snapshotableIdx) { +this.snapshotableIdx = snapshotableIdx; + +return this; +} + +/** * Gets array of cache plugin configurations. * * @return Cache plugin configurations. http://git-wip-us.apache.org/repos/asf/ignite/blob/4af461a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
[11/14] ignite git commit: Disabled shmem communication in failover tests.
Disabled shmem communication in failover tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28d6e006 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28d6e006 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28d6e006 Branch: refs/heads/ignite-1282 Commit: 28d6e006c40b83fc8744b44312e74779264c0265 Parents: 4af461a Author: sboikovAuthored: Thu Nov 26 09:55:24 2015 +0300 Committer: sboikov Committed: Thu Nov 26 09:55:24 2015 +0300 -- .../GridCacheAbstractDataStructuresFailoverSelfTest.java | 3 +++ .../cache/datastructures/IgniteCollectionAbstractTest.java| 3 +++ 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/28d6e006/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java index bc11448..4ee200b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java @@ -54,6 +54,7 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; @@ -122,6 +123,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + AtomicConfiguration atomicCfg = new AtomicConfiguration(); atomicCfg.setCacheMode(collectionCacheMode()); http://git-wip-us.apache.org/repos/asf/ignite/blob/28d6e006/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java index 36c846a..3e38a58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java @@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.datastructures.GridCacheQueueAdapter; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -45,6 +46,8 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + TcpDiscoverySpi spi = new TcpDiscoverySpi(); spi.setIpFinder(ipFinder);
[01/14] ignite git commit: IGNITE-1983 Platforms: fixed a problem with incorrect reader behavior for platform streams.
Repository: ignite Updated Branches: refs/heads/ignite-1282 ae0ea3cf9 -> 7eea46d3e IGNITE-1983 Platforms: fixed a problem with incorrect reader behavior for platform streams. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c40ab677 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c40ab677 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c40ab677 Branch: refs/heads/ignite-1282 Commit: c40ab677e69f0d756281c62549cb2f63de907ed6 Parents: dafad52 Author: Pavel TupitsynAuthored: Wed Nov 25 10:14:26 2015 +0300 Committer: vozerov-gridgain Committed: Wed Nov 25 10:14:26 2015 +0300 -- .../internal/portable/BinaryReaderExImpl.java | 18 +++--- .../processors/platform/PlatformContextImpl.java | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c40ab677/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java index 4809c3c..872d7a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java @@ -162,6 +162,20 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina */ public BinaryReaderExImpl(PortableContext ctx, PortableInputStream in, ClassLoader ldr, @Nullable BinaryReaderHandles hnds) { +this(ctx, in, ldr, hnds, false); +} + +/** + * Constructor. + * + * @param ctx Context. + * @param in Input stream. + * @param ldr Class loader. + * @param hnds Context. + * @param skipHdrCheck Whether to skip header check. + */ +public BinaryReaderExImpl(PortableContext ctx, PortableInputStream in, ClassLoader ldr, +@Nullable BinaryReaderHandles hnds, boolean skipHdrCheck) { // Initialize base members. this.ctx = ctx; this.in = in; @@ -170,10 +184,8 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina start = in.position(); -byte hdr = in.readByte(); - // Perform full header parsing in case of portable object. -if (hdr == GridPortableMarshaller.OBJ) { +if (!skipHdrCheck && (in.readByte() == GridPortableMarshaller.OBJ)) { // Ensure protocol is fine. PortableUtils.checkProtocolVersion(in.readByte()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c40ab677/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 9a7f0df..7db752a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -177,7 +177,7 @@ public class PlatformContextImpl implements PlatformContext { /** {@inheritDoc} */ @Override public BinaryRawReaderEx reader(PlatformInputStream in) { // TODO: IGNITE-1272 - Is class loader needed here? -return new BinaryReaderExImpl(marsh.context(), in, null); +return new BinaryReaderExImpl(marsh.context(), in, null, null, true); } /** {@inheritDoc} */
[06/14] ignite git commit: IGNITE-1992: [Test failed] CacheStopAndDestroySelfTest.testLocalClose test fails periodicaly. This closes #261
IGNITE-1992: [Test failed] CacheStopAndDestroySelfTest.testLocalClose test fails periodicaly. This closes #261 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e02edcd3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e02edcd3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e02edcd3 Branch: refs/heads/ignite-1282 Commit: e02edcd36d79f1e107c2ebe5096238f2f2a62a23 Parents: b9e4e03 Author: Andrey GuraAuthored: Wed Nov 25 18:34:42 2015 +0300 Committer: Denis Magda Committed: Wed Nov 25 18:34:42 2015 +0300 -- .../processors/cache/CacheStopAndDestroySelfTest.java| 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e02edcd3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java index 29828af..061a374 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.managers.communication.GridIoMessage; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; @@ -67,9 +68,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { /** local cache name. */ protected static String CACHE_NAME_LOC = "cache_local"; -/** */ -private static volatile boolean stop; - /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTest(); @@ -674,6 +672,10 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { // Local creation after closed. +AffinityTopologyVersion topVer = grid(1).context().cache().context().exchange().lastTopologyFuture().get(); + + grid(0).context().cache().context().exchange().affinityReadyFuture(topVer).get(); + grid(0).getOrCreateCache(getLocalConfig()); grid(0).cache(CACHE_NAME_LOC).put(KEY_VAL, KEY_VAL + "recreated0");
[05/14] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9e4e036 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9e4e036 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9e4e036 Branch: refs/heads/ignite-1282 Commit: b9e4e0367dd38c5d4053e15e1d7307621f52bcfc Parents: 8a9cc54 f9690df Author: Denis MagdaAuthored: Wed Nov 25 18:23:54 2015 +0300 Committer: Denis Magda Committed: Wed Nov 25 18:23:54 2015 +0300 -- examples/pom.xml| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 9 +++-- .../internal/portable/BinaryReaderExImpl.java | 18 +++-- .../processors/cache/CacheLockImpl.java | 18 - .../colocated/GridDhtColocatedLockFuture.java | 8 ++-- .../platform/PlatformContextImpl.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++- .../Services/ServicesExample.cs | 4 ++ modules/scalar/pom.xml | 4 +- modules/spark/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- parent/pom.xml | 2 +- 12 files changed, 93 insertions(+), 22 deletions(-) --
[04/14] ignite git commit: IGNITE-1544: Make sure objects number stored in a cache can be bigger than Integer.MAX_VALUE. This closes #252
IGNITE-1544: Make sure objects number stored in a cache can be bigger than Integer.MAX_VALUE. This closes #252 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a9cc540 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a9cc540 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a9cc540 Branch: refs/heads/ignite-1282 Commit: 8a9cc5408f99713fb4a1a9036940fc76aef7b050 Parents: c23cda1 Author: Andrey GuraAuthored: Wed Nov 25 18:21:48 2015 +0300 Committer: Denis Magda Committed: Wed Nov 25 18:21:48 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 23 +++ .../processors/cache/GridCacheAdapter.java | 156 ++- .../processors/cache/GridCacheProxyImpl.java| 61 .../processors/cache/IgniteCacheProxy.java | 42 + .../processors/cache/IgniteInternalCache.java | 47 +- .../distributed/dht/GridDhtCacheAdapter.java| 7 +- .../distributed/near/GridNearCacheAdapter.java | 10 ++ .../CacheDeferredDeleteSanitySelfTest.java | 98 .../multijvm/IgniteCacheProcessProxy.java | 38 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + ...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 +- .../ignite-int-max-values-offheap-config.xml| 89 +++ .../ignite-int-max-values-onheap-config.xml | 84 ++ .../ignite-int-max-values-swap-config.xml | 93 +++ .../test-max-int-values-offheap.properties | 70 + .../test-max-int-values-onheap.properties | 70 + .../config/test-max-int-values-swap.properties | 69 .../yardstick/cache/IntMaxValueEntriesTest.java | 135 18 files changed, 1094 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8a9cc540/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 c9de3f1..c575865 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -348,6 +348,19 @@ public interface IgniteCache extends javax.cache.Cache , IgniteAsyncS public int size(CachePeekMode... peekModes) throws CacheException; /** + * Gets the number of all entries cached across all nodes as a long value. By default, if {@code peekModes} value + * isn't defined, only size of primary copies across all nodes will be returned. This behavior is identical to + * calling this method with {@link CachePeekMode#PRIMARY} peek mode. + * + * NOTE: this operation is distributed and will query all participating nodes for their cache sizes. + * + * @param peekModes Optional peek modes. If not provided, then total cache size is returned. + * @return Cache size across all nodes. + */ +@IgniteAsyncSupported +public long sizeLong(CachePeekMode... peekModes) throws CacheException; + +/** * Gets the number of all entries cached on this node. By default, if {@code peekModes} value isn't defined, * only size of primary copies will be returned. This behavior is identical to calling this method with * {@link CachePeekMode#PRIMARY} peek mode. @@ -358,6 +371,16 @@ public interface IgniteCache extends javax.cache.Cache , IgniteAsyncS public int localSize(CachePeekMode... peekModes); /** + * Gets the number of all entries cached on this node as a long value. By default, if {@code peekModes} value isn't + * defined, only size of primary copies will be returned. This behavior is identical to calling this method with + * {@link CachePeekMode#PRIMARY} peek mode. + * + * @param peekModes Optional peek modes. If not provided, then total cache size is returned. + * @return Cache size on this node. + */ +public long localSizeLong(CachePeekMode... peekModes); + +/** * @param map Map containing keys and entry processors to be applied to values. * @param args Additional arguments to pass to the {@link EntryProcessor}. * @return The map of {@link EntryProcessorResult}s of the processing per key, http://git-wip-us.apache.org/repos/asf/ignite/blob/8a9cc540/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
[13/14] ignite git commit: Disabled events in test, otherwise get OOM when run it with -Xmx2g.
Disabled events in test, otherwise get OOM when run it with -Xmx2g. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d99fc8d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d99fc8d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d99fc8d1 Branch: refs/heads/ignite-1282 Commit: d99fc8d12e9dd022eaa9664437fe1ff9b19d6863 Parents: 041cd38 Author: sboikovAuthored: Thu Nov 26 11:12:48 2015 +0300 Committer: sboikov Committed: Thu Nov 26 11:12:48 2015 +0300 -- .../cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d99fc8d1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index ee28cf9..6bbca88 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -110,6 +110,8 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); +cfg.setIncludeEventTypes(); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
[03/14] ignite git commit: IGNITE-1999: Improved .NET ServicesExample a bit.
IGNITE-1999: Improved .NET ServicesExample a bit. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9690df8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9690df8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9690df8 Branch: refs/heads/ignite-1282 Commit: f9690df8e6a87b5e537a2e75f5affc61deda468d Parents: ef2007d Author: vozerov-gridgainAuthored: Wed Nov 25 17:44:15 2015 +0300 Committer: vozerov-gridgain Committed: Wed Nov 25 17:44:15 2015 +0300 -- .../examples/Apache.Ignite.Examples/Services/ServicesExample.cs | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f9690df8/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Services/ServicesExample.cs -- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Services/ServicesExample.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Services/ServicesExample.cs index 121a5c4..77eb253 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Services/ServicesExample.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Services/ServicesExample.cs @@ -72,6 +72,10 @@ namespace Apache.Ignite.Examples.Services ignite.GetServices().CancelAll(); } + +Console.WriteLine(); +Console.WriteLine(">>> Example finished, press any key to exit ..."); +Console.ReadKey(); } } }
[07/14] ignite git commit: ignite-1800: Annotation MBeanServerResource should be deleted as unsupported. This closes #260
ignite-1800: Annotation MBeanServerResource should be deleted as unsupported. This closes #260 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b83f75ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b83f75ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b83f75ed Branch: refs/heads/ignite-1282 Commit: b83f75edaa7145be443429d9cce54c86fe85730a Parents: e02edcd Author: Roman ShtykhAuthored: Wed Nov 25 18:41:03 2015 +0300 Committer: Denis Magda Committed: Wed Nov 25 18:41:03 2015 +0300 -- .../ignite/resources/MBeanServerResource.java | 69 1 file changed, 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b83f75ed/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java deleted file mode 100644 index 17b9aa7..000 --- a/modules/core/src/main/java/org/apache/ignite/resources/MBeanServerResource.java +++ /dev/null @@ -1,69 +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.resources; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import javax.management.MBeanServer; - -/** - * Annotates a field or a setter method for injection of {@link MBeanServer} resource. MBean server - * is provided to grid via {@link org.apache.ignite.configuration.IgniteConfiguration}. - * - * MBean server can be injected into instances of following classes: - * - * {@link org.apache.ignite.compute.ComputeTask} - * {@link org.apache.ignite.compute.ComputeJob} - * {@link org.apache.ignite.spi.IgniteSpi} - * {@link org.apache.ignite.lifecycle.LifecycleBean} - * - * - * Here is how injection would typically happen: - * - * public class MyGridJob implements ComputeJob { - * ... - * IgniteMBeanServerResource - * private MBeanServer mbeanSrv; - * ... - * } - * - * or - * - * public class MyGridJob implements ComputeJob { - * ... - * private MBeanSever mbeanSrv; - * ... - * IgniteMBeanServerResource - * public void setMBeanServer(MBeanServer mbeanSrv) { - * this.mbeanSrv = mbeanSrv; - * } - * ... - * } - * - * - * See {@link org.apache.ignite.configuration.IgniteConfiguration#getMBeanServer()} for Grid configuration details. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.FIELD}) -public @interface MBeanServerResource { -// No-op. -} \ No newline at end of file
[12/14] ignite git commit: Fixed test to do not fail with non-full-sync mode.
Fixed test to do not fail with non-full-sync mode. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/041cd38d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/041cd38d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/041cd38d Branch: refs/heads/ignite-1282 Commit: 041cd38d46b458ea3ae945e15411d4519c1bf777 Parents: 28d6e00 Author: sboikovAuthored: Thu Nov 26 10:09:46 2015 +0300 Committer: sboikov Committed: Thu Nov 26 10:09:46 2015 +0300 -- .../ignite/internal/IgniteClientReconnectCacheTest.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/041cd38d/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index 6cf10f4..3d8f601 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@ -56,6 +56,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLock import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetResponse; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; @@ -1292,6 +1293,12 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac cache.put(1, 1); +GridTestUtils.waitForCondition(new GridAbsPredicate() { +@Override public boolean apply() { +return cache.get(1) != null; +} +}, 5000); + assertEquals(1, cache.get(1)); }
[14/24] ignite git commit: ignite-1.5 - Fixing tests.
ignite-1.5 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/385668b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/385668b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/385668b3 Branch: refs/heads/ignite-1.5 Commit: 385668b3bd9a77f87c11e39a7d915a54a48e39be Parents: 7680392 Author: Alexey GoncharukAuthored: Tue Nov 24 19:34:35 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 24 19:34:35 2015 +0300 -- .../ignite/internal/NodeStoppingException.java | 35 .../processors/cache/GridCacheIoManager.java| 4 +++ .../processors/cache/GridCacheMvccManager.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 19 ++- .../CacheObjectBinaryProcessorImpl.java | 6 ++-- 5 files changed, 54 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java new file mode 100644 index 000..164983a --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java @@ -0,0 +1,35 @@ +/* + * 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; + +import org.apache.ignite.IgniteCheckedException; + +/** + * + */ +public class NodeStoppingException extends IgniteCheckedException { +/** */ +private static final long serialVersionUID = 0L; + +/** + * @param msg Exception message. + */ +public NodeStoppingException(String msg) { +super(msg); +} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 7b1d749..f7fe5bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; @@ -1036,6 +1037,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { catch (IgniteCheckedException e) { cacheMsg.onClassError(e); } +catch (BinaryObjectException e) { +cacheMsg.onClassError(new IgniteCheckedException(e)); +} catch (Error e) { if (cacheMsg.ignoreClassErrors() && X.hasCause(e, NoClassDefFoundError.class, UnsupportedClassVersionError.class)) http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 2449df1..dbc6992 100644 ---
[03/24] ignite git commit: Make binary marshaller default.
Make binary marshaller default. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ca58d7b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ca58d7b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ca58d7b Branch: refs/heads/ignite-1.5 Commit: 3ca58d7b5edd0354c73450ff9fff3acf8a2da2cd Parents: 7ea000a Author: Alexey GoncharukAuthored: Mon Nov 23 16:49:53 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 23 16:49:53 2015 +0300 -- examples/config/example-ignite.xml | 10 +-- .../ignite/examples/binary/EmployeeKey.java | 3 + .../configuration/CacheConfiguration.java | 26 .../org/apache/ignite/internal/IgnitionEx.java | 6 +- .../internal/portable/BinaryMarshaller.java | 68 ++-- .../internal/portable/PortableContext.java | 23 ++- 6 files changed, 62 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca58d7b/examples/config/example-ignite.xml -- diff --git a/examples/config/example-ignite.xml b/examples/config/example-ignite.xml index d842a6d..a3e7e22 100644 --- a/examples/config/example-ignite.xml +++ b/examples/config/example-ignite.xml @@ -27,13 +27,5 @@ - - - - - - - - - + http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca58d7b/examples/src/main/java/org/apache/ignite/examples/binary/EmployeeKey.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/EmployeeKey.java b/examples/src/main/java/org/apache/ignite/examples/binary/EmployeeKey.java index 2794230..7614f2c 100644 --- a/examples/src/main/java/org/apache/ignite/examples/binary/EmployeeKey.java +++ b/examples/src/main/java/org/apache/ignite/examples/binary/EmployeeKey.java @@ -17,6 +17,8 @@ package org.apache.ignite.examples.binary; +import org.apache.ignite.cache.affinity.AffinityKeyMapped; + /** * This class represents key for employee object. * @@ -28,6 +30,7 @@ public class EmployeeKey { private int id; /** Organization ID. */ +@AffinityKeyMapped private int organizationId; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca58d7b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index e7dd9c3..8c3ea19 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -389,9 +389,6 @@ public class CacheConfiguration extends MutableConfiguration { /** Query entities. */ private Collection qryEntities; -/** Cache */ -private Collection cacheKeyCfgs; - /** Empty constructor (all values are initialized to their defaults). */ public CacheConfiguration() { /* No-op. */ @@ -426,7 +423,6 @@ public class CacheConfiguration extends MutableConfiguration { atomicityMode = cc.getAtomicityMode(); atomicWriteOrderMode = cc.getAtomicWriteOrderMode(); backups = cc.getBackups(); -cacheKeyCfgs = cc.getCacheKeyConfiguration(); cacheLoaderFactory = cc.getCacheLoaderFactory(); cacheMode = cc.getCacheMode(); cacheWriterFactory = cc.getCacheWriterFactory(); @@ -997,28 +993,6 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Gets cache key configuration. Cache key configuration allows to override default cache key affinity - * by specifying affinity field name. - * - * @return Cache key configuration. - */ -public Collection getCacheKeyConfiguration() { -return cacheKeyCfgs; -} - -/** - * Sets cache key configuration. - * - * @param cacheKeyCfgs Collection of cache key configurations. - */ -public void setCacheKeyConfiguration(Collection cacheKeyCfgs) { -if (this.cacheKeyCfgs != null) -this.cacheKeyCfgs.addAll(cacheKeyCfgs); -else -this.cacheKeyCfgs = cacheKeyCfgs; -} - -/** * Gets cache atomicity mode. * * Default value is defined by {@link #DFLT_CACHE_ATOMICITY_MODE}.
[16/24] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f1dd6f5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f1dd6f5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f1dd6f5 Branch: refs/heads/ignite-1.5 Commit: 0f1dd6f53a203b3530ca98db37405eac06b18c81 Parents: 8e1d6c0 dafad52 Author: Alexey GoncharukAuthored: Wed Nov 25 09:46:10 2015 +0300 Committer: Alexey Goncharuk Committed: Wed Nov 25 09:46:10 2015 +0300 -- DEVNOTES.txt| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 9 +++-- .../processors/cache/CacheLockImpl.java | 18 - .../colocated/GridDhtColocatedLockFuture.java | 8 ++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++- 5 files changed, 67 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f1dd6f5/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java --
[07/24] ignite git commit: IGNITE-1282 Fixed config for scalar examples.
IGNITE-1282 Fixed config for scalar examples. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e732a0f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e732a0f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e732a0f Branch: refs/heads/ignite-1.5 Commit: 1e732a0f9f38257e7d74960f7b9fe6caa4fcce30 Parents: 01c24e7 Author: Alexey KuznetsovAuthored: Tue Nov 24 13:52:18 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Nov 24 13:52:18 2015 +0700 -- .../test/resources/spring-ping-pong-partner.xml | 18 -- 1 file changed, 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1e732a0f/modules/scalar/src/test/resources/spring-ping-pong-partner.xml -- diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml index adc39ec..0f35c44 100644 --- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml +++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml @@ -42,24 +42,6 @@ - - - - - - - -
[20/24] ignite git commit: Fixing marshalToPortable and IgniteBiTuple
Fixing marshalToPortable and IgniteBiTuple Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afcf0ab5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afcf0ab5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afcf0ab5 Branch: refs/heads/ignite-1.5 Commit: afcf0ab5e5d8e33351cf37790894c1d71ac6cc65 Parents: 809a442 Author: Alexey GoncharukAuthored: Thu Nov 26 09:21:50 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 09:21:50 2015 +0300 -- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/afcf0ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java index ba7d6f8..819b57e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java @@ -62,11 +62,13 @@ import org.apache.ignite.internal.util.lang.GridMapEntry; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; +import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.internal.portable.BinaryMarshaller; @@ -390,6 +392,15 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm return pArr; } +if (obj instanceof IgniteBiTuple) { +IgniteBiTuple tup = (IgniteBiTuple)obj; + +if (obj instanceof T2) +return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + +return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); +} + if (obj instanceof Collection) { Collection col = (Collection)obj;
[17/24] ignite git commit: IGNITE-1282 Added support for IgniteBinary to IgniteMock.
IGNITE-1282 Added support for IgniteBinary to IgniteMock. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22326cc9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22326cc9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22326cc9 Branch: refs/heads/ignite-1.5 Commit: 22326cc9e7994cbb4bf66471503d47ea4f5d4c00 Parents: 0f1dd6f Author: Alexey KuznetsovAuthored: Wed Nov 25 15:17:01 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Nov 25 15:17:01 2015 +0700 -- .../ignite/testframework/junits/IgniteMock.java | 39 +++- 1 file changed, 38 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/22326cc9/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 27a7051..7f27f36 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -42,12 +42,18 @@ import org.apache.ignite.IgniteScheduler; import org.apache.ignite.IgniteServices; import org.apache.ignite.IgniteSet; import org.apache.ignite.IgniteTransactions; +import org.apache.ignite.binary.BinaryObjectBuilder; +import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.portable.BinaryCachingMetadataHandler; +import org.apache.ignite.internal.portable.PortableContext; +import org.apache.ignite.internal.portable.builder.BinaryObjectBuilderImpl; +import org.apache.ignite.internal.processors.cacheobject.NoOpBinary; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.plugin.IgnitePlugin; @@ -79,6 +85,12 @@ public class IgniteMock implements Ignite { /** */ private IgniteConfiguration staticCfg; +/** */ +private IgniteBinary binaryMock; + +/** */ +private PortableContext ctx; + /** * Mock values * @@ -278,12 +290,37 @@ public class IgniteMock implements Ignite { /** {@inheritDoc} */ @Override public IgniteBinary binary() { -return null; +if (binaryMock != null) +return binaryMock; + +if (ctx == null) { +/** {@inheritDoc} */ +ctx = new PortableContext(BinaryCachingMetadataHandler.create(), configuration()) { +@Override public int typeId(String typeName) { +return typeName.hashCode(); +} +}; +} + +binaryMock = new NoOpBinary() { +/** {@inheritDoc} */ +@Override public int typeId(String typeName) { +return typeName.hashCode(); +} + +/** {@inheritDoc} */ +@Override public BinaryObjectBuilder builder(String typeName) throws BinaryObjectException { +return new BinaryObjectBuilderImpl(ctx, typeName); +} +}; + +return binaryMock; } /** {@inheritDoc} */ @Override public void close() {} +/** {@inheritDoc} */ @Nullable @Override public IgniteAtomicSequence atomicSequence(String name, long initVal, boolean create) { return null; }
[10/24] ignite git commit: IGNITE-1282 Debug tests.
IGNITE-1282 Debug tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7518430 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7518430 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7518430 Branch: refs/heads/ignite-1.5 Commit: b75184304b03d8a7cba24473b550669ec95f7512 Parents: 1e732a0 Author: Alexey KuznetsovAuthored: Tue Nov 24 15:15:04 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Nov 24 15:15:04 2015 +0700 -- .../scalar/examples/ScalarCacheExample.scala | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b7518430/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala -- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala index 0bf8d6f..32afab2 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala @@ -49,6 +49,10 @@ object ScalarCacheExample extends App { basicOperations() } +catch { +case e: Throwable => +e.printStackTrace(); +} finally { cache.destroy() } @@ -78,13 +82,20 @@ object ScalarCacheExample extends App { // Put one more value. c += (3.toString -> 11) -// Get with option... -c.opt(44.toString) match { -case Some(v) => sys.error("Should never happen.") -case None => println("Correct") +try { +c.opt(44.toString) match { +case Some(v) => sys.error("Should never happen.") +case _ => println("Correct") +} } +catch { +case e: Throwable => +e.printStackTrace() +} + // Print all values. +println("Print all values.") c.iterator() foreach println }