You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2017/03/01 19:23:36 UTC
[2/2] ignite git commit: ignite-3477 - minor
ignite-3477 - minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4490ddc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4490ddc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4490ddc
Branch: refs/heads/ignite-3477
Commit: c4490ddce4a836fd41fa6d65d3fbfd7b94e56995
Parents: 78c2a7f
Author: Sergi Vladykin <se...@gmail.com>
Authored: Wed Mar 1 22:23:26 2017 +0300
Committer: Sergi Vladykin <se...@gmail.com>
Committed: Wed Mar 1 22:23:26 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +-
.../ignite/internal/processors/query/h2/opt/GridH2Table.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4490ddc/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 3be511e..b45e173 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1263,7 +1263,7 @@ public abstract class GridAbstractTest extends TestCase {
public String getTestGridName() {
String[] parts = getClass().getName().split("\\.");
- return "tg1";
+ return parts[parts.length - 2] + '.' + parts[parts.length - 1];
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4490ddc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index b93bd5e..30219dc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -579,7 +579,7 @@ public class GridH2Table extends TableBase {
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("LockAcquiredButNotSafelyReleased")
- public boolean doUpdate(final GridH2Row row, boolean del) throws IgniteCheckedException {
+ boolean doUpdate(final GridH2Row row, boolean del) throws IgniteCheckedException {
// Here we assume that each key can't be updated concurrently and case when different indexes
// getting updated from different threads with different rows with the same key is impossible.
GridUnsafeMemory mem = desc == null ? null : desc.memory();