You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/01 13:09:46 UTC
[1/6] ignite git commit: IGNITE-2498: Fix.
Repository: ignite
Updated Branches:
refs/heads/master 732dd4136 -> 8eab48778
IGNITE-2498: Fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1614c750
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1614c750
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1614c750
Branch: refs/heads/master
Commit: 1614c75076bce5a67e95efa7fae2d2a1ea015729
Parents: 79db260
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 12:20:12 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 12:20:12 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1614c750/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index c896a82..775ba87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -571,7 +571,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (cctx.kernalContext().config().isPeerClassLoadingEnabled() && !cctx.binaryMarshaller()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
[3/6] ignite git commit: IGNITE-2498: Finalization.
Posted by vo...@apache.org.
IGNITE-2498: Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14a5f93b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14a5f93b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14a5f93b
Branch: refs/heads/master
Commit: 14a5f93bfdb74cad9c2ff77d6c8f703a55abdd10
Parents: 5c76f80
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 13:10:48 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 13:10:48 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 4 +-
...ridCacheDeploymentOffHeapValuesSelfTest.java | 41 ++++++++++++++++++++
.../testsuites/IgniteCacheTestSuite3.java | 2 +
4 files changed, 46 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/14a5f93b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 19c1312..b258c73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -3164,7 +3164,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (hasOffHeapPointer()) {
CacheObject val0 = cctx.fromOffheap(offHeapPointer(), tmp);
- if (!tmp && isPeerClassLoadingEnabled())
+ if (!tmp && cctx.kernalContext().config().isPeerClassLoadingEnabled())
val0.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
return val0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/14a5f93b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
index 1adc3b4..ed58c3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
/**
* Tests deployment with off-heap storage.
@@ -31,7 +31,7 @@ public class GridCacheDeploymentOffHeapSelfTest extends GridCacheDeploymentSelfT
@Override protected CacheConfiguration cacheConfiguration() throws Exception {
CacheConfiguration cacheCfg = super.cacheConfiguration();
- cacheCfg.setMemoryMode(OFFHEAP_VALUES);
+ cacheCfg.setMemoryMode(OFFHEAP_TIERED);
cacheCfg.setOffHeapMaxMemory(0);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setNearConfiguration(new NearCacheConfiguration());
http://git-wip-us.apache.org/repos/asf/ignite/blob/14a5f93b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapValuesSelfTest.java
new file mode 100644
index 0000000..73d5183
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentOffHeapValuesSelfTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
+
+/**
+ * Tests deployment with off-heap storage.
+ */
+public class GridCacheDeploymentOffHeapValuesSelfTest extends GridCacheDeploymentSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheConfiguration cacheConfiguration() throws Exception {
+ CacheConfiguration cacheCfg = super.cacheConfiguration();
+
+ cacheCfg.setMemoryMode(OFFHEAP_VALUES);
+ cacheCfg.setOffHeapMaxMemory(0);
+ cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ cacheCfg.setNearConfiguration(new NearCacheConfiguration());
+
+ return cacheCfg;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/14a5f93b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index b86a33d..d82f0b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -21,6 +21,7 @@ import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.GridCacheAtomicEntryProcessorDeploymentSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheConditionalDeploymentSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheDeploymentOffHeapSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheDeploymentOffHeapValuesSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheDeploymentSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheEntryVersionSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheOrderedPreloadingSelfTest;
@@ -125,6 +126,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTestSuite(GridCacheDeploymentSelfTest.class);
suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class);
+ suite.addTestSuite(GridCacheDeploymentOffHeapValuesSelfTest.class);
suite.addTestSuite(GridCacheConditionalDeploymentSelfTest.class);
suite.addTestSuite(GridCacheAtomicEntryProcessorDeploymentSelfTest.class);
suite.addTestSuite(GridCacheTransactionalEntryProcessorDeploymentSelfTest.class);
[2/6] ignite git commit: IGNITE-2498: Full fix for (p2p + offheap)
deserialization issue.
Posted by vo...@apache.org.
IGNITE-2498: Full fix for (p2p + offheap) deserialization issue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c76f80b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c76f80b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c76f80b
Branch: refs/heads/master
Commit: 5c76f80bf872989d0376d8f03e1adac6dc509222
Parents: 1614c75
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 12:44:49 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 12:44:49 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheMapEntry.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c76f80b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 775ba87..19c1312 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -220,7 +220,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
else {
try {
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (isPeerClassLoadingEnabled()) {
Object val0 = null;
if (val != null && val.cacheObjectType() != CacheObject.TYPE_BYTE_ARR) {
@@ -571,7 +571,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled() && !cctx.binaryMarshaller()) {
+ if (isPeerClassLoadingEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
@@ -598,6 +598,13 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
/**
+ * @return {@code True} if peer class loading is enabled.
+ */
+ private boolean isPeerClassLoadingEnabled() {
+ return !cctx.binaryMarshaller() && cctx.kernalContext().config().isPeerClassLoadingEnabled();
+ }
+
+ /**
* @return Value bytes and flag indicating whether value is byte array.
*/
protected IgniteBiTuple<byte[], Byte> valueBytes0() {
@@ -3157,7 +3164,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (hasOffHeapPointer()) {
CacheObject val0 = cctx.fromOffheap(offHeapPointer(), tmp);
- if (!tmp && cctx.kernalContext().config().isPeerClassLoadingEnabled())
+ if (!tmp && isPeerClassLoadingEnabled())
val0.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
return val0;
@@ -4045,7 +4052,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (isPeerClassLoadingEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
[5/6] ignite git commit: IGNITE-2498: Finalization (2).
Posted by vo...@apache.org.
IGNITE-2498: Finalization (2).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0dfb7a54
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0dfb7a54
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0dfb7a54
Branch: refs/heads/master
Commit: 0dfb7a546db98a7111c87affe3b960ea846fd750
Parents: 9103b20
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 13:43:44 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 13:43:44 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheMapEntry.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0dfb7a54/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index b258c73..2d25d16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -220,7 +220,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
else {
try {
- if (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
Object val0 = null;
if (val != null && val.cacheObjectType() != CacheObject.TYPE_BYTE_ARR) {
@@ -571,7 +571,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
@@ -598,13 +598,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
/**
- * @return {@code True} if peer class loading is enabled.
- */
- private boolean isPeerClassLoadingEnabled() {
- return !cctx.binaryMarshaller() && cctx.kernalContext().config().isPeerClassLoadingEnabled();
- }
-
- /**
* @return Value bytes and flag indicating whether value is byte array.
*/
protected IgniteBiTuple<byte[], Byte> valueBytes0() {
@@ -4052,7 +4045,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
[4/6] ignite git commit: Merge branch 'master' into ignite-2498
Posted by vo...@apache.org.
Merge branch 'master' into ignite-2498
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9103b201
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9103b201
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9103b201
Branch: refs/heads/master
Commit: 9103b201c4edf68b0fa75f05f5936e5ca637a0ac
Parents: 14a5f93 c081e3d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 13:10:59 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 13:10:59 2016 +0300
----------------------------------------------------------------------
modules/benchmarks/pom.xml | 2 +-
.../jmh/cache/JmhCachePutBenchmark.java | 2 +
.../jmh/runner/JmhIdeBenchmarkRunner.java | 18 +++++++
.../GridServicePackagePrivateSelfTest.java | 17 ++++---
modules/docker/1.5.0.final/Dockerfile | 40 ++++++++++++++++
modules/docker/1.5.0.final/run.sh | 50 ++++++++++++++++++++
modules/docker/Dockerfile | 6 +--
7 files changed, 125 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[6/6] ignite git commit: Merge branch 'ignite-2498'
Posted by vo...@apache.org.
Merge branch 'ignite-2498'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8eab4877
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8eab4877
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8eab4877
Branch: refs/heads/master
Commit: 8eab48778467c09a3a89f5a46b88d82bb53b38b9
Parents: 732dd41 0dfb7a5
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Feb 1 15:09:35 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Feb 1 15:09:35 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 6 +--
.../GridCacheDeploymentOffHeapSelfTest.java | 4 +-
...ridCacheDeploymentOffHeapValuesSelfTest.java | 41 ++++++++++++++++++++
.../testsuites/IgniteCacheTestSuite3.java | 2 +
4 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------