You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/07/09 16:47:46 UTC
[1/4] incubator-ignite git commit: # Hive version changed in tests:
1.2.0 -> 1.2.1
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1097 2074f70df -> c6b7a755d
# Hive version changed in tests: 1.2.0 -> 1.2.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bee6f688
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bee6f688
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bee6f688
Branch: refs/heads/ignite-1097
Commit: bee6f6884ba0da9b9418842f7926d1dbd3ddd624
Parents: 546d595
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jul 9 15:05:01 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Jul 9 15:05:01 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bee6f688/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
index 2ab3e8c..7393f69 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
@@ -130,7 +130,7 @@ public class IgniteHadoopTestSuite extends TestSuite {
* @throws Exception If failed.
*/
public static void downloadHive() throws Exception {
- String ver = IgniteSystemProperties.getString("hive.version", "1.2.0");
+ String ver = IgniteSystemProperties.getString("hive.version", "1.2.1");
X.println("Will use Hive version: " + ver);
[2/4] incubator-ignite git commit: Merge branches 'ignite-1097' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-1097
Posted by yz...@apache.org.
Merge branches 'ignite-1097' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1097
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abe04d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abe04d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abe04d8f
Branch: refs/heads/ignite-1097
Commit: abe04d8f71d648a33c9c02c61b6602078718150c
Parents: b131c81 bee6f68
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jul 9 16:42:50 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jul 9 16:42:50 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-1097' into ignite-1097
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-1097' into ignite-1097
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b7a755
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b7a755
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b7a755
Branch: refs/heads/ignite-1097
Commit: c6b7a755d65a20e64bde481bc873519d16cdecd0
Parents: 07a98df 2074f70
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jul 9 17:47:39 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jul 9 17:47:39 2015 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheProxy.java | 53 ++++++--------------
1 file changed, 16 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: IGNITE-1097 review
Posted by yz...@apache.org.
IGNITE-1097 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07a98df4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07a98df4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07a98df4
Branch: refs/heads/ignite-1097
Commit: 07a98df47dc74cc750e0130a9986d0ba1e691090
Parents: abe04d8
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jul 9 17:47:26 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jul 9 17:47:26 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/future/GridFutureChainListener.java | 4 ----
.../processors/cache/GridCacheAbstractFullApiSelfTest.java | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07a98df4/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
index d98538e..43ffa61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureChainListener.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.util.future;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
/**
@@ -57,9 +56,6 @@ public class GridFutureChainListener<T, R> implements IgniteInClosure<IgniteInte
fut.onDone(e.unwrap());
}
catch (RuntimeException | Error e) {
- U.warn(null, "Failed to notify chained future (is grid stopped?) [doneCb=" + doneCb +
- ", err=" + e.getMessage() + ']');
-
fut.onDone(e);
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07a98df4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 3f9c365..0a8f87c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -69,7 +69,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
throw new RuntimeException("Failed!");
}
};
-
+
/** Increment processor for invoke operations. */
public static final EntryProcessor<String, Integer, String> INCR_PROCESSOR = new EntryProcessor<String, Integer, String>() {
@Override public String process(MutableEntry<String, Integer> e, Object... args) {
@@ -5005,7 +5005,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
*/
public void testTransformException() throws Exception {
final IgniteCache<String, Integer> cache = jcache().withAsync();
-
+
cache.invoke("key2", ERR_PROCESSOR);
assertThrows(log, new Callable<Object>() {
@@ -5023,7 +5023,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
}, EntryProcessorException.class, null);
}
-
+
/**
* Sets given value, returns old value.
*/