[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-gg-13195-cache-groups [deleted] c947d4f79
[11/12] ignite git commit: IGNITE-8778 Cache tests fail due short timeout - Fixes #4180.
IGNITE-8778 Cache tests fail due short timeout - Fixes #4180.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f177094
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f177094
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f177094
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 2f1770941b3ab3ed1b6185fb4404452756e31742
Parents: bf5287b
Author: mcherkasov
Authored: Fri Jul 27 19:20:53 2018 +0300
Committer: Dmitriy Pavlov
Committed: Fri Jul 27 19:20:53 2018 +0300
--
.../internal/processors/cache/CacheGetEntryAbstractTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f177094/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
index dd9ed3c..6a7cfc6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetEntryAbstractTest.java
@@ -83,7 +83,7 @@ public abstract class CacheGetEntryAbstractTest extends
GridCacheAbstractSelfTes
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
-return 60_000;
+return 90_000;
}
/** {@inheritDoc} */
[02/12] ignite git commit: IGNITE-7700: SQL system view for list of nodes. This closes #4185. This closes #4424.
IGNITE-7700: SQL system view for list of nodes. This closes #4185. This closes
#4424.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6263dbe6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6263dbe6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6263dbe6
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 6263dbe6c45a0656ba55a0eb04d07941fac27c7c
Parents: e413283
Author: Aleksey Plekhanov
Authored: Fri Jul 27 12:23:08 2018 +0300
Committer: devozerov
Committed: Fri Jul 27 12:23:08 2018 +0300
--
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../internal/processors/query/QueryUtils.java | 3 +
.../processors/query/h2/IgniteH2Indexing.java | 85 ++-
.../query/h2/ddl/DdlStatementsProcessor.java| 28 ++-
.../query/h2/dml/UpdatePlanBuilder.java | 15 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 12 +-
.../processors/query/h2/sys/SqlSystemIndex.java | 143 +++
.../processors/query/h2/sys/SqlSystemTable.java | 208
.../query/h2/sys/SqlSystemTableEngine.java | 60 +
.../h2/sys/view/SqlAbstractLocalSystemView.java | 104
.../h2/sys/view/SqlAbstractSystemView.java | 134 ++
.../query/h2/sys/view/SqlSystemView.java| 79 ++
.../sys/view/SqlSystemViewColumnCondition.java | 102
.../query/h2/sys/view/SqlSystemViewNodes.java | 116 +
.../query/SqlSystemViewsSelfTest.java | 247 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
16 files changed, 1325 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6263dbe6/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 6ba44ee..eb60371 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -477,6 +477,9 @@ public final class IgniteSystemProperties {
/** Force all SQL queries to be processed lazily regardless of what
clients request. */
public static final String IGNITE_SQL_FORCE_LAZY_RESULT_SET =
"IGNITE_SQL_FORCE_LAZY_RESULT_SET";
+/** Disable SQL system views. */
+public static final String IGNITE_SQL_DISABLE_SYSTEM_VIEWS =
"IGNITE_SQL_DISABLE_SYSTEM_VIEWS";
+
/** Maximum size for affinity assignment history. */
public static final String IGNITE_AFFINITY_HISTORY_SIZE =
"IGNITE_AFFINITY_HISTORY_SIZE";
http://git-wip-us.apache.org/repos/asf/ignite/blob/6263dbe6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
index 12eacef..3f40990 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
@@ -75,6 +75,9 @@ public class QueryUtils {
/** Default schema. */
public static final String DFLT_SCHEMA = "PUBLIC";
+/** Schema for system view. */
+public static final String SCHEMA_SYS = "IGNITE";
+
/** Field name for key. */
public static final String KEY_FIELD_NAME = "_KEY";
http://git-wip-us.apache.org/repos/asf/ignite/blob/6263dbe6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 14d4333..4f51ca0 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -113,9 +113,12 @@ import
org.apache.ignite.internal.processors.query.h2.sql.GridSqlQuery;
import org.apache.ignite.internal.processors.query.h2.sql.GridSqlQueryParser;
import org.apache.ignite.internal.processors.query.h2.sql.GridSqlQuerySplitter;
import org.apache.ignite.internal.processors.query.h2.sql.GridSqlStatement;
+import org.apache.ignite.internal.processors.query.h2.sys.SqlSystemTableEngine;
+import
org.apache.ignite.int
[05/12] ignite git commit: IGNITE-4010 Web Console: Fixed table columns width.
IGNITE-4010 Web Console: Fixed table columns width.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/684e0fd0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/684e0fd0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/684e0fd0
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 684e0fd09543740875e5d99a29ae4ee3df01f165
Parents: 9456c52
Author: Vasiliy Sisko
Authored: Fri Jul 27 19:14:34 2018 +0700
Committer: Alexey Kuznetsov
Committed: Fri Jul 27 19:14:34 2018 +0700
--
.../page-queries/components/queries-notebooks-list/controller.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/684e0fd0/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
index 776fb08..2e5ac39 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
@@ -39,8 +39,8 @@ export class NotebooksListCtrl {
const columnDefs = [
{ name: 'name', displayName: 'Notebook name', categoryDisplayName:
'Name', field: 'name', cellTemplate: notebookNameTemplate, pinnedLeft: true,
filter: { placeholder: 'Filter by Name...' } },
-{ name: 'sqlQueryNum', displayName: 'SQL Queries',
categoryDisplayName: 'SQL Queries', field: 'sqlQueriesParagraphsLength',
cellTemplate: sqlQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: 150, enableFiltering: false },
-{ name: 'scanQueryNum', displayName: 'Scan Queries',
categoryDisplayName: 'Scan Queries', field: 'scanQueriesParagraphsLength',
cellTemplate: scanQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: 150, enableFiltering: false }
+{ name: 'sqlQueryNum', displayName: 'SQL Queries',
categoryDisplayName: 'SQL Queries', field: 'sqlQueriesParagraphsLength',
cellTemplate: sqlQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: '10%', enableFiltering: false },
+{ name: 'scanQueryNum', displayName: 'Scan Queries',
categoryDisplayName: 'Scan Queries', field: 'scanQueriesParagraphsLength',
cellTemplate: scanQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: '10%', enableFiltering: false }
];
this.gridOptions = {
[01/12] ignite git commit: IGNITE-9046 Actualize dependency versions for Cassandra Cache Store - Fixes #4422.
Repository: ignite Updated Branches: refs/heads/ignite-gg-13195-cache-groups 914ad3c7a -> c947d4f79 IGNITE-9046 Actualize dependency versions for Cassandra Cache Store - Fixes #4422. Signed-off-by: Dmitriy Pavlov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4132833 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4132833 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4132833 Branch: refs/heads/ignite-gg-13195-cache-groups Commit: e413283335b3c143bd3d69dfbe549ac49421e1ee Parents: 4817944 Author: zzzadruga Authored: Thu Jul 26 19:31:34 2018 +0300 Committer: Dmitriy Pavlov Committed: Thu Jul 26 19:31:34 2018 +0300 -- modules/cassandra/store/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e4132833/modules/cassandra/store/pom.xml -- diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml index 34a227e..df20518 100644 --- a/modules/cassandra/store/pom.xml +++ b/modules/cassandra/store/pom.xml @@ -38,7 +38,7 @@ 1.9.2 3.0.0 3.3 -4.0.33.Final +4.1.27.Final 19.0 3.0.2 http://git-wip-us.apache.org/repos/asf/ignite/blob/e4132833/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 971c505..4029967 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -55,7 +55,7 @@ 1.11.75 2.16.0 1.9.2_1 -1.9.2 +1.9.3 1.11 3.2.2 2.6
[08/12] ignite git commit: IGNITE-9058 Update Apache Tomcat dependency version. - Fixes #4435.
IGNITE-9058 Update Apache Tomcat dependency version. - Fixes #4435. Signed-off-by: Dmitriy Pavlov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b87adb6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b87adb6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b87adb6 Branch: refs/heads/ignite-gg-13195-cache-groups Commit: 9b87adb633fa3358cb8d356e19dfdfddac71b80a Parents: 44fd019 Author: Fedotov Authored: Fri Jul 27 17:20:18 2018 +0300 Committer: Dmitriy Pavlov Committed: Fri Jul 27 17:20:18 2018 +0300 -- assembly/LICENSE_FABRIC | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9b87adb6/assembly/LICENSE_FABRIC -- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 0beb533..ce44bea 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -261,7 +261,7 @@ This product bundles JTidy which is available under the following: Java HTML Tidy License. For details, see http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95. == -For tomcat-servlet-api (http://tomcat.apache.org/) org.apache.tomcat:tomcat-servlet-api:jar:9.0.8 +For tomcat-servlet-api (http://tomcat.apache.org/) org.apache.tomcat:tomcat-servlet-api:jar:9.0.10 == This product bundles tomcat-servlet-api which is available under the following: Apache License, Version 2.0 and Common Development And Distribution License (CDDL) Version 1.0. For details, see http://www.apache.org/licenses/LICENSE-2.0.txt and http://www.opensource.org/licenses/cddl1.txt. http://git-wip-us.apache.org/repos/asf/ignite/blob/9b87adb6/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4029967..78c16a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,7 +118,7 @@ 5.0.5.RELEASE 4.1.7.RELEASE_1 1.1.1 -9.0.8 +9.0.10 2.2.0 2.2.0 2.2.0
[06/12] ignite git commit: IGNITE-3499 Remove unused class GridCacheReplicatedFullApiMultithreadedSelfTest1 - Fixes #4443.
IGNITE-3499 Remove unused class
GridCacheReplicatedFullApiMultithreadedSelfTest1 - Fixes #4443.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/722c4939
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/722c4939
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/722c4939
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 722c49391afd22170ba76455c5a591197390f455
Parents: 684e0fd
Author: Maxim Muzafarov
Authored: Fri Jul 27 16:07:00 2018 +0300
Committer: Dmitriy Pavlov
Committed: Fri Jul 27 16:07:00 2018 +0300
--
...ReplicatedFullApiMultithreadedSelfTest1.java | 1980 --
1 file changed, 1980 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/722c4939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
deleted file mode 100644
index e925854..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java
+++ /dev/null
@@ -1,1980 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.replicated;
-
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-
-/**
- * TODO: GG-4036: include it to cache suite once it is fixed properly.
- * TODO: Also it is necessary to restore compilation after migrating to
open-source.
- */
-public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends
GridCacheAbstractSelfTest {
-///** Mutex. */
-//private static final Object mux = new Object();
-//
-/** Grid count. */
-private static final int GRID_CNT = 2;
-//
-///** Thread count. */
-//private static final int THREAD_CNT = 2;
-//
-///** Wait timeout. */
-//private static final long WAIT_TIMEOUT = 5000;
-//
-///** Thread name */
-//private static final String THREAD_NAME = "grid.cache.test.thread";
-//
-///** Key. */
-//private static final String KEY = "key";
-//
-///** Registered event listeners. */
-//private static final GridTestEventListener[] lsnrs = new
GridTestEventListener[GRID_CNT];
-//
-/** {@inheritDoc} */
-@Override protected int gridCount() {
-assert GRID_CNT > 0;
-
-return GRID_CNT;
-}
-//
-///** {@inheritDoc} */
-//private int getThreadCount() {
-//assert THREAD_CNT > 0;
-//
-//return THREAD_CNT;
-//}
-//
-///** {@inheritDoc} */
-//@Override protected void beforeTestsStarted() throws Exception {
-//super.beforeTestsStarted();
-//
-//int cnt = gridCount();
-//
-//for (int i = 0; i < cnt; i++) {
-//GridTestEventListener lsnr = new GridTestEventListener(i);
-//
-//grid(i).events().localListen(lsnr, EVTS_CACHE);
-//
-//lsnrs[i] = lsnr;
-//}
-//}
-//
-///**
-// * @throws Exception If test failed.
-// */
-//public void testA() throws Exception {
-//runMultiThreadedTest(new GridTestCacheRunnable() {
-//@Override public void run(Cache cache, int idx)
throws Exception {
-//int size = 8;
-//
-//Map pairs = threadPairs(size, idx);
-//
-//for (Map.Entry pair : pairs.entrySet()) {
-//assert !cache.containsKey(pair.getKey());
-//assert !cache.containsValue(pair.getValue());
-//}
-//
-//String[] keys = pairs.keySet().toArray(new String[size]);
-//
-//
[10/12] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf5287bb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf5287bb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf5287bb Branch: refs/heads/ignite-gg-13195-cache-groups Commit: bf5287bb8a674e46f8e6cc2a71d00fc63d657916 Parents: f9ff643 9b87adb Author: sboikov Authored: Fri Jul 27 17:22:43 2018 +0300 Committer: sboikov Committed: Fri Jul 27 17:22:43 2018 +0300 -- assembly/LICENSE_FABRIC | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[09/12] ignite git commit: ignite-5510 Enable test.
ignite-5510 Enable test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9ff6431
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9ff6431
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9ff6431
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: f9ff6431f2658269490e27118bb5d6c2601a4875
Parents: 44fd019
Author: sboikov
Authored: Fri Jul 27 17:22:24 2018 +0300
Committer: sboikov
Committed: Fri Jul 27 17:22:24 2018 +0300
--
.../cache/distributed/CacheLateAffinityAssignmentTest.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/f9ff6431/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index d40f4ca..0cbe67a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -2048,8 +2048,6 @@ public class CacheLateAffinityAssignmentTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoForceKeysRequests() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-5510";);
-
cacheC = new IgniteClosure() {
@Override public CacheConfiguration[] apply(String s) {
return null;
[07/12] ignite git commit: ignite-5510 Remove assert from removeTxReturn - removeTxReturn can be called concurrently from processDhtTxOnePhaseCommitAckRequest and node fail handler - it is possible cl
ignite-5510 Remove assert from removeTxReturn
- removeTxReturn can be called concurrently from
processDhtTxOnePhaseCommitAckRequest and node fail handler
- it is possible client acks tx but it did not start on backup since partition
was evicted (0 backups cache)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44fd019d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44fd019d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44fd019d
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 44fd019d0a06d27ce9e9cb760447a11377a19837
Parents: 722c493
Author: sboikov
Authored: Fri Jul 27 17:00:31 2018 +0300
Committer: sboikov
Committed: Fri Jul 27 17:00:31 2018 +0300
--
.../processors/cache/transactions/IgniteTxManager.java | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/44fd019d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index a30ca04..ec9a5c4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1092,15 +1092,8 @@ public class IgniteTxManager extends
GridCacheSharedManagerAdapter {
public void removeTxReturn(GridCacheVersion xidVer) {
Object prev = completedVersHashMap.get(xidVer);
-if (Boolean.FALSE.equals(prev)) // Tx can be rolled back.
-return;
-
-assert prev instanceof GridCacheReturnCompletableWrapper:
-prev + " instead of GridCacheReturnCompletableWrapper";
-
-boolean res = completedVersHashMap.replace(xidVer, prev, true);
-
-assert res;
+if (prev instanceof GridCacheReturnCompletableWrapper)
+completedVersHashMap.replace(xidVer, prev, true);
}
/**
[12/12] ignite git commit: Merge branches 'ignite-gg-13195-cache-groups' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-13195-cache-groups
Merge branches 'ignite-gg-13195-cache-groups' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-13195-cache-groups Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c947d4f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c947d4f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c947d4f7 Branch: refs/heads/ignite-gg-13195-cache-groups Commit: c947d4f79f1ecfb1b7d4979cd0d35e6dca7288b2 Parents: 914ad3c 2f17709 Author: Alexey Kuznetsov Authored: Mon Jul 30 11:12:35 2018 +0700 Committer: Alexey Kuznetsov Committed: Mon Jul 30 11:12:35 2018 +0700 -- assembly/LICENSE_FABRIC |2 +- docker/web-agent/Dockerfile |3 +- .../ml/tutorial/Step_8_CV_with_Param_Grid.java | 173 ++ modules/cassandra/store/pom.xml |2 +- .../apache/ignite/IgniteSystemProperties.java |3 + .../cache/transactions/IgniteTxManager.java | 11 +- .../internal/processors/query/QueryUtils.java |3 + .../cache/CacheGetEntryAbstractTest.java|2 +- .../CacheLateAffinityAssignmentTest.java|2 - ...ReplicatedFullApiMultithreadedSelfTest1.java | 1980 -- .../processors/query/h2/IgniteH2Indexing.java | 85 +- .../query/h2/ddl/DdlStatementsProcessor.java| 28 +- .../query/h2/dml/UpdatePlanBuilder.java | 15 +- .../query/h2/sql/GridSqlQuerySplitter.java | 12 +- .../processors/query/h2/sys/SqlSystemIndex.java | 143 ++ .../processors/query/h2/sys/SqlSystemTable.java | 208 ++ .../query/h2/sys/SqlSystemTableEngine.java | 60 + .../h2/sys/view/SqlAbstractLocalSystemView.java | 104 + .../h2/sys/view/SqlAbstractSystemView.java | 134 ++ .../query/h2/sys/view/SqlSystemView.java| 79 + .../sys/view/SqlSystemViewColumnCondition.java | 102 + .../query/h2/sys/view/SqlSystemViewNodes.java | 116 + .../query/SqlSystemViewsSelfTest.java | 247 +++ .../IgniteCacheQuerySelfTestSuite.java |2 + .../ignite/ml/selection/cv/CrossValidation.java | 212 +- .../ml/selection/cv/CrossValidationResult.java | 134 ++ .../ml/selection/paramgrid/ParamGrid.java | 58 + .../paramgrid/ParameterSetGenerator.java| 91 + .../ml/selection/paramgrid/package-info.java| 22 + .../org/apache/ignite/ml/tree/DecisionTree.java |6 +- .../tree/DecisionTreeClassificationTrainer.java | 38 + .../ignite/ml/selection/SelectionTestSuite.java |2 + .../paramgrid/ParameterSetGeneratorTest.java| 56 + .../queries-notebooks-list/controller.js|4 +- parent/pom.xml |4 +- 35 files changed, 2059 insertions(+), 2084 deletions(-) --
[03/12] ignite git commit: IGNITE-8924: [ML] Parameter Grid for tuning hyper-parameters in Cross-Validation process.
IGNITE-8924: [ML] Parameter Grid for tuning hyper-parameters in
Cross-Validation process.
this closes #4425
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cddf920
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cddf920
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cddf920
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 5cddf9208faa873f972120bd15270a7f155986e4
Parents: 6263dbe
Author: zaleslaw
Authored: Fri Jul 27 14:59:30 2018 +0300
Committer: Yury Babak
Committed: Fri Jul 27 14:59:30 2018 +0300
--
.../ml/tutorial/Step_8_CV_with_Param_Grid.java | 173 +++
.../ignite/ml/selection/cv/CrossValidation.java | 212 +--
.../ml/selection/cv/CrossValidationResult.java | 134
.../ml/selection/paramgrid/ParamGrid.java | 58 +
.../paramgrid/ParameterSetGenerator.java| 91
.../ml/selection/paramgrid/package-info.java| 22 ++
.../org/apache/ignite/ml/tree/DecisionTree.java | 6 +-
.../tree/DecisionTreeClassificationTrainer.java | 38
.../ignite/ml/selection/SelectionTestSuite.java | 2 +
.../paramgrid/ParameterSetGeneratorTest.java| 56 +
10 files changed, 723 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5cddf920/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV_with_Param_Grid.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV_with_Param_Grid.java
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV_with_Param_Grid.java
new file mode 100644
index 000..6104299
--- /dev/null
+++
b/examples/src/main/java/org/apache/ignite/examples/ml/tutorial/Step_8_CV_with_Param_Grid.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.ml.tutorial;
+
+import java.io.FileNotFoundException;
+import java.util.Arrays;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.primitives.vector.Vector;
+import
org.apache.ignite.ml.preprocessing.encoding.stringencoder.StringEncoderTrainer;
+import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainer;
+import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainer;
+import org.apache.ignite.ml.preprocessing.normalization.NormalizationTrainer;
+import org.apache.ignite.ml.selection.cv.CrossValidation;
+import org.apache.ignite.ml.selection.cv.CrossValidationResult;
+import org.apache.ignite.ml.selection.paramgrid.ParamGrid;
+import org.apache.ignite.ml.selection.scoring.evaluator.Evaluator;
+import org.apache.ignite.ml.selection.scoring.metric.Accuracy;
+import org.apache.ignite.ml.selection.split.TrainTestDatasetSplitter;
+import org.apache.ignite.ml.selection.split.TrainTestSplit;
+import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer;
+import org.apache.ignite.ml.tree.DecisionTreeNode;
+import org.apache.ignite.thread.IgniteThread;
+
+/**
+ * To choose the best hyperparameters the cross-validation will be used in
this example.
+ *
+ * The purpose of cross-validation is model checking, not model building.
+ *
+ * We train k different models.
+ *
+ * They differ in that 1/(k-1)th of the training data is exchanged against
other cases.
+ *
+ * These models are sometimes called surrogate models because the (average)
performance measured for these models
+ * is taken as a surrogate of the performance of the model trained on all
cases.
+ *
+ * All scenarios are described there:
https://sebastianraschka.com/faq/docs/evaluate-a-model.html
+ */
+public class Step_8_CV_with_Param_Grid {
+/** Run example. */
+public static void main(String[] args) throws InterruptedException {
+try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
+
[04/12] ignite git commit: IGNITE-9089 Web Agent not starting in docker container. - Fixes #4438.
IGNITE-9089 Web Agent not starting in docker container. - Fixes #4438.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9456c525
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9456c525
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9456c525
Branch: refs/heads/ignite-gg-13195-cache-groups
Commit: 9456c5259a19b7b519ced2ed9aaaf2b1fbadb99a
Parents: 5cddf92
Author: Ivanov Petr
Authored: Fri Jul 27 15:01:23 2018 +0300
Committer: Dmitriy Pavlov
Committed: Fri Jul 27 15:01:23 2018 +0300
--
docker/web-agent/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9456c525/docker/web-agent/Dockerfile
--
diff --git a/docker/web-agent/Dockerfile b/docker/web-agent/Dockerfile
index cdf7e4d..7c4cdd3 100644
--- a/docker/web-agent/Dockerfile
+++ b/docker/web-agent/Dockerfile
@@ -42,4 +42,5 @@ RUN apk --no-cache \
COPY ignite-web-agent*/* ./
# Entrypoint
-CMD ignite-web-agent.sh -d ${DRIVER_FOLDER} -n ${NODE_URI} -s ${SERVER_URI} -t
${TOKENS}
+CMD ./ignite-web-agent.sh -d ${DRIVER_FOLDER} -n ${NODE_URI} -s ${SERVER_URI}
-t ${TOKENS}
+
