Merge branch 'master' into ignite-28607

Author: shishkovilja

docs/_docs/SQL/schemas.adoc

@@ -85,7 +85,7 @@ CREATE TABLE City (
 ) WITH "backups=1, CACHE_NAME=City";
 ----
 
-See the link:sql-reference/ddl#create-table[CREATE TABLE] page for more details.
+See the link:sql-reference/ddl#create-table[CREATE TABLE] page for more details, including creating a table on an existing cache.
 
 If you do not use this parameter, the cache name is defined in the following format (in capital letters):
 
@@ -140,4 +140,4 @@ cache.put(2, invalidPerson); // CacheException wrapping IgniteSQLException when
 
 With the default configuration (validation disabled for non-indexed columns), the `put` above succeeds even though the stored `BinaryObject` does not match the SQL schema. Turning on validation causes Ignite to reject the update, protecting the table from malformed records.
 
-Enable the option when you need stronger guarantees that dynamic or user-provided data cannot break the table definition, and keep it disabled when the overhead of additional checks outweighs the risk of incorrect data.
+Enable the option when you need stronger guarantees that dynamic or user-provided data cannot break the table definition, and keep it disabled when the overhead of additional checks outweighs the risk of incorrect data.

docs/_docs/sql-reference/ddl.adoc

@@ -21,8 +21,9 @@ This page encompasses all data definition language (DDL) commands supported by I
 
 == CREATE TABLE
 
-The command creates a new Ignite cache and defines a SQL table on top of it. The underlying cache stores the data in
-the form of key-value pairs while the table allows processing the data with SQL queries.
+The command defines a SQL table on top of an Ignite cache. The underlying cache stores the data in the form of
+key-value pairs while the table allows processing the data with SQL queries. By default, Ignite creates a new cache for
+the table. If `CACHE_NAME` points to an existing cache, Ignite defines the SQL table on top of that cache.
 
 The table will reside in the link:SQL/schemas[Schema] specified in the connection parameters. If no schema is specified,
 the `PUBLIC` will be used as a default.
@@ -57,8 +58,9 @@ Parameters:
 sets the write synchronization mode for the underlying cache. If neither this nor the `TEMPLATE` parameter is set, then the cache is created with `FULL_SYNC` mode enabled.
 ** `CACHE_GROUP=<group name>` - specifies the link:configuring-caches/cache-groups[group name] the underlying cache belongs to.
 ** `AFFINITY_KEY=<affinity key column name>` - specifies an link:data-modeling/affinity-collocation[affinity key] name which is a column of the `PRIMARY KEY` constraint.
-** `CACHE_NAME=<custom name of the new cache>` - the name of the underlying cache created by the command,
-or the `SQL_{SCHEMA_NAME}_{TABLE}` format will be used if the parameter not specified.
+** `CACHE_NAME=<cache name>` - the name of the underlying cache. If the cache does not exist, it is created by the command.
+If the cache already exists, Ignite tries to define the table on top of it.
+If the parameter is not specified, the `SQL_{SCHEMA_NAME}_{TABLE}` format is used for the new cache name.
 ** `DATA_REGION=<existing data region name>` - name of the link:memory-configuration/data-regions[data region] where table entries should be stored. By default, Ignite stores all the data in a default region.
 ** `PARALLELISM=<number of SQL execution threads>` - SQL queries are executed by a single thread on each node by default, but certain scenarios can benefit from multi-threaded execution, see link:perf-and-troubleshooting/sql-tuning#query-parallelism[Query Parallelism] for details.
 ** `KEY_TYPE=<custom name of the key type>` - sets the name of the custom key type that is used from the key-value APIs in Ignite. The name should correspond to a Java, .NET, or C++ class, or it can be a random one if link:data-modeling/data-modeling#binary-object-format[BinaryObjects] is used instead of a custom class. The number of fields and their types in the custom key type has to correspond to the `PRIMARY KEY`. Refer to the <<Use non-SQL API>> section below for more details.
@@ -118,6 +120,26 @@ CREATE TABLE IF NOT EXISTS Person (
 ) WITH "template=partitioned,backups=1,affinity_key=city_id,CACHE_NAME=Person,KEY_TYPE=PersonKey,VALUE_TYPE=PersonValue";
 ----
 
+=== Create Table on an Existing Cache
+
+If `CACHE_NAME` points to an existing cache, Ignite adds only SQL metadata to that cache. This is allowed only when the
+cache does not already have query entities, for example from `CacheConfiguration.setQueryEntities(...)` or
+`CacheConfiguration.setIndexedTypes(...)`.
+
+When the existing cache has a SQL schema configured, the table must be created in the same schema. If the schema does not
+match, the command fails with an `Invalid schema` error.
+
+[source,sql]
+----
+CREATE TABLE my_schema.Person (
+  id INT PRIMARY KEY,
+  name VARCHAR
+) WITH "CACHE_NAME=PersonCache";
+----
+
+Cache creation parameters such as `TEMPLATE`, `BACKUPS`, `CACHE_GROUP`, `DATA_REGION`, `ATOMICITY`,
+`WRITE_SYNCHRONIZATION_MODE`, and other cache configuration options are not applied to an existing cache.
+
 
 === Use non-Upper Case Columns
 

modules/control-utility/src/test/java/org/apache/ignite/testsuites/IgniteControlUtilityTestSuite.java

@@ -34,6 +34,7 @@
 import org.apache.ignite.util.GridCommandHandlerIndexingTest;
 import org.apache.ignite.util.GridCommandHandlerIndexingWithSSLTest;
 import org.apache.ignite.util.GridCommandHandlerLegacyClientTest;
