You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2016/02/19 08:22:58 UTC
[1/2] ignite git commit: IGNITE-2648: DataStreamer doesn't stream
BinaryObjects created with BinaryBuilder
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.7 51efdfaa1 -> 0bdd56f97
IGNITE-2648: DataStreamer doesn't stream BinaryObjects created with BinaryBuilder
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2622793b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2622793b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2622793b
Branch: refs/heads/ignite-1.5.7
Commit: 2622793b726d05694025fb092dc96b6bbdf3a7e8
Parents: cffde1b
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Feb 19 10:19:06 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Feb 19 10:21:58 2016 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamerImpl.java | 6 +--
.../GridDataStreamerImplSelfTest.java | 49 +++++++++++++++++---
2 files changed, 46 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2622793b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 27eff0c..f832e4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -628,7 +628,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
Map<ClusterNode, Collection<DataStreamerEntry>> mappings = new HashMap<>();
- boolean initPda = ctx.deploy().enabled() && jobPda == null;
+ boolean initPda = ctx.deploy().enabled() && cacheObjCtx.addDeploymentInfo() && jobPda == null;
AffinityTopologyVersion topVer = ctx.cache().context().exchange().readyAffinityVersion();
@@ -1304,7 +1304,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
GridDeployment dep = null;
GridPeerDeployAware jobPda0 = null;
- if (ctx.deploy().enabled()) {
+ if (ctx.deploy().enabled() && cacheObjCtx.addDeploymentInfo()) {
try {
jobPda0 = jobPda;
@@ -1619,4 +1619,4 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2622793b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
index 4caa5fb..a260e6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
@@ -23,19 +23,20 @@ import java.util.Random;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinaryReader;
+import org.apache.ignite.binary.BinaryWriter;
+import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.Binarylizable;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryReader;
-import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -237,6 +238,42 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
}
/**
+ * Tries to propagate cache with binary objects created using the builder.
+ *
+ * @throws Exception If failed.
+ */
+ public void testAddBinaryCreatedWithBuilder() throws Exception {
+ try {
+ binaries = true;
+
+ startGrids(2);
+
+ awaitPartitionMapExchange();
+
+ Ignite g0 = grid(0);
+
+ IgniteDataStreamer<Integer, BinaryObject> dataLdr = g0.dataStreamer(null);
+
+ for (int i = 0; i < 500; i++) {
+ BinaryObjectBuilder obj = g0.binary().builder("NoExistedClass");
+
+ obj.setField("id", i);
+ obj.setField("name", String.valueOf("name = " + i));
+
+ dataLdr.addData(i, obj.build());
+ }
+
+ dataLdr.close(false);
+
+ assertEquals(500, g0.cache(null).size(CachePeekMode.ALL));
+ assertEquals(500, grid(1).cache(null).size(CachePeekMode.ALL));
+ }
+ finally {
+ G.stopAll(true);
+ }
+ }
+
+ /**
* Check that keys correctly destributed by nodes after data streamer.
*
* @param g Grid to check.
[2/2] ignite git commit: Merge branch 'ignite-1.5.7' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.7
Posted by dm...@apache.org.
Merge branch 'ignite-1.5.7' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.7
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bdd56f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bdd56f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bdd56f9
Branch: refs/heads/ignite-1.5.7
Commit: 0bdd56f9764a18b3b9988e7e7681ade122055f6f
Parents: 2622793 51efdfa
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Feb 19 10:22:35 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Feb 19 10:22:35 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryContext.java | 1 +
.../ignite/internal/binary/BinaryUtils.java | 4 +-
.../binary/builder/BinaryBuilderSerializer.java | 16 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 12 +-
.../binary/builder/BinaryValueWithType.java | 3 +-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../cache/GridCacheEvictionManager.java | 6 +-
.../processors/cache/GridCacheMapEntry.java | 105 ++---
.../processors/cache/GridCacheTtlManager.java | 75 +++-
.../distributed/dht/GridDhtCacheAdapter.java | 29 +-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 424 +++++++++++++------
.../BinaryObjectBuilderAdditionalSelfTest.java | 91 +++-
...naryObjectBuilderDefaultMappersSelfTest.java | 30 +-
...CacheAtomicLocalOffheapExpiryPolicyTest.java | 30 ++
...gniteCacheAtomicOffheapExpiryPolicyTest.java | 30 ++
...rimaryWriteOrderOffheapExpiryPolicyTest.java | 31 ++
...teOrderWithStoreOffheapExpiryPolicyTest.java | 31 ++
...AtomicReplicatedOffheapExpiryPolicyTest.java | 30 ++
...eAtomicWithStoreOffheapExpiryPolicyTest.java | 30 ++
.../IgniteCacheExpiryPolicyAbstractTest.java | 169 ++++++--
.../IgniteCacheExpiryPolicyTestSuite.java | 13 +
...niteCacheTxLocalOffheapExpiryPolicyTest.java | 30 ++
.../IgniteCacheTxOffheapExpiryPolicyTest.java | 30 ++
...acheTxReplicatedOffheapExpiryPolicyTest.java | 30 ++
...CacheTxWithStoreOffheapExpiryPolicyTest.java | 30 ++
.../testsuites/IgniteBinaryCacheTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 95 +++--
.../cache/IgniteClientReconnectQueriesTest.java | 9 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 38 +-
31 files changed, 1128 insertions(+), 304 deletions(-)
----------------------------------------------------------------------