Adding property to control compact footer flag.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd99d1ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd99d1ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd99d1ea Branch: refs/heads/ignite-1626 Commit: bd99d1ea7fa58aac1fb2e4195b97a673b111ed9d Parents: c4d29f9 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Wed Dec 2 19:35:42 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Wed Dec 2 19:35:42 2015 +0300 ---------------------------------------------------------------------- .../testframework/config/GridTestProperties.java | 3 +++ .../testframework/junits/GridAbstractTest.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bd99d1ea/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index 2005c4c..1ea8c38 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -72,6 +72,9 @@ public final class GridTestProperties { /** */ public static final String MARSH_CLASS_NAME = "marshaller.class"; + /** Binary marshaller compact footers property. */ + public static final String BINARY_COMPACT_FOOTERS = "binary.marshaller.compact.footers"; + /** */ static { // Initialize IGNITE_HOME system property. http://git-wip-us.apache.org/repos/asf/ignite/blob/bd99d1ea/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index afb6141..95661cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -51,6 +51,7 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.Ignition; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -1117,6 +1118,20 @@ public abstract class GridAbstractTest extends TestCase { cfg.setNodeId(null); + if (GridTestProperties.getProperty(GridTestProperties.BINARY_COMPACT_FOOTERS) != null) { + if (!Boolean.valueOf(GridTestProperties.getProperty(GridTestProperties.BINARY_COMPACT_FOOTERS))) { + BinaryConfiguration bCfg = cfg.getBinaryConfiguration(); + + if (bCfg == null) { + bCfg = new BinaryConfiguration(); + + cfg.setBinaryConfiguration(bCfg); + } + + bCfg.setCompactFooter(false); + } + } + if (gridName != null && gridName.matches(".*\\d")) { String idStr = UUID.randomUUID().toString();