[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1694 [deleted] 4d79c2b65
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1286 [deleted] de76c5c84
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1917 [deleted] 626903a67
[12/29] ignite git commit: ignite-2359 Added locking for files used by MarshallerContextImpl.
ignite-2359 Added locking for files used by MarshallerContextImpl. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d8c4e25 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d8c4e25 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d8c4e25 Branch: refs/heads/ignite-2236 Commit: 1d8c4e259dfe17611289cfac70bf1c3b351073cd Parents: 59a893c Author: sboikovAuthored: Wed Jan 13 08:56:34 2016 +0300 Committer: sboikov Committed: Wed Jan 13 08:59:39 2016 +0300 -- .../ignite/internal/MarshallerContextImpl.java | 86 +++-- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 +++ .../dht/GridCacheTxNodeFailureSelfTest.java | 6 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + 4 files changed, 264 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1d8c4e25/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index c7fa902..e3f2bc9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -19,12 +19,16 @@ package org.apache.ignite.internal; import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.channels.FileLock; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.locks.Lock; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryListenerException; import javax.cache.event.CacheEntryUpdatedListener; @@ -33,6 +37,7 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedException; +import org.apache.ignite.internal.util.GridStripedLock; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.plugin.PluginProvider; @@ -42,6 +47,9 @@ import org.apache.ignite.plugin.PluginProvider; */ public class MarshallerContextImpl extends MarshallerContextAdapter { /** */ +private static final GridStripedLock fileLock = new GridStripedLock(32); + +/** */ private final CountDownLatch latch = new CountDownLatch(1); /** */ @@ -72,7 +80,7 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { */ public void onMarshallerCacheStarted(GridKernalContext ctx) throws IgniteCheckedException { ctx.cache().marshallerCache().context().continuousQueries().executeInternalQuery( -new ContinuousQueryListener(log, workDir), +new ContinuousQueryListener(ctx.log(MarshallerContextImpl.class), workDir), null, ctx.cache().marshallerCache().context().affinityNode(), true @@ -149,14 +157,31 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { String clsName = cache0.getTopologySafe(id); if (clsName == null) { -File file = new File(workDir, id + ".classname"); +String fileName = id + ".classname"; + +Lock lock = fileLock(fileName); + +lock.lock(); + +try { +File file = new File(workDir, fileName); -try (BufferedReader reader = new BufferedReader(new FileReader(file))) { -clsName = reader.readLine(); +try (FileInputStream in = new FileInputStream(file)) { +FileLock fileLock = in.getChannel().lock(0L, Long.MAX_VALUE, true); + +assert fileLock != null : fileName; + +try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { +clsName = reader.readLine(); +} +} +catch (IOException e) { +throw new IgniteCheckedException("Failed to read class name from file [id=" + id + +", file=" + file.getAbsolutePath() + ']', e); +} } -catch (IOException e) { -throw
[07/29] ignite git commit: IGNITE-2218: Fixed a problem with native Hadoop libraries load. This closes #378.
IGNITE-2218: Fixed a problem with native Hadoop libraries load. This closes #378. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d58d14a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d58d14a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d58d14a Branch: refs/heads/ignite-2236 Commit: 7d58d14a80b1c32f88fbb4cf68e5d289c5aee474 Parents: 012ca73 Author: vozerov-gridgainAuthored: Mon Jan 4 12:14:58 2016 +0400 Committer: vozerov-gridgain Committed: Mon Jan 4 12:14:58 2016 +0400 -- .../processors/hadoop/HadoopClassLoader.java| 71 ++--- .../hadoop/v2/HadoopNativeCodeLoader.java | 74 -- .../hadoop/HadoopAbstractWordCountTest.java | 46 +++-- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 15 ++- .../hadoop/HadoopSnappyFullMapReduceTest.java | 28 + .../processors/hadoop/HadoopSnappyTest.java | 102 +++ .../processors/hadoop/HadoopTasksV2Test.java| 2 +- .../hadoop/examples/HadoopWordCount1Reduce.java | 1 + .../hadoop/examples/HadoopWordCount2.java | 18 +++- .../examples/HadoopWordCount2Reducer.java | 1 + .../testsuites/IgniteHadoopTestSuite.java | 18 +++- 12 files changed, 279 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d58d14a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java index 735133f..270b31d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java @@ -30,13 +30,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; - +import java.util.Vector; +import org.apache.hadoop.util.NativeCodeLoader; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.hadoop.v2.HadoopDaemon; -import org.apache.ignite.internal.processors.hadoop.v2.HadoopNativeCodeLoader; import org.apache.ignite.internal.processors.hadoop.v2.HadoopShutdownHookManager; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; import org.objectweb.asm.AnnotationVisitor; @@ -69,6 +70,9 @@ public class HadoopClassLoader extends URLClassLoader { /** Name of the Hadoop daemon class. */ public static final String HADOOP_DAEMON_CLASS_NAME = "org.apache.hadoop.util.Daemon"; +/** Name of libhadoop library. */ +private static final String LIBHADOOP = "hadoop."; + /** */ private static final URLClassLoader APP_CLS_LDR = (URLClassLoader)HadoopClassLoader.class.getClassLoader(); @@ -119,6 +123,51 @@ public class HadoopClassLoader extends URLClassLoader { assert !(getParent() instanceof HadoopClassLoader); this.name = name; + +initializeNativeLibraries(); +} + +/** + * Workaround to load native Hadoop libraries. Java doesn't allow native libraries to be loaded from different + * classloaders. But we load Hadoop classes many times and one of these classes - {@code NativeCodeLoader} - tries + * to load the same native library over and over again. + * + * To fix the problem, we force native library load in parent class loader and then "link" handle to this native + * library to our class loader. As a result, our class loader will think that the library is already loaded and will + * be able to link native methods. + * + * @see http://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/invocation.html#library_version;> + * JNI specification + */ +private void initializeNativeLibraries() { +try { +// This must trigger native library load. +Class.forName(NativeCodeLoader.class.getName(), true, APP_CLS_LDR); + +final Vector curVector = U.field(this, "nativeLibraries"); + +ClassLoader ldr = APP_CLS_LDR; + +while (ldr != null) { +Vector vector = U.field(ldr, "nativeLibraries"); + +for (Object lib : vector) { +String libName = U.field(lib, "name"); + +if
[13/29] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index d07a1e6..34872c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -85,7 +85,6 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index 7521f2e..b7c0deb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -49,11 +49,13 @@ import org.apache.ignite.testframework.GridTestNode; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.eclipse.jetty.util.ConcurrentHashSet; /** * */ +@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") public class IgniteTcpCommunicationRecoveryAckClosureSelfTest extends GridSpiAbstractTest { /** */ @@ -87,7 +89,6 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); @@ -151,6 +152,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest totAcked0; +} +}, 5000); + +GridTestUtils.waitForCondition(new GridAbsPredicate() { +@Override public boolean apply() { return recoveryDesc.messagesFutures().isEmpty(); } }, 10_000); @@ -218,6 +231,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTesthttp://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 0df7da6..4f329e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -118,6 +118,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + TcpDiscoverySpi spi = nodeSpi.get(); if (spi == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index e0ffc60..949290e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -978,7 +978,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * @param key Key. * @param cacheName Cache name. - * @return Ignite
[20/29] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b409b8de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b409b8de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b409b8de Branch: refs/heads/ignite-2236 Commit: b409b8dee64d297fe03869533182109c8e40c7a4 Parents: 59cfbfd 2d10630 Author: Yakov ZhdanovAuthored: Thu Jan 14 12:55:10 2016 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 14 12:55:10 2016 +0300 -- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 -- .../apache/ignite/internal/IgniteKernal.java| 221 - .../ignite/internal/IgniteVersionUtils.java | 4 +- .../ignite/internal/MarshallerContextImpl.java | 86 +++- .../discovery/GridDiscoveryManager.java | 6 +- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java| 23 + .../processors/cache/GridCacheProcessor.java| 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java| 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java| 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java| 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java| 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java| 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 432 +- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java| 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../processors/cluster/ClusterProcessor.java| 174 +++ .../processors/cluster/GridUpdateNotifier.java | 457 +++ .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java| 3 +- .../internal/GridUpdateNotifierSelfTest.java| 137 -- ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++ ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 13 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 +++ .../IgniteCachePutRetryAbstractSelfTest.java| 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../cluster/GridUpdateNotifierSelfTest.java | 140 ++ .../continuous/GridEventConsumeSelfTest.java| 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 -
[06/29] ignite git commit: IGNITE-2308: Fixed HadoopClassLoader dependency resolution. This closes #391.
IGNITE-2308: Fixed HadoopClassLoader dependency resolution. This closes #391. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/012ca730 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/012ca730 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/012ca730 Branch: refs/heads/ignite-2236 Commit: 012ca7308bf125d2c90d68ef7a8bc75aeb84bf53 Parents: ddbe2d5 Author: iveselovskiyAuthored: Mon Jan 4 10:47:28 2016 +0400 Committer: vozerov-gridgain Committed: Mon Jan 4 10:47:28 2016 +0400 -- .../processors/hadoop/HadoopClassLoader.java| 636 ++- .../hadoop/HadoopClassLoaderTest.java | 101 ++- .../hadoop/deps/CircularWIthHadoop.java | 32 + .../hadoop/deps/CircularWithoutHadoop.java | 27 + .../processors/hadoop/deps/WithCast.java| 41 ++ .../hadoop/deps/WithClassAnnotation.java| 28 + .../hadoop/deps/WithConstructorInvocation.java | 31 + .../processors/hadoop/deps/WithExtends.java | 27 + .../processors/hadoop/deps/WithField.java | 29 + .../processors/hadoop/deps/WithImplements.java | 36 ++ .../hadoop/deps/WithIndirectField.java | 27 + .../processors/hadoop/deps/WithInitializer.java | 33 + .../processors/hadoop/deps/WithInnerClass.java | 31 + .../hadoop/deps/WithLocalVariable.java | 38 ++ .../hadoop/deps/WithMethodAnnotation.java | 32 + .../hadoop/deps/WithMethodArgument.java | 31 + .../hadoop/deps/WithMethodCheckedException.java | 31 + .../hadoop/deps/WithMethodInvocation.java | 31 + .../hadoop/deps/WithMethodReturnType.java | 31 + .../hadoop/deps/WithMethodRuntimeException.java | 31 + .../processors/hadoop/deps/WithOuterClass.java | 38 ++ .../hadoop/deps/WithParameterAnnotation.java| 31 + .../processors/hadoop/deps/WithStaticField.java | 29 + .../hadoop/deps/WithStaticInitializer.java | 34 + .../processors/hadoop/deps/Without.java | 25 + .../testsuites/IgniteHadoopTestSuite.java | 3 + 26 files changed, 1279 insertions(+), 185 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/012ca730/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java index f12af46..735133f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.hadoop.v2.HadoopDaemon; import org.apache.ignite.internal.processors.hadoop.v2.HadoopNativeCodeLoader; @@ -40,13 +40,16 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Handle; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.RemappingClassAdapter; @@ -125,10 +128,14 @@ public class HadoopClassLoader extends URLClassLoader { * @return {@code true} if we need to check this class. */ private static boolean isHadoopIgfs(String cls) { -String ignitePackagePrefix = "org.apache.ignite"; -int len = ignitePackagePrefix.length(); +String ignitePkgPrefix = "org.apache.ignite"; + +int len = ignitePkgPrefix.length(); -return cls.startsWith(ignitePackagePrefix) && (cls.indexOf("igfs.", len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) != -1); +return cls.startsWith(ignitePkgPrefix) && ( +cls.indexOf("igfs.", len) != -1 || +cls.indexOf(".fs.", len) != -1 || +cls.indexOf("hadoop.", len) != -1); } /** @@ -159,7 +166,7 @@ public class HadoopClassLoader extends URLClassLoader { Boolean hasDeps = cache.get(name); if
[22/29] ignite git commit: Added IgniteGetTxBenchmark (cache 'get' using transactional cache).
Added IgniteGetTxBenchmark (cache 'get' using transactional cache). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d608ebdf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d608ebdf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d608ebdf Branch: refs/heads/ignite-2236 Commit: d608ebdfd3f9088255dd6e32de6e90e1564569b1 Parents: 8b0c59a Author: sboikovAuthored: Fri Jan 15 10:06:02 2016 +0300 Committer: sboikov Committed: Fri Jan 15 10:06:02 2016 +0300 -- .../yardstick/cache/IgniteGetTxBenchmark.java | 30 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d608ebdf/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java -- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java new file mode 100644 index 000..fbb73e2 --- /dev/null +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java @@ -0,0 +1,30 @@ +/* + * 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.yardstick.cache; + +import org.apache.ignite.IgniteCache; + +/** + * + */ +public class IgniteGetTxBenchmark extends IgniteGetBenchmark { +/** {@inheritDoc} */ +@Override protected IgniteCache cache() { +return ignite().cache("tx"); +} +}
[08/29] ignite git commit: IGNITE-2206: Hadoop file system creation is now abstracted out using factory interface.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ed73b4a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java index 99ca1ec..0d7de86 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java @@ -17,22 +17,6 @@ package org.apache.ignite.hadoop.fs.v2; -import java.io.BufferedOutputStream; -import java.io.Closeable; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -43,6 +27,7 @@ import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileChecksum; import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FsServerDefaults; import org.apache.hadoop.fs.FsStatus; import org.apache.hadoop.fs.InvalidPathException; @@ -51,13 +36,14 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.util.DataChecksum; import org.apache.hadoop.util.Progressable; +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; +import org.apache.ignite.hadoop.fs.HadoopFileSystemFactory; import org.apache.ignite.igfs.IgfsBlockLocation; import org.apache.ignite.igfs.IgfsFile; import org.apache.ignite.igfs.IgfsMode; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.igfs.common.IgfsLogger; -import org.apache.ignite.internal.processors.hadoop.SecondaryFileSystemProvider; import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsEndpoint; import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsInputStream; import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsOutputStream; @@ -74,8 +60,26 @@ import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lifecycle.LifecycleAware; import org.jetbrains.annotations.Nullable; +import java.io.BufferedOutputStream; +import java.io.Closeable; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; + import static org.apache.ignite.configuration.FileSystemConfiguration.DFLT_IGFS_LOG_BATCH_SIZE; import static org.apache.ignite.configuration.FileSystemConfiguration.DFLT_IGFS_LOG_DIR; import static org.apache.ignite.hadoop.fs.v1.IgniteHadoopFileSystem.getFsHadoopUser; @@ -92,8 +96,6 @@ import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_GROUP_NAME; import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PERMISSION; import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PREFER_LOCAL_WRITES; import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_USER_NAME; -import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_CONFIG_PATH; -import static org.apache.ignite.internal.processors.igfs.IgfsEx.SECONDARY_FS_URI; /** * {@code IGFS} Hadoop 2.x file system driver over file system API. To use @@ -168,8 +170,8 @@ public class IgniteHadoopFileSystem extends AbstractFileSystem implements Closea /** Mode resolver. */ private IgfsModeResolver modeRslvr; -/** Secondary file system instance. */ -private AbstractFileSystem secondaryFs; +/** The secondary file system factory. */ +private HadoopFileSystemFactory factory; /** Whether custom sequential reads before prefetch value is provided. */ private boolean seqReadsBeforePrefetchOverride; @@ -335,20 +337,27 @@ public class IgniteHadoopFileSystem extends AbstractFileSystem implements Closea } if (initSecondary) { -Mapprops =
[29/29] ignite git commit: Merge branch 'master' into ignite-2236
Merge branch 'master' into ignite-2236 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d8e304d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d8e304d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d8e304d Branch: refs/heads/ignite-2236 Commit: 7d8e304d9014869cd71e4470d5faeea9a6c1523a Parents: 0ca561a d881417 Author: vozerov-gridgainAuthored: Mon Jan 18 11:24:24 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 11:24:24 2016 +0300 -- assembly/release-fabric-base.xml|1 + .../org/apache/ignite/IgniteTransactions.java |4 +- .../org/apache/ignite/igfs/IgfsUserContext.java | 16 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 - .../apache/ignite/internal/GridComponent.java |5 +- .../ignite/internal/GridUpdateNotifier.java | 454 - .../apache/ignite/internal/IgniteKernal.java| 248 +-- .../ignite/internal/IgniteVersionUtils.java |4 +- .../ignite/internal/MarshallerContextImpl.java | 86 +- .../ignite/internal/binary/BinaryUtils.java | 78 + .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../internal/direct/DirectMessageReader.java| 11 + .../internal/direct/DirectMessageWriter.java| 13 + .../direct/state/DirectMessageState.java| 10 + .../stream/v1/DirectByteBufferStreamImplV1.java |8 + .../stream/v2/DirectByteBufferStreamImplV2.java |8 + .../managers/discovery/CustomEventListener.java |4 +- .../discovery/DiscoveryCustomMessage.java |9 - .../discovery/GridDiscoveryManager.java | 58 +- .../loadbalancer/GridLoadBalancerManager.java |8 +- .../cache/CacheEntrySerializablePredicate.java |3 +- .../cache/CacheInvokeDirectResult.java |4 +- .../processors/cache/CacheObjectContext.java| 91 +- .../cache/DynamicCacheChangeBatch.java |5 - .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheContext.java |3 +- .../cache/GridCacheEvictionManager.java |5 +- .../processors/cache/GridCacheIoManager.java| 28 +- .../processors/cache/GridCacheIterator.java |4 +- .../processors/cache/GridCacheKeySet.java |2 +- .../GridCachePartitionExchangeManager.java | 12 +- .../processors/cache/GridCacheProcessor.java| 103 +- .../processors/cache/GridCacheReturn.java |2 + .../processors/cache/GridCacheSwapManager.java |7 +- .../processors/cache/GridCacheUtils.java| 92 - .../cache/GridCacheValueCollection.java |5 +- .../processors/cache/IgniteCacheProxy.java |6 +- .../binary/CacheObjectBinaryProcessorImpl.java | 33 +- .../GridDistributedLockResponse.java|2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java|2 +- .../GridDistributedTxPrepareResponse.java |4 +- .../dht/GridClientPartitionTopology.java|3 +- .../dht/GridDhtAffinityAssignmentResponse.java |4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java |2 +- .../dht/GridDhtPartitionTopologyImpl.java |3 +- .../dht/GridDhtTransactionalCacheAdapter.java |3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 +- .../dht/GridDhtTxFinishResponse.java|4 +- .../cache/distributed/dht/GridDhtTxLocal.java |1 + .../distributed/dht/GridDhtTxLocalAdapter.java |3 +- .../distributed/dht/GridDhtTxPrepareFuture.java |5 +- .../dht/GridDhtTxPrepareRequest.java|2 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java |6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java|4 +- .../dht/preloader/GridDhtForceKeysFuture.java |8 +- .../dht/preloader/GridDhtForceKeysResponse.java |6 +- .../GridDhtPartitionDemandMessage.java |6 +- .../dht/preloader/GridDhtPartitionDemander.java | 11 +- .../GridDhtPartitionSupplyMessageV2.java|6 +- .../GridDhtPartitionsExchangeFuture.java|8 +- .../preloader/GridDhtPartitionsFullMessage.java |2 +- .../GridDhtPartitionsSingleMessage.java |4 +- .../distributed/near/GridNearCacheAdapter.java | 11 +- .../distributed/near/GridNearGetResponse.java |4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java |6 +- .../near/GridNearSingleGetResponse.java |2 +- .../near/GridNearTxFinishFuture.java| 432 +++-- .../near/GridNearTxFinishRequest.java |5 +
[05/29] ignite git commit: Revert "IGNITE-2330: Simplified GridFunc."
Revert "IGNITE-2330: Simplified GridFunc." This reverts commit 80579253febd6389dbb3a84706671cc8083df1f2. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ddbe2d59 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ddbe2d59 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ddbe2d59 Branch: refs/heads/ignite-2236 Commit: ddbe2d596e5aaf0b04a26c584dfe2ca8a664c570 Parents: cd5cd2e Author: vozerov-gridgainAuthored: Sun Jan 3 23:49:09 2016 +0400 Committer: vozerov-gridgain Committed: Sun Jan 3 23:49:09 2016 +0400 -- .../apache/ignite/internal/IgniteKernal.java| 27 +- .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../discovery/GridDiscoveryManager.java | 19 +- .../loadbalancer/GridLoadBalancerManager.java |8 +- .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheContext.java |3 +- .../cache/GridCacheEvictionManager.java |5 +- .../processors/cache/GridCacheIoManager.java|5 +- .../processors/cache/GridCacheIterator.java |4 +- .../processors/cache/GridCacheKeySet.java |2 +- .../GridCachePartitionExchangeManager.java | 12 +- .../processors/cache/GridCacheProcessor.java|9 +- .../processors/cache/GridCacheSwapManager.java |7 +- .../processors/cache/GridCacheUtils.java| 92 - .../cache/GridCacheValueCollection.java |5 +- .../processors/cache/IgniteCacheProxy.java |4 +- .../dht/GridClientPartitionTopology.java|3 +- .../dht/GridDhtPartitionTopologyImpl.java |3 +- .../dht/GridDhtTransactionalCacheAdapter.java |3 +- .../distributed/dht/GridDhtTxLocalAdapter.java |3 +- .../distributed/dht/GridDhtTxPrepareFuture.java |5 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- .../dht/preloader/GridDhtForceKeysFuture.java |8 +- .../distributed/near/GridNearCacheAdapter.java | 11 +- .../local/atomic/GridLocalAtomicCache.java | 17 +- .../GridCacheAtomicStampedImpl.java |5 +- .../internal/processors/igfs/IgfsProcessor.java |8 +- .../dotnet/PlatformDotNetCacheStore.java|4 +- .../top/GridTopologyCommandHandler.java |3 +- .../org/apache/ignite/internal/util/F0.java | 325 +++- .../internal/util/GridExecutionStatistics.java |4 +- .../ignite/internal/util/IgniteUtils.java |4 +- .../ignite/internal/util/lang/GridFunc.java | 1764 ++ .../ignite/internal/util/lang/GridTuple3.java |1 + .../ignite/internal/util/lang/GridTuple4.java |1 + .../ignite/internal/util/lang/GridTuple5.java |1 + .../ignite/internal/util/lang/GridTuple6.java |1 + .../ignite/internal/util/lang/GridTupleV.java |1 + .../java/org/apache/ignite/lang/IgniteUuid.java |2 +- .../memory/MemoryEventStorageSpi.java |1 - .../cache/GridCacheLuceneQueryIndexTest.java|4 +- .../distributed/GridCacheEventAbstractTest.java |2 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 16 +- .../ignite/lang/GridBasicPerformanceTest.java | 10 +- .../ignite/lang/GridFuncPerformanceTest.java| 102 + .../ignite/loadtest/GridLoadTestStatistics.java |2 +- .../query/h2/opt/GridH2TreeIndex.java |4 +- 47 files changed, 1988 insertions(+), 577 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/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 7fc0313..14b5816 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 @@ -589,16 +589,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { @Override public List getLifecycleBeansFormatted() { LifecycleBean[] beans = cfg.getLifecycleBeans(); -if (F.isEmpty(beans)) -return Collections.emptyList(); -else { -List res = new ArrayList<>(beans.length); - -for (LifecycleBean bean : beans) -res.add(String.valueOf(bean)); - -return res; -} +return F.isEmpty(beans) ? Collections.emptyList() : +(List)F.transform(beans, F.string()); } /** @@ -2277,19 +2269,16 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { Collection objs = new ArrayList<>(); if
[03/19] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index d07a1e6..34872c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -85,7 +85,6 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index 7521f2e..b7c0deb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -49,11 +49,13 @@ import org.apache.ignite.testframework.GridTestNode; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.eclipse.jetty.util.ConcurrentHashSet; /** * */ +@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") public class IgniteTcpCommunicationRecoveryAckClosureSelfTest extends GridSpiAbstractTest { /** */ @@ -87,7 +89,6 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); @@ -151,6 +152,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest totAcked0; +} +}, 5000); + +GridTestUtils.waitForCondition(new GridAbsPredicate() { +@Override public boolean apply() { return recoveryDesc.messagesFutures().isEmpty(); } }, 10_000); @@ -218,6 +231,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTesthttp://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 0df7da6..4f329e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -118,6 +118,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + TcpDiscoverySpi spi = nodeSpi.get(); if (spi == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index e0ffc60..949290e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -978,7 +978,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * @param key Key. * @param cacheName Cache name. - * @return Ignite
[08/19] ignite git commit: Changed copyright from 2015 to 2016
Changed copyright from 2015 to 2016 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d106303 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d106303 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d106303 Branch: refs/heads/ignite-2316 Commit: 2d106303ab406aec98265b0ae2bd07c7862d0f23 Parents: 7175a42 Author: Denis MagdaAuthored: Thu Jan 14 10:17:07 2016 +0300 Committer: Denis Magda Committed: Thu Jan 14 10:17:07 2016 +0300 -- .../main/java/org/apache/ignite/internal/IgniteVersionUtils.java | 4 ++-- .../org/apache/ignite/startup/GridRandomCommandLineLoader.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d106303/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java index 02cbc81..bd8726f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java @@ -47,7 +47,7 @@ public class IgniteVersionUtils { public static final String ACK_VER_STR; /** Copyright blurb. */ -public static final String COPYRIGHT = "2015 Copyright(C) Apache Software Foundation"; +public static final String COPYRIGHT = "2016 Copyright(C) Apache Software Foundation"; /** * Static initializer. @@ -77,4 +77,4 @@ public class IgniteVersionUtils { private IgniteVersionUtils() { // No-op. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/2d106303/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java index 20d1b32..13c38ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java @@ -61,7 +61,7 @@ public final class GridRandomCommandLineLoader { private static final String IGNITE_PROG_NAME = "IGNITE_PROG_NAME"; /** Copyright text. Ant processed. */ -private static final String COPYRIGHT = "2015 Copyright(C) Apache Software Foundation."; +private static final String COPYRIGHT = "2016 Copyright(C) Apache Software Foundation."; /** Version. Ant processed. */ private static final String VER = "x.x.x"; @@ -408,4 +408,4 @@ public final class GridRandomCommandLineLoader { return options; } -} \ No newline at end of file +}
[10/19] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b409b8de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b409b8de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b409b8de Branch: refs/heads/ignite-2316 Commit: b409b8dee64d297fe03869533182109c8e40c7a4 Parents: 59cfbfd 2d10630 Author: Yakov ZhdanovAuthored: Thu Jan 14 12:55:10 2016 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 14 12:55:10 2016 +0300 -- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 -- .../apache/ignite/internal/IgniteKernal.java| 221 - .../ignite/internal/IgniteVersionUtils.java | 4 +- .../ignite/internal/MarshallerContextImpl.java | 86 +++- .../discovery/GridDiscoveryManager.java | 6 +- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java| 23 + .../processors/cache/GridCacheProcessor.java| 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java| 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java| 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java| 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java| 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java| 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 432 +- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java| 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../processors/cluster/ClusterProcessor.java| 174 +++ .../processors/cluster/GridUpdateNotifier.java | 457 +++ .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java| 3 +- .../internal/GridUpdateNotifierSelfTest.java| 137 -- ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++ ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 13 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 +++ .../IgniteCachePutRetryAbstractSelfTest.java| 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../cluster/GridUpdateNotifierSelfTest.java | 140 ++ .../continuous/GridEventConsumeSelfTest.java| 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 -
[05/19] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed race between statically configured cache start and GridDhtAffinityAssignmentRequest - fixed 'prepareMarshal' methods to marshal only once (ignite-2219) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/457a9ae4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/457a9ae4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/457a9ae4 Branch: refs/heads/ignite-2316 Commit: 457a9ae4d3b0d6eef6e92a15f5ef79c15ccf1f95 Parents: 1d8c4e2 Author: sboikovAuthored: Wed Jan 13 09:21:09 2016 +0300 Committer: sboikov Committed: Wed Jan 13 09:29:17 2016 +0300 -- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/IgniteKernal.java| 95 +++- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java| 23 + .../processors/cache/GridCacheProcessor.java| 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java| 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java| 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java| 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java| 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java| 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 432 ++- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java| 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java| 3 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 7 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 .../IgniteCachePutRetryAbstractSelfTest.java| 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../continuous/GridEventConsumeSelfTest.java| 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...CommunicationRecoveryAckClosureSelfTest.java | 19 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 + .../junits/common/GridCommonAbstractTest.java | 34 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 3 + .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 ++- 67 files changed, 1314 insertions(+), 358 deletions(-) --
[09/29] ignite git commit: IGNITE-2206: Hadoop file system creation is now abstracted out using factory interface.
IGNITE-2206: Hadoop file system creation is now abstracted out using factory interface. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ed73b4a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ed73b4a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ed73b4a Branch: refs/heads/ignite-2236 Commit: 8ed73b4af8024167daeb4775e084b1f6a23fbf13 Parents: 7d58d14 Author: vozerov-gridgainAuthored: Tue Jan 5 10:59:31 2016 +0400 Committer: vozerov-gridgain Committed: Tue Jan 5 10:59:31 2016 +0400 -- .../org/apache/ignite/igfs/IgfsUserContext.java | 16 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 - .../processors/hadoop/HadoopPayloadAware.java | 28 ++ .../ignite/internal/processors/igfs/IgfsEx.java | 13 - .../internal/processors/igfs/IgfsImpl.java | 16 +- .../internal/processors/igfs/IgfsPaths.java | 62 +++- .../igfs/IgfsSecondaryFileSystemImpl.java | 11 - .../visor/node/VisorIgfsConfiguration.java | 43 --- .../processors/igfs/IgfsAbstractSelfTest.java | 8 +- .../igfs/IgfsExUniversalFileSystemAdapter.java | 11 +- .../igfs/UniversalFileSystemAdapter.java| 5 +- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 209 .../fs/CachingHadoopFileSystemFactory.java | 86 + .../hadoop/fs/HadoopFileSystemFactory.java | 52 +++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 264 +++ .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 144 +--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 115 --- .../hadoop/SecondaryFileSystemProvider.java | 139 .../hadoop/fs/HadoopFileSystemCacheUtils.java | 8 +- .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 +- .../ignite/igfs/Hadoop1DualAbstractTest.java| 14 +- .../igfs/HadoopFIleSystemFactorySelfTest.java | 326 +++ ...oopFileSystemUniversalFileSystemAdapter.java | 53 +-- ...oopSecondaryFileSystemConfigurationTest.java | 27 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 71 ++-- .../testsuites/IgniteHadoopTestSuite.java | 3 + 26 files changed, 1191 insertions(+), 552 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ed73b4a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java index 8db4e23..1e1cd31 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java @@ -34,24 +34,24 @@ public abstract class IgfsUserContext { * The main contract of this method is that {@link #currentUser()} method invoked * inside closure always returns 'user' this callable executed with. * @param user the user name to invoke closure on behalf of. - * @param clo the closure to execute + * @param c the closure to execute * @param The type of closure result. * @return the result of closure execution. * @throws IllegalArgumentException if user name is null or empty String or if the closure is null. */ -public static T doAs(String user, final IgniteOutClosure clo) { +public static T doAs(String user, final IgniteOutClosure c) { if (F.isEmpty(user)) throw new IllegalArgumentException("Failed to use null or empty user name."); final String ctxUser = userStackThreadLocal.get(); if (F.eq(ctxUser, user)) -return clo.apply(); // correct context is already there +return c.apply(); // correct context is already there userStackThreadLocal.set(user); try { -return clo.apply(); +return c.apply(); } finally { userStackThreadLocal.set(ctxUser); @@ -81,24 +81,24 @@ public abstract class IgfsUserContext { * } * * @param user the user name to invoke closure on behalf of. - * @param clbl the Callable to execute + * @param c the Callable to execute * @param The type of callable result. * @return the result of closure execution. * @throws IllegalArgumentException if user name is null or empty String or if the closure is null. */ -public static T doAs(String user, final Callable clbl) throws Exception { +public static T doAs(String user, final Callable c) throws Exception { if (F.isEmpty(user)) throw new IllegalArgumentException("Failed to use null or empty user name."); final String ctxUser =
[15/29] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed race between statically configured cache start and GridDhtAffinityAssignmentRequest - fixed 'prepareMarshal' methods to marshal only once (ignite-2219) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/457a9ae4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/457a9ae4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/457a9ae4 Branch: refs/heads/ignite-2236 Commit: 457a9ae4d3b0d6eef6e92a15f5ef79c15ccf1f95 Parents: 1d8c4e2 Author: sboikovAuthored: Wed Jan 13 09:21:09 2016 +0300 Committer: sboikov Committed: Wed Jan 13 09:29:17 2016 +0300 -- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/IgniteKernal.java| 95 +++- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java| 23 + .../processors/cache/GridCacheProcessor.java| 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java| 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java| 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java| 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java| 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java| 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 432 ++- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java| 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java| 3 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 7 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 .../IgniteCachePutRetryAbstractSelfTest.java| 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../continuous/GridEventConsumeSelfTest.java| 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...CommunicationRecoveryAckClosureSelfTest.java | 19 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 + .../junits/common/GridCommonAbstractTest.java | 34 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 3 + .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 ++- 67 files changed, 1314 insertions(+), 358 deletions(-) --
[02/29] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cca90c77 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cca90c77 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cca90c77 Branch: refs/heads/ignite-2236 Commit: cca90c77f56db5d96f99610ca8dc48f6066ac1b3 Parents: 8e6b365 f1f8cda Author: Anton VinogradovAuthored: Wed Dec 30 09:57:01 2015 +0300 Committer: Anton Vinogradov Committed: Wed Dec 30 09:57:01 2015 +0300 -- assembly/release-fabric-base.xml | 1 + 1 file changed, 1 insertion(+) --
ignite git commit: ignite-1923 Test fixed
Repository: ignite Updated Branches: refs/heads/master c160ed479 -> 130164605 ignite-1923 Test fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13016460 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13016460 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13016460 Branch: refs/heads/master Commit: 130164605b2cd6142c7e01feb6aef6f3f9fac343 Parents: c160ed4 Author: aguraAuthored: Mon Jan 18 17:23:47 2016 +0300 Committer: agura Committed: Mon Jan 18 17:46:10 2016 +0300 -- ...IgniteCacheP2pUnmarshallingQueryErrorTest.java | 18 +++--- 1 file changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/13016460/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java index eafbb7a..cb7e3ad 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java @@ -24,9 +24,7 @@ import javax.cache.CacheException; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.lang.IgniteBiPredicate; -import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; /** * Checks behavior on exception while unmarshalling key. @@ -80,24 +78,14 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm } private void writeObject(ObjectOutputStream os) throws IOException { -throw new IOException(); +// No-op. } })).getAll(); -assertTrue("Request unmarshalling failed, but error response was not sent.", binaryMarshaller()); +fail(); } catch (Exception e) { -assertFalse("Unexpected exception: " + e, binaryMarshaller()); +// No-op. } } - -/** - * @return {@code True} if binary marshaller is configured. - */ -private boolean binaryMarshaller() { -IgniteEx kernal = (IgniteEx)ignite(0); - -return !OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass() -.getSimpleName()); -} }
[1/2] ignite git commit: minor
Repository: ignite Updated Branches: refs/heads/master 130164605 -> d85616b9b minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6dcc63a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6dcc63a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6dcc63a Branch: refs/heads/master Commit: f6dcc63ac10150bd99b78b482b03edcfdc767d37 Parents: da601c2 Author: Yakov ZhdanovAuthored: Mon Jan 18 17:58:29 2016 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 18 17:58:29 2016 +0300 -- .../distributed/dht/colocated/GridDhtColocatedLockFuture.java| 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6dcc63a/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 a5f5286..cfeee4b 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 @@ -1316,10 +1316,6 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture @GridToStringInclude private Collection keys; -/** Mappings to proceed. */ -@GridToStringExclude -private Deque mappings; - /** */ private boolean rcvRes;
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d85616b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d85616b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d85616b9 Branch: refs/heads/master Commit: d85616b9bd788d0192272a13df18f9319f14a836 Parents: f6dcc63 1301646 Author: Yakov ZhdanovAuthored: Mon Jan 18 17:58:48 2016 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 18 17:58:48 2016 +0300 -- .../internal/processors/igfs/IgfsProcessor.java | 3 --- ...CommunicationRecoveryAckClosureSelfTest.java | 2 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 20 +--- .../Common/IgniteFutureCancelledException.cs| 1 + 4 files changed, 8 insertions(+), 18 deletions(-) --
[2/2] ignite git commit: ignite-1811 Optimized cache 'get' on affinity node.
ignite-1811 Optimized cache 'get' on affinity node. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83b2bf5e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83b2bf5e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83b2bf5e Branch: refs/heads/master Commit: 83b2bf5e1f287dc83343945b0e47b83ee7724a8e Parents: d85616b Author: sboikovAuthored: Mon Jan 18 18:05:37 2016 +0300 Committer: sboikov Committed: Mon Jan 18 18:05:37 2016 +0300 -- .../processors/cache/GridCacheAdapter.java | 30 +- .../processors/cache/GridCacheContext.java | 33 ++ .../dht/CacheDistributedGetFutureAdapter.java | 28 +- .../dht/GridClientPartitionTopology.java| 2 + .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../dht/GridPartitionedGetFuture.java | 241 ++- .../dht/GridPartitionedSingleGetFuture.java | 229 ++ .../dht/atomic/GridDhtAtomicCache.java | 26 ++ .../distributed/near/GridNearGetFuture.java | 267 +++- .../cache/transactions/IgniteTxManager.java | 18 +- .../internal/TestRecordingCommunicationSpi.java | 157 +++ ...idCacheConfigurationConsistencySelfTest.java | 58 +-- .../cache/IgniteCacheNearLockValueSelfTest.java | 62 +-- .../cache/IgniteCacheStoreCollectionTest.java | 12 + ...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 + ...ridCachePartitionNotLoadedEventSelfTest.java | 7 +- .../IgniteCacheAtomicNodeRestartTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../distributed/IgniteCacheGetRestartTest.java | 280 .../IgniteCacheReadFromBackupTest.java | 427 +++ .../IgniteCacheSingleGetMessageTest.java| 88 +--- .../IgniteCrossCacheTxStoreSelfTest.java| 1 + .../GridCacheDhtPreloadMessageCountTest.java| 62 +-- .../near/GridCacheGetStoreErrorSelfTest.java| 9 +- .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 28 files changed, 1524 insertions(+), 566 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/83b2bf5e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 5d4c386..2582e6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4540,9 +4540,33 @@ public abstract class GridCacheAdapter implements IgniteInternalCache
[1/2] ignite git commit: ignite-1811 Optimized cache 'get' on affinity node.
Repository: ignite Updated Branches: refs/heads/master d85616b9b -> 83b2bf5e1 http://git-wip-us.apache.org/repos/asf/ignite/blob/83b2bf5e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java new file mode 100644 index 000..b14109b --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.internal.util.typedef.internal.U; +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.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; + +/** + * + */ +public class IgniteCacheGetRestartTest extends GridCommonAbstractTest { +/** */ +private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private static final long TEST_TIME = 60_000; + +/** */ +private static final int SRVS = 3; + +/** */ +private static final int CLIENTS = 1; + +/** */ +private static final int KEYS = 100_000; + +/** */ +private ThreadLocal client = new ThreadLocal<>(); + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +Boolean clientMode = client.get(); + +if (clientMode != null) { +cfg.setClientMode(clientMode); + +client.remove(); +} + +cfg.setConsistentId(gridName); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGrids(SRVS); + +for (int i = 0; i < CLIENTS; i++) { +client.set(true); + +Ignite client = startGrid(SRVS); + +assertTrue(client.configuration().isClientMode()); +} +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** {@inheritDoc} */ +@Override protected long getTestTimeout() { +return TEST_TIME + 60_000; +} + +/** + * @throws Exception If failed. + */ +public void testGetRestartReplicated() throws Exception { +CacheConfiguration
ignite git commit: .NET: IgniteFutureCancelledException is marked as serializable.
Repository: ignite Updated Branches: refs/heads/master 36486b411 -> ce2dda7ca .NET: IgniteFutureCancelledException is marked as serializable. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce2dda7c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce2dda7c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce2dda7c Branch: refs/heads/master Commit: ce2dda7ca9a9be34458a4b472d9c4e34eba1a94e Parents: 36486b4 Author: vozerov-gridgainAuthored: Mon Jan 18 17:24:18 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 17:24:18 2016 +0300 -- .../Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ce2dda7c/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs index 02433ce..cc9436d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs @@ -23,6 +23,7 @@ namespace Apache.Ignite.Core.Common /// /// Indicates future cancellation within Ignite. /// +[Serializable] public class IgniteFutureCancelledException : IgniteException { ///
ignite git commit: IGNITE-1788: Removed duplicate check of a single invariant from IgfsProcessor. This closes #221.
Repository: ignite Updated Branches: refs/heads/master ce2dda7ca -> c160ed479 IGNITE-1788: Removed duplicate check of a single invariant from IgfsProcessor. This closes #221. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c160ed47 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c160ed47 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c160ed47 Branch: refs/heads/master Commit: c160ed4798c9d86e870a39813f7ec2037f8da601 Parents: ce2dda7 Author: iveselovskiyAuthored: Mon Jan 18 17:28:42 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 17:28:42 2016 +0300 -- .../org/apache/ignite/internal/processors/igfs/IgfsProcessor.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c160ed47/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 5b8cf86..21446e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -297,9 +297,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (GridQueryProcessor.isEnabled(metaCacheCfg)) throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing."); -if (GridQueryProcessor.isEnabled(metaCacheCfg)) -throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing."); - if (metaCacheCfg.getAtomicityMode() != TRANSACTIONAL) throw new IgniteCheckedException("Meta cache should be transactional: " + cfg.getMetaCacheName());
ignite git commit: IGNITE-843 Minor revert.
Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 7b3d6ff24 -> dfbbfdc01 IGNITE-843 Minor revert. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfbbfdc0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfbbfdc0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfbbfdc0 Branch: refs/heads/ignite-843-rc2 Commit: dfbbfdc013176f963b577063b1928ae99d749748 Parents: 7b3d6ff Author: AKuznetsovAuthored: Mon Jan 18 20:14:05 2016 +0700 Committer: AKuznetsov Committed: Mon Jan 18 20:14:05 2016 +0700 -- modules/control-center-web/src/main/js/routes/agent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dfbbfdc0/modules/control-center-web/src/main/js/routes/agent.js -- diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js index bb3d16c..02d5c7a 100644 --- a/modules/control-center-web/src/main/js/routes/agent.js +++ b/modules/control-center-web/src/main/js/routes/agent.js @@ -190,7 +190,7 @@ router.post('/query/close', function (req, res) { } }); -/* Get domain model for cache. */ +/* Get metadata for cache. */ router.post('/cache/metadata', function (req, res) { var client = _client(req, res);
ignite git commit: IGNITE-2384 Fixed review notes.
Repository: ignite Updated Branches: refs/heads/ignite-2384 df56be914 -> 9e39e500c IGNITE-2384 Fixed review notes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e39e500 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e39e500 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e39e500 Branch: refs/heads/ignite-2384 Commit: 9e39e500c5cbdbdb046abade8c838057589b8e66 Parents: df56be9 Author: nikolay_tikhonovAuthored: Mon Jan 18 16:27:29 2016 +0300 Committer: nikolay_tikhonov Committed: Mon Jan 18 16:27:29 2016 +0300 -- ...ContinuousQueryFailoverAbstractSelfTest.java | 80 .../CacheContinuousQueryLostPartitionTest.java | 77 --- ...CacheContinuousQueryLostPartitionTxTest.java | 36 - .../IgniteBinaryCacheQueryTestSuite.java| 2 - 4 files changed, 145 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e39e500/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index 283da80..5de3d0f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -41,6 +41,9 @@ import javax.cache.CacheException; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryListenerException; import javax.cache.event.CacheEntryUpdatedListener; +import javax.cache.expiry.Duration; +import javax.cache.expiry.ExpiryPolicy; +import javax.cache.expiry.TouchedExpiryPolicy; import javax.cache.processor.EntryProcessorException; import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; @@ -90,11 +93,13 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; +import static org.apache.ignite.testframework.GridTestUtils.waitForCondition; /** * @@ -1278,6 +1283,81 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC /** * @throws Exception If failed. */ +public void testBackupQueueEvict() throws Exception { +startGridsMultiThreaded(2); + +client = true; + +Ignite qryClient = startGrid(2); + +CacheEventListener1 lsnr = new CacheEventListener1(false); + +ContinuousQuery
[34/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8cd01c3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8cd01c3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8cd01c3b Branch: refs/heads/ignite-2324 Commit: 8cd01c3b0e1bdf06a3a56beac21dad5cfebc9079 Parents: 53d8148 Author: Pavel TupitsynAuthored: Wed Jan 13 20:37:59 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:37:59 2016 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset | 1 + .../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8cd01c3b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset index 8c8c9ca..704a7d4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset @@ -21,5 +21,6 @@ + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/8cd01c3b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs index 685ccd9..0f0596e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs @@ -77,6 +77,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged private readonly GCHandle _thisHnd; /** Callbacks pointer. */ +[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")] private readonly IntPtr _cbsPtr; /** Error type: generic. */
[08/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/495c1ac5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/495c1ac5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/495c1ac5 Branch: refs/heads/ignite-2324 Commit: 495c1ac5e10b01a1446e91fccb170e0b37b43943 Parents: a022c64 Author: Pavel TupitsynAuthored: Wed Jan 13 17:48:41 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 17:48:41 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/495c1ac5/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs index 9cf173b..dc61a34 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxyInvoker.cs @@ -88,6 +88,7 @@ namespace Apache.Ignite.Core.Impl.Services return methods[0]; // 3) 0 or more than 1 matching method - throw. +// ReSharper disable once ConditionIsAlwaysTrueOrFalse var argsString = arguments == null || arguments.Length == 0 ? "0" : "(" +
[46/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8315f02 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8315f02 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8315f02 Branch: refs/heads/ignite-2324 Commit: a8315f02eb32ee6cc769c4e2547644d4a96e3f31 Parents: 61b4b64 Author: Pavel TupitsynAuthored: Thu Jan 14 12:49:24 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:49:24 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a8315f02/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs index 2348844..a09c132 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs @@ -18,7 +18,6 @@ namespace Apache.Ignite.Core.Compute { using System.Collections.Generic; -using System.Diagnostics; using Apache.Ignite.Core.Cluster; using Apache.Ignite.Core.Common; using Apache.Ignite.Core.Impl;
[18/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/674cc533 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/674cc533 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/674cc533 Branch: refs/heads/ignite-2324 Commit: 674cc533175a97e34b5ed24d5f6af0144994e6e4 Parents: 11942fb Author: Pavel TupitsynAuthored: Wed Jan 13 18:26:43 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:26:43 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs | 6 -- .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs | 1 - modules/platforms/dotnet/Apache.Ignite.sln | 8 ++-- .../platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs index 3e02d2f..3a01395 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs @@ -124,8 +124,10 @@ namespace Apache.Ignite.Core.Events /// public object Row { get { return _row; } } -/** */ - public override string ToShortString() +/// +/// Gets shortened version of ToString result. +/// +public override string ToShortString() { return string.Format(CultureInfo.InvariantCulture, "{0}: QueryType={1}, CacheName={2}, ClassName={3}, Clause={4}, SubjectId={5}, " + http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs index 02b9efc..2c67efe 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs @@ -678,7 +678,6 @@ namespace Apache.Ignite.Core.Impl.Memory /// /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. /// -// ReSharper disable once VirtualMemberNeverOverriden.Global protected virtual void Dispose(bool disposing) { if (disposing) http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.sln -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index 164f388..e28e05e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -1,5 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}" @@ -24,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Apache.Ignite.dxg = Apache.Ignite.dxg Apache.Ignite.FxCop = Apache.Ignite.FxCop Apache.Ignite.sln.DotSettings = Apache.Ignite.sln.DotSettings + Apache.Ignite.sln.TeamCity.DotSettings = Apache.Ignite.sln.TeamCity.DotSettings build.bat = build.bat DEVNOTES.txt = DEVNOTES.txt examples\Config\example-cache-query.xml = examples\Config\example-cache-query.xml http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
[39/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9edb32f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9edb32f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9edb32f7 Branch: refs/heads/ignite-2324 Commit: 9edb32f7e3e4262bd3a71b93c3dd93d696b2e9bd Parents: 41ae014 Author: Pavel TupitsynAuthored: Thu Jan 14 11:48:47 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 11:48:47 2016 +0300 -- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 43 1 file changed, 26 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9edb32f7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs index dbb58c8..325d429 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs @@ -1000,36 +1000,45 @@ namespace Apache.Ignite.Core.Impl.Cache /// /// QueryContinuous implementation. /// -private IContinuousQueryHandle > QueryContinuousImpl(ContinuousQuery qry, +private IContinuousQueryHandle > QueryContinuousImpl(ContinuousQuery qry, QueryBase initialQry) { qry.Validate(); var hnd = new ContinuousQueryHandleImpl (qry, Marshaller, _flagKeepBinary); -using (var stream = IgniteManager.Memory.Allocate().GetStream()) +try { -var writer = Marshaller.StartMarshal(stream); - -hnd.Start(_ignite, writer, () => +using (var stream = IgniteManager.Memory.Allocate().GetStream()) { -if (initialQry != null) +var writer = Marshaller.StartMarshal(stream); + +hnd.Start(_ignite, writer, () => { -writer.WriteInt((int) initialQry.OpId); +if (initialQry != null) +{ +writer.WriteInt((int) initialQry.OpId); -initialQry.Write(writer, IsKeepBinary); -} -else -writer.WriteInt(-1); // no initial query +initialQry.Write(writer, IsKeepBinary); +} +else +writer.WriteInt(-1); // no initial query -FinishMarshal(writer); +FinishMarshal(writer); -// ReSharper disable once AccessToDisposedClosure -return UU.CacheOutOpContinuousQuery(Target, (int)CacheOp.QryContinuous, stream.SynchronizeOutput()); -}, qry); -} +// ReSharper disable once AccessToDisposedClosure +return UU.CacheOutOpContinuousQuery(Target, (int) CacheOp.QryContinuous, +stream.SynchronizeOutput()); +}, qry); +} -return hnd; +return hnd; +} +catch (Exception) +{ +hnd.Dispose(); +throw; +} } #endregion
[12/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b66a937 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b66a937 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b66a937 Branch: refs/heads/ignite-2324 Commit: 9b66a937ce7f5d8305bdcf9df097d4fed9e5979b Parents: 829c5e0 Author: Pavel TupitsynAuthored: Wed Jan 13 18:06:38 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:06:38 2016 +0300 -- .../Apache.Ignite.Core/Events/CacheEvent.cs | 8 ++- .../Apache.Ignite.Core/Events/EventBase.cs | 67 .../Apache.Ignite.Core/Impl/Common/Future.cs| 1 + .../Impl/Common/FutureType.cs | 1 + .../Apache.Ignite.Core/Impl/Handle/Handle.cs| 1 + .../Impl/Memory/PlatformMemoryStream.cs | 1 + 6 files changed, 64 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9b66a937/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheEvent.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheEvent.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheEvent.cs index 2c3230d..4c75e0a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheEvent.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheEvent.cs @@ -166,9 +166,11 @@ namespace Apache.Ignite.Core.Events /// Gets task name if cache event was caused by an operation initiated within task execution. /// public string TaskName { get { return _taskName; } } - -/** */ - public override string ToShortString() + +/// +/// Gets shortened version of ToString result. +/// +public override string ToShortString() { return string.Format(CultureInfo.InvariantCulture, "{0}: IsNear={1}, Key={2}, HasNewValue={3}, HasOldValue={4}, NodeId={5}", Name, http://git-wip-us.apache.org/repos/asf/ignite/blob/9b66a937/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs index 4334158..8d3f5cd 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs @@ -74,55 +74,82 @@ namespace Apache.Ignite.Core.Events _timestamp = timestamp.Value; } -/** */ +/// +/// Gets globally unique ID of this event. +/// public IgniteGuid Id { get { return _id; } } -/** */ +/// +/// Gets locally unique ID that is atomically incremented for each event. Unlike global +/// this local ID can be used for ordering events on this node. +/// +/// Note that for performance considerations Ignite doesn't order events globally. +/// public long LocalOrder { get { return _localOrder; } } -/** */ +/// +/// Node where event occurred and was recorded. +/// public IClusterNode Node { get { return _node; } } -/** */ +/// +/// Gets optional message for this event. +/// public string Message { get { return _message; } } -/** */ +/// +/// Gets type of this event. All system event types are defined in +/// public int Type { get { return _type; } } -/** */ +/// +/// Gets name of this event. +/// public string Name { get { return _name; } } -/** */ +/// +/// Gets event timestamp. Timestamp is local to the node on which this event was produced. +/// Note that more than one event can be generated with the same timestamp. +/// For ordering purposes use instead. +/// public DateTime Timestamp { get { return _timestamp; } } -/** */ +/// +/// Gets shortened version of ToString result. +/// public virtual string ToShortString() { return ToString(); } -/** */ +/// +/// Determines whether the specified object is equal to this instance. +/// +/// The object to compare with this instance. +
[23/50] ignite git commit: ruleset added
ruleset added Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4307355a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4307355a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4307355a Branch: refs/heads/ignite-2324 Commit: 4307355ac6a871af32a8f6f321c0b5e645c26284 Parents: b9d9e7d Author: Pavel TupitsynAuthored: Wed Jan 13 18:55:28 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:55:28 2016 +0300 -- .../Apache.Ignite.Core.csproj | 6 +- .../Apache.Ignite.Core.ruleset | 123 +++ 2 files changed, 128 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4307355a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index 8dd0d33..7de8330 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -19,7 +19,7 @@ DEBUG;CODE_ANALYSIS bin\x64\Debug\Apache.Ignite.Core.XML true -AllRules.ruleset +Apache.Ignite.Core.ruleset x64 @@ -27,6 +27,7 @@ true true bin\x64\Release\Apache.Ignite.Core.XML +Apache.Ignite.Core.ruleset x86 @@ -34,6 +35,7 @@ true DEBUG;CODE_ANALYSIS bin\x86\Debug\Apache.Ignite.Core.XML +Apache.Ignite.Core.ruleset x86 @@ -41,6 +43,7 @@ true true bin\x86\Release\Apache.Ignite.Core.XML +Apache.Ignite.Core.ruleset true @@ -399,6 +402,7 @@ + http://git-wip-us.apache.org/repos/asf/ignite/blob/4307355a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset new file mode 100644 index 000..ba6c8e6 --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file
[27/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34a4eb48 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34a4eb48 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34a4eb48 Branch: refs/heads/ignite-2324 Commit: 34a4eb48733e5110676a4cacbef128468618fb77 Parents: 0c1f704 Author: Pavel TupitsynAuthored: Wed Jan 13 19:36:19 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 19:36:19 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs | 3 +++ .../dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs| 3 +++ modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs | 3 +++ 3 files changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/34a4eb48/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs index 2ee6ebe..28dfb1a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Impl.Binary.Metadata { using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Binary; /// @@ -56,6 +57,8 @@ namespace Apache.Ignite.Core.Impl.Binary.Metadata /// /// Initializes the class. /// +[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", +Justification = "Readability.")] static BinaryType() { TypeNames[BinaryUtils.TypeBool] = BinaryTypeNames.TypeNameBool; http://git-wip-us.apache.org/repos/asf/ignite/blob/34a4eb48/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs index 0a84d81..7551d35 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CancelledTask.cs @@ -17,6 +17,7 @@ namespace Apache.Ignite.Core.Impl.Common { +using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; /// @@ -30,6 +31,8 @@ namespace Apache.Ignite.Core.Impl.Common /// /// Initializes the class. /// +[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", +Justification = "Readability.")] static CancelledTask() { TaskCompletionSource = new TaskCompletionSource(); http://git-wip-us.apache.org/repos/asf/ignite/blob/34a4eb48/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs index 5fcf8d7..fe4548c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Impl { using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; using System.Linq; @@ -64,6 +65,8 @@ namespace Apache.Ignite.Core.Impl /// /// Initializes the class. /// +[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", +Justification = "Readability.")] static IgniteUtils() { TryCleanTempDirectories();
[43/50] ignite git commit: wip fixes
wip fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ebd0eaf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ebd0eaf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ebd0eaf Branch: refs/heads/ignite-2324 Commit: 2ebd0eaf6254f52070e5e45f7007d13c4ef8f1ec Parents: 9a7e3ee Author: Pavel TupitsynAuthored: Thu Jan 14 12:31:32 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:31:32 2016 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs | 3 +++ .../Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs | 1 + .../Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Cache/Query/Continuous/ContinuousQueryFilterHolder.cs | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2ebd0eaf/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs index 8d3f5cd..4bc4c35 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs @@ -24,6 +24,7 @@ namespace Apache.Ignite.Core.Events using Apache.Ignite.Core.Cluster; using Apache.Ignite.Core.Common; using Apache.Ignite.Core.Impl.Binary; +using Apache.Ignite.Core.Impl.Common; /// /// Base event implementation. @@ -204,6 +205,8 @@ namespace Apache.Ignite.Core.Events /// Node or null. protected static IClusterNode ReadNode(IBinaryRawReader reader) { +IgniteArgumentCheck.NotNull(reader, "reader"); + return ((BinaryReader)reader).Marshaller.Ignite.GetNode(reader.ReadGuid()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/2ebd0eaf/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs index 39f4945..36e324d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs @@ -799,6 +799,7 @@ namespace Apache.Ignite.Core.Impl.Binary } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] T2 IBinarySystemReader.Read(BinaryReader ctx) { return _readDelegate2(ctx.Stream); http://git-wip-us.apache.org/repos/asf/ignite/blob/2ebd0eaf/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs index 2265abc..1bf4d21 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Io/BinaryHeapStream.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Impl.Binary.IO { using System; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; @@ -69,6 +70,7 @@ namespace Apache.Ignite.Core.Impl.Binary.IO } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public override void WriteByteArray(byte[] val) { int pos0 = EnsureWriteCapacityAndShift(val.Length); @@ -91,6 +93,7 @@ namespace Apache.Ignite.Core.Impl.Binary.IO } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public override void WriteBoolArray(bool[] val) { int pos0 = EnsureWriteCapacityAndShift(val.Length); @@ -135,6 +138,7 @@ namespace Apache.Ignite.Core.Impl.Binary.IO } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public override void WriteShortArray(short[] val) { int cnt = val.Length << 1; @@ -161,6 +165,7 @@ namespace Apache.Ignite.Core.Impl.Binary.IO } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public
[05/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81ab374a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81ab374a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81ab374a Branch: refs/heads/ignite-2324 Commit: 81ab374a8f05ed2e3a1b1cf1c362776c4351e463 Parents: 83a760c Author: Pavel TupitsynAuthored: Wed Jan 13 16:58:18 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 16:58:18 2016 +0300 -- .../platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/81ab374a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings index 81e3251..3287c4c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings +++ b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings @@ -1,4 +1,5 @@ http://schemas.microsoft.com/winfx/2006/xaml; xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation;> + DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW @@ -6,6 +7,14 @@ DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW
[21/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0684049 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0684049 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0684049 Branch: refs/heads/ignite-2324 Commit: e06840493489983747d9a254677cb0a37cfed3a8 Parents: cdea54d Author: Pavel TupitsynAuthored: Wed Jan 13 18:45:54 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:45:54 2016 +0300 -- modules/platforms/dotnet/Apache.Ignite.sln | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e0684049/modules/platforms/dotnet/Apache.Ignite.sln -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index e28e05e..a28d714 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -1,8 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}"
[25/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f704b5fd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f704b5fd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f704b5fd Branch: refs/heads/ignite-2324 Commit: f704b5fd2e0e9dca0e5959d2d9b7b6d777fa1cbe Parents: b4131bc Author: Pavel TupitsynAuthored: Wed Jan 13 19:21:35 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 19:21:35 2016 +0300 -- .../Apache.Ignite.Core.ruleset | 125 ++- .../Compute/ComputeJobAdapter.cs| 2 +- .../Apache.Ignite.Core/Impl/Common/Future.cs| 1 + 3 files changed, 12 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f704b5fd/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset index ba6c8e6..35f156c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset @@ -2,122 +2,17 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f704b5fd/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobAdapter.cs index 2a0ed4e..c53279e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobAdapter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobAdapter.cs @@ -88,7 +88,7 @@ namespace Apache.Ignite.Core.Compute public TArg GetArgument(int idx) { if (_args == null || idx < 0 || idx >= _args.Length) -throw new IndexOutOfRangeException("Invalid argument index: " + idx); +throw new ArgumentOutOfRangeException("Invalid argument index: " + idx); return (TArg)_args[idx]; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f704b5fd/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs index 3e99040..6815df7 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs @@ -70,6 +70,7 @@ namespace Apache.Ignite.Core.Impl.Common /// /// Gets the task. /// +[SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")] public Task Task { get { return _taskCompletionSource.Task; }
[32/50] ignite git commit: Revert test errors
Revert test errors Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a24456 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a24456 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a24456 Branch: refs/heads/ignite-2324 Commit: 70a24456adf79038b0eac0643c90a2dbfa197666 Parents: cb093d0 Author: Pavel TupitsynAuthored: Wed Jan 13 20:24:59 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:24:59 2016 +0300 -- .../Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs | 1 + .../dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs| 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a24456/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs index fad8949..dd19620 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs @@ -21,6 +21,7 @@ namespace Apache.Ignite.Core.Cache.Event /// /// Cache entry event filter. /// +// ReSharper disable TypeParameterCanBeVariant public interface ICacheEntryEventFilter { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/70a24456/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs index 87434a7..e992245 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs @@ -379,6 +379,8 @@ namespace Apache.Ignite.Core.Impl.Compute } /** */ +[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", +Justification = "User object deserialization can throw any exception")] public void CompleteWithError(long taskHandle, PlatformMemoryStream stream) { BinaryReader reader = _compute.Marshaller.StartUnmarshal(stream);
[17/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11942fb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11942fb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11942fb8 Branch: refs/heads/ignite-2324 Commit: 11942fb8b62b271ec174036753879dd5d8e4b699 Parents: 33e01f2 Author: Pavel TupitsynAuthored: Wed Jan 13 18:24:52 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:24:52 2016 +0300 -- .../Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs | 2 +- modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/11942fb8/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs index 4623b87..69734d0 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs @@ -48,7 +48,7 @@ namespace Apache.Ignite.Core.Cache.Query.Continuous /// Default time interval. /// [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")] -// ReSharper disable once StaticMemberInGenericType +//[SuppressMessage("ReSharper", "StaticMemberInGenericType")] public static readonly TimeSpan DfltTimeInterval = new TimeSpan(0); /// http://git-wip-us.apache.org/repos/asf/ignite/blob/11942fb8/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings index 8633d7f..88a4a12 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings +++ b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings @@ -23,5 +23,6 @@ True DO_NOT_SHOW DO_NOT_SHOW + DO_NOT_SHOW True \ No newline at end of file
[06/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1687b5ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1687b5ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1687b5ca Branch: refs/heads/ignite-2324 Commit: 1687b5ca6854f8203d33cb816327d33becee9d98 Parents: 81ab374 Author: Pavel TupitsynAuthored: Wed Jan 13 17:12:09 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 17:12:09 2016 +0300 -- .../Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs | 2 +- .../Impl/Binary/BinaryReflectiveSerializer.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs| 5 ++--- .../dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs| 2 +- .../Apache.Ignite.Core/Impl/Resource/ResourceTypeDescriptor.cs | 2 +- modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 1 + 6 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1687b5ca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs index 3d2b34d..ac86770 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFullTypeDescriptor.cs @@ -64,7 +64,7 @@ namespace Apache.Ignite.Core.Impl.Binary private readonly BinaryObjectSchema _schema = new BinaryObjectSchema(); /** Enum flag. */ -private bool _isEnum; +private readonly bool _isEnum; /// /// Constructor. http://git-wip-us.apache.org/repos/asf/ignite/blob/1687b5ca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializer.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializer.cs index 0804c25..ceffef5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializer.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveSerializer.cs @@ -42,7 +42,7 @@ namespace Apache.Ignite.Core.Impl.Binary internal class BinaryReflectiveSerializer : IBinarySerializer { /** Cached binding flags. */ -private static readonly BindingFlags Flags = BindingFlags.Instance | BindingFlags.Public | +private const BindingFlags Flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly; /** Cached type descriptors. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1687b5ca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs index 41bd284..06dec2c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs @@ -227,15 +227,14 @@ namespace Apache.Ignite.Core.Impl.Binary private static readonly long JavaDateTicks = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).Ticks; /** Bindig flags for static search. */ -private static BindingFlags _bindFlagsStatic = -BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; +private const BindingFlags BindFlagsStatic = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; /** Default poratble marshaller. */ private static readonly Marshaller Marsh = new Marshaller(null); /** Method: ReadArray. */ public static readonly MethodInfo MtdhReadArray = -typeof(BinaryUtils).GetMethod("ReadArray", _bindFlagsStatic); +typeof(BinaryUtils).GetMethod("ReadArray", BindFlagsStatic); /** Cached UTF8 encoding. */ private static readonly Encoding Utf8 = Encoding.UTF8; http://git-wip-us.apache.org/repos/asf/ignite/blob/1687b5ca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs
[41/50] ignite git commit: wip dispose fixes
wip dispose fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94a147bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94a147bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94a147bc Branch: refs/heads/ignite-2324 Commit: 94a147bcc60867cbc85ce517921223c9ae63b014 Parents: a2583c8 Author: Pavel TupitsynAuthored: Thu Jan 14 12:07:24 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:07:24 2016 +0300 -- .../Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs | 2 +- .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs | 2 +- .../Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs | 2 +- .../Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/94a147bc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs index e2b3d13..6066504 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs @@ -545,9 +545,9 @@ namespace Apache.Ignite.Core.Impl.Datastream Marshaller.Ignite.HandleRegistry.Release(_hnd, true); Marshaller.Ignite.HandleRegistry.Release(_rcvHnd, true); - -base.Dispose(false); } + +base.Dispose(false); } /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/94a147bc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs index 87c357f..cb30051 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs @@ -39,7 +39,7 @@ namespace Apache.Ignite.Core.Impl.Memory } /** */ -[SuppressMessage("Reliability", "S2930:\"IDisposables\" should be disposed")] +[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")] public virtual PlatformMemoryStream GetStream() { return BitConverter.IsLittleEndian ? new PlatformMemoryStream(this) : http://git-wip-us.apache.org/repos/asf/ignite/blob/94a147bc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs index b66a8ef..f934081 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs @@ -81,7 +81,7 @@ namespace Apache.Ignite.Core.Impl.Memory /// Gets or creates thread-local memory pool. /// /// Memory pool. -[SuppressMessage("Reliability", "S2930:\"IDisposables\" should be disposed")] +[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")] public PlatformMemoryPool Pool() { PlatformMemoryPool pool = _threadLocPool.Value; http://git-wip-us.apache.org/repos/asf/ignite/blob/94a147bc/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs index bc813af..851d24f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs @@ -44,7 +44,7 @@ namespace Apache.Ignite.Core.Impl.Memory } /** */ -[SuppressMessage("Reliability", "S2930:\"IDisposables\" should be disposed")] +[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects
[48/50] ignite git commit: Revert IgnitionStart changes
Revert IgnitionStart changes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54e34d13 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54e34d13 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54e34d13 Branch: refs/heads/ignite-2324 Commit: 54e34d13b0f1d510cee79700637a207c662c87b2 Parents: 468b20c Author: Pavel TupitsynAuthored: Thu Jan 14 13:02:29 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 13:02:29 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/54e34d13/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs index 26f74a1..4c8f1dc 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs @@ -57,7 +57,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged #region NATIVE METHODS: PROCESSOR -internal static void IgnitionStart(UnmanagedContext ctx, string cfgPath, string gridName, +internal static IUnmanagedTarget IgnitionStart(UnmanagedContext ctx, string cfgPath, string gridName, bool clientMode) { using (var mem = IgniteManager.Memory.Allocate().GetStream()) @@ -69,8 +69,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged try { -JNI.IgnitionStart(ctx.NativeContext, cfgPath0, gridName0, InteropFactoryId, +void* res = JNI.IgnitionStart(ctx.NativeContext, cfgPath0, gridName0, InteropFactoryId, mem.SynchronizeOutput()); + +return new UnmanagedTarget(ctx, res); } finally {
[22/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9d9e7d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9d9e7d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9d9e7d1 Branch: refs/heads/ignite-2324 Commit: b9d9e7d1e05f4b96a5202340ac8ed53044bb8fa9 Parents: e068404 Author: Pavel TupitsynAuthored: Wed Jan 13 18:53:23 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:53:23 2016 +0300 -- .../platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 2 ++ .../Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs| 1 + modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj| 1 + 3 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b9d9e7d1/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index f452cec..8dd0d33 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -18,6 +18,8 @@ true DEBUG;CODE_ANALYSIS bin\x64\Debug\Apache.Ignite.Core.XML +true +AllRules.ruleset x64 http://git-wip-us.apache.org/repos/asf/ignite/blob/b9d9e7d1/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs index 02433ce..cc9436d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Common/IgniteFutureCancelledException.cs @@ -23,6 +23,7 @@ namespace Apache.Ignite.Core.Common /// /// Indicates future cancellation within Ignite. /// +[Serializable] public class IgniteFutureCancelledException : IgniteException { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/b9d9e7d1/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj index d0ad857..d26d70c 100644 --- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj +++ b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj @@ -15,6 +15,7 @@ x64 bin\x64\Debug\ +true x64
[04/50] ignite git commit: code cleanup
code cleanup Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83a760c3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83a760c3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83a760c3 Branch: refs/heads/ignite-2324 Commit: 83a760c3833b91a55f3d9aa6f93b9b1b34dc9708 Parents: d8a958a Author: Pavel TupitsynAuthored: Wed Jan 13 16:57:45 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 16:57:45 2016 +0300 -- modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs | 3 +-- .../platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs| 2 +- .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs| 4 .../Apache.Ignite.Core/Impl/Datastream/DataStreamerBatch.cs | 1 + .../Apache.Ignite.Core/Impl/Datastream/DataStreamerImpl.cs | 1 + .../dotnet/Apache.Ignite.Core/Impl/Handle/HandleRegistry.cs | 1 + .../Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 2 +- 8 files changed, 11 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/83a760c3/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs index 7a3fafc..3a27ad1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs @@ -148,8 +148,7 @@ namespace Apache.Ignite.Core var gridName = cfgEx != null ? cfgEx.GridName : null; -var cfgPath = Environment.GetEnvironmentVariable(EnvIgniteSpringConfigUrlPrefix) + -(cfg.SpringConfigUrl ?? DefaultCfg); +var cfgPath = Environment.GetEnvironmentVariable(EnvIgniteSpringConfigUrlPrefix) + cfg.SpringConfigUrl; // 3. Create startup object which will guide us through the rest of the process. _startup = new Startup(cfg, cbs); http://git-wip-us.apache.org/repos/asf/ignite/blob/83a760c3/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs index a261e18..e96720e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs @@ -187,7 +187,7 @@ namespace Apache.Ignite.Core.Impl.Binary /// Empty binary object. private BinaryObject BinaryFromDescriptor(IBinaryTypeDescriptor desc) { -var len = BinaryObjectHeader.Size; +const int len = BinaryObjectHeader.Size; var hdr = new BinaryObjectHeader(desc.TypeId, 0, len, 0, len, desc.UserType ? BinaryObjectHeader.Flag.UserType : BinaryObjectHeader.Flag.None); http://git-wip-us.apache.org/repos/asf/ignite/blob/83a760c3/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs index 1c85e31..41bd284 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs @@ -1125,7 +1125,7 @@ namespace Apache.Ignite.Core.Impl.Binary res = factory.Invoke(len); if (adder == null) -adder = (col, elem) => { ((ArrayList) col).Add(elem); }; +adder = (col, elem) => ((ArrayList) col).Add(elem); for (int i = 0; i < len; i++) adder.Invoke(res, ctx.Deserialize()); http://git-wip-us.apache.org/repos/asf/ignite/blob/83a760c3/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs index 189cd50..0810891 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs @@ -803,6 +803,7 @@ namespace Apache.Ignite.Core.Impl.Binary /// Enum value. public void WriteEnum(T val) { +// ReSharper disable
[50/50] ignite git commit: IGNITE-2324: Review.
IGNITE-2324: Review. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ec03ff3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ec03ff3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ec03ff3 Branch: refs/heads/ignite-2324 Commit: 8ec03ff31263619cf0d1177d5e25c70600e333a5 Parents: f1d9652 Author: vozerov-gridgainAuthored: Mon Jan 18 17:11:27 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 17:11:27 2016 +0300 -- .../Apache.Ignite.Core/Cache/CachePartialUpdateException.cs | 4 ++-- .../Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs | 1 - .../Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs | 7 +++ .../dotnet/Apache.Ignite.Core/Compute/ComputeTaskAdapter.cs | 4 ++-- .../Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs | 5 ++--- .../dotnet/Apache.Ignite.Core/Datastream/StreamTransformer.cs | 5 ++--- .../dotnet/Apache.Ignite.Core/Datastream/StreamVisitor.cs | 5 ++--- .../platforms/dotnet/Apache.Ignite.Core/Events/EventBase.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs | 1 - .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs | 1 + .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs | 1 - .../dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 1 + .../platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs | 1 - .../dotnet/Apache.Ignite.Core/Impl/Common/FutureType.cs | 1 - .../platforms/dotnet/Apache.Ignite.Core/Impl/Handle/Handle.cs | 1 - .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs| 1 - .../Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs | 1 - 17 files changed, 17 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ec03ff3/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs index 25ed42c..b80913f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Cache { using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.Serialization; using Apache.Ignite.Core.Impl.Common; @@ -110,10 +111,9 @@ namespace Apache.Ignite.Core.Cache } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public override void GetObjectData(SerializationInfo info, StreamingContext context) { -IgniteArgumentCheck.NotNull(info, "info"); - info.AddValue(KeyFailedKeys, _failedKeys); base.GetObjectData(info, context); http://git-wip-us.apache.org/repos/asf/ignite/blob/8ec03ff3/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs index dd19620..853619d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs @@ -15,7 +15,6 @@ * limitations under the License. */ - namespace Apache.Ignite.Core.Cache.Event { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/8ec03ff3/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs index d9ad024..3f3b558 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Cache.Store { using System; using System.Collections; +using System.Diagnostics.CodeAnalysis; using System.Linq; using Apache.Ignite.Core.Impl.Common; @@ -73,10 +74,9 @@ namespace Apache.Ignite.Core.Cache.Store /// Writes all. /// /// The map. +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of
[20/50] ignite git commit: Merge remote-tracking branch 'remotes/upstream/master' into ignite-2324
Merge remote-tracking branch 'remotes/upstream/master' into ignite-2324 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdea54d7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdea54d7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdea54d7 Branch: refs/heads/ignite-2324 Commit: cdea54d705bad7298818c9ec9df953a2a69c13c0 Parents: 9229f54 457a9ae Author: Pavel TupitsynAuthored: Wed Jan 13 18:44:52 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:44:52 2016 +0300 -- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/IgniteKernal.java| 95 +++- .../ignite/internal/MarshallerContextImpl.java | 86 +++- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java| 23 + .../processors/cache/GridCacheProcessor.java| 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java| 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java| 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java| 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java| 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java| 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 432 ++- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java| 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java| 3 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 13 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 .../IgniteCachePutRetryAbstractSelfTest.java| 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../continuous/GridEventConsumeSelfTest.java| 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...CommunicationRecoveryAckClosureSelfTest.java | 19 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 + .../junits/common/GridCommonAbstractTest.java | 34 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheTxRecoverySelfTestSuite.java | 3 + .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 ++- 70 files changed, 1578 insertions(+), 377 deletions(-) --
[01/50] ignite git commit: code cleanup
Repository: ignite Updated Branches: refs/heads/ignite-2324 [created] 8ec03ff31 code cleanup Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5c61312 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5c61312 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5c61312 Branch: refs/heads/ignite-2324 Commit: d5c61312ce7a99f6ad72ac4994cb92ce4abc3b13 Parents: 3841276 Author: Pavel TupitsynAuthored: Wed Jan 13 15:18:40 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 15:18:40 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs| 2 -- modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs | 1 - .../dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs | 1 - modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs | 1 - 4 files changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d5c61312/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs index 9807c37..6283377 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeJobResultPolicy.cs @@ -17,8 +17,6 @@ namespace Apache.Ignite.Core.Compute { -using System.Collections.Generic; - /// /// This enumeration provides different types of actions following the last received job result. See /// http://git-wip-us.apache.org/repos/asf/ignite/blob/d5c61312/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs index 43a4bb8..a261e18 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs @@ -23,7 +23,6 @@ namespace Apache.Ignite.Core.Impl.Binary using Apache.Ignite.Core.Binary; using Apache.Ignite.Core.Common; using Apache.Ignite.Core.Impl.Binary.IO; -using Apache.Ignite.Core.Impl.Binary.Metadata; using Apache.Ignite.Core.Impl.Common; /// http://git-wip-us.apache.org/repos/asf/ignite/blob/d5c61312/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs index 476e651..2ee6ebe 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs @@ -18,7 +18,6 @@ namespace Apache.Ignite.Core.Impl.Binary.Metadata { using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Binary; /// http://git-wip-us.apache.org/repos/asf/ignite/blob/d5c61312/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs index 0472ce4..cf073d5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs @@ -22,7 +22,6 @@ namespace Apache.Ignite.Core.Impl using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Threading; using System.Threading.Tasks; using Apache.Ignite.Core.Impl.Binary; using Apache.Ignite.Core.Impl.Binary.IO;
[19/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9229f540 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9229f540 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9229f540 Branch: refs/heads/ignite-2324 Commit: 9229f5400321693013000f2d20d3d6e072120bcf Parents: 674cc53 Author: Pavel TupitsynAuthored: Wed Jan 13 18:32:06 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:32:06 2016 +0300 -- .../Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs | 2 +- modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9229f540/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs index 69734d0..3bb136e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs @@ -48,7 +48,7 @@ namespace Apache.Ignite.Core.Cache.Query.Continuous /// Default time interval. /// [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")] -//[SuppressMessage("ReSharper", "StaticMemberInGenericType")] +[SuppressMessage("ReSharper", "StaticMemberInGenericType")] public static readonly TimeSpan DfltTimeInterval = new TimeSpan(0); /// http://git-wip-us.apache.org/repos/asf/ignite/blob/9229f540/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings index 834adf4..cf9e287 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings +++ b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings @@ -20,10 +20,11 @@ DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW - True DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW + DO_NOT_SHOW DO_NOT_SHOW + True True \ No newline at end of file
[35/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d615407d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d615407d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d615407d Branch: refs/heads/ignite-2324 Commit: d615407d4ecf9337b82b8950ad9aeca97623960b Parents: 8cd01c3 Author: Pavel TupitsynAuthored: Wed Jan 13 20:42:28 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:42:28 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset| 2 +- .../dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs | 3 +++ .../dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs | 5 + .../Apache.Ignite.Core/Cache/CachePartialUpdateException.cs | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d615407d/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset index 704a7d4..0b4f76b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset @@ -1,6 +1,6 @@  - + http://git-wip-us.apache.org/repos/asf/ignite/blob/d615407d/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs index 5041a84..4d82a65 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryConfiguration.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Binary { using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using Apache.Ignite.Core.Impl.Common; /// /// Binary type configuration. @@ -39,6 +40,8 @@ namespace Apache.Ignite.Core.Binary /// Configuration to copy. public BinaryConfiguration(BinaryConfiguration cfg) { +IgniteArgumentCheck.NotNull(cfg, "cfg"); + DefaultIdMapper = cfg.DefaultIdMapper; DefaultNameMapper = cfg.DefaultNameMapper; DefaultKeepDeserialized = cfg.DefaultKeepDeserialized; http://git-wip-us.apache.org/repos/asf/ignite/blob/d615407d/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs index 99f8572..c36b9fd 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryTypeConfiguration.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Binary { using System; +using Apache.Ignite.Core.Impl.Common; /// /// Binary type configuration. @@ -47,6 +48,8 @@ namespace Apache.Ignite.Core.Binary /// Type. public BinaryTypeConfiguration(Type type) { +IgniteArgumentCheck.NotNull(type, "type"); + TypeName = type.AssemblyQualifiedName; IsEnum = type.IsEnum; } @@ -57,6 +60,8 @@ namespace Apache.Ignite.Core.Binary /// Configuration to copy. public BinaryTypeConfiguration(BinaryTypeConfiguration cfg) { +IgniteArgumentCheck.NotNull(cfg, "cfg"); + AffinityKeyFieldName = cfg.AffinityKeyFieldName; IdMapper = cfg.IdMapper; NameMapper = cfg.NameMapper; http://git-wip-us.apache.org/repos/asf/ignite/blob/d615407d/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs index b3ed537..25ed42c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CachePartialUpdateException.cs @@ -21,6 +21,7 @@ namespace Apache.Ignite.Core.Cache using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; +using
[40/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a2583c83 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a2583c83 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a2583c83 Branch: refs/heads/ignite-2324 Commit: a2583c83daaf6e0f3d764c9d0529d7356d9e5b56 Parents: 9edb32f Author: Pavel TupitsynAuthored: Thu Jan 14 12:03:51 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:03:51 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs | 7 --- .../dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs | 2 ++ .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs | 1 + .../Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs | 2 ++ .../Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs | 3 +++ .../Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 2 ++ 6 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a2583c83/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs index c9b491b..20fa146 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs @@ -70,9 +70,10 @@ namespace Apache.Ignite.Core.Impl { writer0.WriteBoolean(false); -BinaryFormatter bf = new BinaryFormatter(); - -bf.Serialize(new BinaryStreamAdapter(writer0.Stream), _err); +using (var streamAdapter = new BinaryStreamAdapter(writer0.Stream)) +{ +new BinaryFormatter().Serialize(streamAdapter, _err); +} } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a2583c83/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs index 4a905c3..87c357f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemory.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Impl.Memory { using System; +using System.Diagnostics.CodeAnalysis; /// /// Abstract memory chunk. @@ -38,6 +39,7 @@ namespace Apache.Ignite.Core.Impl.Memory } /** */ +[SuppressMessage("Reliability", "S2930:\"IDisposables\" should be disposed")] public virtual PlatformMemoryStream GetStream() { return BitConverter.IsLittleEndian ? new PlatformMemoryStream(this) : http://git-wip-us.apache.org/repos/asf/ignite/blob/a2583c83/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs index 945b05f..b66a8ef 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs @@ -81,6 +81,7 @@ namespace Apache.Ignite.Core.Impl.Memory /// Gets or creates thread-local memory pool. /// /// Memory pool. +[SuppressMessage("Reliability", "S2930:\"IDisposables\" should be disposed")] public PlatformMemoryPool Pool() { PlatformMemoryPool pool = _threadLocPool.Value; http://git-wip-us.apache.org/repos/asf/ignite/blob/a2583c83/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs index 76aa237..bc813af 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformRawMemory.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Impl.Memory { using System; +using System.Diagnostics.CodeAnalysis; /// /// Non-resizeable raw memory chunk without
[28/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05dc2a44 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05dc2a44 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05dc2a44 Branch: refs/heads/ignite-2324 Commit: 05dc2a44cf21a57b281e7de2e482aef4cf993438 Parents: 34a4eb4 Author: Pavel TupitsynAuthored: Wed Jan 13 19:38:01 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 19:38:01 2016 +0300 -- modules/platforms/dotnet/Apache.Ignite.FxCop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/05dc2a44/modules/platforms/dotnet/Apache.Ignite.FxCop -- diff --git a/modules/platforms/dotnet/Apache.Ignite.FxCop b/modules/platforms/dotnet/Apache.Ignite.FxCop index 0df73c5..e995bb0 100644 --- a/modules/platforms/dotnet/Apache.Ignite.FxCop +++ b/modules/platforms/dotnet/Apache.Ignite.FxCop @@ -432,4 +432,4 @@ - + \ No newline at end of file
[02/50] ignite git commit: TeamCity.DotSettings and some cleanup
TeamCity.DotSettings and some cleanup Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a2924bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a2924bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a2924bf Branch: refs/heads/ignite-2324 Commit: 5a2924bf36b2d8b052284c8a4457d4152ba08e47 Parents: d5c6131 Author: Pavel TupitsynAuthored: Wed Jan 13 16:31:02 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 16:31:02 2016 +0300 -- .../Cache/Event/ICacheEntryEventFilter.cs| 2 ++ .../Cache/Event/ICacheEntryEventListener.cs | 1 + .../Impl/Memory/PlatformMemoryManager.cs | 1 + .../Impl/Memory/PlatformMemoryStream.cs | 1 + .../dotnet/Apache.Ignite.sln.TeamCity.DotSettings| 15 +++ 5 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2924bf/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs index 98f5c5a..dd19620 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs @@ -15,11 +15,13 @@ * limitations under the License. */ + namespace Apache.Ignite.Core.Cache.Event { /// /// Cache entry event filter. /// +// ReSharper disable TypeParameterCanBeVariant public interface ICacheEntryEventFilter { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2924bf/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventListener.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventListener.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventListener.cs index 76ae04c..f20c823 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventListener.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventListener.cs @@ -22,6 +22,7 @@ namespace Apache.Ignite.Core.Cache.Event /// /// Cache entry event listener. /// +// ReSharper disable TypeParameterCanBeVariant public interface ICacheEntryEventListener { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2924bf/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs index dccf8ab..945b05f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryManager.cs @@ -27,6 +27,7 @@ namespace Apache.Ignite.Core.Impl.Memory [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "This class instance usually lives as long as the app runs.")] [CLSCompliant(false)] +// ReSharper disable once ClassWithVirtualMembersNeverInherited.Global public class PlatformMemoryManager { /** Default capacity. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2924bf/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs index 374cc4a..e68ef42 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs @@ -677,6 +677,7 @@ namespace Apache.Ignite.Core.Impl.Memory /// /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. /// +// ReSharper disable once VirtualMemberNeverOverriden.Global protected virtual void Dispose(bool disposing) { if (disposing) http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2924bf/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
[26/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c1f7041 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c1f7041 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c1f7041 Branch: refs/heads/ignite-2324 Commit: 0c1f704146c5fc0e8ab5d6294d8222076e75fcb8 Parents: f704b5f Author: Pavel TupitsynAuthored: Wed Jan 13 19:33:17 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 19:33:17 2016 +0300 -- modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0c1f7041/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs index 6815df7..cd42c36 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/Future.cs @@ -114,6 +114,7 @@ namespace Apache.Ignite.Core.Impl.Common } /** */ +[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] public void OnNullResult() { if (_converter == null)
[33/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53d81485 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53d81485 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53d81485 Branch: refs/heads/ignite-2324 Commit: 53d814853f0d0f0898b622c994228b36eb8c3471 Parents: 70a2445 Author: Pavel TupitsynAuthored: Wed Jan 13 20:35:57 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:35:57 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset | 7 +++ modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/53d81485/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset index 35f156c..8c8c9ca 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.ruleset @@ -8,11 +8,18 @@ + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/53d81485/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj index d26d70c..e2dae25 100644 --- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj +++ b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj @@ -15,7 +15,7 @@ x64 bin\x64\Debug\ -true +false x64
[14/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e43fd47e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e43fd47e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e43fd47e Branch: refs/heads/ignite-2324 Commit: e43fd47e991b5c76fb0d8956a59b2fef86f65b8b Parents: 41e1e46 Author: Pavel TupitsynAuthored: Wed Jan 13 18:11:24 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:11:24 2016 +0300 -- .../Apache.Ignite.Core/Cache/CacheResult.cs | 41 +--- 1 file changed, 36 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e43fd47e/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheResult.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheResult.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheResult.cs index 75208cd..b610298 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheResult.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheResult.cs @@ -59,13 +59,25 @@ namespace Apache.Ignite.Core.Cache get { return _success; } } -/** */ +/// +/// Determines whether the specified , is equal to this instance. +/// +/// The to compare with this instance. +/// +/// true if the specified is equal to this instance; otherwise, false. +/// public bool Equals(CacheResult other) { return EqualityComparer.Default.Equals(_value, other._value) && _success == other._success; } -/** */ +/// +/// Determines whether the specified , is equal to this instance. +/// +/// The to compare with this instance. +/// +/// true if the specified is equal to this instance; otherwise, false. +/// public override bool Equals(object obj) { if (ReferenceEquals(null, obj)) @@ -74,7 +86,12 @@ namespace Apache.Ignite.Core.Cache return obj is CacheResult && Equals((CacheResult) obj); } -/** */ +/// +/// Returns a hash code for this instance. +/// +/// +/// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. +/// public override int GetHashCode() { unchecked @@ -83,13 +100,27 @@ namespace Apache.Ignite.Core.Cache } } -/** */ +/// +/// Implements the operator ==. +/// +/// The left. +/// The right. +/// +/// The result of the operator. +/// public static bool operator ==(CacheResult left, CacheResult right) { return left.Equals(right); } -/** */ +/// +/// Implements the operator !=. +/// +/// The left. +/// The right. +/// +/// The result of the operator. +/// public static bool operator !=(CacheResult left, CacheResult right) { return !left.Equals(right);
[10/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3b46e2e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3b46e2e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3b46e2e Branch: refs/heads/ignite-2324 Commit: e3b46e2e1f5ed8ea846253d5783c30475e0e790d Parents: 8969e5d Author: Pavel TupitsynAuthored: Wed Jan 13 17:50:25 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 17:50:25 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs | 1 + modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e3b46e2e/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs index 105589a..1c5c719 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs @@ -538,6 +538,7 @@ namespace Apache.Ignite.Core.Impl.Binary { T res; +// ReSharper disable once CompareNonConstrainedGenericWithNull if (!TryDeserialize(out res) && default(T) != null) throw new BinaryObjectException(string.Format("Invalid data on deserialization. " + "Expected: '{0}' But was: null", typeof (T))); http://git-wip-us.apache.org/repos/asf/ignite/blob/e3b46e2e/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs index cf073d5..c4258bd 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTarget.cs @@ -234,7 +234,7 @@ namespace Apache.Ignite.Core.Impl /// Write action to perform on item when it is not null. /// The same writer for chaining. protected static BinaryWriter WriteNullable(BinaryWriter writer, T item, -Func writeItem) +Func writeItem) where T : class { if (item == null) {
[15/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc7dcd3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc7dcd3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc7dcd3b Branch: refs/heads/ignite-2324 Commit: dc7dcd3bd8780b433149f767d74e4e6f625baa01 Parents: e43fd47 Author: Pavel TupitsynAuthored: Wed Jan 13 18:19:01 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:19:01 2016 +0300 -- .../Cache/Query/Continuous/ContinuousQuery.cs| 2 +- .../dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs | 2 +- .../Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs | 2 +- .../Compute/ComputeTaskSplitAdapter.cs | 11 +++ .../Apache.Ignite.Core/Events/CacheQueryExecutedEvent.cs | 4 +++- .../Apache.Ignite.Core/Events/CacheRebalancingEvent.cs | 4 +++- .../dotnet/Apache.Ignite.Core/Events/CheckpointEvent.cs | 4 +++- .../dotnet/Apache.Ignite.Core/Events/DiscoveryEvent.cs | 4 +++- .../dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs| 8 9 files changed, 22 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dc7dcd3b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs index dbf6c97..4623b87 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/Continuous/ContinuousQuery.cs @@ -47,8 +47,8 @@ namespace Apache.Ignite.Core.Cache.Query.Continuous /// /// Default time interval. /// -[SuppressMessage("ReSharper", "StaticMemberInGenericType")] [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes")] +// ReSharper disable once StaticMemberInGenericType public static readonly TimeSpan DfltTimeInterval = new TimeSpan(0); /// http://git-wip-us.apache.org/repos/asf/ignite/blob/dc7dcd3b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs index 5bbfc1c..cf1f637 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/QueryBase.cs @@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Cache.Query /// public abstract class QueryBase { -/** Default page size. */ +/// Default page size. public const int DfltPageSize = 1024; /// http://git-wip-us.apache.org/repos/asf/ignite/blob/dc7dcd3b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs index c0d58ca..1753a8b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlFieldsQuery.cs @@ -24,7 +24,7 @@ namespace Apache.Ignite.Core.Cache.Query /// public class SqlFieldsQuery { -/** Default page size. */ +/// Default page size. public const int DfltPageSize = 1024; /// http://git-wip-us.apache.org/repos/asf/ignite/blob/dc7dcd3b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs index 14651b1..fe8f85d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs @@ -22,6 +22,7 @@ namespace Apache.Ignite.Core.Compute using System.Diagnostics; using Apache.Ignite.Core.Cluster; using Apache.Ignite.Core.Common; +using Apache.Ignite.Core.Impl; using Apache.Ignite.Core.Impl.Compute; /// @@ -32,11 +33,6 @@ namespace Apache.Ignite.Core.Compute /// public abstract class ComputeTaskSplitAdapter
[07/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a022c64c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a022c64c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a022c64c Branch: refs/heads/ignite-2324 Commit: a022c64cdb894c10f580d3de78d7609b37a0b6b2 Parents: 1687b5c Author: Pavel TupitsynAuthored: Wed Jan 13 17:22:21 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 17:22:21 2016 +0300 -- modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a022c64c/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings -- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings index 3f8326e..8633d7f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings +++ b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings @@ -21,5 +21,7 @@ DO_NOT_SHOW DO_NOT_SHOW True + DO_NOT_SHOW + DO_NOT_SHOW True \ No newline at end of file
[16/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33e01f26 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33e01f26 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33e01f26 Branch: refs/heads/ignite-2324 Commit: 33e01f268ebb94bc4f82e0a96088c150e3797280 Parents: dc7dcd3 Author: Pavel TupitsynAuthored: Wed Jan 13 18:22:09 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 18:22:09 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/33e01f26/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs index fe8f85d..e08af92 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs @@ -17,7 +17,6 @@ namespace Apache.Ignite.Core.Compute { -using System; using System.Collections.Generic; using System.Diagnostics; using Apache.Ignite.Core.Cluster;
[36/50] ignite git commit: wip arg checks
wip arg checks Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b33534a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b33534a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b33534a5 Branch: refs/heads/ignite-2324 Commit: b33534a5f641246ce105fd4815db6035ba3252f2 Parents: d615407 Author: Pavel TupitsynAuthored: Wed Jan 13 20:50:29 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:50:29 2016 +0300 -- .../dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 6 +- .../dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs| 7 ++- .../Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs | 5 + .../dotnet/Apache.Ignite.Core/Compute/ComputeTaskAdapter.cs | 3 +++ .../Apache.Ignite.Core/Compute/ComputeTaskSplitAdapter.cs | 4 +++- .../dotnet/Apache.Ignite.Core/Datastream/StreamTransformer.cs | 3 +++ .../dotnet/Apache.Ignite.Core/Datastream/StreamVisitor.cs | 3 +++ 7 files changed, 28 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b33534a5/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs index 69dc7ee..0e3c887 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/SqlQuery.cs @@ -21,6 +21,7 @@ namespace Apache.Ignite.Core.Cache.Query using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Impl.Binary; using Apache.Ignite.Core.Impl.Cache; +using Apache.Ignite.Core.Impl.Common; /// /// SQL Query. @@ -46,7 +47,7 @@ namespace Apache.Ignite.Core.Cache.Query /// Whether query should be executed locally. /// Arguments. public SqlQuery(Type queryType, string sql, bool local, params object[] args) -: this(queryType.Name, sql, local, args) +: this(queryType == null ? null : queryType.Name, sql, local, args) { // No-op. } @@ -71,6 +72,9 @@ namespace Apache.Ignite.Core.Cache.Query /// Arguments. public SqlQuery(string queryType, string sql, bool local, params object[] args) { +IgniteArgumentCheck.NotNullOrEmpty("queryType", queryType); +IgniteArgumentCheck.NotNullOrEmpty("sql", sql); + QueryType = queryType; Sql = sql; Local = local; http://git-wip-us.apache.org/repos/asf/ignite/blob/b33534a5/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs index 8c7880f..e77d6e3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Query/TextQuery.cs @@ -20,6 +20,7 @@ namespace Apache.Ignite.Core.Cache.Query using System; using Apache.Ignite.Core.Impl.Binary; using Apache.Ignite.Core.Impl.Cache; +using Apache.Ignite.Core.Impl.Common; /// /// Text query. @@ -42,7 +43,8 @@ namespace Apache.Ignite.Core.Cache.Query /// Type. /// Text. /// Whether query should be executed locally. -public TextQuery(Type queryType, string text, bool local) : this(queryType.Name, text, local) +public TextQuery(Type queryType, string text, bool local) +: this(queryType == null ? null : queryType.Name, text, local) { // No-op. } @@ -65,6 +67,9 @@ namespace Apache.Ignite.Core.Cache.Query /// Whether query should be executed locally. public TextQuery(string queryType, string text, bool local) { +IgniteArgumentCheck.NotNullOrEmpty("queryType", queryType); +IgniteArgumentCheck.NotNullOrEmpty("text", text); + QueryType = queryType; Text = text; Local = local; http://git-wip-us.apache.org/repos/asf/ignite/blob/b33534a5/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Store/CacheStoreAdapter.cs index fe0aeaa..d9ad024 100644 ---
[47/50] ignite git commit: Fix nullref
Fix nullref Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/468b20ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/468b20ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/468b20ca Branch: refs/heads/ignite-2324 Commit: 468b20cadb52e2f935f67681ded9e16d5fbf10b7 Parents: a8315f0 Author: Pavel TupitsynAuthored: Thu Jan 14 12:55:39 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:55:39 2016 +0300 -- .../Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/468b20ca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs index fef904b..bbc2dbe 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/Continuous/ContinuousQueryHandleImpl.cs @@ -192,11 +192,9 @@ namespace Apache.Ignite.Core.Impl.Cache.Query.Continuous { lock (this) { -if (_disposed) +if (_disposed || _nativeQry == null) return; -Debug.Assert(_nativeQry != null); - try { UU.ContinuousQueryClose(_nativeQry);
[37/50] ignite git commit: Merge remote-tracking branch 'remotes/upstream/master' into ignite-2324
Merge remote-tracking branch 'remotes/upstream/master' into ignite-2324 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04786dcf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04786dcf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04786dcf Branch: refs/heads/ignite-2324 Commit: 04786dcfcdc40227d87804851659c06e3ae0d049 Parents: b33534a 2d10630 Author: Pavel TupitsynAuthored: Thu Jan 14 11:27:27 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 11:27:27 2016 +0300 -- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 -- .../apache/ignite/internal/IgniteKernal.java| 126 + .../ignite/internal/IgniteVersionUtils.java | 4 +- .../discovery/GridDiscoveryManager.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +- .../near/GridNearTxFinishFuture.java| 2 +- .../processors/cluster/ClusterProcessor.java| 174 +++ .../processors/cluster/GridUpdateNotifier.java | 457 +++ .../internal/GridUpdateNotifierSelfTest.java| 137 -- ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++ .../cluster/GridUpdateNotifierSelfTest.java | 140 ++ .../startup/GridRandomCommandLineLoader.java| 4 +- .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- 14 files changed, 926 insertions(+), 719 deletions(-) --
ignite git commit: Disabled failing tests.
Repository: ignite Updated Branches: refs/heads/master da601c27d -> 36486b411 Disabled failing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/36486b41 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36486b41 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/36486b41 Branch: refs/heads/master Commit: 36486b4117a7447802dbcb73caddad423d980fde Parents: da601c2 Author: sboikovAuthored: Mon Jan 18 16:20:57 2016 +0300 Committer: sboikov Committed: Mon Jan 18 16:20:57 2016 +0300 -- .../tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java | 2 ++ .../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java | 2 ++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/36486b41/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index b7c0deb..25e3611 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -244,6 +244,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTesthttps://issues.apache.org/jira/browse/IGNITE-172;); + for (int i = 0; i < 3; i++) { try { startSpis(5, 60_000, 10); http://git-wip-us.apache.org/repos/asf/ignite/blob/36486b41/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java index 8aaf34b..eafbb7a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java @@ -65,6 +65,8 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm * @throws Exception If failed. */ public void testResponseMessageOnRequestUnmarshallingFailed() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-1923;); + readCnt.set(Integer.MAX_VALUE); try {
[44/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a76b135f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a76b135f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a76b135f Branch: refs/heads/ignite-2324 Commit: a76b135faf0427ebe02cdf361fd4c416df9fa10c Parents: 2ebd0ea Author: Pavel TupitsynAuthored: Thu Jan 14 12:34:49 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:34:49 2016 +0300 -- .../Impl/Cache/Query/FieldsQueryCursor.cs| 2 ++ .../Impl/Common/CopyOnWriteConcurrentDictionary.cs | 1 + .../Apache.Ignite.Core/Impl/Common/DelegateConverter.cs | 11 ++- 3 files changed, 13 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a76b135f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/FieldsQueryCursor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/FieldsQueryCursor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/FieldsQueryCursor.cs index 6d45ecd..42fa1b9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/FieldsQueryCursor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/FieldsQueryCursor.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Impl.Cache.Query { using System.Collections; +using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Impl.Binary; using Apache.Ignite.Core.Impl.Unmanaged; @@ -39,6 +40,7 @@ namespace Apache.Ignite.Core.Impl.Cache.Query } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] protected override IList Read(BinaryReader reader) { int cnt = reader.ReadInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/a76b135f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CopyOnWriteConcurrentDictionary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CopyOnWriteConcurrentDictionary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CopyOnWriteConcurrentDictionary.cs index 918bbd1..01fc8a9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CopyOnWriteConcurrentDictionary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/CopyOnWriteConcurrentDictionary.cs @@ -48,6 +48,7 @@ namespace Apache.Ignite.Core.Impl.Common /// The key. /// The function used to generate a value for the key. /// The value for the key. +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public TValue GetOrAdd(TKey key, Func valueFactory) { lock (this) http://git-wip-us.apache.org/repos/asf/ignite/blob/a76b135f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/DelegateConverter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/DelegateConverter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/DelegateConverter.cs index 5d1a4e2..fa19a9e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/DelegateConverter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/DelegateConverter.cs @@ -19,6 +19,7 @@ namespace Apache.Ignite.Core.Impl.Common { using System; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; using System.Reflection; using System.Reflection.Emit; @@ -30,12 +31,13 @@ namespace Apache.Ignite.Core.Impl.Common { /** */ private const string DefaultMethodName = "Invoke"; - + /// /// Compiles a function without arguments. /// /// Type of the target. /// Compiled function that calls specified method on specified target. +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public static Func CompileFunc(Type targetType) { var method = targetType.GetMethod(DefaultMethodName); @@ -62,6 +64,7 @@ namespace Apache.Ignite.Core.Impl.Common /// /// Compiled function that calls specified method on specified target. /// +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public static T CompileFunc(Type targetType, Type[] argTypes, bool[] convertToObject = null, string methodName = null) where T : class @@ -84,6
[45/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61b4b64a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61b4b64a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61b4b64a Branch: refs/heads/ignite-2324 Commit: 61b4b64a4733cbe535761bcb71fe7cc532a75569 Parents: a76b135 Author: Pavel TupitsynAuthored: Thu Jan 14 12:42:46 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 12:42:46 2016 +0300 -- .../Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs | 2 ++ .../Impl/Compute/Closure/ComputeAbstractClosureTask.cs | 3 +++ .../Impl/Compute/Closure/ComputeMultiClosureTask.cs | 2 ++ .../Impl/Compute/Closure/ComputeReducingClosureTask.cs | 2 ++ .../Impl/Compute/Closure/ComputeSingleClosureTask.cs | 2 ++ .../dotnet/Apache.Ignite.Core/Impl/InteropExceptionHolder.cs | 2 ++ .../Impl/Memory/PlatformBigEndianMemoryStream.cs | 8 .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs | 2 ++ .../dotnet/Apache.Ignite.Core/Impl/Services/ServiceProxy.cs | 2 ++ .../Services/ServiceInvocationException.cs | 2 ++ 10 files changed, 27 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/61b4b64a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs index 6670ae6..5a46915 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/Query/QueryCursor.cs @@ -17,6 +17,7 @@ namespace Apache.Ignite.Core.Impl.Cache.Query { +using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Cache; using Apache.Ignite.Core.Impl.Binary; using Apache.Ignite.Core.Impl.Unmanaged; @@ -39,6 +40,7 @@ namespace Apache.Ignite.Core.Impl.Cache.Query } /** */ +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] protected override ICacheEntry Read(BinaryReader reader) { TK key = reader.ReadObject(); http://git-wip-us.apache.org/repos/asf/ignite/blob/61b4b64a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeAbstractClosureTask.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeAbstractClosureTask.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeAbstractClosureTask.cs index 286ae3a..220dbf8 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeAbstractClosureTask.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeAbstractClosureTask.cs @@ -19,8 +19,10 @@ namespace Apache.Ignite.Core.Impl.Compute.Closure { using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Cluster; using Apache.Ignite.Core.Compute; +using Apache.Ignite.Core.Impl.Common; /// /// Base class for all tasks working with closures. @@ -60,6 +62,7 @@ namespace Apache.Ignite.Core.Impl.Compute.Closure /// /// Result policy that dictates how to process further upcoming job results. /// +[SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods")] public ComputeJobResultPolicy OnResult(IComputeJobResult res, IList rcvd) { Exception err = res.Exception; http://git-wip-us.apache.org/repos/asf/ignite/blob/61b4b64a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeMultiClosureTask.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeMultiClosureTask.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeMultiClosureTask.cs index f26fe93..167ede9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeMultiClosureTask.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/Closure/ComputeMultiClosureTask.cs @@ -18,6 +18,7 @@ namespace Apache.Ignite.Core.Impl.Compute.Closure { using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Apache.Ignite.Core.Compute; /// @@ -40,6 +41,7 @@ namespace Apache.Ignite.Core.Impl.Compute.Closure } /** */ +
[09/50] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8969e5d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8969e5d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8969e5d3 Branch: refs/heads/ignite-2324 Commit: 8969e5d37eedf76566ef5837693513b2f8d22594 Parents: 495c1ac Author: Pavel TupitsynAuthored: Wed Jan 13 17:49:19 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 17:49:19 2016 +0300 -- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 56 ++-- 1 file changed, 28 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8969e5d3/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs index 665d37e..4d2e458 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs @@ -46,7 +46,7 @@ namespace Apache.Ignite.Core.Impl private const string ClsCachePartialUpdateErr = "org.apache.ignite.internal.processors.platform.cache.PlatformCachePartialUpdateException"; /** Map with predefined exceptions. */ -private static readonly IDictionary EXS = new Dictionary (); +private static readonly IDictionary Exs = new Dictionary (); /** Exception factory delegate. */ private delegate Exception ExceptionFactoryDelegate(string msg); @@ -59,46 +59,46 @@ namespace Apache.Ignite.Core.Impl static ExceptionUtils() { // Common Java exceptions mapped to common .Net exceptions. -EXS["java.lang.IllegalArgumentException"] = m => new ArgumentException(m); -EXS["java.lang.IllegalStateException"] = m => new InvalidOperationException(m); -EXS["java.lang.UnsupportedOperationException"] = m => new NotImplementedException(m); -EXS["java.lang.InterruptedException"] = m => new ThreadInterruptedException(m); +Exs["java.lang.IllegalArgumentException"] = m => new ArgumentException(m); +Exs["java.lang.IllegalStateException"] = m => new InvalidOperationException(m); +Exs["java.lang.UnsupportedOperationException"] = m => new NotImplementedException(m); +Exs["java.lang.InterruptedException"] = m => new ThreadInterruptedException(m); // Generic Ignite exceptions. -EXS["org.apache.ignite.IgniteException"] = m => new IgniteException(m); -EXS["org.apache.ignite.IgniteCheckedException"] = m => new IgniteException(m); +Exs["org.apache.ignite.IgniteException"] = m => new IgniteException(m); +Exs["org.apache.ignite.IgniteCheckedException"] = m => new IgniteException(m); // Cluster exceptions. -EXS["org.apache.ignite.cluster.ClusterGroupEmptyException"] = m => new ClusterGroupEmptyException(m); -EXS["org.apache.ignite.cluster.ClusterTopologyException"] = m => new ClusterTopologyException(m); +Exs["org.apache.ignite.cluster.ClusterGroupEmptyException"] = m => new ClusterGroupEmptyException(m); +Exs["org.apache.ignite.cluster.ClusterTopologyException"] = m => new ClusterTopologyException(m); // Compute exceptions. -EXS["org.apache.ignite.compute.ComputeExecutionRejectedException"] = m => new ComputeExecutionRejectedException(m); -EXS["org.apache.ignite.compute.ComputeJobFailoverException"] = m => new ComputeJobFailoverException(m); -EXS["org.apache.ignite.compute.ComputeTaskCancelledException"] = m => new ComputeTaskCancelledException(m); -EXS["org.apache.ignite.compute.ComputeTaskTimeoutException"] = m => new ComputeTaskTimeoutException(m); -EXS["org.apache.ignite.compute.ComputeUserUndeclaredException"] = m => new ComputeUserUndeclaredException(m); +Exs["org.apache.ignite.compute.ComputeExecutionRejectedException"] = m => new ComputeExecutionRejectedException(m); +Exs["org.apache.ignite.compute.ComputeJobFailoverException"] = m => new ComputeJobFailoverException(m); +Exs["org.apache.ignite.compute.ComputeTaskCancelledException"] = m => new ComputeTaskCancelledException(m); +Exs["org.apache.ignite.compute.ComputeTaskTimeoutException"] = m => new ComputeTaskTimeoutException(m); +
[31/50] ignite git commit: Introduce errors to test build
Introduce errors to test build Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb093d0f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb093d0f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb093d0f Branch: refs/heads/ignite-2324 Commit: cb093d0f8ba97d5489d4b8f8528ecf595540e2c7 Parents: c0288a3 Author: Pavel TupitsynAuthored: Wed Jan 13 20:13:15 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 20:13:15 2016 +0300 -- .../Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs | 1 - .../dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs| 2 -- 2 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cb093d0f/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs index dd19620..fad8949 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Event/ICacheEntryEventFilter.cs @@ -21,7 +21,6 @@ namespace Apache.Ignite.Core.Cache.Event /// /// Cache entry event filter. /// -// ReSharper disable TypeParameterCanBeVariant public interface ICacheEntryEventFilter { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/cb093d0f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs index e992245..87434a7 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeTaskHolder.cs @@ -379,8 +379,6 @@ namespace Apache.Ignite.Core.Impl.Compute } /** */ -[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", -Justification = "User object deserialization can throw any exception")] public void CompleteWithError(long taskHandle, PlatformMemoryStream stream) { BinaryReader reader = _compute.Marshaller.StartUnmarshal(stream);
[03/50] ignite git commit: Fix DotSettings ignore
Fix DotSettings ignore Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8a958a2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8a958a2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8a958a2 Branch: refs/heads/ignite-2324 Commit: d8a958a240ee4a28b5ddd9ae9696751e4d280319 Parents: 5a2924b Author: Pavel TupitsynAuthored: Wed Jan 13 16:36:55 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Jan 13 16:36:55 2016 +0300 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8a958a2/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4497d01..a74e04f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -885,7 +885,7 @@ **/*.sln **/*.snk **/*.slnrel -**/*.sln.DotSettings +**/*.DotSettings **/*.FxCop **/*.csproj **/*.csprojrel
[49/50] ignite git commit: Merge branch 'ignite-2324' of https://github.com/ptupitsyn/ignite into ignite-2324
Merge branch 'ignite-2324' of https://github.com/ptupitsyn/ignite into ignite-2324 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1d96524 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1d96524 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1d96524 Branch: refs/heads/ignite-2324 Commit: f1d965247c4a3b2b584e85287a89e793eab0faca Parents: 36486b4 54e34d1 Author: vozerov-gridgainAuthored: Mon Jan 18 16:39:01 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 16:39:01 2016 +0300 -- .../cpp/common/project/vs/common.vcxproj| 2 +- .../Apache.Ignite.Benchmarks.csproj | 4 +- .../Apache.Ignite.Core.Tests.TestDll.csproj | 4 +- .../Apache.Ignite.Core.Tests.csproj | 2 +- .../Apache.Ignite.Core.csproj | 8 +- .../Apache.Ignite.Core.ruleset | 26 ++ .../Binary/BinaryConfiguration.cs | 3 + .../Binary/BinaryTypeConfiguration.cs | 5 + .../Binary/BinaryTypeNames.cs | 64 ++-- .../Cache/CachePartialUpdateException.cs| 3 + .../Apache.Ignite.Core/Cache/CacheResult.cs | 41 ++- .../Cache/Event/ICacheEntryEventFilter.cs | 2 + .../Cache/Event/ICacheEntryEventListener.cs | 1 + .../Cache/Query/Continuous/ContinuousQuery.cs | 2 +- .../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 2 +- .../Cache/Query/SqlFieldsQuery.cs | 2 +- .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 6 +- .../Apache.Ignite.Core/Cache/Query/TextQuery.cs | 7 +- .../Cache/Store/CacheStoreAdapter.cs| 5 + .../Common/IgniteFutureCancelledException.cs| 1 + .../Compute/ComputeJobAdapter.cs| 2 +- .../Compute/ComputeJobResultPolicy.cs | 2 - .../Compute/ComputeTaskAdapter.cs | 3 + .../Compute/ComputeTaskSplitAdapter.cs | 17 +- .../Datastream/StreamTransformer.cs | 3 + .../Datastream/StreamVisitor.cs | 3 + .../Apache.Ignite.Core/Events/CacheEvent.cs | 8 +- .../Events/CacheQueryExecutedEvent.cs | 4 +- .../Events/CacheQueryReadEvent.cs | 6 +- .../Events/CacheRebalancingEvent.cs | 4 +- .../Events/CheckpointEvent.cs | 4 +- .../Apache.Ignite.Core/Events/DiscoveryEvent.cs | 4 +- .../Apache.Ignite.Core/Events/EventBase.cs | 70 +++- .../dotnet/Apache.Ignite.Core/Ignition.cs | 3 +- .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 44 +-- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 2 +- .../Impl/Binary/BinaryObject.cs | 45 +-- .../Impl/Binary/BinaryObjectBuilder.cs | 75 ++-- .../Impl/Binary/BinaryReader.cs | 1 + .../Impl/Binary/BinaryReflectiveSerializer.cs | 2 +- .../Impl/Binary/BinarySystemHandlers.cs | 9 +- .../Impl/Binary/BinaryUtils.cs | 7 +- .../Impl/Binary/BinaryWriter.cs | 4 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Marshaller.cs | 19 +- .../Impl/Binary/Metadata/BinaryType.cs | 2 + .../Impl/Binary/SerializableObjectHolder.cs | 13 +- .../Impl/Binary/Structure/BinaryStructure.cs| 3 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 43 ++- .../Impl/Cache/Query/AbstractQueryCursor.cs | 4 +- .../Continuous/ContinuousQueryFilterHolder.cs | 2 +- .../Continuous/ContinuousQueryHandleImpl.cs | 4 +- .../Impl/Cache/Query/FieldsQueryCursor.cs | 2 + .../Impl/Cache/Query/QueryCursor.cs | 2 + .../Impl/Common/CancelledTask.cs| 3 + .../Common/CopyOnWriteConcurrentDictionary.cs | 1 + .../Impl/Common/DelegateConverter.cs| 11 +- .../Apache.Ignite.Core/Impl/Common/Future.cs| 3 + .../Impl/Common/FutureType.cs | 1 + .../Impl/Common/LoadedAssembliesResolver.cs | 1 + .../Closure/ComputeAbstractClosureTask.cs | 3 + .../Compute/Closure/ComputeMultiClosureTask.cs | 2 + .../Closure/ComputeReducingClosureTask.cs | 2 + .../Compute/Closure/ComputeSingleClosureTask.cs | 2 + .../Impl/Datastream/DataStreamerBatch.cs| 1 + .../Impl/Datastream/DataStreamerImpl.cs | 5 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 56 +-- .../Apache.Ignite.Core/Impl/Handle/Handle.cs| 1 + .../Impl/Handle/HandleRegistry.cs | 1 + .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 11 +- .../Impl/InteropExceptionHolder.cs | 11 +- .../Memory/PlatformBigEndianMemoryStream.cs | 8 + .../Impl/Memory/PlatformMemory.cs | 2 + .../Impl/Memory/PlatformMemoryManager.cs| 2 +
[38/50] ignite git commit: wip fixing dispose
wip fixing dispose Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41ae0148 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41ae0148 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41ae0148 Branch: refs/heads/ignite-2324 Commit: 41ae01482bfe7533af5f63803af613dc412ba6ed Parents: 04786dc Author: Pavel TupitsynAuthored: Thu Jan 14 11:42:06 2016 +0300 Committer: Pavel Tupitsyn Committed: Thu Jan 14 11:42:06 2016 +0300 -- .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 41 ++- .../Impl/Binary/BinaryObject.cs | 45 ++-- .../Impl/Binary/BinaryObjectBuilder.cs | 75 ++-- .../Impl/Binary/Marshaller.cs | 19 +++-- .../Impl/Binary/SerializableObjectHolder.cs | 13 +++- 5 files changed, 108 insertions(+), 85 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/41ae0148/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs index e96720e..7163486 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs @@ -48,25 +48,27 @@ namespace Apache.Ignite.Core.Impl.Binary if (obj is IBinaryObject) return (T)obj; -IBinaryStream stream = new BinaryHeapStream(1024); +using (var stream = new BinaryHeapStream(1024)) +{ -// Serialize. -BinaryWriter writer = _marsh.StartMarshal(stream); +// Serialize. +BinaryWriter writer = _marsh.StartMarshal(stream); -try -{ -writer.Write(obj); -} -finally -{ -// Save metadata. -_marsh.FinishMarshal(writer); -} +try +{ +writer.Write(obj); +} +finally +{ +// Save metadata. +_marsh.FinishMarshal(writer); +} -// Deserialize. -stream.Seek(0, SeekOrigin.Begin); +// Deserialize. +stream.Seek(0, SeekOrigin.Begin); -return _marsh.Unmarshal(stream, BinaryMode.ForceBinary); +return _marsh.Unmarshal(stream, BinaryMode.ForceBinary); +} } /** */ @@ -192,11 +194,12 @@ namespace Apache.Ignite.Core.Impl.Binary var hdr = new BinaryObjectHeader(desc.TypeId, 0, len, 0, len, desc.UserType ? BinaryObjectHeader.Flag.UserType : BinaryObjectHeader.Flag.None); -var stream = new BinaryHeapStream(len); - -BinaryObjectHeader.Write(hdr, stream, 0); +using (var stream = new BinaryHeapStream(len)) +{ +BinaryObjectHeader.Write(hdr, stream, 0); -return new BinaryObject(_marsh, stream.InternalArray, 0, hdr); +return new BinaryObject(_marsh, stream.InternalArray, 0, hdr); +} } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/41ae0148/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs index 90607dd..2f68a0a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs @@ -110,11 +110,12 @@ namespace Apache.Ignite.Core.Impl.Binary /// Field value. public T GetField(int pos, BinaryObjectBuilder builder) { -IBinaryStream stream = new BinaryHeapStream(_data); - -stream.Seek(pos + _offset, SeekOrigin.Begin); +using (IBinaryStream stream = new BinaryHeapStream(_data)) +{ +stream.Seek(pos + _offset, SeekOrigin.Begin); -return _marsh.Unmarshal(stream, BinaryMode.ForceBinary, builder); +return _marsh.Unmarshal(stream, BinaryMode.ForceBinary, builder); +} } /** */ @@ -144,13 +145,15 @@ namespace Apache.Ignite.Core.Impl.Binary { if (_deserialized == null) { -IBinaryStream stream = new BinaryHeapStream(_data); - -
ignite git commit: ignite-1811
Repository: ignite Updated Branches: refs/heads/ignite-1811 d41a79fa2 -> d0f48c727 ignite-1811 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0f48c72 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0f48c72 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0f48c72 Branch: refs/heads/ignite-1811 Commit: d0f48c727ac9d65c8465ca8e238e5e8c758d39f3 Parents: d41a79f Author: sboikovAuthored: Mon Jan 18 17:06:10 2016 +0300 Committer: sboikov Committed: Mon Jan 18 17:06:10 2016 +0300 -- .../processors/cache/IgniteCacheStoreCollectionTest.java | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d0f48c72/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java index cba9e15..48acdfc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java @@ -26,6 +26,9 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; +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 static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -36,10 +39,15 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; * */ public class IgniteCacheStoreCollectionTest extends GridCommonAbstractTest { +/** */ +private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + CacheConfiguration ccfg1 = new CacheConfiguration<>(); ccfg1.setName("cache1"); ccfg1.setAtomicityMode(ATOMIC);
[3/3] ignite git commit: ignite-1811 Optimized cache 'get' on affinity node. (cherry picked from commit 83b2bf5)
ignite-1811 Optimized cache 'get' on affinity node. (cherry picked from commit 83b2bf5) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b31f4e6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b31f4e6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b31f4e6 Branch: refs/heads/ignite-1.5.4 Commit: 4b31f4e66c15003cee866a6e5660257346c16c1c Parents: 4ba6574 Author: sboikovAuthored: Mon Jan 18 18:05:37 2016 +0300 Committer: sboikov Committed: Mon Jan 18 18:16:05 2016 +0300 -- .../processors/cache/GridCacheAdapter.java | 30 +- .../processors/cache/GridCacheContext.java | 33 ++ .../dht/CacheDistributedGetFutureAdapter.java | 28 +- .../dht/GridClientPartitionTopology.java| 2 + .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../dht/GridPartitionedGetFuture.java | 241 ++- .../dht/GridPartitionedSingleGetFuture.java | 229 ++ .../dht/atomic/GridDhtAtomicCache.java | 26 ++ .../distributed/near/GridNearGetFuture.java | 267 +++- .../cache/transactions/IgniteTxManager.java | 18 +- .../internal/TestRecordingCommunicationSpi.java | 157 +++ ...idCacheConfigurationConsistencySelfTest.java | 58 +-- .../cache/IgniteCacheNearLockValueSelfTest.java | 62 +-- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 + ...ridCachePartitionNotLoadedEventSelfTest.java | 7 +- .../IgniteCacheAtomicNodeRestartTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../distributed/IgniteCacheGetRestartTest.java | 280 .../IgniteCacheReadFromBackupTest.java | 427 +++ .../IgniteCacheSingleGetMessageTest.java| 88 +--- .../IgniteCrossCacheTxStoreSelfTest.java| 1 + .../GridCacheDhtPreloadMessageCountTest.java| 62 +-- .../near/GridCacheGetStoreErrorSelfTest.java| 9 +- .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 27 files changed, 1512 insertions(+), 566 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b31f4e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 5d4c386..2582e6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4540,9 +4540,33 @@ public abstract class GridCacheAdapter implements IgniteInternalCache
[1/3] ignite git commit: ignite-1811 Optimized cache 'get' on affinity node. (cherry picked from commit 83b2bf5e1f287dc83343945b0e47b83ee7724a8e)
Repository: ignite Updated Branches: refs/heads/ignite-1.5.4 6482dc80b -> 4b31f4e66 ignite-1811 Optimized cache 'get' on affinity node. (cherry picked from commit 83b2bf5e1f287dc83343945b0e47b83ee7724a8e) Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ba6574d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ba6574d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ba6574d Branch: refs/heads/ignite-1.5.4 Commit: 4ba6574dfa8077f8de23c8c2663826f81c7fd187 Parents: 6482dc8 Author: sboikovAuthored: Mon Jan 18 18:15:04 2016 +0300 Committer: sboikov Committed: Mon Jan 18 18:15:04 2016 +0300 -- .../cache/IgniteCacheStoreCollectionTest.java | 175 +++ 1 file changed, 175 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba6574d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java new file mode 100644 index 000..48acdfc --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java @@ -0,0 +1,175 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.F; +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 static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; + +/** + * + */ +public class IgniteCacheStoreCollectionTest extends GridCommonAbstractTest { +/** */ +private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +CacheConfiguration ccfg1 = new CacheConfiguration<>(); +ccfg1.setName("cache1"); +ccfg1.setAtomicityMode(ATOMIC); +ccfg1.setWriteSynchronizationMode(FULL_SYNC); + +CacheConfiguration ccfg2 = new CacheConfiguration<>(); +ccfg2.setName("cache2"); +ccfg2.setAtomicityMode(TRANSACTIONAL); +ccfg2.setWriteSynchronizationMode(FULL_SYNC); + +cfg.setCacheConfiguration(ccfg1, ccfg2); + +cfg.setMarshaller(null); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGrid(0); +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +stopAllGrids(); + +
[2/3] ignite git commit: ignite-1811 Optimized cache 'get' on affinity node. (cherry picked from commit 83b2bf5)
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b31f4e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java new file mode 100644 index 000..b14109b --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.internal.util.typedef.internal.U; +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.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; + +/** + * + */ +public class IgniteCacheGetRestartTest extends GridCommonAbstractTest { +/** */ +private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private static final long TEST_TIME = 60_000; + +/** */ +private static final int SRVS = 3; + +/** */ +private static final int CLIENTS = 1; + +/** */ +private static final int KEYS = 100_000; + +/** */ +private ThreadLocal client = new ThreadLocal<>(); + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +Boolean clientMode = client.get(); + +if (clientMode != null) { +cfg.setClientMode(clientMode); + +client.remove(); +} + +cfg.setConsistentId(gridName); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGrids(SRVS); + +for (int i = 0; i < CLIENTS; i++) { +client.set(true); + +Ignite client = startGrid(SRVS); + +assertTrue(client.configuration().isClientMode()); +} +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** {@inheritDoc} */ +@Override protected long getTestTimeout() { +return TEST_TIME + 60_000; +} + +/** + * @throws Exception If failed. + */ +public void testGetRestartReplicated() throws Exception { +CacheConfigurationcache = cacheConfiguration(REPLICATED, 0, false); + +checkRestart(cache, 3); +} + +/** + * @throws Exception If failed. + */ +public void testGetRestartPartitioned1() throws Exception { +CacheConfiguration cache =
[1/2] ignite git commit: IGNITE-2166: .NET: Added toBuilder() method to BinaryObject interface. This closes #379.
Repository: ignite Updated Branches: refs/heads/master 83b2bf5e1 -> d7fd58077 IGNITE-2166: .NET: Added toBuilder() method to BinaryObject interface. This closes #379. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22cf3a34 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22cf3a34 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22cf3a34 Branch: refs/heads/master Commit: 22cf3a345e8f6bd517d4b0e875cabdd69491713e Parents: c160ed4 Author: Pavel TupitsynAuthored: Mon Jan 18 18:31:39 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 18:31:39 2016 +0300 -- .../apache/ignite/internal/binary/BinaryEnumObjectImpl.java | 3 +-- .../Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs | 8 .../dotnet/Apache.Ignite.Core/Binary/IBinaryObject.cs| 8 .../dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs | 3 +++ .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEnum.cs | 6 ++ .../dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs| 6 ++ 6 files changed, 28 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/22cf3a34/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 536c582..180e20a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -23,7 +23,6 @@ import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.BinaryType; import org.apache.ignite.internal.GridDirectTransient; -import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderImpl; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; @@ -124,7 +123,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac /** {@inheritDoc} */ @Override public BinaryObjectBuilder toBuilder() throws BinaryObjectException { -return BinaryObjectBuilderImpl.wrap(this); +throw new UnsupportedOperationException("Builder cannot be created for enum."); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/22cf3a34/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 373e173..d442fb1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs @@ -265,7 +265,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(0, meta.Fields.Count); // Populate it with field. -IBinaryObjectBuilder builder = _grid.GetBinary().GetBuilder(binObj); +IBinaryObjectBuilder builder = binObj.ToBuilder(); Assert.IsNull(builder.GetField("val")); @@ -288,7 +288,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(BinaryTypeNames.TypeNameObject, meta.GetFieldTypeName("val")); // Perform field remove. -builder = _grid.GetBinary().GetBuilder(binObj); +builder = binObj.ToBuilder(); Assert.AreEqual(val, builder.GetField("val")); @@ -314,7 +314,7 @@ namespace Apache.Ignite.Core.Tests.Binary .SetField("val2", inner) .Build(); -binObj = _grid.GetBinary().GetBuilder(binObj).RemoveField("val").Build(); +binObj = binObj.ToBuilder().RemoveField("val").Build(); Remove obj = binObj.Deserialize(); @@ -636,7 +636,7 @@ namespace Apache.Ignite.Core.Tests.Binary Assert.AreEqual(6, obj.FDouble); // Overwrite. -binObj = _grid.GetBinary().GetBuilder(binObj) +binObj = binObj.ToBuilder() .SetField("fByte", 7) .SetField("fBool", false) .SetField("fShort", 8)
ignite git commit: IGNITE-1514: .NET: Added "DestroyCache" method. This closes #375.
Repository: ignite Updated Branches: refs/heads/master d7fd58077 -> 9a996332d IGNITE-1514: .NET: Added "DestroyCache" method. This closes #375. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a996332 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a996332 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a996332 Branch: refs/heads/master Commit: 9a996332df81aee79b629811062d28fe75dead99 Parents: d7fd580 Author: Pavel TupitsynAuthored: Mon Jan 18 18:42:34 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 18 18:42:34 2016 +0300 -- .../platform/PlatformNoopProcessor.java | 5 + .../processors/platform/PlatformProcessor.java | 8 .../platform/PlatformProcessorImpl.java | 5 + .../cpp/common/include/ignite/common/exports.h | 1 + .../cpp/common/include/ignite/common/java.h | 3 +++ .../platforms/cpp/common/project/vs/module.def | 3 ++- modules/platforms/cpp/common/src/exports.cpp| 4 modules/platforms/cpp/common/src/java.cpp | 20 .../Cache/CacheAbstractTest.cs | 19 +++ .../dotnet/Apache.Ignite.Core/IIgnite.cs| 7 +++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs| 6 ++ .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 ++ .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 3 +++ .../Impl/Unmanaged/UnmanagedUtils.cs| 16 14 files changed, 105 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9a996332/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java index 9142543..fb28008 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java @@ -74,6 +74,11 @@ public class PlatformNoopProcessor extends GridProcessorAdapter implements Platf } /** {@inheritDoc} */ +@Override public void destroyCache(@Nullable String name) throws IgniteCheckedException { +// No-op. +} + +/** {@inheritDoc} */ @Override public PlatformTarget affinity(@Nullable String name) throws IgniteCheckedException { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a996332/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java index fa22953..8e684e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java @@ -90,6 +90,14 @@ public interface PlatformProcessor extends GridProcessor { public PlatformTarget getOrCreateCache(@Nullable String name) throws IgniteCheckedException; /** + * Destroy dynamically created cache. + * + * @param name Cache name. + * @throws IgniteCheckedException If failed. + */ +public void destroyCache(@Nullable String name) throws IgniteCheckedException; + +/** * Get affinity. * * @param name Cache name. http://git-wip-us.apache.org/repos/asf/ignite/blob/9a996332/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java index b0870bb..dc6e0df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java @@ -244,6 +244,11 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf } /** {@inheritDoc} */ +@Override public void destroyCache(@Nullable String name) throws IgniteCheckedException { +
[16/29] ignite git commit: Fixed compatibility issues from commit 457a9ae.
Fixed compatibility issues from commit 457a9ae. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd44be5f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd44be5f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd44be5f Branch: refs/heads/ignite-2236 Commit: cd44be5f0398148313f4c8d1802302c7a04f16ff Parents: 457a9ae Author: sboikovAuthored: Wed Jan 13 12:19:16 2016 +0300 Committer: sboikov Committed: Wed Jan 13 12:19:16 2016 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +- .../processors/cache/distributed/near/GridNearTxFinishFuture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd44be5f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 95fdeb6..8f1d9a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -165,7 +165,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri prepareMarshalCacheObjects(nearEvicted, cctx); -if (err != null && errBytes == null) +if (errBytes == null) errBytes = ctx.marshaller().marshal(err); } http://git-wip-us.apache.org/repos/asf/ignite/blob/cd44be5f/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 1b40d6e..26e189b 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 @@ -68,7 +68,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu public static final IgniteProductVersion FINISH_NEAR_ONE_PHASE_SINCE = IgniteProductVersion.fromString("1.4.0"); /** */ -public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.0"); +public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.1"); /** */ private static final long serialVersionUID = 0L;
[21/29] ignite git commit: Added more logging for direct message read errors.
Added more logging for direct message read errors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b0c59a2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b0c59a2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b0c59a2 Branch: refs/heads/ignite-2236 Commit: 8b0c59a25822e69bd2fe896685be5e921b859e26 Parents: b409b8d Author: sboikovAuthored: Thu Jan 14 16:42:46 2016 +0300 Committer: sboikov Committed: Thu Jan 14 16:42:46 2016 +0300 -- .../internal/direct/DirectMessageReader.java| 11 + .../internal/direct/DirectMessageWriter.java| 13 + .../direct/state/DirectMessageState.java| 10 .../stream/v1/DirectByteBufferStreamImplV1.java | 8 +++ .../stream/v2/DirectByteBufferStreamImplV2.java | 8 +++ .../internal/util/nio/GridDirectParser.java | 52 +--- .../communication/tcp/TcpCommunicationSpi.java | 9 +++- 7 files changed, 92 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8b0c59a2/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java index e0b7b22..10bc7e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java @@ -27,6 +27,7 @@ import org.apache.ignite.internal.direct.state.DirectMessageStateItem; import org.apache.ignite.internal.direct.stream.DirectByteBufferStream; import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1; import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteOutClosure; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -373,6 +374,11 @@ public class DirectMessageReader implements MessageReader { state.reset(); } +/** {@inheritDoc} */ +public String toString() { +return S.toString(DirectMessageReader.class, this); +} + /** */ private static class StateItem implements DirectMessageStateItem { @@ -407,5 +413,10 @@ public class DirectMessageReader implements MessageReader { @Override public void reset() { state = 0; } + +/** {@inheritDoc} */ +public String toString() { +return S.toString(StateItem.class, this); +} } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8b0c59a2/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index 085cf68..730f9bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -27,6 +27,8 @@ import org.apache.ignite.internal.direct.state.DirectMessageStateItem; import org.apache.ignite.internal.direct.stream.DirectByteBufferStream; import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1; import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteOutClosure; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -39,6 +41,7 @@ import org.jetbrains.annotations.Nullable; */ public class DirectMessageWriter implements MessageWriter { /** State. */ +@GridToStringInclude private final DirectMessageState state; /** @@ -327,6 +330,11 @@ public class DirectMessageWriter implements MessageWriter { state.reset(); } +/** {@inheritDoc} */ +public String toString() { +return S.toString(DirectMessageWriter.class, this); +} + /** */ private static class StateItem implements DirectMessageStateItem { @@ -364,5 +372,10 @@ public class DirectMessageWriter implements MessageWriter { state = 0; hdrWritten = false; } + +/** {@inheritDoc} */ +
[17/29] ignite git commit: ignite-2350 Pass update notifier flag in discovery data (all cluster nodes will have the same notifier status as first cluster node)
ignite-2350 Pass update notifier flag in discovery data (all cluster nodes will have the same notifier status as first cluster node) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7175a425 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7175a425 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7175a425 Branch: refs/heads/ignite-2236 Commit: 7175a425aeec1f225a9409778c8a316c3ee35151 Parents: cd44be5 Author: sboikovAuthored: Wed Jan 13 18:40:08 2016 +0300 Committer: sboikov Committed: Wed Jan 13 18:40:08 2016 +0300 -- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 -- .../apache/ignite/internal/IgniteKernal.java| 126 + .../discovery/GridDiscoveryManager.java | 6 +- .../processors/cluster/ClusterProcessor.java| 174 +++ .../processors/cluster/GridUpdateNotifier.java | 457 +++ .../internal/GridUpdateNotifierSelfTest.java| 137 -- ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++ .../cluster/GridUpdateNotifierSelfTest.java | 140 ++ .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- 10 files changed, 920 insertions(+), 713 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7175a425/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java index 0e234cd..5c77aee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java @@ -40,7 +40,10 @@ public interface GridComponent { CACHE_PROC, /** */ -PLUGIN +PLUGIN, + +/** */ +CLUSTER_PROC } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7175a425/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java deleted file mode 100644 index 5d2cf35..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java +++ /dev/null @@ -1,454 +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.internal; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.net.URL; -import java.net.URLConnection; -import java.util.Collection; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.atomic.AtomicReference; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.SB; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.internal.util.worker.GridWorker; -import org.apache.ignite.plugin.PluginProvider; -import org.jetbrains.annotations.Nullable; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; - -import static java.net.URLEncoder.encode; - -/** - * This class is responsible for
[18/29] ignite git commit: Changed copyright from 2015 to 2016
Changed copyright from 2015 to 2016 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d106303 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d106303 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d106303 Branch: refs/heads/ignite-2236 Commit: 2d106303ab406aec98265b0ae2bd07c7862d0f23 Parents: 7175a42 Author: Denis MagdaAuthored: Thu Jan 14 10:17:07 2016 +0300 Committer: Denis Magda Committed: Thu Jan 14 10:17:07 2016 +0300 -- .../main/java/org/apache/ignite/internal/IgniteVersionUtils.java | 4 ++-- .../org/apache/ignite/startup/GridRandomCommandLineLoader.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d106303/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java index 02cbc81..bd8726f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java @@ -47,7 +47,7 @@ public class IgniteVersionUtils { public static final String ACK_VER_STR; /** Copyright blurb. */ -public static final String COPYRIGHT = "2015 Copyright(C) Apache Software Foundation"; +public static final String COPYRIGHT = "2016 Copyright(C) Apache Software Foundation"; /** * Static initializer. @@ -77,4 +77,4 @@ public class IgniteVersionUtils { private IgniteVersionUtils() { // No-op. } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/2d106303/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java index 20d1b32..13c38ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java @@ -61,7 +61,7 @@ public final class GridRandomCommandLineLoader { private static final String IGNITE_PROG_NAME = "IGNITE_PROG_NAME"; /** Copyright text. Ant processed. */ -private static final String COPYRIGHT = "2015 Copyright(C) Apache Software Foundation."; +private static final String COPYRIGHT = "2016 Copyright(C) Apache Software Foundation."; /** Version. Ant processed. */ private static final String VER = "x.x.x"; @@ -408,4 +408,4 @@ public final class GridRandomCommandLineLoader { return options; } -} \ No newline at end of file +}
[27/29] ignite git commit: IGNITE-429
IGNITE-429 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a0cb51f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a0cb51f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a0cb51f Branch: refs/heads/ignite-2236 Commit: 3a0cb51f8303af5a841c2d5353f9d0ddc0e626df Parents: fa427dc Author: shtykh_romanAuthored: Fri Jan 15 14:24:22 2016 +0300 Committer: Anton Vinogradov Committed: Fri Jan 15 14:24:22 2016 +0300 -- modules/storm/README.txt| 37 +++ modules/storm/licenses/apache-2.0.txt | 202 modules/storm/pom.xml | 104 +++ .../ignite/stream/storm/StormStreamer.java | 304 +++ .../ignite/stream/storm/package-info.java | 22 ++ .../storm/IgniteStormStreamerSelfTestSuite.java | 38 +++ .../storm/StormIgniteStreamerSelfTest.java | 184 +++ .../ignite/stream/storm/TestStormSpout.java | 141 + .../storm/src/test/resources/example-ignite.xml | 71 + pom.xml | 1 + 10 files changed, 1104 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3a0cb51f/modules/storm/README.txt -- diff --git a/modules/storm/README.txt b/modules/storm/README.txt new file mode 100644 index 000..eb20f25 --- /dev/null +++ b/modules/storm/README.txt @@ -0,0 +1,37 @@ +Apache Ignite Storm Streamer Module +--- + +Apache Ignite Storm Streamer module provides streaming via Storm to Ignite cache. + +Starting data transfer to Ignite cache can be done with the following steps. + +1. Import Ignite Kafka Streamer Module In Maven Project + +If you are using Maven to manage dependencies of your project, you can add Storm 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-storm +${ignite.version} + +... + +... + + +2. Create an Ignite configuration file (see example-ignite.xml) and make sure it is accessible from the streamer. + +3. Make sure your key-value data input to the streamer is specified with the field named "ignite" +(or a different one you configure with StormStreamer.setIgniteTupleField(...)). +See TestStormSpout.declareOutputFields(...) for an example. + +4. Create a topology with the streamer and start. http://git-wip-us.apache.org/repos/asf/ignite/blob/3a0cb51f/modules/storm/licenses/apache-2.0.txt -- diff --git a/modules/storm/licenses/apache-2.0.txt b/modules/storm/licenses/apache-2.0.txt new file mode 100644 index 000..d645695 --- /dev/null +++ b/modules/storm/licenses/apache-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work"
[04/29] ignite git commit: Revert "IGNITE-2330: Simplified GridFunc."
http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java index 015be5c..0678657 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java @@ -35,10 +35,16 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import javax.cache.Cache; +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridEmptyIterator; @@ -46,6 +52,7 @@ import org.apache.ignite.internal.util.GridLeanMap; import org.apache.ignite.internal.util.GridLeanSet; import org.apache.ignite.internal.util.GridSerializableCollection; import org.apache.ignite.internal.util.GridSerializableIterator; +import org.apache.ignite.internal.util.GridSerializableList; import org.apache.ignite.internal.util.GridSerializableMap; import org.apache.ignite.internal.util.GridSerializableSet; import org.apache.ignite.internal.util.typedef.C1; @@ -61,6 +68,7 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgniteInClosure; +import org.apache.ignite.lang.IgniteOutClosure; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteReducer; import org.jetbrains.annotations.NotNull; @@ -144,6 +152,13 @@ public class GridFunc { }; /** */ +public static final IgnitePredicate IS_NULL = new P1() { +@Override public boolean apply(Object o) { +return o == null; +} +}; + +/** */ public static final IgnitePredicate IS_NOT_NULL = new P1() { @Override public boolean apply(Object o) { return o != null; @@ -151,6 +166,28 @@ public class GridFunc { }; /** */ +private static final IgniteCallable LIST_FACTORY = new IgniteCallable() { +@Override public List call() { +return new ArrayList(); +} + +@Override public String toString() { +return "Array list factory."; +} +}; + +/** */ +private static final IgniteCallable LINKED_LIST_FACTORY = new IgniteCallable() { +@Override public LinkedList call() { +return new LinkedList(); +} + +@Override public String toString() { +return "Linked list factory."; +} +}; + +/** */ private static final IgniteCallable SET_FACTORY = new IgniteCallable() { @Override public Set call() { return new HashSet(); @@ -162,6 +199,61 @@ public class GridFunc { }; /** */ +private static final IgniteCallable ATOMIC_INT_FACTORY = new IgniteCallable() { +@Override public AtomicInteger call() { +return new AtomicInteger(0); +} + +@Override public String toString() { +return "Atomic integer factory."; +} +}; + +/** */ +private static final IgniteCallable ATOMIC_LONG_FACTORY = new IgniteCallable() { +@Override public AtomicLong call() { +return new AtomicLong(0); +} + +@Override public String toString() { +return "Atomic long factory."; +} +}; + +/** */ +private static final IgniteCallable ATOMIC_BOOL_FACTORY = new IgniteCallable() { +@Override public AtomicBoolean call() { +return new AtomicBoolean(); +} + +@Override public String toString() { +return "Atomic boolean factory."; +} +}; + +/** */ +private static final IgniteCallable ATOMIC_REF_FACTORY = new IgniteCallable() { +@Override public AtomicReference call() { +return new AtomicReference(); +} + +@Override public String toString() { +return "Atomic reference factory."; +} +}; + +/** */ +private static final IgniteCallable MAP_FACTORY = new IgniteCallable() { +@Override public Map call() { +return new HashMap(); +} + +
[11/29] ignite git commit: Page Memory WIP.
Page Memory WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59a893c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59a893c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59a893c2 Branch: refs/heads/ignite-2236 Commit: 59a893c2598a64a4777d4db3875f99df70577193 Parents: 10012b4 Author: Alexey GoncharukAuthored: Mon Jan 11 20:05:55 2016 +0300 Committer: Alexey Goncharuk Committed: Mon Jan 11 20:05:55 2016 +0300 -- .../ignite/internal/util/GridStringBuilder.java | 19 +++ .../apache/ignite/internal/util/IgniteUtils.java | 10 ++ 2 files changed, 29 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59a893c2/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java index bc979f5..e9b72cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java @@ -425,6 +425,25 @@ public class GridStringBuilder implements Serializable { } /** + * Appends given long value as a hex string to this string builder. + * + * @param val Value to append. + * @return This builder for chaining method calls. + */ +public GridStringBuilder appendHex(long val) { +String hex = Long.toHexString(val); + +int len = hex.length(); + +for (int i = 0; i < 16 - len; i++) +a('0'); + +a(hex); + +return this; +} + +/** * * @param s Stream to write to. * @throws IOException Thrown in case of any IO errors. http://git-wip-us.apache.org/repos/asf/ignite/blob/59a893c2/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 480859d..6a7145c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -2482,6 +2482,16 @@ public abstract class IgniteUtils { } /** + * Gets a hex string representation of the given long value. + * + * @param val Value to convert to string. + * @return Hex string. + */ +public static String hexLong(long val) { +return new SB().appendHex(val).toString(); +} + +/** * Return byte value for certain character. * * @param ch Character
[25/29] ignite git commit: IGNITE-2328 - Added the ticket test to the suite.
IGNITE-2328 - Added the ticket test to the suite. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4ff7111 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4ff7111 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4ff7111 Branch: refs/heads/ignite-2236 Commit: c4ff7111638e939ee395111840fd786314527003 Parents: 6524c79 Author: Alexey GoncharukAuthored: Fri Jan 15 10:31:37 2016 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 15 10:31:37 2016 +0300 -- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ff7111/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index 0f86c4c..442e116 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheNearReaderUpdateTest; import org.apache.ignite.internal.processors.cache.CacheSerializableTransactionsTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheStoreCollectionTest; /** * Test suite. @@ -34,6 +35,7 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTestSuite(CacheSerializableTransactionsTest.class); suite.addTestSuite(CacheNearReaderUpdateTest.class); +suite.addTestSuite(IgniteCacheStoreCollectionTest.class); return suite; }
[26/29] ignite git commit: Renamed fields to change fields write order (to preserve backward compatibility).
Renamed fields to change fields write order (to preserve backward compatibility). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa427dce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa427dce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa427dce Branch: refs/heads/ignite-2236 Commit: fa427dce25061b3c85be04f83debb452e60f08a2 Parents: c4ff711 Author: sboikovAuthored: Fri Jan 15 11:17:30 2016 +0300 Committer: sboikov Committed: Fri Jan 15 11:17:30 2016 +0300 -- .../continuous/CacheContinuousQueryEntry.java | 70 ++-- 1 file changed, 35 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa427dce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index 4d3786a..bcc2576 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -84,17 +84,17 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { private GridDeploymentInfo depInfo; /** Partition. */ -private int part; +private int _part; /** Update counter. */ -private long updateCntr; +private long _updateCntr; /** Flags. */ private byte flags; /** */ @GridToStringInclude -private AffinityTopologyVersion topVer; +private AffinityTopologyVersion _topVer; /** Filtered events. */ private GridLongList filteredEvts; @@ -134,9 +134,9 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { this.key = key; this.newVal = newVal; this.oldVal = oldVal; -this.part = part; -this.updateCntr = updateCntr; -this.topVer = topVer; +this._part = part; +this._updateCntr = updateCntr; +this._topVer = topVer; this.keepBinary = keepBinary; } @@ -144,7 +144,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { * @return Topology version if applicable. */ @Nullable AffinityTopologyVersion topologyVersion() { -return topVer; +return _topVer; } /** @@ -165,14 +165,14 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { * @return Partition. */ int partition() { -return part; +return _part; } /** * @return Update counter. */ long updateCounter() { -return updateCntr; +return _updateCntr; } /** @@ -310,67 +310,67 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { switch (writer.state()) { case 0: -if (!writer.writeInt("cacheId", cacheId)) +if (!writer.writeInt("_part", _part)) return false; writer.incrementState(); case 1: -if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1)) +if (!writer.writeMessage("_topVer", _topVer)) return false; writer.incrementState(); case 2: -if (!writer.writeMessage("filteredEvts", filteredEvts)) +if (!writer.writeLong("_updateCntr", _updateCntr)) return false; writer.incrementState(); case 3: -if (!writer.writeByte("flags", flags)) +if (!writer.writeInt("cacheId", cacheId)) return false; writer.incrementState(); case 4: -if (!writer.writeBoolean("keepBinary", keepBinary)) +if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1)) return false; writer.incrementState(); case 5: -if (!writer.writeMessage("key", key)) +if (!writer.writeMessage("filteredEvts", filteredEvts)) return false; writer.incrementState(); case 6: -if (!writer.writeMessage("newVal", newVal)) +if
[24/29] ignite git commit: IGNITE-2365 - Notify policy if swap or offheap is enabled and rebalanced entry was not preloaded. IGNITE-2099 - Fixing custom collections. This closes #396
IGNITE-2365 - Notify policy if swap or offheap is enabled and rebalanced entry was not preloaded. IGNITE-2099 - Fixing custom collections. This closes #396 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6524c796 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6524c796 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6524c796 Branch: refs/heads/ignite-2236 Commit: 6524c79629f587fb28bc43ddbef973aa2e83f66b Parents: 2af1d9b Author: Alexey GoncharukAuthored: Wed Jan 13 16:47:32 2016 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 15 10:27:48 2016 +0300 -- .../ignite/internal/binary/BinaryUtils.java | 78 .../processors/cache/CacheObjectContext.java| 91 + .../binary/CacheObjectBinaryProcessorImpl.java | 33 ++-- .../dht/preloader/GridDhtPartitionDemander.java | 11 +- .../binary/BinaryMarshallerSelfTest.java| 44 - .../cache/GridCacheDeploymentSelfTest.java | 3 +- ...IgniteCacheGetCustomCollectionsSelfTest.java | 128 + ...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 +++ .../platform/PlatformComputeEchoTask.java | 6 +- .../testsuites/IgniteCacheTestSuite4.java | 5 + 10 files changed, 515 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6524c796/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 62a9d26..a82b65f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -590,6 +590,43 @@ public class BinaryUtils { } /** + * @param map Map to check. + * @return {@code True} if this map type is supported. + */ +public static boolean knownMap(Object map) { +Class cls = map == null ? null : map.getClass(); + +return cls == HashMap.class || +cls == LinkedHashMap.class || +cls == TreeMap.class || +cls == ConcurrentHashMap8.class || +cls == ConcurrentHashMap.class; +} + +/** + * Attempts to create a new map of the same known type. Will return null if map type is not supported. + * + * @param map Map. + * @return New map of the same type or null. + */ +public static Map newKnownMap(Object map) { +Class cls = map == null ? null : map.getClass(); + +if (cls == HashMap.class) +return U.newHashMap(((Map)map).size()); +else if (cls == LinkedHashMap.class) +return U.newLinkedHashMap(((Map)map).size()); +else if (cls == TreeMap.class) +return new TreeMap<>(((TreeMap )map).comparator()); +else if (cls == ConcurrentHashMap8.class) +return new ConcurrentHashMap8<>(U.capacity(((Map)map).size())); +else if (cls == ConcurrentHashMap.class) +return new ConcurrentHashMap<>(U.capacity(((Map)map).size())); + +return null; +} + +/** * Attempts to create a new map of the same type as {@code map} has. Otherwise returns new {@code HashMap} instance. * * @param map Original map. @@ -609,6 +646,47 @@ public class BinaryUtils { } /** + * @param col Collection to check. + * @return True if this is a collection of a known type. + */ +public static boolean knownCollection(Object col) { +Class cls = col == null ? null : col.getClass(); + +return cls == HashSet.class || +cls == LinkedHashSet.class || +cls == TreeSet.class || +cls == ConcurrentSkipListSet.class || +cls == ArrayList.class || +cls == LinkedList.class; +} + +/** + * Attempts to create a new collection of the same known type. Will return null if collection type is + * unknown. + * + * @param col Collection. + * @return New empty collection. + */ +public static Collection newKnownCollection(Object col) { +Class cls = col == null ? null : col.getClass(); + +if (cls == HashSet.class) +return U.newHashSet(((Collection)col).size()); +else if (cls == LinkedHashSet.class) +return U.newLinkedHashSet(((Collection)col).size()); +else if (cls == TreeSet.class) +return new TreeSet<>(((TreeSet)col).comparator()); +else if (cls == ConcurrentSkipListSet.class) +
[28/29] ignite git commit: ignite-2386 Fixed DiscoverManager to do not increase minor topology version if exchange is not triggered.
ignite-2386 Fixed DiscoverManager to do not increase minor topology version if exchange is not triggered. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8814178 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8814178 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8814178 Branch: refs/heads/ignite-2236 Commit: d8814178c2f8e93a76336069772cc3aec42fda46 Parents: 3a0cb51 Author: sboikovAuthored: Fri Jan 15 15:15:02 2016 +0300 Committer: sboikov Committed: Fri Jan 15 15:15:02 2016 +0300 -- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/DiscoveryCustomMessage.java | 9 -- .../discovery/GridDiscoveryManager.java | 33 ++--- .../cache/DynamicCacheChangeBatch.java | 5 - .../processors/cache/GridCacheProcessor.java| 42 +-- .../continuous/AbstractContinuousMessage.java | 5 - .../continuous/GridContinuousProcessor.java | 13 +- ...niteDynamicCacheStartStopConcurrentTest.java | 119 +++ .../ignite/testframework/GridTestUtils.java | 27 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 10 files changed, 200 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java index 8db4e67..ab143fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; /** * Listener interface. @@ -27,7 +26,6 @@ public interface CustomEventListener { /** * @param snd Sender. * @param msg Message. - * @param topVer Current topology version. */ -public void onCustomEvent(ClusterNode snd, T msg, AffinityTopologyVersion topVer); +public void onCustomEvent(ClusterNode snd, T msg); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java index 2ff40bf..d85075e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.managers.discovery; import java.io.Serializable; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -32,14 +31,6 @@ public interface DiscoveryCustomMessage extends Serializable { public IgniteUuid id(); /** - * Whether or not minor version of topology should be increased on message receive. - * - * @return {@code true} if minor topology version should be increased. - * @see AffinityTopologyVersion#minorTopVer - */ -public boolean incrementMinorTopologyVersion(); - -/** * Called when custom message has been handled by all nodes. * * @return Ack message or {@code null} if ack is not required. http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 23a85e4..29e85dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -474,21 +474,11 @@ public class GridDiscoveryManager extends
[03/29] ignite git commit: Revert "IGNITE-2330: Simplified GridFunc."
http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java index e5d247a..b999e2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; * This class doesn't provide any synchronization for multi-threaded access * and it is responsibility of the user of this class to provide outside * synchronization, if needed. + * @see GridFunc#t3() * @see GridFunc#t(Object, Object, Object) */ public class GridTuple3implements Iterable, Externalizable, Cloneable { http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java index d1e69b5..c95a859 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; * This class doesn't provide any synchronization for multi-threaded access * and it is responsibility of the user of this class to provide outside * synchronization, if needed. + * @see GridFunc#t4() * @see GridFunc#t(Object, Object, Object, Object) */ public class GridTuple4 implements Iterable, Externalizable, Cloneable { http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java index 7d25996..9790f48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; * This class doesn't provide any synchronization for multi-threaded access * and it is responsibility of the user of this class to provide outside * synchronization, if needed. + * @see GridFunc#t5() * @see GridFunc#t(Object, Object, Object, Object, Object) */ public class GridTuple5 implements Iterable, Externalizable, Cloneable { http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java index c904587..044944b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; * This class doesn't provide any synchronization for multi-threaded access * and it is responsibility of the user of this class to provide outside * synchronization, if needed. + * @see GridFunc#t5() * @see GridFunc#t(Object, Object, Object, Object, Object) */ public class GridTuple6 implements Iterable, Externalizable, http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe2d59/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java index 58e18aa..225366a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; * This class doesn't provide any synchronization for multi-threaded access * and it is responsibility of the user of this class to provide outside * synchronization, if needed. + * @see GridFunc#tv(Object...) */ public class GridTupleV implements Iterable, Externalizable,
[01/29] ignite git commit: Platforms now publish DEVNOTES.txt
Repository: ignite Updated Branches: refs/heads/ignite-2236 0ca561aca -> 7d8e304d9 Platforms now publish DEVNOTES.txt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1f8cda2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1f8cda2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1f8cda2 Branch: refs/heads/ignite-2236 Commit: f1f8cda2f3f62231f42a59951bf34c39577c1bec Parents: f97dc9f Author: Anton VinogradovAuthored: Tue Dec 29 13:02:42 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 29 13:02:42 2015 +0300 -- assembly/release-fabric-base.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f1f8cda2/assembly/release-fabric-base.xml -- diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml index 5be9f8f..9f9d310 100644 --- a/assembly/release-fabric-base.xml +++ b/assembly/release-fabric-base.xml @@ -104,6 +104,7 @@ /platforms/cpp README.txt +DEVNOTES.txt
[14/29] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/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 291c88a..1b40d6e 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 @@ -19,6 +19,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; @@ -44,6 +47,7 @@ import org.apache.ignite.internal.util.future.GridCompoundIdentityFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; @@ -64,6 +68,9 @@ public final class GridNearTxFinishFutureextends GridCompoundIdentityFutu public static final IgniteProductVersion FINISH_NEAR_ONE_PHASE_SINCE = IgniteProductVersion.fromString("1.4.0"); /** */ +public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.0"); + +/** */ private static final long serialVersionUID = 0L; /** Logger reference. */ @@ -122,22 +129,23 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu } /** {@inheritDoc} */ +@SuppressWarnings("unchecked") @Override public boolean onNodeLeft(UUID nodeId) { +boolean found = false; + for (IgniteInternalFuture fut : futures()) if (isMini(fut)) { -MiniFuture f = (MiniFuture)fut; +MinFuture f = (MinFuture)fut; -if (f.node().id().equals(nodeId)) { +if (f.onNodeLeft(nodeId)) { // Remove previous mapping. mappings.remove(nodeId); -f.onResult(new ClusterTopologyCheckedException("Remote node left grid (will fail): " + nodeId)); - -return true; +found = true; } } -return false; +return found; } /** {@inheritDoc} */ @@ -156,19 +164,32 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu * @param nodeId Sender. * @param res Result. */ +@SuppressWarnings("ForLoopReplaceableByForEach") public void onResult(UUID nodeId, GridNearTxFinishResponse res) { -if (!isDone()) -for (IgniteInternalFuture fut : futures()) { -if (isMini(fut)) { -MiniFuture f = (MiniFuture)fut; +if (!isDone()) { +FinishMiniFuture finishFut = null; -if (f.futureId().equals(res.miniId())) { -assert f.node().id().equals(nodeId); +synchronized (futs) { +for (int i = 0; i < futs.size(); i++) { +IgniteInternalFuture fut = futs.get(i); + +if (fut.getClass() == FinishMiniFuture.class) { +FinishMiniFuture f = (FinishMiniFuture)fut; -f.onResult(res); +if (f.futureId().equals(res.miniId())) { +assert f.node().id().equals(nodeId); + +finishFut = f; + +break; +} } } } + +if (finishFut != null) +finishFut.onNearFinishResponse(res); +} } /** @@ -178,15 +199,21 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu public void onResult(UUID nodeId, GridDhtTxFinishResponse res) { if (!isDone()) for (IgniteInternalFuture fut : futures()) { -if (isMini(fut)) { -MiniFuture f = (MiniFuture)fut; +if (fut.getClass() == CheckBackupMiniFuture.class) { +CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut; if
[19/29] ignite git commit: fixes to javadoc
fixes to javadoc Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59cfbfde Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59cfbfde Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59cfbfde Branch: refs/heads/ignite-2236 Commit: 59cfbfdea535539227fd02ac2966a8f5dc42ead6 Parents: 59a893c Author: Yakov ZhdanovAuthored: Thu Jan 14 12:54:48 2016 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 14 12:54:48 2016 +0300 -- .../discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59cfbfde/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java index 1e112c4..d277a3a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java @@ -61,9 +61,17 @@ public interface TcpDiscoveryIpFinder { /** * Checks whether IP finder is shared or not. * - * If it is shared then only coordinator can unregister addresses. + * If this property is set to {@code true} then IP finder allows to add and remove + * addresses in runtime and this is how, for example, IP finder should work in + * Amazon EC2 environment or any other environment where IPs may not be known beforehand. * - * All nodes should register their address themselves, as early as possible on node start. + * If this property is set to {@code false} then IP finder is immutable and all the addresses + * should be listed in configuration before Ignite start. This is the most use case for IP finders + * local to current VM. Since, usually such IP finders are created per each Ignite instance and + * all the known IPs are listed right away, but there is also an option to make such IP finders shared + * by setting this property to {@code true} and literally share it between local VM Ignite instances. + * This way user does not have to list any IPs before start, instead all starting nodes add their addresses + * to the finder, then get the registered addresses and continue with discovery procedure. * * @return {@code true} if IP finder is shared. */ @@ -95,4 +103,4 @@ public interface TcpDiscoveryIpFinder { * Closes this IP finder and releases any system resources associated with it. */ public void close(); -} \ No newline at end of file +}
[10/29] ignite git commit: Merge branch 'ignite-1.5.1-2'
Merge branch 'ignite-1.5.1-2' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10012b4e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10012b4e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10012b4e Branch: refs/heads/ignite-2236 Commit: 10012b4ef96f2ae727dc27c28185938d016ab9e3 Parents: 8ed73b4 cca90c7 Author: vozerov-gridgainAuthored: Tue Jan 5 11:03:06 2016 +0400 Committer: vozerov-gridgain Committed: Tue Jan 5 11:03:06 2016 +0400 -- assembly/release-fabric-base.xml | 1 + 1 file changed, 1 insertion(+) --
[12/19] ignite git commit: Added IgniteGetTxBenchmark (cache 'get' using transactional cache).
Added IgniteGetTxBenchmark (cache 'get' using transactional cache). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d608ebdf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d608ebdf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d608ebdf Branch: refs/heads/ignite-2234 Commit: d608ebdfd3f9088255dd6e32de6e90e1564569b1 Parents: 8b0c59a Author: sboikovAuthored: Fri Jan 15 10:06:02 2016 +0300 Committer: sboikov Committed: Fri Jan 15 10:06:02 2016 +0300 -- .../yardstick/cache/IgniteGetTxBenchmark.java | 30 1 file changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d608ebdf/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java -- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java new file mode 100644 index 000..fbb73e2 --- /dev/null +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetTxBenchmark.java @@ -0,0 +1,30 @@ +/* + * 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.yardstick.cache; + +import org.apache.ignite.IgniteCache; + +/** + * + */ +public class IgniteGetTxBenchmark extends IgniteGetBenchmark { +/** {@inheritDoc} */ +@Override protected IgniteCache cache() { +return ignite().cache("tx"); +} +}
[18/19] ignite git commit: ignite-2386 Fixed DiscoverManager to do not increase minor topology version if exchange is not triggered.
ignite-2386 Fixed DiscoverManager to do not increase minor topology version if exchange is not triggered. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8814178 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8814178 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8814178 Branch: refs/heads/ignite-2234 Commit: d8814178c2f8e93a76336069772cc3aec42fda46 Parents: 3a0cb51 Author: sboikovAuthored: Fri Jan 15 15:15:02 2016 +0300 Committer: sboikov Committed: Fri Jan 15 15:15:02 2016 +0300 -- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/DiscoveryCustomMessage.java | 9 -- .../discovery/GridDiscoveryManager.java | 33 ++--- .../cache/DynamicCacheChangeBatch.java | 5 - .../processors/cache/GridCacheProcessor.java| 42 +-- .../continuous/AbstractContinuousMessage.java | 5 - .../continuous/GridContinuousProcessor.java | 13 +- ...niteDynamicCacheStartStopConcurrentTest.java | 119 +++ .../ignite/testframework/GridTestUtils.java | 27 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 10 files changed, 200 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java index 8db4e67..ab143fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; /** * Listener interface. @@ -27,7 +26,6 @@ public interface CustomEventListener { /** * @param snd Sender. * @param msg Message. - * @param topVer Current topology version. */ -public void onCustomEvent(ClusterNode snd, T msg, AffinityTopologyVersion topVer); +public void onCustomEvent(ClusterNode snd, T msg); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java index 2ff40bf..d85075e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.managers.discovery; import java.io.Serializable; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -32,14 +31,6 @@ public interface DiscoveryCustomMessage extends Serializable { public IgniteUuid id(); /** - * Whether or not minor version of topology should be increased on message receive. - * - * @return {@code true} if minor topology version should be increased. - * @see AffinityTopologyVersion#minorTopVer - */ -public boolean incrementMinorTopologyVersion(); - -/** * Called when custom message has been handled by all nodes. * * @return Ack message or {@code null} if ack is not required. http://git-wip-us.apache.org/repos/asf/ignite/blob/d8814178/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 23a85e4..29e85dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -474,21 +474,11 @@ public class GridDiscoveryManager extends
[01/19] ignite git commit: Page Memory WIP.
Repository: ignite Updated Branches: refs/heads/ignite-2234 0f36404f7 -> a58d36757 Page Memory WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59a893c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59a893c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59a893c2 Branch: refs/heads/ignite-2234 Commit: 59a893c2598a64a4777d4db3875f99df70577193 Parents: 10012b4 Author: Alexey GoncharukAuthored: Mon Jan 11 20:05:55 2016 +0300 Committer: Alexey Goncharuk Committed: Mon Jan 11 20:05:55 2016 +0300 -- .../ignite/internal/util/GridStringBuilder.java | 19 +++ .../apache/ignite/internal/util/IgniteUtils.java | 10 ++ 2 files changed, 29 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59a893c2/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java index bc979f5..e9b72cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridStringBuilder.java @@ -425,6 +425,25 @@ public class GridStringBuilder implements Serializable { } /** + * Appends given long value as a hex string to this string builder. + * + * @param val Value to append. + * @return This builder for chaining method calls. + */ +public GridStringBuilder appendHex(long val) { +String hex = Long.toHexString(val); + +int len = hex.length(); + +for (int i = 0; i < 16 - len; i++) +a('0'); + +a(hex); + +return this; +} + +/** * * @param s Stream to write to. * @throws IOException Thrown in case of any IO errors. http://git-wip-us.apache.org/repos/asf/ignite/blob/59a893c2/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 480859d..6a7145c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -2482,6 +2482,16 @@ public abstract class IgniteUtils { } /** + * Gets a hex string representation of the given long value. + * + * @param val Value to convert to string. + * @return Hex string. + */ +public static String hexLong(long val) { +return new SB().appendHex(val).toString(); +} + +/** * Return byte value for certain character. * * @param ch Character
[03/19] ignite git commit: Fixes: - allow 'committing' -> 'marked_rollback' tx state change only for thread committing transaction - fixed 'full_sync' mode for case when tx primary nodes fail - fixed
http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index d07a1e6..34872c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -85,7 +85,6 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index 7521f2e..b7c0deb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -49,11 +49,13 @@ import org.apache.ignite.testframework.GridTestNode; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.eclipse.jetty.util.ConcurrentHashSet; /** * */ +@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") public class IgniteTcpCommunicationRecoveryAckClosureSelfTest extends GridSpiAbstractTest { /** */ @@ -87,7 +89,6 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest { /** */ private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); @@ -151,6 +152,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest totAcked0; +} +}, 5000); + +GridTestUtils.waitForCondition(new GridAbsPredicate() { +@Override public boolean apply() { return recoveryDesc.messagesFutures().isEmpty(); } }, 10_000); @@ -218,6 +231,8 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTesthttp://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 0df7da6..4f329e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -118,6 +118,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + TcpDiscoverySpi spi = nodeSpi.get(); if (spi == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/457a9ae4/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index e0ffc60..949290e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -978,7 +978,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * @param key Key. * @param cacheName Cache name. - * @return Ignite
[15/19] ignite git commit: IGNITE-2328 - Added the ticket test to the suite.
IGNITE-2328 - Added the ticket test to the suite. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4ff7111 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4ff7111 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4ff7111 Branch: refs/heads/ignite-2234 Commit: c4ff7111638e939ee395111840fd786314527003 Parents: 6524c79 Author: Alexey GoncharukAuthored: Fri Jan 15 10:31:37 2016 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 15 10:31:37 2016 +0300 -- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ff7111/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index 0f86c4c..442e116 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheNearReaderUpdateTest; import org.apache.ignite.internal.processors.cache.CacheSerializableTransactionsTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheStoreCollectionTest; /** * Test suite. @@ -34,6 +35,7 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTestSuite(CacheSerializableTransactionsTest.class); suite.addTestSuite(CacheNearReaderUpdateTest.class); +suite.addTestSuite(IgniteCacheStoreCollectionTest.class); return suite; }