You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/27 13:01:42 UTC
[1/4] ignite git commit: ignite-1307 Do not complete prepare future
with null result
Repository: ignite
Updated Branches:
refs/heads/ignite-1301 6c5e833cf -> 88f799904
ignite-1307 Do not complete prepare future with null result
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b132006f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b132006f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b132006f
Branch: refs/heads/ignite-1301
Commit: b132006f85df6c1b15e676dd0d8082cf44984b84
Parents: 3d46b62
Author: sboikov <sb...@gridgain.com>
Authored: Thu Aug 27 13:39:26 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Aug 27 13:39:26 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b132006f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 2071f8e..4c39476 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -729,7 +729,11 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* Completes this future.
*/
public void complete() {
- onComplete(null);
+ GridNearTxPrepareResponse res = new GridNearTxPrepareResponse();
+
+ res.error(new IgniteCheckedException("Failed to prepare transaction."));
+
+ onComplete(res);
}
/**
[3/4] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into master-main
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c279fca9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c279fca9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c279fca9
Branch: refs/heads/ignite-1301
Commit: c279fca96e16b54482725bbca4d9a30b33144c33
Parents: 28c8dc7 b132006
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Aug 27 13:58:34 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Aug 27 13:58:34 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/apache-main/master' into ignite-1301
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1301
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88f79990
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88f79990
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88f79990
Branch: refs/heads/ignite-1301
Commit: 88f799904ef17e92eb364752ba64b02efc56d075
Parents: 6c5e833 c279fca
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Aug 27 14:01:20 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Aug 27 14:01:20 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/portable/PortableContext.java | 7 +++++--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 +++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/4] ignite git commit: correct predefined classes IDs mapping
(portable context)
Posted by sb...@apache.org.
correct predefined classes IDs mapping (portable context)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28c8dc7e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28c8dc7e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28c8dc7e
Branch: refs/heads/ignite-1301
Commit: 28c8dc7e9d92fb95aa1a9bdef82944697aac95e6
Parents: 3d46b62
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Aug 27 13:57:58 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Aug 27 13:57:58 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/portable/PortableContext.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/28c8dc7e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 723113e..cd3abc1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -159,6 +159,8 @@ public class PortableContext implements Externalizable {
mapTypes.put(ConcurrentHashMap8.class, GridPortableMarshaller.CONC_HASH_MAP);
mapTypes.put(Properties.class, GridPortableMarshaller.PROPERTIES_MAP);
+ // IDs range from [0..200] is used by Java SDK API and GridGain legacy API
+
registerPredefinedType(Byte.class, GridPortableMarshaller.BYTE);
registerPredefinedType(Boolean.class, GridPortableMarshaller.BOOLEAN);
registerPredefinedType(Short.class, GridPortableMarshaller.SHORT);
@@ -205,9 +207,10 @@ public class PortableContext implements Externalizable {
registerPredefinedType(IgniteBiTuple.class, 61);
registerPredefinedType(T2.class, 62);
- registerPredefinedType(PortableObjectImpl.class, 63);
+ // IDs range [200..1000] is used by Ignite internal APIs.
- registerPredefinedType(PortableMetaDataImpl.class, 64);
+ registerPredefinedType(PortableObjectImpl.class, 200);
+ registerPredefinedType(PortableMetaDataImpl.class, 201);
}
/**