+import org.apache.ignite.util.GridCommandHandlerManagementPoolTest;
 import org.apache.ignite.util.GridCommandHandlerMetadataTest;
 import org.apache.ignite.util.GridCommandHandlerSslTest;
 import org.apache.ignite.util.GridCommandHandlerTest;
@@ -80,7 +81,8 @@
     BaselineEventsRemoteTest.class,
 
     GridCommandHandlerWalTest.class,
-    GridCommandHandlerCheckpointTest.class
+    GridCommandHandlerCheckpointTest.class,
+    GridCommandHandlerManagementPoolTest.class,
 })
 public class IgniteControlUtilityTestSuite {
 }

modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerManagementPoolTest.java

@@ -0,0 +1,94 @@
+/*
+ * 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.util;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterState;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.configuration.ClientConnectorConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.query.QueryUtils;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+
+import static org.apache.ignite.Ignition.startClient;
+import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK;
+
+/**
+ * Tests management pool usage for management tasks.
+ */
+public class GridCommandHandlerManagementPoolTest extends GridCommandHandlerClusterPerMethodAbstractTest {
+    /** */
+    private static final long TIMEOUT = 10_000L;
+
+    /** */
+    @Test
+    public void testManagementTasksWorksWhenClientPoolBlocked() throws Exception {
+        Ignite ignite = startGrid(0);
+
+        assertEquals(EXIT_CODE_OK, execute("--set-state", ClusterState.ACTIVE.name()));
+
+        ignite.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)
+            .setSqlSchema(QueryUtils.DFLT_SCHEMA)
+            .setSqlFunctionClasses(TestSqlFunctions.class)
+            .setIndexedTypes(Integer.class, String.class)
+        );
+
+        TestSqlFunctions.latch = new CountDownLatch(1);
+
+        try (IgniteClient client = startClient(new ClientConfiguration().setAddresses("127.0.0.1:10800"))) {
+            // Block client pool by SQL queries.
+            IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
+                () -> client.query(new SqlFieldsQuery("SELECT wait_latch()")).getAll(),
+                ClientConnectorConfiguration.DFLT_THREAD_POOL_SIZE, "client-thread");
+
+            // Check that management tasks still can be processed.
+            assertEquals(EXIT_CODE_OK, execute("--state")); // Native command.
+            assertEquals(EXIT_CODE_OK, execute("--checkpoint")); // Multi-node task command.
+
+            TestSqlFunctions.latch.countDown();
+
+            fut.get(TIMEOUT, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    /** */
+    public static class TestSqlFunctions {
+        /** */
+        private static CountDownLatch latch;
+
+        /** */
+        @QuerySqlFunction
+        public static boolean wait_latch() {
+            try {
+                latch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+            }
+            catch (InterruptedException ignored) {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java

@@ -23,6 +23,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
 import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -301,6 +302,7 @@ public class DataStorageConfiguration implements Serializable {
     private boolean alwaysWriteFullPages = DFLT_WAL_ALWAYS_WRITE_FULL_PAGES;
 
     /** Factory to provide I/O interface for data storage files */
+    @GridToStringExclude
     private FileIOFactory fileIOFactory =
         IgniteSystemProperties.getBoolean(IGNITE_USE_ASYNC_FILE_IO_FACTORY, DFLT_USE_ASYNC_FILE_IO_FACTORY) ?
             new AsyncFileIOFactory() : new RandomAccessFileIOFactory();

modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java

@@ -18,11 +18,14 @@
 package org.apache.ignite.configuration;
 
 import java.io.Serializable;
+
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.typedef.internal.A;
 
 /**
  * Encryption configuration.
  */
+@GridToStringExclude
 public class EncryptionConfiguration implements Serializable {
     /** */
     private static final long serialVersionUID = 0L;

modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java

@@ -49,6 +49,7 @@
 import org.apache.ignite.failure.FailureHandler;
 import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
 import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -314,6 +315,7 @@ public class IgniteConfiguration implements IgniteConfigurationDefaults {
     private String igniteWorkDir;
 
     /** MBean server. */
+    @GridToStringExclude
     private MBeanServer mbeanSrv;
 
     /** Local node ID. */
@@ -398,6 +400,7 @@ public class IgniteConfiguration implements IgniteConfigurationDefaults {
     private LoadBalancingSpi[] loadBalancingSpi;
 
     /** Indexing SPI. */
+    @GridToStringExclude
     private IndexingSpi indexingSpi;
 
     /** Address resolver. */

modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java

@@ -18,6 +18,7 @@
 
 import java.io.Serializable;
 import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * This class allows defining system data region configuration with various parameters for Apache Ignite
@@ -90,4 +91,9 @@ public SystemDataRegionConfiguration setMaxSize(long maxSize) {
 
         return this;
     }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(SystemDataRegionConfiguration.class, this);
+    }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java

@@ -767,6 +767,10 @@ private String taskName() {
             @Override public boolean isPrimaryOnly() {
                 return locOnly && !skipPrimaryCheck;
             }
+
+            @Override public boolean isLocalOnly() {
+                return locOnly;
+            }
         };
 
         CacheContinuousQueryManager mgr = manager(ctx);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java

@@ -131,4 +131,7 @@ public void onEntryUpdated(CacheContinuousQueryEvent<K, V> evt, boolean primary,
      * @return {@code True} if this listener should be called on events on primary partitions only.
      */
     public boolean isPrimaryOnly();
+
+    /** @return {@code true} if this listener belongs to a local continuous query. */
+    public boolean isLocalOnly();
 }