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/12/14 13:22:40 UTC
[1/3] ignite git commit: ignite-2065: portable -> binary renaming
(Fix platforms)
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 30f3c341d -> bedd357bc
ignite-2065: portable -> binary renaming (Fix platforms)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6b46115
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6b46115
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6b46115
Branch: refs/heads/ignite-1537
Commit: d6b46115147704f13c36aa59f307f77baf954e3f
Parents: 3d9be34
Author: ashutak <as...@gridgain.com>
Authored: Mon Dec 14 14:17:37 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Mon Dec 14 14:17:37 2015 +0300
----------------------------------------------------------------------
modules/platforms/cpp/common/src/java.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6b46115/modules/platforms/cpp/common/src/java.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp
index 002eb44..7bc18f1 100644
--- a/modules/platforms/cpp/common/src/java.cpp
+++ b/modules/platforms/cpp/common/src/java.cpp
@@ -234,7 +234,7 @@ namespace ignite
JniMethod M_PLATFORM_CACHE_WITH_NO_RETRIES = JniMethod("withNoRetries", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_WITH_EXPIRY_PLC = JniMethod("withExpiryPolicy", "(JJJ)Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
- JniMethod M_PLATFORM_CACHE_WITH_KEEP_PORTABLE = JniMethod("withKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+ JniMethod M_PLATFORM_CACHE_WITH_KEEP_PORTABLE = JniMethod("withKeepBinary", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_CLEAR = JniMethod("clear", "()V", false);
JniMethod M_PLATFORM_CACHE_REMOVE_ALL = JniMethod("removeAll", "()V", false);
JniMethod M_PLATFORM_CACHE_ITERATOR = JniMethod("iterator", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator;", false);
@@ -372,7 +372,7 @@ namespace ignite
const char* C_PLATFORM_SERVICES = "org/apache/ignite/internal/processors/platform/services/PlatformServices";
JniMethod M_PLATFORM_SERVICES_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
- JniMethod M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE = JniMethod("withServerKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
+ JniMethod M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE = JniMethod("withServerKeepBinary", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
JniMethod M_PLATFORM_SERVICES_CANCEL = JniMethod("cancel", "(Ljava/lang/String;)V", false);
JniMethod M_PLATFORM_SERVICES_CANCEL_ALL = JniMethod("cancelAll", "()V", false);
JniMethod M_PLATFORM_SERVICES_SERVICE_PROXY = JniMethod("dotNetServiceProxy", "(Ljava/lang/String;Z)Ljava/lang/Object;", false);
@@ -867,7 +867,7 @@ namespace ignite
try {
if (!JVM.GetJvm()) {
- // 1. Create JVM itself.
+ // 1. Create JVM itself.
CreateJvm(opts, optsLen, &jvm, &env);
// 2. Populate members;
@@ -2413,4 +2413,4 @@ namespace ignite
}
}
}
-}
\ No newline at end of file
+}
[2/3] ignite git commit: IGNITE-2149: Fix compilation under Java 8
Posted by sb...@apache.org.
IGNITE-2149: Fix compilation under Java 8
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b906ed3f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b906ed3f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b906ed3f
Branch: refs/heads/ignite-1537
Commit: b906ed3f2e3c235ddaea9061af808e8e4b1c769c
Parents: d6b4611
Author: ashutak <as...@gridgain.com>
Authored: Mon Dec 14 15:09:46 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Mon Dec 14 15:09:46 2015 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b906ed3f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 3a08824..091c633 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -210,7 +210,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes
for (int i = 0; i < 100; i++) {
Object person = all.get(i).getValue();
- assertEquals(i, U.field(person, "id"));
+ assertEquals((Integer) i, U.field(person, "id"));
assertEquals("person-" + i, U.field(person, "name"));
assertEquals("person-last-" + i, U.field(person, "lastName"));
assertEquals((double)(i * 25), U.field(person, "salary"));
[3/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bedd357b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bedd357b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bedd357b
Branch: refs/heads/ignite-1537
Commit: bedd357bc702db349e15d22c53f75ba9554bacef
Parents: 30f3c34 b906ed3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 15:22:09 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 15:22:09 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteBinaryObjectFieldsQuerySelfTest.java | 2 +-
modules/platforms/cpp/common/src/java.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------