Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 14F28200D09 for ; Tue, 12 Sep 2017 11:03:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 13C7A1609C8; Tue, 12 Sep 2017 09:03:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E84841609C6 for ; Tue, 12 Sep 2017 11:02:58 +0200 (CEST) Received: (qmail 26630 invoked by uid 500); 12 Sep 2017 09:02:58 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 26612 invoked by uid 99); 12 Sep 2017 09:02:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2017 09:02:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12303F5765; Tue, 12 Sep 2017 09:02:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 12 Sep 2017 09:02:59 -0000 Message-Id: <4e90b942306c4d7caee326bb9208bc9d@git.apache.org> In-Reply-To: <9c5d4d3edc784a26ae8f020555ddfe1b@git.apache.org> References: <9c5d4d3edc784a26ae8f020555ddfe1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] ignite git commit: IGNITE-5703: SQL: Added WRITE_SYNCHRONIZATION_MODE parameter to CREATE TABLE command. This closes #2591. archived-at: Tue, 12 Sep 2017 09:03:00 -0000 IGNITE-5703: SQL: Added WRITE_SYNCHRONIZATION_MODE parameter to CREATE TABLE command. This closes #2591. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c61f134e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c61f134e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c61f134e Branch: refs/heads/ignite-5896 Commit: c61f134e21d8b8e17057b40c53e757eff6e8490d Parents: acd7861 Author: Alexander Paschenko Authored: Tue Sep 12 11:40:47 2017 +0300 Committer: devozerov Committed: Tue Sep 12 11:40:47 2017 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryProcessor.java | 7 +- .../query/h2/ddl/DdlStatementsProcessor.java | 3 +- .../query/h2/sql/GridSqlCreateTable.java | 18 ++++ .../query/h2/sql/GridSqlQueryParser.java | 31 ++++++- .../cache/index/H2DynamicTableSelfTest.java | 95 ++++++++++++++++---- .../IgnitePersistentStoreSchemaLoadTest.java | 16 +--- 6 files changed, 137 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/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 ea4c576..323bae6 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 @@ -1362,13 +1362,15 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param cacheGroup Cache group name. * @param affinityKey Affinity key column name. * @param atomicityMode Atomicity mode. + * @param writeSyncMode Write synchronization mode. * @param backups Backups. * @param ifNotExists Quietly ignore this command if table already exists. * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") public void dynamicTableCreate(String schemaName, QueryEntity entity, String templateName, String cacheGroup, - String affinityKey, @Nullable CacheAtomicityMode atomicityMode, int backups, boolean ifNotExists) + String affinityKey, @Nullable CacheAtomicityMode atomicityMode, + @Nullable CacheWriteSynchronizationMode writeSyncMode, int backups, boolean ifNotExists) throws IgniteCheckedException { assert !F.isEmpty(templateName); assert backups >= 0; @@ -1398,6 +1400,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (atomicityMode != null) ccfg.setAtomicityMode(atomicityMode); + if (writeSyncMode != null) + ccfg.setWriteSynchronizationMode(writeSyncMode); + ccfg.setBackups(backups); ccfg.setSqlSchema(schemaName); http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java index f322010..6f3c3ba 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java @@ -181,7 +181,8 @@ public class DdlStatementsProcessor { throw err; ctx.query().dynamicTableCreate(cmd.schemaName(), e, cmd.templateName(), cmd.cacheGroup(), - cmd.affinityKey(), cmd.atomicityMode(), cmd.backups(), cmd.ifNotExists()); + cmd.affinityKey(), cmd.atomicityMode(), cmd.writeSynchronizationMode(), cmd.backups(), + cmd.ifNotExists()); } } else if (stmt0 instanceof GridSqlDropTable) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlCreateTable.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlCreateTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlCreateTable.java index fa76123..d28ee7a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlCreateTable.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlCreateTable.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; /** * CREATE TABLE statement. @@ -43,6 +44,9 @@ public class GridSqlCreateTable extends GridSqlStatement { /** Atomicity mode for new cache. */ private CacheAtomicityMode atomicityMode; + /** Write sync mode. */ + private CacheWriteSynchronizationMode writeSyncMode; + /** Backups number for new cache. */ private int backups; @@ -104,6 +108,20 @@ public class GridSqlCreateTable extends GridSqlStatement { } /** + * @return Write sync mode for new cache. + */ + public CacheWriteSynchronizationMode writeSynchronizationMode() { + return writeSyncMode; + } + + /** + * @param writeSyncMode Write sync mode for new cache. + */ + public void writeSynchronizationMode(CacheWriteSynchronizationMode writeSyncMode) { + this.writeSyncMode = writeSyncMode; + } + + /** * @return Backups number for new cache. */ public int backups() { http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java index 97e9d5d..d19e66f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java @@ -30,6 +30,7 @@ import java.util.Map; import javax.cache.CacheException; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.cache.QueryIndexType; import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; @@ -437,6 +438,9 @@ public class GridSqlQueryParser { private static final String PARAM_AFFINITY_KEY = "AFFINITYKEY"; /** */ + private static final String PARAM_WRITE_SYNC = "WRITE_SYNCHRONIZATION_MODE"; + + /** */ private final IdentityHashMap h2ObjToGridObj = new IdentityHashMap<>(); /** */ @@ -1125,17 +1129,17 @@ public class GridSqlQueryParser { case PARAM_ATOMICITY: ensureNotEmpty(name, val); - CacheAtomicityMode mode; + CacheAtomicityMode atomicityMode; if (CacheAtomicityMode.TRANSACTIONAL.name().equalsIgnoreCase(val)) - mode = CacheAtomicityMode.TRANSACTIONAL; + atomicityMode = CacheAtomicityMode.TRANSACTIONAL; else if (CacheAtomicityMode.ATOMIC.name().equalsIgnoreCase(val)) - mode = CacheAtomicityMode.ATOMIC; + atomicityMode = CacheAtomicityMode.ATOMIC; else throw new IgniteSQLException("Invalid value of \"" + PARAM_ATOMICITY + "\" parameter " + "(should be either TRANSACTIONAL or ATOMIC): " + val, IgniteQueryErrorCode.PARSING); - res.atomicityMode(mode); + res.atomicityMode(atomicityMode); break; @@ -1187,6 +1191,25 @@ public class GridSqlQueryParser { break; + case PARAM_WRITE_SYNC: + ensureNotEmpty(name, val); + + CacheWriteSynchronizationMode writeSyncMode; + + if (CacheWriteSynchronizationMode.FULL_ASYNC.name().equalsIgnoreCase(val)) + writeSyncMode = CacheWriteSynchronizationMode.FULL_ASYNC; + else if (CacheWriteSynchronizationMode.FULL_SYNC.name().equalsIgnoreCase(val)) + writeSyncMode = CacheWriteSynchronizationMode.FULL_SYNC; + else if (CacheWriteSynchronizationMode.PRIMARY_SYNC.name().equalsIgnoreCase(val)) + writeSyncMode = CacheWriteSynchronizationMode.PRIMARY_SYNC; + else + throw new IgniteSQLException("Invalid value of \"" + PARAM_WRITE_SYNC + "\" parameter " + + "(should be FULL_SYNC, FULL_ASYNC, or PRIMARY_SYNC): " + val, IgniteQueryErrorCode.PARSING); + + res.writeSynchronizationMode(writeSyncMode); + + break; + default: throw new IgniteSQLException("Unsupported parameter: " + name, IgniteQueryErrorCode.PARSING); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java index d737a0f..0be6c70 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java @@ -77,6 +77,8 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { Ignition.start(cfg); client().addCacheConfiguration(cacheConfiguration()); + client().addCacheConfiguration(cacheConfiguration().setName(CACHE_NAME + "_async") + .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC)); } /** {@inheritDoc} */ @@ -107,7 +109,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTable() throws Exception { - doTestCreateTable(CACHE_NAME, null, null); + doTestCreateTable(CACHE_NAME, null, null, null); } /** @@ -115,7 +117,15 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTableWithCacheGroup() throws Exception { - doTestCreateTable(CACHE_NAME, "MyGroup", null); + doTestCreateTable(CACHE_NAME, "MyGroup", null, null); + } + + /** + * Test that {@code CREATE TABLE} actually creates new cache from template, H2 table and type descriptor on all nodes. + * @throws Exception if failed. + */ + public void testCreateTableWithWriteSyncMode() throws Exception { + doTestCreateTable(CACHE_NAME + "_async", null, null, CacheWriteSynchronizationMode.FULL_ASYNC); } /** @@ -124,7 +134,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTableReplicated() throws Exception { - doTestCreateTable("REPLICATED", null, CacheMode.REPLICATED); + doTestCreateTable("REPLICATED", null, CacheMode.REPLICATED, CacheWriteSynchronizationMode.FULL_SYNC); } /** @@ -133,7 +143,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTablePartitioned() throws Exception { - doTestCreateTable("PARTITIONED", null, CacheMode.PARTITIONED); + doTestCreateTable("PARTITIONED", null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } /** @@ -142,7 +152,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTableReplicatedCaseInsensitive() throws Exception { - doTestCreateTable("replicated", null, CacheMode.REPLICATED); + doTestCreateTable("replicated", null, CacheMode.REPLICATED, CacheWriteSynchronizationMode.FULL_SYNC); } /** @@ -151,7 +161,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTablePartitionedCaseInsensitive() throws Exception { - doTestCreateTable("partitioned", null, CacheMode.PARTITIONED); + doTestCreateTable("partitioned", null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } /** @@ -160,7 +170,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception if failed. */ public void testCreateTableNoTemplate() throws Exception { - doTestCreateTable(null, null, CacheMode.PARTITIONED); + doTestCreateTable(null, null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } /** @@ -173,6 +183,33 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { } /** + * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. + * @throws Exception if failed. + */ + public void testFullSyncWriteMode() throws Exception { + doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.FULL_SYNC, + "write_synchronization_mode=full_sync"); + } + + /** + * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. + * @throws Exception if failed. + */ + public void testPrimarySyncWriteMode() throws Exception { + doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.PRIMARY_SYNC, + "write_synchronization_mode=primary_sync"); + } + + /** + * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. + * @throws Exception if failed. + */ + public void testFullAsyncWriteMode() throws Exception { + doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.FULL_ASYNC, + "write_synchronization_mode=full_async"); + } + + /** * Perform a check on given table name considering case sensitivity. * @param tblName Table name to check. * @param sensitive Whether table should be created w/case sensitive name or not. @@ -277,13 +314,21 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes, optionally with cache type check. * @param tplCacheName Template cache name. * @param cacheGrp Cache group name, or {@code null} if no group is set. - * @param mode Expected cache mode, or {@code null} if no check is needed. + * @param cacheMode Expected cache mode, or {@code null} if no check is needed. + * @param writeSyncMode Expected write sync mode, or {@code null} if no check is needed. + * @param additionalParams Supplemental parameters to append to {@code CREATE TABLE} SQL. */ - private void doTestCreateTable(String tplCacheName, String cacheGrp, CacheMode mode) { - execute("CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar," + + private void doTestCreateTable(String tplCacheName, String cacheGrp, CacheMode cacheMode, + CacheWriteSynchronizationMode writeSyncMode, String... additionalParams) { + String sql = "CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + (F.isEmpty(tplCacheName) ? "" : "\"template=" + tplCacheName + "\",") + "\"backups=10,atomicity=atomic\"" + - (F.isEmpty(cacheGrp) ? "" : ",\"cacheGroup=" + cacheGrp + '"')); + (F.isEmpty(cacheGrp) ? "" : ",\"cacheGroup=" + cacheGrp + '"'); + + for (String p : additionalParams) + sql += ",\"" + p + "\""; + + execute(sql); String cacheName = cacheName("Person"); @@ -296,7 +341,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { assertNotNull(cacheDesc); - if (mode == CacheMode.REPLICATED) + if (cacheMode == CacheMode.REPLICATED) assertEquals(Integer.MAX_VALUE, cacheDesc.cacheConfiguration().getBackups()); else assertEquals(10, cacheDesc.cacheConfiguration().getBackups()); @@ -307,8 +352,11 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { assertEquals(cacheGrp, cacheDesc.groupDescriptor().groupName()); - if (mode != null) - assertEquals(mode, cacheDesc.cacheConfiguration().getCacheMode()); + if (cacheMode != null) + assertEquals(cacheMode, cacheDesc.cacheConfiguration().getCacheMode()); + + if (writeSyncMode != null) + assertEquals(writeSyncMode, cacheDesc.cacheConfiguration().getWriteSynchronizationMode()); QueryTypeDescriptorImpl desc = typeExisting(node, cacheName, "Person"); @@ -374,6 +422,23 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { } /** + * Test that attempting to omit mandatory value of WRITE_SYNCHRONIZATION_MODE parameter yields an error. + */ + public void testEmptyWriteSyncMode() { + assertCreateTableWithParamsThrows("write_synchronization_mode=", + "Parameter value cannot be empty: WRITE_SYNCHRONIZATION_MODE"); + } + + /** + * Test that attempting to provide invalid value of WRITE_SYNCHRONIZATION_MODE parameter yields an error. + */ + public void testInvalidWriteSyncMode() { + assertCreateTableWithParamsThrows("write_synchronization_mode=invalid", + "Invalid value of \"WRITE_SYNCHRONIZATION_MODE\" parameter " + + "(should be FULL_SYNC, FULL_ASYNC, or PRIMARY_SYNC): invalid"); + } + + /** * Test that attempting to {@code CREATE TABLE} that already exists does not yield an error if the statement * contains {@code IF NOT EXISTS} clause. * @throws Exception if failed. @@ -536,7 +601,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { e.setValueType("City"); queryProcessor(client()).dynamicTableCreate("PUBLIC", e, CacheMode.PARTITIONED.name(), null, - null, CacheAtomicityMode.ATOMIC, 10, false); + null, CacheAtomicityMode.ATOMIC, null, 10, false); return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f134e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java index 927de07..349f062 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java @@ -36,7 +36,6 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.cache.persistence.DbCheckpointListener; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; -import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -151,7 +150,8 @@ public class IgnitePersistentStoreSchemaLoadTest extends GridCommonAbstractTest idx.setName(IDX_NAME); - ig0.context().query().dynamicTableCreate(SCHEMA_NAME, getEntity(), TMPL_NAME, null, null, null, 1, true); + ig0.context().query().dynamicTableCreate(SCHEMA_NAME, getEntity(), TMPL_NAME, null, null, null, + null, 1, true); assert indexCnt(ig0, CACHE_NAME) == 0; @@ -183,7 +183,7 @@ public class IgnitePersistentStoreSchemaLoadTest extends GridCommonAbstractTest } }); - ig0.context().query().dynamicTableCreate(SCHEMA_NAME, getEntity(), TMPL_NAME, null, null, null, 1, true); + ig0.context().query().dynamicTableCreate(SCHEMA_NAME, getEntity(), TMPL_NAME, null, null, null, null, 1, true); assert indexCnt(ig0, CACHE_NAME) == 0; @@ -222,21 +222,13 @@ public class IgnitePersistentStoreSchemaLoadTest extends GridCommonAbstractTest int cnt = 0; - for (QueryEntity entity : desc.schema().entities()) { + for (QueryEntity entity : desc.schema().entities()) cnt += entity.getIndexes().size(); - } return cnt; } /** - * @return Indexing. - */ - private IgniteH2Indexing getIndexing(IgniteEx ignite) { - return U.field(ignite.context().query(), "idx"); - } - - /** * */ private void deleteWorkFiles() throws IgniteCheckedException {