You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/01/13 16:44:12 UTC
[2/4] ignite git commit: ignite-gg-8.0.2.ea2 fix test,
add licenses header, mute metrics test
ignite-gg-8.0.2.ea2 fix test, add licenses header, mute metrics test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2254d372
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2254d372
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2254d372
Branch: refs/heads/ignite-3477
Commit: 2254d37232ea994ff9dd63917cbd9c8c599bbb12
Parents: 00e88cc
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Jan 13 15:40:26 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Jan 13 15:40:26 2017 +0300
----------------------------------------------------------------------
.../internal/ClusterNodeMetricsSelfTest.java | 2 ++
.../testsuites/IgniteComputeGridTestSuite.java | 1 -
.../query/IgniteSqlSplitterSelfTest.java | 2 +-
.../testsuites/IgniteDistributedJoinTestSuite.java | 17 +++++++++++++++++
4 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 77359ab..97d17e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -116,6 +116,8 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAllocatedMemory() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-4536");
+
Ignite ignite = grid();
final IgniteCache onHeapCache = ignite.getOrCreateCache(ON_HEAP_TIERED_NAME);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 8a501fd..c6b7a15 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -133,7 +133,6 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(GridMultipleJobsSelfTest.class);
suite.addTestSuite(GridCheckpointManagerSelfTest.class);
suite.addTestSuite(GridCheckpointTaskSelfTest.class);
- suite.addTestSuite(ClusterNodeMetricsSelfTest.class);
suite.addTestSuite(GridTaskNameAnnotationSelfTest.class);
suite.addTestSuite(GridJobCheckpointCleanupSelfTest.class);
suite.addTestSuite(GridEventStorageSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8140a1d..75bbe00 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -974,7 +974,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
c1.put(key++, p);
}
- String select = "select count(*) from Organization o, \"pers\".Person2 p where p.orgId = o._key";
+ String select = "select count(*) from \"org\".Organization o, \"pers\".Person2 p where p.orgId = o._key";
String plan = (String)c2.query(new SqlFieldsQuery("explain " + select)
.setDistributedJoins(true).setEnforceJoinOrder(enforceJoinOrder).setPageSize(pageSize))
http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
index dca640f..5371856 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
@@ -1,3 +1,20 @@
+/*
+ * 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.testsuites;
import junit.framework.TestSuite;