You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/11/17 13:05:45 UTC
ignite git commit: IGNITE-6932: SQL: cache-less query execution now
checks for cluster state. This closes #3048.
Repository: ignite
Updated Branches:
refs/heads/master 4e046794c -> cbd7e39cf
IGNITE-6932: SQL: cache-less query execution now checks for cluster state. This closes #3048.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cbd7e39c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cbd7e39c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cbd7e39c
Branch: refs/heads/master
Commit: cbd7e39cf34d86bc4fe41ac44a286ba7690b08cb
Parents: 4e04679
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Fri Nov 17 16:05:35 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Nov 17 16:05:35 2017 +0300
----------------------------------------------------------------------
.../processors/query/GridQueryProcessor.java | 8 ++
...CheckClusterStateBeforeExecuteQueryTest.java | 89 ++++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 3 +
3 files changed, 100 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbd7e39c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 7ad95a6..ed5fdd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1944,6 +1944,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
*
* @param qry Query.
* @param keepBinary Keep binary flag.
+ * @param failOnMultipleStmts If {@code true} the method must throws exception when query contains
+ * more then one SQL statement.
* @return Cursor.
*/
public List<FieldsQueryCursor<List<?>>> querySqlFieldsNoCache(final SqlFieldsQuery qry,
@@ -1955,6 +1957,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (qry.isLocal())
throw new IgniteException("Local query is not supported without specific cache.");
+ if (!ctx.state().publicApiActiveState()) {
+ throw new IgniteException("Can not perform the operation because the cluster is inactive. Note, that " +
+ "the cluster is considered inactive by default if Ignite Persistent Store is used to let all the nodes " +
+ "join the cluster. To activate the cluster call Ignite.active(true).");
+ }
+
if (qry.getSchema() == null)
qry.setSchema(QueryUtils.DFLT_SCHEMA);
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbd7e39c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
new file mode 100644
index 0000000..aae6a0c
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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;
+
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
+
+/**
+ *
+ */
+public class IgniteCheckClusterStateBeforeExecuteQueryTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ DataStorageConfiguration pCfg = new DataStorageConfiguration();
+
+ pCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
+ .setPersistenceEnabled(true)
+ .setMaxSize(100 * 1024 * 1024));
+
+ cfg.setDataStorageConfiguration(pCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ stopAllGrids();
+
+ deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false));
+ }
+
+ /**
+ * @throws Exception On failed.
+ */
+ public void testDynamicSchemaChangesPersistence() throws Exception {
+ final IgniteEx ig = startGrid(0);
+
+ assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ig.context().query().querySqlFieldsNoCache(new SqlFieldsQuery("SELECT 1"), false);
+
+ return null;
+ }
+ }, IgniteException.class, "Can not perform the operation because the cluster is inactive.");
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbd7e39c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 16fd5e0..7b3b271 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -70,6 +70,7 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheQueryH2IndexingLea
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryIndexSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryLoadSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheUpdateSqlQuerySelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCheckClusterStateBeforeExecuteQueryTest;
import org.apache.ignite.internal.processors.cache.IgniteCrossCachesJoinsQueryTest;
import org.apache.ignite.internal.processors.cache.IncorrectQueryEntityTest;
import org.apache.ignite.internal.processors.cache.QueryEntityCaseMismatchTest;
@@ -366,6 +367,8 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheQuerySqlFieldInlineSizeSelfTest.class);
suite.addTestSuite(IgniteSqlParameterizedQueryTest.class);
+ suite.addTestSuite(IgniteCheckClusterStateBeforeExecuteQueryTest.class);
+
return suite;
}
}