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 2015/06/02 11:40:32 UTC
[1/5] incubator-ignite git commit: ignite-471-2: yardstick
configuration with portable marshaller
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10054 f15b1b0e9 -> 73daf3cdb
ignite-471-2: yardstick configuration with portable marshaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba0b5037
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba0b5037
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba0b5037
Branch: refs/heads/ignite-gg-10054
Commit: ba0b5037169bef4be2e285f934d0a2a8f4ae446f
Parents: 9a83c89
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jun 1 14:16:12 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jun 1 14:16:12 2015 +0300
----------------------------------------------------------------------
modules/yardstick/config/ignite-base-config.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba0b5037/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 9d28774..9af03c0 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -163,6 +163,11 @@
<list/>
</property>
+ <property name="marshaller">
+ <bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller">
+ </bean>
+ </property>
+
<property name="loadBalancingSpi">
<bean class="org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi">
<property name="perTask" value="false"/>
[4/5] incubator-ignite git commit: ignite-471-2: modifications after
the next review round
Posted by vo...@apache.org.
ignite-471-2: modifications after the next review round
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2299bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2299bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2299bc3
Branch: refs/heads/ignite-gg-10054
Commit: e2299bc323e1b9d5a2b91e696776e3397d93c66a
Parents: 2e58d49
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 2 12:05:03 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 2 12:05:03 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2299bc3/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 4ccb759..2be5afa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -41,7 +41,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
private final ConcurrentMap<Integer, String> map = new ConcurrentHashMap8<>();
/** */
- private final Set<String> registeredTypes = new HashSet<>();
+ private final Set<String> registeredSystemTypes = new HashSet<>();
/**
* Initializes context.
@@ -86,7 +86,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
", oldClsName=" + oldClsName + ']');
- registeredTypes.add(clsName);
+ registeredSystemTypes.add(clsName);
}
}
}
@@ -131,7 +131,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
/** {@inheritDoc} */
@Override public boolean isSystemType(String typeName) {
- return registeredTypes.contains(typeName);
+ return registeredSystemTypes.contains(typeName);
}
/**
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-471-2' into ignite-gg-10054
Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-471-2' into ignite-gg-10054
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73daf3cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73daf3cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73daf3cd
Branch: refs/heads/ignite-gg-10054
Commit: 73daf3cdb084bf3ccb088edf7d92a0858b81a381
Parents: f15b1b0 e2299bc
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 2 12:36:51 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Jun 2 12:36:51 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextAdapter.java | 13 +++++++++----
.../internal/processors/cache/GridCacheProcessor.java | 2 +-
modules/yardstick/config/ignite-base-config.xml | 5 +++++
3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73daf3cd/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index ea006fb,2be5afa..e7ee2ff
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@@ -82,13 -82,11 +82,13 @@@ public abstract class MarshallerContext
String oldClsName;
- if ((oldClsName = map.put(typeId, clsName)) != null)
- throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
+ if ((oldClsName = map.put(typeId, clsName)) != null) {
+ if (!oldClsName.equals(clsName))
+ throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
", oldClsName=" + oldClsName + ']');
+ }
- registeredTypes.add(clsName);
+ registeredSystemTypes.add(clsName);
}
}
}
[3/5] incubator-ignite git commit: # IGNITE-471 - formatting
Posted by vo...@apache.org.
# IGNITE-471 - formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e58d49b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e58d49b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e58d49b
Branch: refs/heads/ignite-gg-10054
Commit: 2e58d49b9e8aea4c64e118a4c40c53aa227abf02
Parents: d783ca3
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Jun 1 23:49:56 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Jun 1 23:49:56 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e58d49b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 8c18b84..7c2dfe9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -784,7 +784,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (cfg.getRebalanceMode() == SYNC) {
if (cfg.getCacheMode() == REPLICATED ||
(cfg.getCacheMode() == PARTITIONED && cfg.getRebalanceDelay() >= 0))
- cache.preloader().syncFuture().get();
+ cache.preloader().syncFuture().get();
}
if (CU.isUtilityCache(cache.name()))
[2/5] incubator-ignite git commit: ignite-471-2: check duplicate type
id in MarshallerContext
Posted by vo...@apache.org.
ignite-471-2: check duplicate type id in MarshallerContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d783ca30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d783ca30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d783ca30
Branch: refs/heads/ignite-gg-10054
Commit: d783ca309b079a65747f11c442cee8abb0442315
Parents: ba0b503
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jun 1 16:44:54 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jun 1 16:44:54 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/MarshallerContextAdapter.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d783ca30/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 8386675..4ccb759 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -95,12 +95,17 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
@Override public boolean registerClass(int id, Class cls) throws IgniteCheckedException {
boolean registered = true;
- if (!map.containsKey(id)) {
+ String clsName = map.get(id);
+
+ if (clsName == null) {
registered = registerClassName(id, cls.getName());
if (registered)
map.putIfAbsent(id, cls.getName());
}
+ else if (!clsName.equals(cls.getName()))
+ throw new IgniteCheckedException("Duplicate ID [id=" + id + ", oldCls=" + clsName +
+ ", newCls=" + cls.getName());
return registered;
}