[2/3] ignite git commit: Revert "IGNITE-9209 fix for GridDistributedTxMapping.toString() returns broken string. - Fixes #4519."
Revert "IGNITE-9209 fix for GridDistributedTxMapping.toString() returns broken
string. - Fixes #4519."
This reverts commit 9bb9c043513c3cc6c6b70c6c3395e5bb76fad75e.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f968d24
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f968d24
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f968d24
Branch: refs/heads/ignite-2.7
Commit: 5f968d2413c0c914da0ebcb5c051023429b3e518
Parents: e6b42ab
Author: Nikolay Izhikov
Authored: Fri Nov 23 22:51:45 2018 +0300
Committer: Nikolay Izhikov
Committed: Fri Nov 23 22:51:45 2018 +0300
--
.../internal/util/tostring/GridToStringBuilder.java| 10 +++---
.../util/tostring/GridToStringBuilderSelfTest.java | 13 -
2 files changed, 3 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f968d24/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 67b9af1..86daf7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -985,7 +985,6 @@ public class GridToStringBuilder {
if (newStr)
return s;
-// Called from another GTSB.toString(), so this string is already
in the buffer and shouldn't be returned.
return "";
}
finally {
@@ -1053,6 +1052,7 @@ public class GridToStringBuilder {
}
// Specifically catching all exceptions.
catch (Exception e) {
+
// Remove entry from cache to avoid potential memory leak
// in case new class loader got loaded under the same identity
hash.
classCache.remove(cls.getName() +
System.identityHashCode(cls.getClassLoader()));
@@ -1605,7 +1605,7 @@ public class GridToStringBuilder {
private static String toStringImpl(String str, SBLimitedLength buf,
Object[] propNames, Object[] propVals,
boolean[] propSens, int propCnt) {
-boolean newStr = buf.length() == 0;
+buf.setLength(0);
if (str != null)
buf.a(str).a(" ");
@@ -1616,11 +1616,7 @@ public class GridToStringBuilder {
buf.a(']');
-if (newStr)
-return buf.toString();
-
-// Called from another GTSB.toString(), so this string is already in
the buffer and shouldn't be returned.
-return "";
+return buf.toString();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f968d24/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
index 9a9e67e..eff3349 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java
@@ -31,8 +31,6 @@ import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -479,17 +477,6 @@ public class GridToStringBuilderSelfTest extends
GridCommonAbstractTest {
}
/**
- *
- */
-public void testObjectPlusStringToString() {
-IgniteTxKey k = new IgniteTxKey(new KeyCacheObjectImpl(1, null, 1),
123);
-
-info(k.toString());
-
-assertTrue("Wrong string: " + k, k.toString().startsWith("IgniteTxKey
["));
-}
-
-/**
* Test class.
*/
private static class TestClass1 {
[1/3] ignite git commit: Revert "IGNITE-8493 GridToStringBuilder arrayToString refactoring. - Fixes #4501."
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 c670b012c -> 307ac58d1
Revert "IGNITE-8493 GridToStringBuilder arrayToString refactoring. - Fixes
#4501."
This reverts commit dd8c933fd44e4ad9b315daccce8e2327606867b0.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6b42abb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6b42abb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6b42abb
Branch: refs/heads/ignite-2.7
Commit: e6b42abb81c22bd119a9233023be6be66b2aad09
Parents: c670b01
Author: Nikolay Izhikov
Authored: Fri Nov 23 22:51:08 2018 +0300
Committer: Nikolay Izhikov
Committed: Fri Nov 23 22:51:08 2018 +0300
--
.../util/tostring/GridToStringBuilder.java | 129 +++
.../tostring/GridToStringBuilderSelfTest.java | 97 +-
...niteHadoopFileSystemClientBasedOpenTest.java | 2 +-
3 files changed, 112 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e6b42abb/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 329682f..67b9af1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -21,7 +21,6 @@ import java.io.Externalizable;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
-import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -854,7 +853,7 @@ public class GridToStringBuilder {
*/
private static void addArray(SBLimitedLength buf, Class arrType, Object
obj) {
if (arrType.getComponentType().isPrimitive()) {
-buf.a(arrayToString(obj));
+buf.a(arrayToString(arrType, obj));
return;
}
@@ -1076,40 +1075,95 @@ public class GridToStringBuilder {
}
/**
- * Returns limited string representation of array.
- *
- * @param arr Array object. Each value is automatically wrapped if it has
a primitive type.
+ * @param arrType Type of the array.
+ * @param arr Array object.
* @return String representation of an array.
*/
-public static String arrayToString(Object arr) {
+@SuppressWarnings({"ConstantConditions", "unchecked"})
+public static String arrayToString(Class arrType, Object arr) {
if (arr == null)
return "null";
String res;
+int more = 0;
-int arrLen;
-
-if (arr instanceof Object[]) {
+if (arrType.equals(byte[].class)) {
+byte[] byteArr = (byte[])arr;
+if (byteArr.length > COLLECTION_LIMIT) {
+more = byteArr.length - COLLECTION_LIMIT;
+byteArr = Arrays.copyOf(byteArr, COLLECTION_LIMIT);
+}
+res = Arrays.toString(byteArr);
+}
+else if (arrType.equals(boolean[].class)) {
+boolean[] boolArr = (boolean[])arr;
+if (boolArr.length > COLLECTION_LIMIT) {
+more = boolArr.length - COLLECTION_LIMIT;
+boolArr = Arrays.copyOf(boolArr, COLLECTION_LIMIT);
+}
+res = Arrays.toString(boolArr);
+}
+else if (arrType.equals(short[].class)) {
+short[] shortArr = (short[])arr;
+if (shortArr.length > COLLECTION_LIMIT) {
+more = shortArr.length - COLLECTION_LIMIT;
+shortArr = Arrays.copyOf(shortArr, COLLECTION_LIMIT);
+}
+res = Arrays.toString(shortArr);
+}
+else if (arrType.equals(int[].class)) {
+int[] intArr = (int[])arr;
+if (intArr.length > COLLECTION_LIMIT) {
+more = intArr.length - COLLECTION_LIMIT;
+intArr = Arrays.copyOf(intArr, COLLECTION_LIMIT);
+}
+res = Arrays.toString(intArr);
+}
+else if (arrType.equals(long[].class)) {
+long[] longArr = (long[])arr;
+if (longArr.length > COLLECTION_LIMIT) {
+more = longArr.length - COLLECTION_LIMIT;
+longArr = Arrays.copyOf(longArr, COLLECTION_LIMIT);
+}
+res = Arrays.toString(longArr);
+}
+else if (arrType.equals(float[].class)) {
+float[] floatArr = (float[])arr;
+if (floatArr.length > COLLECTION_LIMIT) {
+
[3/3] ignite git commit: Revert "IGNITE-602 Fixed possible StackOverflowError in GridToStringBuilder when circular references are present - Fixes #1558."
Revert "IGNITE-602 Fixed possible StackOverflowError in GridToStringBuilder
when circular references are present - Fixes #1558."
This reverts commit d67c5bf4c22338695a116e0fbf0a58a4d581af5d.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/307ac58d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/307ac58d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/307ac58d
Branch: refs/heads/ignite-2.7
Commit: 307ac58d1aa1f0145c16affe6de96314b1c8ecef
Parents: 5f968d2
Author: Nikolay Izhikov
Authored: Fri Nov 23 22:52:12 2018 +0300
Committer: Nikolay Izhikov
Committed: Fri Nov 23 22:52:12 2018 +0300
--
.../util/tostring/GridToStringBuilder.java | 706 ++-
.../util/tostring/GridToStringThreadLocal.java | 66 ++
.../internal/util/tostring/SBLimitedLength.java | 20 -
.../tostring/GridToStringBuilderSelfTest.java | 247 +--
4 files changed, 439 insertions(+), 600 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/307ac58d/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 86daf7c..77c333d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -28,16 +28,19 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EventListener;
-import java.util.IdentityHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -47,9 +50,6 @@ import static
org.apache.ignite.IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_
/**
* Provides auto-generation framework for {@code toString()} output.
*
- * In case of recursion, repeatable objects will be shown as "ClassName@hash".
- * But fields will be printed only for the first entry to prevent recursion.
- *
* Default exclusion policy (can be overridden with {@link GridToStringInclude}
* annotation):
*
@@ -84,9 +84,6 @@ import static
org.apache.ignite.IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_
*/
public class GridToStringBuilder {
/** */
-private static final Object[] EMPTY_ARRAY = new Object[0];
-
-/** */
private static final Map classCache =
new ConcurrentHashMap<>();
/** {@link IgniteSystemProperties#IGNITE_TO_STRING_INCLUDE_SENSITIVE} */
@@ -97,30 +94,25 @@ public class GridToStringBuilder {
private static final int COLLECTION_LIMIT =
IgniteSystemProperties.getInteger(IGNITE_TO_STRING_COLLECTION_LIMIT,
100);
-/** Every thread has its own string builder. */
-private static ThreadLocal threadLocSB = new
ThreadLocal() {
-@Override protected SBLimitedLength initialValue() {
-SBLimitedLength sb = new SBLimitedLength(256);
+/** */
+private static ThreadLocal> threadCache =
new ThreadLocal>() {
+@Override protected Queue initialValue() {
+Queue queue = new LinkedList<>();
-sb.initLimit(new SBLengthLimit());
+queue.offer(new GridToStringThreadLocal());
-return sb;
+return queue;
}
};
-/**
- * Contains objects currently printing in the string builder.
- *
- * Since {@code toString()} methods can be chain-called from the same
thread we
- * have to keep a map of this objects pointed to the position of previous
occurrence
- * and remove/add them in each {@code toString()} apply.
- */
-private static ThreadLocal> savedObjects
= new ThreadLocal>() {
-@Override protected IdentityHashMap initialValue() {
-return new IdentityHashMap<>();
+/** */
+private static ThreadLocal threadCurLen = new
ThreadLocal() {
+@Override protected SBLengthLimit initialValue() {
+return new SBLengthLimit();
}
};
+
/**
* Produces auto-generated output
[ignite-teamcity-bot] branch ignite-9542 updated: Removing unused code
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9542
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9542 by this push:
new 8fb4c02 Removing unused code
8fb4c02 is described below
commit 8fb4c02e6db6f1b2cfb147001642813299166a41
Author: Dmitriy Pavlov
AuthorDate: Sat Nov 24 00:54:00 2018 +0300
Removing unused code
---
.../main/java/org/apache/ignite/ci/ITeamcity.java | 33 +++---
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 72 +-
.../apache/ignite/ci/IgniteTeamcityConnection.java | 57 +
.../java/org/apache/ignite/ci/db/DbMigrations.java | 3 +
.../org/apache/ignite/ci/issue/IssuesStorage.java | 4 +-
.../apache/ignite/ci/runners/ClientTmpHelper.java | 4 +-
.../ignite/ci/tcmodel/result/issues/IssueRef.java | 39
.../ci/tcmodel/result/issues/IssueUsage.java | 46 --
.../ci/tcmodel/result/issues/IssuesUsagesList.java | 50 ---
9 files changed, 48 insertions(+), 260 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index a50ab94..75868d1 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -17,35 +17,25 @@
package org.apache.ignite.ci;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import javax.annotation.Nullable;
import org.apache.ignite.ci.analysis.LogCheckResult;
import org.apache.ignite.ci.analysis.SingleBuildRunCtx;
import org.apache.ignite.ci.tcmodel.agent.Agent;
-import org.apache.ignite.ci.tcmodel.changes.Change;
-import org.apache.ignite.ci.tcmodel.changes.ChangesList;
import org.apache.ignite.ci.tcmodel.conf.BuildType;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.result.Build;
-import org.apache.ignite.ci.tcmodel.result.Configurations;
-import org.apache.ignite.ci.tcmodel.result.issues.IssuesUsagesList;
-import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrences;
-import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
-import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
-import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrences;
-import org.apache.ignite.ci.tcmodel.result.tests.TestRef;
import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.teamcity.pure.ITeamcityConn;
import org.apache.ignite.ci.util.Base64Util;
-import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+
/**
* API for calling methods from REST service:
* https://confluence.jetbrains.com/display/TCD10/REST+API
@@ -78,13 +68,6 @@ public interface ITeamcity extends ITeamcityConn {
return "app/rest/latest/builds/id:" + id;
}
-/**
- * List of build's related issues.
- *
- * @param href IssuesUsagesList href.
- */
-IssuesUsagesList getIssuesUsagesList(String href);
-
CompletableFuture unzipFirstFile(CompletableFuture fut);
CompletableFuture downloadBuildLogZip(int id);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 2766db3..6a85ddf 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -19,35 +19,9 @@ package org.apache.ignite.ci;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-import javax.annotation.Nullable;
-import javax.cache.Cache;
-import javax.inject.Inject;
-
import org.apache.ignite.Ig
ignite git commit: IGNITE-10216: disable sort annotations in inspection config - Fixes #5471.
Repository: ignite Updated Branches: refs/heads/master 475a0a715 -> cdaeda108 IGNITE-10216: disable sort annotations in inspection config - Fixes #5471. Signed-off-by: Nikolay Izhikov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdaeda10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdaeda10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdaeda10 Branch: refs/heads/master Commit: cdaeda108c7ce42e9b32264a37ce4ccbdbf55e42 Parents: 475a0a7 Author: Maxim Muzafarov Authored: Fri Nov 23 23:03:15 2018 +0300 Committer: Nikolay Izhikov Committed: Fri Nov 23 23:03:15 2018 +0300 -- idea/ignite_inspections.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cdaeda10/idea/ignite_inspections.xml -- diff --git a/idea/ignite_inspections.xml b/idea/ignite_inspections.xml index 7ce5af8..9695fca 100644 --- a/idea/ignite_inspections.xml +++ b/idea/ignite_inspections.xml @@ -518,7 +518,7 @@ - +
ignite git commit: IGNITE-9996: Performance drop final fix.
Repository: ignite
Updated Branches:
refs/heads/master 5c01c4199 -> 475a0a715
IGNITE-9996: Performance drop final fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/475a0a71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/475a0a71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/475a0a71
Branch: refs/heads/master
Commit: 475a0a71500dc4f638100f3ec0c7f8029db42f4a
Parents: 5c01c41
Author: Nikolay Izhikov
Authored: Fri Nov 23 21:22:12 2018 +0300
Committer: Nikolay Izhikov
Committed: Fri Nov 23 21:31:02 2018 +0300
--
.../cache/persistence/pagemem/PageMemoryImpl.java | 6 +++---
.../wal/serializer/RecordDataV1Serializer.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/475a0a71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index 6f7d2c5..b64b294 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -228,7 +228,7 @@ public class PageMemoryImpl implements PageMemoryEx {
private final GridEncryptionManager encMgr;
/** */
-private final EncryptionSpi encSpi;
+private final boolean encryptionDisabled;
/** */
private final IgniteLogger log;
@@ -324,7 +324,7 @@ public class PageMemoryImpl implements PageMemoryEx {
storeMgr = ctx.pageStore();
walMgr = ctx.wal();
encMgr = ctx.kernalContext().encryption();
-encSpi = ctx.gridConfig().getEncryptionSpi();
+encryptionDisabled = ctx.gridConfig().getEncryptionSpi() instanceof
NoopEncryptionSpi;
assert storeMgr != null;
assert walMgr != null;
@@ -973,7 +973,7 @@ public class PageMemoryImpl implements PageMemoryEx {
/** {@inheritDoc} */
@Override public int realPageSize(int grpId) {
-if ((encSpi instanceof NoopEncryptionSpi) || encMgr.groupKey(grpId) ==
null)
+if (encryptionDisabled || encMgr.groupKey(grpId) == null)
return pageSize();
return encPageSize;
http://git-wip-us.apache.org/repos/asf/ignite/blob/475a0a71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index ab35f46..84c4074 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -146,6 +146,9 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
private final GridEncryptionManager encMgr;
/** */
+private final boolean encryptionDisabled;
+
+/** */
private static final byte ENCRYPTED = 1;
/** */
@@ -162,6 +165,8 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
this.encSpi = cctx.gridConfig().getEncryptionSpi();
this.encMgr = cctx.kernalContext().encryption();
+encryptionDisabled = encSpi instanceof NoopEncryptionSpi;
+
//This happen on offline WAL iteration(we don't have encryption keys
available).
if (encSpi != null)
this.realPageSize = CU.encryptedPageSize(pageSize, encSpi);
@@ -227,7 +232,7 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
* @return {@code True} if this record should be encrypted.
*/
private boolean needEncryption(WALRecord rec) {
-if (encSpi instanceof NoopEncryptionSpi)
+if (encryptionDisabled)
return false;
if (!(rec instanceof WalRecordCacheGroupAware))
@@ -241,7 +246,7 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
* @return {@code True} if this record should be encrypted.
*/
private boolean needEncryption(int grpId) {
-if (encSpi instanceof NoopEncryptionSpi)
+if (enc
ignite git commit: IGNITE-9996: Performance drop final fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 db52210a5 -> c670b012c
IGNITE-9996: Performance drop final fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c670b012
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c670b012
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c670b012
Branch: refs/heads/ignite-2.7
Commit: c670b012c915f244f508340cbbaef47709b0c4c4
Parents: db52210
Author: Nikolay Izhikov
Authored: Fri Nov 23 21:22:12 2018 +0300
Committer: Nikolay Izhikov
Committed: Fri Nov 23 21:22:12 2018 +0300
--
.../cache/persistence/pagemem/PageMemoryImpl.java | 6 +++---
.../wal/serializer/RecordDataV1Serializer.java | 17 ++---
2 files changed, 17 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c670b012/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index 0214c10..31c1438 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -228,7 +228,7 @@ public class PageMemoryImpl implements PageMemoryEx {
private final GridEncryptionManager encMgr;
/** */
-private final EncryptionSpi encSpi;
+private final boolean encryptionDisabled;
/** */
private final IgniteLogger log;
@@ -324,7 +324,7 @@ public class PageMemoryImpl implements PageMemoryEx {
storeMgr = ctx.pageStore();
walMgr = ctx.wal();
encMgr = ctx.kernalContext().encryption();
-encSpi = ctx.gridConfig().getEncryptionSpi();
+encryptionDisabled = ctx.gridConfig().getEncryptionSpi() instanceof
NoopEncryptionSpi;
assert storeMgr != null;
assert walMgr != null;
@@ -970,7 +970,7 @@ public class PageMemoryImpl implements PageMemoryEx {
/** {@inheritDoc} */
@Override public int realPageSize(int grpId) {
-if ((encSpi instanceof NoopEncryptionSpi) || encMgr.groupKey(grpId) ==
null)
+if (encryptionDisabled || encMgr.groupKey(grpId) == null)
return pageSize();
return encPageSize;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c670b012/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index a802665..69316a2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -146,6 +146,9 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
private final GridEncryptionManager encMgr;
/** */
+private final boolean encryptionDisabled;
+
+/** */
private static final byte ENCRYPTED = 1;
/** */
@@ -162,6 +165,8 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
this.encSpi = cctx.gridConfig().getEncryptionSpi();
this.encMgr = cctx.kernalContext().encryption();
+encryptionDisabled = encSpi instanceof NoopEncryptionSpi;
+
//This happen on offline WAL iteration(we don't have encryption keys
available).
if (encSpi != null)
this.realPageSize = CU.encryptedPageSize(pageSize, encSpi);
@@ -227,7 +232,7 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
* @return {@code True} if this record should be encrypted.
*/
private boolean needEncryption(WALRecord rec) {
-if (encSpi instanceof NoopEncryptionSpi)
+if (encryptionDisabled)
return false;
if (!(rec instanceof WalRecordCacheGroupAware))
@@ -241,7 +246,7 @@ public class RecordDataV1Serializer implements
RecordDataSerializer {
* @return {@code True} if this record should be encrypted.
*/
private boolean needEncryption(int grpId) {
-if (encSpi instanceof NoopEncryptionSpi)
+
ignite git commit: IGNITE-10392 Use lasdAffChangedTopVer if DiscoCache for the requested topVer isn't ready - Fixes #5488.
Repository: ignite
Updated Branches:
refs/heads/master 5b656e2f3 -> 5c01c4199
IGNITE-10392 Use lasdAffChangedTopVer if DiscoCache for the requested topVer
isn't ready - Fixes #5488.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c01c419
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c01c419
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c01c419
Branch: refs/heads/master
Commit: 5c01c4199df3ba3a479d4566561335d57adffd0f
Parents: 5b656e2
Author: Ilya Lantukh
Authored: Fri Nov 23 20:23:16 2018 +0300
Committer: Alexey Goncharuk
Committed: Fri Nov 23 20:23:16 2018 +0300
--
.../internal/managers/discovery/GridDiscoveryManager.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c01c419/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 476fe7e..0a982b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -2058,6 +2058,14 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
snap.discoCache : discoCacheHist.get(topVer);
if (cache == null) {
+AffinityTopologyVersion lastAffChangedTopVer =
+
ctx.cache().context().exchange().lastAffinityChangedTopologyVersion(topVer);
+
+DiscoCache lastAffChangedDiscoCache =
discoCacheHist.get(lastAffChangedTopVer);
+
+if (lastAffChangedDiscoCache != null)
+return lastAffChangedDiscoCache;
+
CacheGroupDescriptor desc =
ctx.cache().cacheGroupDescriptors().get(grpId);
throw new IgniteException("Failed to resolve nodes topology [" +
ignite git commit: IGNITE-10339 Skip index partition file integrity check for in-memory caches - Fixes #5475.
Repository: ignite
Updated Branches:
refs/heads/master 97d242263 -> 5b656e2f3
IGNITE-10339 Skip index partition file integrity check for in-memory caches -
Fixes #5475.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b656e2f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b656e2f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b656e2f
Branch: refs/heads/master
Commit: 5b656e2f3b2157200d650923e5aca800c4d61635
Parents: 97d2422
Author: Ivan Daschinskiy
Authored: Fri Nov 23 19:36:00 2018 +0300
Committer: Alexey Goncharuk
Committed: Fri Nov 23 19:36:00 2018 +0300
--
.../apache/ignite/internal/commandline/CommandHandler.java | 6 --
.../ignite/internal/visor/verify/ValidateIndexesClosure.java | 8 +---
2 files changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5b656e2f/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index 56fbfae..e9a4281 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -820,7 +820,11 @@ public class CommandHandler {
VisorValidateIndexesTaskResult taskRes = executeTaskByNameOnNode(
client, VALIDATE_INDEXES_TASK, taskArg, null);
+boolean errors = false;
+
if (!F.isEmpty(taskRes.exceptions())) {
+errors = true;
+
log("Index validation failed on nodes:");
for (Map.Entry e :
taskRes.exceptions().entrySet()) {
@@ -832,8 +836,6 @@ public class CommandHandler {
}
}
-boolean errors = false;
-
for (Map.Entry nodeEntry :
taskRes.results().entrySet()) {
if (!nodeEntry.getValue().hasIssues())
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5b656e2f/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
index ec02c25..b6909e3 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
@@ -260,7 +260,8 @@ public class ValidateIndexesClosure implements
IgniteCallable partRes =
fut.get();
-partResults.putAll(partRes);
+if (!partRes.isEmpty() &&
partRes.entrySet().stream().anyMatch(e -> !e.getValue().issues().isEmpty()))
+partResults.putAll(partRes);
}
for (; curIdx < procIdxFutures.size(); curIdx++) {
@@ -268,7 +269,8 @@ public class ValidateIndexesClosure implements
IgniteCallable idxRes = fut.get();
-idxResults.putAll(idxRes);
+if (!idxRes.isEmpty() && idxRes.entrySet().stream().anyMatch(e
-> !e.getValue().issues().isEmpty()))
+idxResults.putAll(idxRes);
}
log.warning("ValidateIndexesClosure finished: processed " +
totalPartitions + " partitions and "
@@ -296,7 +298,7 @@ public class ValidateIndexesClosure implements
IgniteCallable
ignite git commit: IGNITE-10381 Fixed U.doInParallel not to terminate early - Fixes #5483.
Repository: ignite
Updated Branches:
refs/heads/master ae5bfadf0 -> 97d242263
IGNITE-10381 Fixed U.doInParallel not to terminate early - Fixes #5483.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97d24226
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97d24226
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97d24226
Branch: refs/heads/master
Commit: 97d242263a2b2f8f2c6677df1007a6bd3188522b
Parents: ae5bfad
Author: Alexey Goncharuk
Authored: Fri Nov 23 19:11:31 2018 +0300
Committer: Alexey Goncharuk
Committed: Fri Nov 23 19:11:31 2018 +0300
--
.../GridCachePartitionExchangeManager.java | 4 +-
.../GridDhtPartitionsExchangeFuture.java| 3 +-
.../ignite/internal/util/IgniteUtils.java | 189 +++
...ynamicCacheStartFailWithPersistenceTest.java | 1 +
.../internal/util/IgniteUtilsSelfTest.java | 43 -
5 files changed, 34 insertions(+), 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index fed5686..6dad367 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -2906,8 +2906,8 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
"topVer=" +
exchFut.initialVersion() +
", node=" + cctx.localNodeId() +
"]. " +
(curTimeout <= 0 && !txRolledBack
? "Consider changing " +
-
"TransactionConfiguration.txTimeoutOnPartitionMapSynchronization" +
-" to non default value to
avoid this message. " : "") +
+
"TransactionConfiguration.txTimeoutOnPartitionMapSynchronization" +
+" to non default value to avoid
this message. " : "") +
"Dumping pending objects that
might be the cause: ");
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 9d81405..3384bb9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1189,7 +1189,8 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
// This exception will be handled by init() method.
throw e;
-U.error(log, "Failed to initialize cache(s) (will try to
rollback). " + exchId, e);
+U.error(log, "Failed to initialize cache(s) (will try to rollback)
[exchId=" + exchId +
+", caches=" + exchActions.cacheGroupsToStart() + ']', e);
exchangeLocE = new IgniteCheckedException(
"Failed to initialize exchange locally [locNodeId=" +
cctx.localNodeId() + "]", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/97d24226/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f1f4253..2d6b584 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -202,7 +202,6 @@ i
[ignite-teamcity-bot] 01/01: IGNITE-9542 Remove unused code, provide separated base/current branch history for PR page
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9542
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit e6bbf11a3adcc96dd9cb73adb8efea0572983d09
Author: Dmitriy Pavlov
AuthorDate: Fri Nov 23 17:51:31 2018 +0300
IGNITE-9542 Remove unused code, provide separated base/current branch
history for PR page
---
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 37 ++
.../java/org/apache/ignite/ci/db/DbMigrations.java | 2 --
2 files changed, 2 insertions(+), 37 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 14795cc..2766db3 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -127,8 +127,7 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
DbMigrations migrations = new DbMigrations(ignite, conn.serverId());
migrations.dataMigration(
-this::migrateOccurrencesToLatest,
-buildsCache(), this::addBuildOccurrenceToFailuresStat,
+buildsCache(), this::addBuildOccurrenceToFailuresStat,
buildsFailureRunStatCache(), testRunStatCache(),
visasHistStorage.visas());
}
@@ -512,40 +511,8 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
}, next);
}
-private void migrateOccurrencesToLatest(TestOccurrences val) {
-for (TestOccurrence next : val.getTests())
-migrateTestOneOcurrToAddToLatest(next);
-}
-
-private void migrateTestOneOcurrToAddToLatest(TestOccurrence next) {
-String name = next.getName();
-if (Strings.isNullOrEmpty(name))
-return;
-
-if (next.isMutedTest() || next.isIgnoredTest())
-return;
-
-TestInBranch k = new TestInBranch(name, ITeamcity.DEFAULT);
-
-testRunStatCache().invoke(k, (entry, arguments) -> {
-TestInBranch key = entry.getKey();
-TestOccurrence testOccurrence = (TestOccurrence)arguments[0];
-
-RunStat val = entry.getValue();
-if (val == null)
-val = new RunStat(key.name);
-
-val.addTestRunToLatest(testOccurrence,
RunStat.ChangesState.UNKNOWN);
-
-entry.setValue(val);
-
-return null;
-}, next);
-}
-
/** {@inheritDoc} */
-@Override
-public List topFailingSuite(int cnt) {
+@Override public List topFailingSuite(int cnt) {
return CollectionUtil.top(buildsFailureAnalysis(), cnt,
Comparator.comparing(RunStat::getFailRate));
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
index 8ead279..0df6cc2 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/DbMigrations.java
@@ -42,7 +42,6 @@ import org.apache.ignite.ci.issue.IssuesStorage;
import org.apache.ignite.ci.observer.CompactBuildsInfo;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
-import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrences;
import org.apache.ignite.ci.web.model.CompactContributionKey;
import org.apache.ignite.ci.web.model.CompactVisa;
import org.apache.ignite.ci.web.model.CompactVisaRequest;
@@ -127,7 +126,6 @@ public class DbMigrations {
}
public void dataMigration(
-Consumer saveTestToLatest,
Cache buildCache, Consumer saveBuildToStat,
IgniteCache suiteHistCache,
IgniteCache testHistCache,
[ignite-teamcity-bot] branch ignite-9542 created (now e6bbf11)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch ignite-9542 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. at e6bbf11 IGNITE-9542 Remove unused code, provide separated base/current branch history for PR page This branch includes the following new commits: new e6bbf11 IGNITE-9542 Remove unused code, provide separated base/current branch history for PR page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
ignite git commit: IGNITE-9828: Muted tests.
Repository: ignite
Updated Branches:
refs/heads/master 1dea0a427 -> ae5bfadf0
IGNITE-9828: Muted tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae5bfadf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae5bfadf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae5bfadf
Branch: refs/heads/master
Commit: ae5bfadf09254fd62416c887c1404713582a4571
Parents: 1dea0a4
Author: Igor Seliverstov
Authored: Fri Nov 23 17:32:00 2018 +0300
Committer: Igor Seliverstov
Committed: Fri Nov 23 17:32:22 2018 +0300
--
.../CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java| 5 +
.../continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java | 5 +
2 files changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae5bfadf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
index 334d219..7c15f38 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
@@ -50,4 +50,9 @@ public class CacheContinuousQueryAsyncFailoverMvccTxSelfTest
extends CacheConti
@Override public void testLeftPrimaryAndBackupNodes() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-10047";);
}
+
+/** {@inheritDoc} */
+@Override public void testFailoverStartStopBackup() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
+}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae5bfadf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
index 76d1689..2d578f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
@@ -45,4 +45,9 @@ public class CacheContinuousQueryFailoverMvccTxSelfTest
extends CacheContinuousQ
@Override public void testLeftPrimaryAndBackupNodes() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-10047";);
}
+
+/** {@inheritDoc} */
+@Override public void testFailoverStartStopBackup() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
+}
}
\ No newline at end of file
[2/5] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/titanic.csv
--
diff --git a/examples/src/main/resources/datasets/titanic.csv
b/examples/src/main/resources/datasets/titanic.csv
new file mode 100644
index 000..6994016
--- /dev/null
+++ b/examples/src/main/resources/datasets/titanic.csv
@@ -0,0 +1,1310 @@
+pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest
+1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO
+1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22
C26;AA;11;;Montreal, PQ / Chesterville, ON
+1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22
C26;S;;;Montreal, PQ / Chesterville, ON
+1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22
C26;S;;135;Montreal, PQ / Chesterville, ON
+1;0;Allison, Mrs. Hudson J C (Bessie Waldo
Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON
+1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY
+1;1;Andrews, Miss. Kornelia
Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY
+1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI
+1;1;Appleton, Mrs. Edward Dale (Charlotte
Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY
+1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo,
Uruguay
+1;0;Astor, Col. John Jacob;male;47;1;0;PC 17757;227,525;C62 C64;C;;124;New
York, NY
+1;1;Astor, Mrs. John Jacob (Madeleine Talmadge Force);female;18;1;0;PC
17757;227,525;C62 C64;C;4;;New York, NY
+1;1;Aubart, Mme. Leontine Pauline;female;24;0;0;PC 17477;69,3;B35;C;9;;Paris,
France
+1;1;"Barber, Miss. Ellen ""Nellie""";female;26;0;0;19877;78,85;;S;6;;
+1;1;Barkworth, Mr. Algernon Henry Wilson;male;80;0;0;27042;30;A23;S;B;;Hessle,
Yorks
+1;0;Baumann, Mr. John D;male;;0;0;PC 17318;25,925;;S;;;New York, NY
+1;0;Baxter, Mr. Quigg Edmond;male;24;0;1;PC 17558;247,5208;B58
B60;C;;;Montreal, PQ
+1;1;Baxter, Mrs. James (Helene DeLaudeniere Chaput);female;50;0;1;PC
17558;247,5208;B58 B60;C;6;;Montreal, PQ
+1;1;Bazzani, Miss. Albina;female;32;0;0;11813;76,2917;D15;C;8;;
+1;0;Beattie, Mr. Thomson;male;36;0;0;13050;75,2417;C6;C;A;;Winnipeg, MN
+1;1;Beckwith, Mr. Richard Leonard;male;37;1;1;11751;52,5542;D35;S;5;;New York,
NY
+1;1;Beckwith, Mrs. Richard Leonard (Sallie
Monypeny);female;47;1;1;11751;52,5542;D35;S;5;;New York, NY
+1;1;Behr, Mr. Karl Howell;male;26;0;0;111369;30;C148;C;5;;New York, NY
+1;1;Bidois, Miss. Rosalie;female;42;0;0;PC 17757;227,525;;C;4;;
+1;1;Bird, Miss. Ellen;female;29;0;0;PC 17483;221,7792;C97;S;8;;
+1;0;Birnbaum, Mr. Jakob;male;25;0;0;13905;26;;C;;148;San Francisco, CA
+1;1;Bishop, Mr. Dickinson H;male;25;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI
+1;1;Bishop, Mrs. Dickinson H (Helen
Walton);female;19;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI
+1;1;Bissette, Miss. Amelia;female;35;0;0;PC 17760;135,6333;C99;S;8;;
+1;1;Bjornstrom-Steffansson, Mr. Mauritz
Hakan;male;28;0;0;110564;26,55;C52;S;D;;Stockholm, Sweden / Washington, DC
+1;0;Blackwell, Mr. Stephen Weart;male;45;0;0;113784;35,5;T;S;;;Trenton, NJ
+1;1;Blank, Mr. Henry;male;40;0;0;112277;31;A31;C;7;;Glen Ridge, NJ
+1;1;Bonnell, Miss. Caroline;female;30;0;0;36928;164,8667;C7;S;8;;Youngstown, OH
+1;1;Bonnell, Miss. Elizabeth;female;58;0;0;113783;26,55;C103;S;8;;Birkdale,
England Cleveland, Ohio
+1;0;Borebank, Mr. John James;male;42;0;0;110489;26,55;D22;S;;;London /
Winnipeg, MB
+1;1;Bowen, Miss. Grace Scott;female;45;0;0;PC 17608;262,375;;C;4;;Cooperstown,
NY
+1;1;Bowerman, Miss. Elsie Edith;female;22;0;1;113505;55;E33;S;6;;St
Leonards-on-Sea, England Ohio
+1;1;"Bradley, Mr. George (""George Arthur
Brayton"")";male;;0;0;111427;26,55;;S;9;;Los Angeles, CA
+1;0;Brady, Mr. John Bertram;male;41;0;0;113054;30,5;A21;S;;;Pomeroy, WA
+1;0;Brandeis, Mr. Emil;male;48;0;0;PC 17591;50,4958;B10;C;;208;Omaha, NE
+1;0;Brewe, Dr. Arthur Jackson;male;;0;0;112379;39,6;;C;;;Philadelphia, PA
+1;1;Brown, Mrs. James Joseph (Margaret Tobin);female;44;0;0;PC
17610;27,7208;B4;C;6;;Denver, CO
+1;1;Brown, Mrs. John Murray (Caroline Lane
Lamson);female;59;2;0;11769;51,4792;C101;S;D;;Belmont, MA
+1;1;Bucknell, Mrs. William Robert (Emma Eliza
Ward);female;60;0;0;11813;76,2917;D15;C;8;;Philadelphia, PA
+1;1;Burns, Miss. Elizabeth Margaret;female;41;0;0;16966;134,5;E40;C;3;;
+1;0;Butt, Major. Archibald
Willingham;male;45;0;0;113050;26,55;B38;S;;;Washington, DC
+1;0;Cairns, Mr. Alexander;male;;0;0;113798;31;;S;;;
+1;1;Calderhead, Mr. Edward Pennington;male;42;0;0;PC
17476;26,2875;E24;S;5;;New York, NY
+1;1;Candee, Mrs. Edward (Helen Churchill Hungerford);female;53;0;0;PC
17606;27,4458;;C;6;;Washington, DC
+1;1;Cardeza, Mr. Thomas Drake Martinez;male;36;0;1;PC 17755;512,3292;B51 B53
B55;C;3;;Austria-Hungary / Germantown, Philadelphia, PA
+1;1;Cardeza, Mrs. James Warburton Martinez (Charlotte Wardle
Drake);fe
[4/5] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv
b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv
deleted file mode 100644
index 6994016..000
---
a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic.csv
+++ /dev/null
@@ -1,1310 +0,0 @@
-pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest
-1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO
-1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22
C26;AA;11;;Montreal, PQ / Chesterville, ON
-1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22
C26;S;;;Montreal, PQ / Chesterville, ON
-1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22
C26;S;;135;Montreal, PQ / Chesterville, ON
-1;0;Allison, Mrs. Hudson J C (Bessie Waldo
Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON
-1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY
-1;1;Andrews, Miss. Kornelia
Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY
-1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI
-1;1;Appleton, Mrs. Edward Dale (Charlotte
Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY
-1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo,
Uruguay
-1;0;Astor, Col. John Jacob;male;47;1;0;PC 17757;227,525;C62 C64;C;;124;New
York, NY
-1;1;Astor, Mrs. John Jacob (Madeleine Talmadge Force);female;18;1;0;PC
17757;227,525;C62 C64;C;4;;New York, NY
-1;1;Aubart, Mme. Leontine Pauline;female;24;0;0;PC 17477;69,3;B35;C;9;;Paris,
France
-1;1;"Barber, Miss. Ellen ""Nellie""";female;26;0;0;19877;78,85;;S;6;;
-1;1;Barkworth, Mr. Algernon Henry Wilson;male;80;0;0;27042;30;A23;S;B;;Hessle,
Yorks
-1;0;Baumann, Mr. John D;male;;0;0;PC 17318;25,925;;S;;;New York, NY
-1;0;Baxter, Mr. Quigg Edmond;male;24;0;1;PC 17558;247,5208;B58
B60;C;;;Montreal, PQ
-1;1;Baxter, Mrs. James (Helene DeLaudeniere Chaput);female;50;0;1;PC
17558;247,5208;B58 B60;C;6;;Montreal, PQ
-1;1;Bazzani, Miss. Albina;female;32;0;0;11813;76,2917;D15;C;8;;
-1;0;Beattie, Mr. Thomson;male;36;0;0;13050;75,2417;C6;C;A;;Winnipeg, MN
-1;1;Beckwith, Mr. Richard Leonard;male;37;1;1;11751;52,5542;D35;S;5;;New York,
NY
-1;1;Beckwith, Mrs. Richard Leonard (Sallie
Monypeny);female;47;1;1;11751;52,5542;D35;S;5;;New York, NY
-1;1;Behr, Mr. Karl Howell;male;26;0;0;111369;30;C148;C;5;;New York, NY
-1;1;Bidois, Miss. Rosalie;female;42;0;0;PC 17757;227,525;;C;4;;
-1;1;Bird, Miss. Ellen;female;29;0;0;PC 17483;221,7792;C97;S;8;;
-1;0;Birnbaum, Mr. Jakob;male;25;0;0;13905;26;;C;;148;San Francisco, CA
-1;1;Bishop, Mr. Dickinson H;male;25;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI
-1;1;Bishop, Mrs. Dickinson H (Helen
Walton);female;19;1;0;11967;91,0792;B49;C;7;;Dowagiac, MI
-1;1;Bissette, Miss. Amelia;female;35;0;0;PC 17760;135,6333;C99;S;8;;
-1;1;Bjornstrom-Steffansson, Mr. Mauritz
Hakan;male;28;0;0;110564;26,55;C52;S;D;;Stockholm, Sweden / Washington, DC
-1;0;Blackwell, Mr. Stephen Weart;male;45;0;0;113784;35,5;T;S;;;Trenton, NJ
-1;1;Blank, Mr. Henry;male;40;0;0;112277;31;A31;C;7;;Glen Ridge, NJ
-1;1;Bonnell, Miss. Caroline;female;30;0;0;36928;164,8667;C7;S;8;;Youngstown, OH
-1;1;Bonnell, Miss. Elizabeth;female;58;0;0;113783;26,55;C103;S;8;;Birkdale,
England Cleveland, Ohio
-1;0;Borebank, Mr. John James;male;42;0;0;110489;26,55;D22;S;;;London /
Winnipeg, MB
-1;1;Bowen, Miss. Grace Scott;female;45;0;0;PC 17608;262,375;;C;4;;Cooperstown,
NY
-1;1;Bowerman, Miss. Elsie Edith;female;22;0;1;113505;55;E33;S;6;;St
Leonards-on-Sea, England Ohio
-1;1;"Bradley, Mr. George (""George Arthur
Brayton"")";male;;0;0;111427;26,55;;S;9;;Los Angeles, CA
-1;0;Brady, Mr. John Bertram;male;41;0;0;113054;30,5;A21;S;;;Pomeroy, WA
-1;0;Brandeis, Mr. Emil;male;48;0;0;PC 17591;50,4958;B10;C;;208;Omaha, NE
-1;0;Brewe, Dr. Arthur Jackson;male;;0;0;112379;39,6;;C;;;Philadelphia, PA
-1;1;Brown, Mrs. James Joseph (Margaret Tobin);female;44;0;0;PC
17610;27,7208;B4;C;6;;Denver, CO
-1;1;Brown, Mrs. John Murray (Caroline Lane
Lamson);female;59;2;0;11769;51,4792;C101;S;D;;Belmont, MA
-1;1;Bucknell, Mrs. William Robert (Emma Eliza
Ward);female;60;0;0;11813;76,2917;D15;C;8;;Philadelphia, PA
-1;1;Burns, Miss. Elizabeth Margaret;female;41;0;0;16966;134,5;E40;C;3;;
-1;0;Butt, Major. Archibald
Willingham;male;45;0;0;113050;26,55;B38;S;;;Washington, DC
-1;0;Cairns, Mr. Alexander;male;;0;0;113798;31;;S;;;
-1;1;Calderhead, Mr. Edward Pennington;male;42;0;0;PC
17476;26,2875;E24;S;5;;New York, NY
-1;1;Candee, Mrs. Edward (Helen Churchill Hungerford);female;53;0;0;PC
17606;27,4458;;C;6;;Washington, DC
-1;1;Cardeza, Mr. Thomas Drake Martinez;male;36;0;1;PC 17755;512,3292;B51 B53
B
[3/5] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv deleted file mode 100644 index 8146db3..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/titanic_10_rows.csv +++ /dev/null @@ -1,11 +0,0 @@ -pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest -1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO -1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;S;11;;Montreal, PQ / Chesterville, ON -1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON -1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON -1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY -1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY -1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI -1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY -1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv -- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv b/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv deleted file mode 100644 index 872c699..000 --- a/examples/src/main/java/org/apache/ignite/examples/ml/util/datasets/two_classed_iris.csv +++ /dev/null @@ -1,100 +0,0 @@ -0 5.1 3.5 1.4 0.2 -0 4.9 3 1.4 0.2 -0 4.7 3.2 1.3 0.2 -0 4.6 3.1 1.5 0.2 -0 5 3.6 1.4 0.2 -0 5.4 3.9 1.7 0.4 -0 4.6 3.4 1.4 0.3 -0 5 3.4 1.5 0.2 -0 4.4 2.9 1.4 0.2 -0 4.9 3.1 1.5 0.1 -0 5.4 3.7 1.5 0.2 -0 4.8 3.4 1.6 0.2 -0 4.8 3 1.4 0.1 -0 4.3 3 1.1 0.1 -0 5.8 4 1.2 0.2 -0 5.7 4.4 1.5 0.4 -0 5.4 3.9 1.3 0.4 -0 5.1 3.5 1.4 0.3 -0 5.7 3.8 1.7 0.3 -0 5.1 3.8 1.5 0.3 -0 5.4 3.4 1.7 0.2 -0 5.1 3.7 1.5 0.4 -0 4.6 3.6 1 0.2 -0 5.1 3.3 1.7 0.5 -0 4.8 3.4 1.9 0.2 -0 5 3 1.6 0.2 -0 5 3.4 1.6 0.4 -0 5.2 3.5 1.5 0.2 -0 5.2 3.4 1.4 0.2 -0 4.7 3.2 1.6 0.2 -0 4.8 3.1 1.6 0.2 -0 5.4 3.4 1.5 0.4 -0 5.2 4.1 1.5 0.1 -0 5.5 4.2 1.4 0.2 -0 4.9 3.1 1.5 0.1 -0 5 3.2 1.2 0.2 -0 5.5 3.5 1.3 0.2 -0 4.9 3.1 1.5 0.1 -0 4.4 3 1.3 0.2 -0 5.1 3.4 1.5 0.2 -0 5 3.5 1.3 0.3 -0 4.5 2.3 1.3 0.3 -0 4.4 3.2 1.3 0.2 -0 5 3.5 1.6 0.6 -0 5.1 3.8 1.9 0.4 -0 4.8 3 1.4 0.3 -0 5.1 3.8 1.6 0.2 -0 4.6 3.2 1.4 0.2 -0 5.3 3.7 1.5 0.2 -0 5 3.3 1.4 0.2 -1 7 3.2 4.7 1.4 -1 6.4 3.2 4.5 1.5 -1 6.9 3.1 4.9 1.5 -1 5.5 2.3 4 1.3 -1 6.5 2.8 4.6 1.5 -1 5.7 2.8 4.5 1.3 -1 6.3 3.3 4.7 1.6 -1 4.9 2.4 3.3 1 -1 6.6 2.9 4.6 1.3 -1 5.2 2.7 3.9 1.4 -1 5 2 3.5 1 -1 5.9 3 4.2 1.5 -1 6 2.2 4 1 -1 6.1 2.9 4.7 1.4 -1 5.6 2.9 3.6 1.3 -1 6.7 3.1 4.4 1.4 -1 5.6 3 4.5 1.5 -1 5.8 2.7 4.1 1 -1 6.2 2.2 4.5 1.5 -1 5.6 2.5 3.9 1.1 -1 5.9 3.2 4.8 1.8 -1 6.1 2.8 4 1.3 -1 6.3 2.5 4.9 1.5 -1 6.1 2.8 4.7 1.2 -1 6.4 2.9 4.3 1.3 -1 6.6 3 4.4 1.4 -1 6.8 2.8 4.8 1.4 -1 6.7
[5/5] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
IGNITE-10335: move ML examples datasets files to resources
This closes #5434
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1dea0a42
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1dea0a42
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1dea0a42
Branch: refs/heads/master
Commit: 1dea0a4273bf54ca2361a3a940db22ba89274ab5
Parents: 39b59d2
Author: Oleg Ignatenko
Authored: Fri Nov 23 16:54:25 2018 +0300
Committer: Yury Babak
Committed: Fri Nov 23 16:54:25 2018 +0300
--
.../TensorFlowDistributedInferenceExample.java | 16 +-
.../TensorFlowLocalInferenceExample.java| 16 +-
.../TensorFlowThreadedInferenceExample.java | 16 +-
.../examples/ml/util/MLSandboxDatasets.java | 16 +-
.../ignite/examples/ml/util/SandboxMLCache.java | 11 +-
.../ignite/examples/ml/util/datasets/README.md |2 -
.../ml/util/datasets/boston_housing_dataset.txt | 505 ---
.../ml/util/datasets/cleared_machines.csv | 209 ---
.../ml/util/datasets/glass_identification.csv | 116 --
.../ignite/examples/ml/util/datasets/iris.txt | 150 --
.../examples/ml/util/datasets/mortalitydata.csv | 53 -
.../ml/util/datasets/t10k-images-idx3-ubyte | Bin 7840016 -> 0 bytes
.../ml/util/datasets/t10k-labels-idx1-ubyte | Bin 10008 -> 0 bytes
.../examples/ml/util/datasets/titanic.csv | 1310 --
.../ml/util/datasets/titanic_10_rows.csv| 11 -
.../ml/util/datasets/two_classed_iris.csv | 100 --
.../ignite/examples/ml/util/datasets/wine.txt | 178 ---
examples/src/main/resources/datasets/README.md |2 +
.../datasets/boston_housing_dataset.txt | 505 +++
.../resources/datasets/cleared_machines.csv | 209 +++
.../resources/datasets/glass_identification.csv | 116 ++
examples/src/main/resources/datasets/iris.txt | 150 ++
.../main/resources/datasets/mortalitydata.csv | 53 +
.../resources/datasets/t10k-images-idx3-ubyte | Bin 0 -> 9876027 bytes
.../resources/datasets/t10k-labels-idx1-ubyte | Bin 0 -> 10008 bytes
.../src/main/resources/datasets/titanic.csv | 1310 ++
.../main/resources/datasets/titanic_10_rows.csv | 11 +
.../resources/datasets/two_classed_iris.csv | 100 ++
examples/src/main/resources/datasets/wine.txt | 178 +++
parent/pom.xml |1 -
30 files changed, 2676 insertions(+), 2668 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java
b/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java
index cc22df3..ec8cac6 100644
---
a/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/ml/inference/TensorFlowDistributedInferenceExample.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Random;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -46,10 +47,10 @@ public class TensorFlowDistributedInferenceExample {
private static final String MODEL_PATH =
"examples/src/main/resources/ml/mnist_tf_model";
/** Path to the MNIST images data. */
-private static final String MNIST_IMG_PATH =
"org/apache/ignite/examples/ml/util/datasets/t10k-images-idx3-ubyte";
+private static final String MNIST_IMG_PATH =
"examples/src/main/resources/datasets/t10k-images-idx3-ubyte";
/** Path to the MNIST labels data. */
-private static final String MNIST_LBL_PATH =
"org/apache/ignite/examples/ml/util/datasets/t10k-labels-idx1-ubyte";
+private static final String MNIST_LBL_PATH =
"examples/src/main/resources/datasets/t10k-labels-idx1-ubyte";
/** Run example. */
public static void main(String[] args) throws IOException,
ExecutionException, InterruptedException {
@@ -69,13 +70,12 @@ public class TensorFlowDistributedInferenceExample {
return Tensor.create(reshaped);
})
-.withOutput(Collections.singletonList("ArgMax"),
collectedTensors -> {
-return collectedTensors.get("ArgMax").copyTo(new
long[1])[0];
-});
+.withOutput(Collections.singletonList("ArgMax"),
collectedTensors -> collectedTensors.get("ArgMax")
+.copyTo(new long[1])[0]);
[1/5] ignite git commit: IGNITE-10335: move ML examples datasets files to resources
Repository: ignite Updated Branches: refs/heads/master 39b59d21e -> 1dea0a427 http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/titanic_10_rows.csv -- diff --git a/examples/src/main/resources/datasets/titanic_10_rows.csv b/examples/src/main/resources/datasets/titanic_10_rows.csv new file mode 100644 index 000..8146db3 --- /dev/null +++ b/examples/src/main/resources/datasets/titanic_10_rows.csv @@ -0,0 +1,11 @@ +pclass;survived;name;sex;age;sibsp;parch;ticket;fare;cabin;embarked;boat;body;homedest +1;1;Allen, Miss. Elisabeth Walton;;29;;;24160;211,3375;B5;;2;;St Louis, MO +1;1;Allison, Master. Hudson Trevor;male;0,9167;1;2;113781;151,55;C22 C26;S;11;;Montreal, PQ / Chesterville, ON +1;0;Allison, Miss. Helen Loraine;female;2;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;0;Allison, Mr. Hudson Joshua Creighton;male;30;1;2;113781;151,55;C22 C26;S;;135;Montreal, PQ / Chesterville, ON +1;0;Allison, Mrs. Hudson J C (Bessie Waldo Daniels);female;25;1;2;113781;151,55;C22 C26;S;;;Montreal, PQ / Chesterville, ON +1;1;Anderson, Mr. Harry;male;48;0;0;19952;26,55;E12;S;3;;New York, NY +1;1;Andrews, Miss. Kornelia Theodosia;female;63;1;0;13502;77,9583;D7;S;10;;Hudson, NY +1;0;Andrews, Mr. Thomas Jr;male;39;0;0;112050;0;A36;S;;;Belfast, NI +1;1;Appleton, Mrs. Edward Dale (Charlotte Lamson);female;53;2;0;11769;51,4792;C101;S;D;;Bayside, Queens, NY +1;0;Artagaveytia, Mr. Ramon;male;71;0;0;PC 17609;49,5042;;C;;22;Montevideo, Uruguay http://git-wip-us.apache.org/repos/asf/ignite/blob/1dea0a42/examples/src/main/resources/datasets/two_classed_iris.csv -- diff --git a/examples/src/main/resources/datasets/two_classed_iris.csv b/examples/src/main/resources/datasets/two_classed_iris.csv new file mode 100644 index 000..872c699 --- /dev/null +++ b/examples/src/main/resources/datasets/two_classed_iris.csv @@ -0,0 +1,100 @@ +0 5.1 3.5 1.4 0.2 +0 4.9 3 1.4 0.2 +0 4.7 3.2 1.3 0.2 +0 4.6 3.1 1.5 0.2 +0 5 3.6 1.4 0.2 +0 5.4 3.9 1.7 0.4 +0 4.6 3.4 1.4 0.3 +0 5 3.4 1.5 0.2 +0 4.4 2.9 1.4 0.2 +0 4.9 3.1 1.5 0.1 +0 5.4 3.7 1.5 0.2 +0 4.8 3.4 1.6 0.2 +0 4.8 3 1.4 0.1 +0 4.3 3 1.1 0.1 +0 5.8 4 1.2 0.2 +0 5.7 4.4 1.5 0.4 +0 5.4 3.9 1.3 0.4 +0 5.1 3.5 1.4 0.3 +0 5.7 3.8 1.7 0.3 +0 5.1 3.8 1.5 0.3 +0 5.4 3.4 1.7 0.2 +0 5.1 3.7 1.5 0.4 +0 4.6 3.6 1 0.2 +0 5.1 3.3 1.7 0.5 +0 4.8 3.4 1.9 0.2 +0 5 3 1.6 0.2 +0 5 3.4 1.6 0.4 +0 5.2 3.5 1.5 0.2 +0 5.2 3.4 1.4 0.2 +0 4.7 3.2 1.6 0.2 +0 4.8 3.1 1.6 0.2 +0 5.4 3.4 1.5 0.4 +0 5.2 4.1 1.5 0.1 +0 5.5 4.2 1.4 0.2 +0 4.9 3.1 1.5 0.1 +0 5 3.2 1.2 0.2 +0 5.5 3.5 1.3 0.2 +0 4.9 3.1 1.5 0.1 +0 4.4 3 1.3 0.2 +0 5.1 3.4 1.5 0.2 +0 5 3.5 1.3 0.3 +0 4.5 2.3 1.3 0.3 +0 4.4 3.2 1.3 0.2 +0 5 3.5 1.6 0.6 +0 5.1 3.8 1.9 0.4 +0 4.8 3 1.4 0.3 +0 5.1 3.8 1.6 0.2 +0 4.6 3.2 1.4 0.2 +0 5.3 3.7 1.5 0.2 +0 5 3.3 1.4 0.2 +1 7 3.2 4.7 1.4 +1 6.4 3.2 4.5 1.5 +1 6.9 3.1 4.9 1.5 +1 5.5 2.3 4 1.3 +1 6.5 2.8 4.6 1.5 +1 5.7 2.8 4.5 1.3 +1 6.3 3.3 4.7 1.6 +1 4.9 2.4 3.3 1 +1 6.6 2.9 4.6 1.3 +1 5.2 2.7 3.9 1.4 +1 5 2 3.5 1 +1 5.9 3 4.2 1.5 +1 6 2.2 4 1 +1 6.1 2.9 4.7 1.4 +1 5.6 2.9 3.6 1.3 +1 6.7 3.1 4.4 1.4 +1 5.6 3 4.5 1.5 +1 5.8 2.7 4.1 1 +1 6.2 2.2 4.5 1.5 +1 5.6 2.5 3.9 1.1 +1 5.9 3.2 4.8 1.8 +1 6.1 2.8 4 1.3 +1 6.3 2.5 4.9 1.5 +1 6.1 2.8 4.7 1.2 +1 6.4 2.9 4.3 1.3 +1 6.6 3 4.4 1.4 +1 6.8 2.8 4.8 1.4 +1 6.7 3 5 1.7 +1 6 2.9 4.5 1.5 +1 5.7 2.6 3.5 1 +1 5.5 2.4 3.8 1.1 +1 5.5 2.4 3.7 1 +1
ignite git commit: IGNITE-9828: Muted tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-9828 [created] 4ebafd7e3
IGNITE-9828: Muted tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ebafd7e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ebafd7e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ebafd7e
Branch: refs/heads/ignite-9828
Commit: 4ebafd7e3c6b77e1f5808510c988ae46be6471fe
Parents: 5477048
Author: Igor Seliverstov
Authored: Fri Nov 23 16:03:26 2018 +0300
Committer: Igor Seliverstov
Committed: Fri Nov 23 16:03:26 2018 +0300
--
.../CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java| 5 +
.../continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java | 5 +
2 files changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ebafd7e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
index 334d219..7c15f38 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java
@@ -50,4 +50,9 @@ public class CacheContinuousQueryAsyncFailoverMvccTxSelfTest
extends CacheConti
@Override public void testLeftPrimaryAndBackupNodes() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-10047";);
}
+
+/** {@inheritDoc} */
+@Override public void testFailoverStartStopBackup() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
+}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ebafd7e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
index 76d1689..2d578f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
@@ -45,4 +45,9 @@ public class CacheContinuousQueryFailoverMvccTxSelfTest
extends CacheContinuousQ
@Override public void testLeftPrimaryAndBackupNodes() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-10047";);
}
+
+/** {@inheritDoc} */
+@Override public void testFailoverStartStopBackup() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
+}
}
\ No newline at end of file
[ignite-teamcity-bot] branch ignite-10372 updated (53fe393 -> a7ad185)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch ignite-10372 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. from 53fe393 IGNITE-10372 Optimize master trends page step 3: Tests fixed, now data is shown correctly add 77de001 IGNITE-10372 Optimize master trends page step 3: Tests fixed, now data is shown correctly - Fixes #81. new a7ad185 Merge branch 'master' into ignite-10372 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java | 2 -- .../main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java | 5 - 2 files changed, 7 deletions(-)
[ignite-teamcity-bot] 01/01: Merge branch 'master' into ignite-10372
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-10372 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git commit a7ad1856fb1e52c8cb00b156b242a9eb55cfde3f Merge: 53fe393 77de001 Author: Dmitriy Pavlov AuthorDate: Fri Nov 23 14:37:20 2018 +0300 Merge branch 'master' into ignite-10372 # Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java .../src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java | 2 -- .../main/java/org/apache/ignite/ci/web/model/hist/BuildsHistory.java | 5 - 2 files changed, 7 deletions(-)
[ignite-teamcity-bot] branch master updated: IGNITE-10372 Optimize master trends page step 3: Tests fixed, now data is shown correctly - Fixes #81.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 77de001 IGNITE-10372 Optimize master trends page step 3: Tests fixed,
now data is shown correctly - Fixes #81.
77de001 is described below
commit 77de001ad7f9e4163173222a3d28b0029aa349fc
Author: Dmitriy Pavlov
AuthorDate: Fri Nov 23 14:36:33 2018 +0300
IGNITE-10372 Optimize master trends page step 3: Tests fixed, now data is
shown correctly - Fixes #81.
Signed-off-by: Dmitriy Pavlov
---
.../main/java/org/apache/ignite/ci/ITeamcity.java | 10 --
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 82 +---
.../apache/ignite/ci/IgniteTeamcityConnection.java | 33 -
.../java/org/apache/ignite/ci/db/DbMigrations.java | 84 +++-
.../ci/tcbot/trends/MasterTrendsService.java | 41 +++---
.../teamcity/ignited/fatbuild/TestCompacted.java | 11 +-
.../web/model/current/BuildStatisticsSummary.java | 45 ++-
.../ignite/ci/web/model/hist/BuildsHistory.java| 145 ++---
.../ci/web/rest/build/GetBuildTestFailures.java| 38 --
.../src/main/webapp/comparison.html| 68 --
10 files changed, 157 insertions(+), 400 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index 1820d14..a50ab94 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -77,16 +77,6 @@ public interface ITeamcity extends ITeamcityConn {
@NotNull static String buildHref(int id) {
return "app/rest/latest/builds/id:" + id;
}
-@Deprecated
-public TestOccurrences getTests(String fullUrl);
-
-@Deprecated
-TestOccurrences getFailedTests(String href, int cnt, String
normalizedBranch);
-
-@Deprecated
-CompletableFuture getTestRef(FullQueryParams key);
-
-Configurations getConfigurations(FullQueryParams key);
/**
* List of build's related issues.
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 102a9c5..14795cc 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -22,13 +22,8 @@ import com.google.common.base.Throwables;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
-import java.util.Date;
import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -36,8 +31,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
@@ -45,7 +38,6 @@ import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
import javax.cache.Cache;
import javax.inject.Inject;
-import javax.ws.rs.BadRequestException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
@@ -66,21 +58,17 @@ import org.apache.ignite.ci.tcmodel.changes.ChangesList;
import org.apache.ignite.ci.tcmodel.conf.BuildType;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.result.Build;
-import org.apache.ignite.ci.tcmodel.result.Configurations;
import org.apache.ignite.ci.tcmodel.result.issues.IssuesUsagesList;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrences;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
-import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrences;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrencesFull;
import org.apache.ignite.ci.tcmodel.result.tests.TestRef;
import org.apache.ignite.ci.tcmodel.user.User;
-import org.apache.ignite.ci.util.CacheUpdateUtil;
import org.apache.ignite.ci.util.CollectionUtil;
import org.apache.ignite.ci.util.ObjectInterner;
import org.apache.ignite.ci.web.model.hist.VisasHistoryStorage;
-import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
import org.jetbrains.a
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-2.7-perfix [created] db52210a5
ignite git commit: IGNITE-10323 Don't run deactivation process on inactive cluster - Fixes #5476.
Repository: ignite
Updated Branches:
refs/heads/master d45ea4b43 -> 39b59d21e
IGNITE-10323 Don't run deactivation process on inactive cluster - Fixes #5476.
Signed-off-by: Pavel Kovalenko
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39b59d21
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39b59d21
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39b59d21
Branch: refs/heads/master
Commit: 39b59d21e96bac51dca9a12702f1993ad96fead9
Parents: d45ea4b
Author: vd-pyatkov
Authored: Fri Nov 23 14:05:46 2018 +0300
Committer: Pavel Kovalenko
Committed: Fri Nov 23 14:05:46 2018 +0300
--
.../cluster/GridClusterStateProcessor.java | 3 +-
...erActivateDeactivateTestWithPersistence.java | 37
2 files changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/39b59d21/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index 6d5d474..95ff770 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -849,7 +849,8 @@ public class GridClusterStateProcessor extends
GridProcessorAdapter implements I
DiscoveryDataClusterState curState = globalState;
-if (!curState.transition() && curState.active() == activate &&
BaselineTopology.equals(curState.baselineTopology(), blt))
+if (!curState.transition() && curState.active() == activate
+&& (!activate ||
BaselineTopology.equals(curState.baselineTopology(), blt)))
return new GridFinishedFuture<>();
GridChangeGlobalStateFuture startedFut = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/39b59d21/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
index 0972ea2..4dc4f27 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
@@ -98,6 +98,43 @@ public class
IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
activateCachesRestore(5, true);
}
+/**
+ * Test deactivation on cluster that is not yet activated.
+ *
+ * @throws Exception If failed.
+ */
+public void testDeactivateInactiveCluster() throws Exception {
+ccfgs = new CacheConfiguration[] {
+new CacheConfiguration<>("test_cache_1")
+.setGroupName("test_cache"),
+new CacheConfiguration<>("test_cache_2")
+.setGroupName("test_cache")
+};
+
+Ignite ignite = startGrids(3);
+
+ignite.cluster().active(true);
+
+ignite.cache("test_cache_1")
+.put("key1", "val1");
+ignite.cache("test_cache_2")
+.put("key1", "val1");
+
+ignite.cluster().active(false);
+
+assertFalse(ignite.cluster().active());
+
+stopAllGrids();
+
+ignite = startGrids(2);
+
+assertFalse(ignite.cluster().active());
+
+ignite.cluster().active(false);
+
+assertFalse(ignite.cluster().active());
+}
+
/** */
private Map startGridsAndLoadData(int srvs) throws
Exception {
Ignite srv = startGrids(srvs);
ignite git commit: IGNITE-10390 Revert inspection fix due to a bug in BPlusTree#isEmpty()
Repository: ignite
Updated Branches:
refs/heads/master 8591be103 -> d45ea4b43
IGNITE-10390 Revert inspection fix due to a bug in BPlusTree#isEmpty()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d45ea4b4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d45ea4b4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d45ea4b4
Branch: refs/heads/master
Commit: d45ea4b43be106601dd05d243e1c19a048803648
Parents: 8591be1
Author: Alexey Goncharuk
Authored: Fri Nov 23 12:50:31 2018 +0300
Committer: Alexey Goncharuk
Committed: Fri Nov 23 12:50:31 2018 +0300
--
.../processors/cache/persistence/GridCacheOffheapManager.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d45ea4b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 44ae6f1..7d4a3ae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -1463,6 +1463,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
* @return Store delegate.
* @throws IgniteCheckedException If failed.
*/
+@SuppressWarnings("SizeReplaceableByIsEmpty")
private CacheDataStore init0(boolean checkExists) throws
IgniteCheckedException {
CacheDataStore delegate0 = delegate;
@@ -1573,7 +1574,8 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
pendingTree = pendingTree0;
-if (!hasPendingEntries && !pendingTree0.isEmpty())
+// TODO IGNITE-10390 replace size() > 0 with isEmpty()
+if (!hasPendingEntries && pendingTree0.size() > 0)
hasPendingEntries = true;
int grpId = grp.groupId();
