Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 144DA1729E for ; Mon, 2 Mar 2015 14:04:24 +0000 (UTC) Received: (qmail 33618 invoked by uid 500); 2 Mar 2015 14:04:14 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 33582 invoked by uid 500); 2 Mar 2015 14:04:14 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 33573 invoked by uid 99); 2 Mar 2015 14:04:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 14:04:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 14:04:11 +0000 Received: (qmail 29898 invoked by uid 99); 2 Mar 2015 14:03:51 -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; Mon, 02 Mar 2015 14:03:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AAA2DFD4C; Mon, 2 Mar 2015 14:03:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 14:04:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests Conflicts: modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/69b8cd85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69b8cd85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69b8cd85 Branch: refs/heads/ignite-sql-tests Commit: 69b8cd853c04ad5378b30d8f8be82078c66a2f1f Parents: 48ce2a8 11efb91 Author: S.Vladykin Authored: Mon Mar 2 16:57:43 2015 +0300 Committer: S.Vladykin Committed: Mon Mar 2 16:57:43 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 12 + config/ignite-log4j.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 2 +- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 +- ipc/shmem/Makefile.am | 15 + ipc/shmem/igniteshmem/Makefile.am | 15 + ipc/shmem/include/Makefile.am | 15 + modules/clients/src/test/keystore/generate.sh | 15 +- .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../ignite/cache/query/ContinuousQuery.java | 18 +- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 +- .../apache/ignite/cluster/ClusterMetrics.java | 2 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/GridProperties.java | 78 - .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 41 +- .../ignite/internal/IgniteProperties.java | 79 + .../ignite/internal/IgniteVersionUtils.java | 8 +- .../internal/events/DiscoveryCustomEvent.java | 3 + .../processors/cache/GridCacheStoreManager.java | 18 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../GridDistributedCacheAdapter.java | 2 + .../processors/cluster/ClusterProcessor.java | 46 + .../dataload/IgniteDataLoaderImpl.java | 29 +- .../plugin/IgnitePluginProcessor.java | 24 + .../ignite/internal/util/IgniteUtils.java | 90 +- .../ignite/internal/visor/cache/VisorCache.java | 190 +-- .../cache/VisorCacheAffinityConfiguration.java | 53 +- .../visor/cache/VisorCacheConfiguration.java | 466 +----- .../cache/VisorCacheDefaultConfiguration.java | 27 +- .../cache/VisorCacheEvictionConfiguration.java | 81 +- .../cache/VisorCacheNearConfiguration.java | 42 +- .../cache/VisorCachePreloadConfiguration.java | 54 +- .../cache/VisorCacheStoreConfiguration.java | 148 +- .../VisorCacheWriteBehindConfiguration.java | 137 -- .../visor/node/VisorAtomicConfiguration.java | 27 +- .../visor/node/VisorBasicConfiguration.java | 197 +-- .../node/VisorCacheQueryConfiguration.java | 35 - .../node/VisorExecutorServiceConfiguration.java | 54 +- .../visor/node/VisorGridConfiguration.java | 175 +- .../visor/node/VisorIgfsConfiguration.java | 244 +-- .../visor/node/VisorLifecycleConfiguration.java | 9 +- .../visor/node/VisorMetricsConfiguration.java | 29 +- .../node/VisorPeerToPeerConfiguration.java | 28 +- .../visor/node/VisorQueryConfiguration.java | 53 +- .../visor/node/VisorRestConfiguration.java | 80 +- .../node/VisorSegmentationConfiguration.java | 45 +- .../visor/node/VisorSpisConfiguration.java | 92 +- .../node/VisorTransactionConfiguration.java | 62 +- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../optimized-classnames.previous.properties | 15 + .../optimized/optimized-classnames.properties | 1565 +----------------- .../apache/ignite/plugin/PluginProvider.java | 5 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++ .../TcpDiscoveryCustomEventMessage.java | 3 + .../core/src/test/config/store/jdbc/Ignite.xml | 63 +- .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 38 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../config/GridTestProperties.java | 10 +- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + modules/extdata/p2p/pom.xml | 6 - .../client/hadoop/GridHadoopClientProtocol.java | 6 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 +++++ .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 ----- .../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../processors/hadoop/GridHadoopSetup.java | 8 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../GridHadoopExternalCommunication.java | 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- .../hadoop/GridHadoopGroupingTest.java | 4 +- .../igfs/IgfsPerformanceBenchmark.java | 9 +- modules/hibernate/pom.xml | 6 - .../HibernateReadWriteAccessStrategy.java | 81 +- modules/indexing/pom.xml | 6 - modules/jta/pom.xml | 6 - modules/scalar/pom.xml | 6 - .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +- modules/spring/pom.xml | 6 - modules/visor-console/pom.xml | 7 - .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 95 +- .../config/VisorConfigurationCommand.scala | 140 +- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 +- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- modules/web/pom.xml | 6 - modules/winservice/IgniteService.sln | 2 +- .../IgniteService/IgniteService.csproj | 2 +- .../config/benchmark-atomic-win.properties | 15 + .../config/benchmark-atomic.properties | 15 + .../config/benchmark-compute-win.properties | 15 + .../config/benchmark-compute.properties | 15 + .../config/benchmark-multicast.properties | 15 + .../config/benchmark-query-win.properties | 15 + .../yardstick/config/benchmark-query.properties | 15 + .../config/benchmark-tx-win.properties | 15 + .../yardstick/config/benchmark-tx.properties | 15 + .../yardstick/config/benchmark-win.properties | 15 + modules/yardstick/config/benchmark.properties | 15 + .../yardstick/config/ignite-store-config.xml | 15 +- pom.xml | 150 +- 124 files changed, 2264 insertions(+), 4596 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index 20d9a8b,a6ec05c..241e79d --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@@ -153,47 -138,41 +135,40 @@@ public class VisorCacheConfiguration im * @return Data transfer object for cache configuration properties. */ public static VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) { - GridCacheContext cctx = ((IgniteKernal)ignite).internalCache(ccfg.getName()).context(); - - boolean jdbcStore = cctx.store().configuredStore() instanceof CacheAbstractJdbcStore; - VisorCacheConfiguration cfg = new VisorCacheConfiguration(); - cfg.name(ccfg.getName()); - cfg.mode(ccfg.getCacheMode()); - cfg.distributionMode(ccfg.getDistributionMode()); - cfg.atomicityMode(ccfg.getAtomicityMode()); - cfg.atomicWriteOrderMode(ccfg.getAtomicWriteOrderMode()); - cfg.eagerTtl(ccfg.isEagerTtl()); - cfg.writeSynchronizationMode(ccfg.getWriteSynchronizationMode()); - cfg.swapEnabled(ccfg.isSwapEnabled()); - cfg.queryIndexEnabled(ccfg.isQueryIndexEnabled()); - cfg.invalidate(ccfg.isInvalidate()); - cfg.startSize(ccfg.getStartSize()); - cfg.transactionManagerLookupClassName(ccfg.getTransactionManagerLookupClassName()); - cfg.offsetHeapMaxMemory(ccfg.getOffHeapMaxMemory()); - cfg.maxQueryIteratorCount(ccfg.getMaximumQueryIteratorCount()); - cfg.maxConcurrentAsyncOperations(ccfg.getMaxConcurrentAsyncOperations()); - cfg.memoryMode(ccfg.getMemoryMode()); - cfg.interceptor(compactClass(ccfg.getInterceptor())); - cfg.affinityConfiguration(VisorCacheAffinityConfiguration.from(ccfg)); - cfg.preloadConfiguration(VisorCachePreloadConfiguration.from(ccfg)); - cfg.evictConfiguration(VisorCacheEvictionConfiguration.from(ccfg)); - cfg.nearConfiguration(VisorCacheNearConfiguration.from(ccfg)); - cfg.defaultConfiguration(VisorCacheDefaultConfiguration.from(ccfg)); - cfg.storeConfiguration(VisorCacheStoreConfiguration.from(ccfg)); - cfg.writeBehind(VisorCacheWriteBehindConfiguration.from(ccfg)); - - cfg.typeMeta(VisorCacheTypeMetadata.list(ccfg.getTypeMetadata())); - cfg.jdbcStore(jdbcStore); - - cfg.readThrough(ccfg.isReadThrough()); - cfg.writeThrough(ccfg.isWriteThrough()); - cfg.statisticsEnabled(ccfg.isStatisticsEnabled()); - cfg.managementEnabled(ccfg.isManagementEnabled()); - cfg.loaderFactory(compactClass(ccfg.getCacheLoaderFactory())); - cfg.writerFactory(compactClass(ccfg.getCacheWriterFactory())); - cfg.expiryPolicyFactory(compactClass(ccfg.getExpiryPolicyFactory())); + cfg.name = ccfg.getName(); + cfg.mode = ccfg.getCacheMode(); + cfg.distributionMode = ccfg.getDistributionMode(); + cfg.atomicityMode = ccfg.getAtomicityMode(); + cfg.atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode(); + cfg.eagerTtl = ccfg.isEagerTtl(); + cfg.writeSynchronizationMode = ccfg.getWriteSynchronizationMode(); + cfg.swapEnabled = ccfg.isSwapEnabled(); + cfg.qryIdxEnabled = ccfg.isQueryIndexEnabled(); + cfg.invalidate = ccfg.isInvalidate(); + cfg.startSize = ccfg.getStartSize(); + cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName(); + cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory(); + cfg.maxQryIterCnt = ccfg.getMaximumQueryIteratorCount(); + cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations(); + cfg.memoryMode = ccfg.getMemoryMode(); - cfg.indexingSpiName = ccfg.getIndexingSpiName(); + cfg.interceptor = compactClass(ccfg.getInterceptor()); + cfg.valBytes = ccfg.isStoreValueBytes(); + cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata()); + cfg.statisticsEnabled = ccfg.isStatisticsEnabled(); + cfg.mgmtEnabled = ccfg.isManagementEnabled(); + cfg.ldrFactory = compactClass(ccfg.getCacheLoaderFactory()); + cfg.writerFactory = compactClass(ccfg.getCacheWriterFactory()); + cfg.expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory()); + + cfg.affinityCfg = VisorCacheAffinityConfiguration.from(ccfg); + cfg.preloadCfg = VisorCachePreloadConfiguration.from(ccfg); + cfg.evictCfg = VisorCacheEvictionConfiguration.from(ccfg); + cfg.nearCfg = VisorCacheNearConfiguration.from(ccfg); + cfg.dfltCfg = VisorCacheDefaultConfiguration.from(ccfg); + cfg.storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg); + cfg.qryCfg = VisorCacheQueryConfiguration.from(ccfg.getQueryConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 1576fc7,96c69d9..baf5999 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@@ -102,24 -102,25 +102,24 @@@ public class VisorGridConfiguration imp IgniteConfiguration c = ignite.configuration(); - basic(VisorBasicConfiguration.from(ignite, c)); - metrics(VisorMetricsConfiguration.from(c)); - spis(VisorSpisConfiguration.from(c)); - p2p(VisorPeerToPeerConfiguration.from(c)); - lifecycle(VisorLifecycleConfiguration.from(c)); - executeService(VisorExecutorServiceConfiguration.from(c)); - segmentation(VisorSegmentationConfiguration.from(c)); - includeProperties(compactArray(c.getIncludeProperties())); - includeEventTypes(c.getIncludeEventTypes()); - rest(VisorRestConfiguration.from(c)); - userAttributes(c.getUserAttributes()); - caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration())); - igfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration())); - streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration())); - env(new HashMap<>(getenv())); - systemProperties(getProperties()); - atomic(VisorAtomicConfiguration.from(c.getAtomicConfiguration())); - transaction(VisorTransactionConfiguration.from(c.getTransactionConfiguration())); + basic = VisorBasicConfiguration.from(ignite, c); + metrics = VisorMetricsConfiguration.from(c); + spis = VisorSpisConfiguration.from(c); + p2p = VisorPeerToPeerConfiguration.from(c); + lifecycle = VisorLifecycleConfiguration.from(c); + execSvc = VisorExecutorServiceConfiguration.from(c); + seg = VisorSegmentationConfiguration.from(c); + inclProps = compactArray(c.getIncludeProperties()); + inclEvtTypes = c.getIncludeEventTypes(); + rest = VisorRestConfiguration.from(c); + userAttrs = c.getUserAttributes(); + caches = VisorCacheConfiguration.list(ignite, c.getCacheConfiguration()); + igfss = VisorIgfsConfiguration.list(c.getIgfsConfiguration()); + streamers = VisorStreamerConfiguration.list(c.getStreamerConfiguration()); + env = new HashMap<>(getenv()); + sysProps = getProperties(); + atomic = VisorAtomicConfiguration.from(c.getAtomicConfiguration()); + txCfg = VisorTransactionConfiguration.from(c.getTransactionConfiguration()); - qryCfg = VisorQueryConfiguration.from(c.getQueryConfiguration()); return this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java index 7c50b52,de5e0b2..b834a51 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java @@@ -48,7 -50,38 +48,7 @@@ public class VisorQueryConfiguration im /** The flag indicating that serializer for H2 database will be set to Ignite's marshaller. */ private boolean useOptimizedSerializer; - - /** - * @param qcfg Query configuration. - * @return Fill data transfer object with query configuration data. - */ - public static VisorQueryConfiguration from(QueryConfiguration qcfg) { - VisorQueryConfiguration c = null; - - if (qcfg != null) { - c = new VisorQueryConfiguration(); - - Class[] clss = qcfg.getIndexCustomFunctionClasses(); - - int sz = clss != null ? clss.length : 0; - - String[] strClss = new String[sz]; - - for (int i = 0; i < sz; i++) - strClss[i] = U.compact(clss[i].getName()); - - c.idxCustomFuncClss = strClss; - c.searchPath = qcfg.getSearchPath(); - c.initScriptPath = qcfg.getInitialScriptPath(); - c.maxOffHeapMemory = qcfg.getMaxOffHeapMemory(); - c.longQryExecTimeout = qcfg.getLongQueryExecutionTimeout(); - c.longQryExplain = qcfg.isLongQueryExplain(); - c.useOptimizedSerializer = qcfg.isUseOptimizedSerializer(); - } - - return c; - } -- ++ /** * @return Classes with methods annotated by {@link QuerySqlFunction}. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 86e8a9f,bee5b95..b3d72e7 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@@ -614,12 -614,12 +614,12 @@@ public abstract class GridCacheContinuo /** * @throws Exception If failed. */ - public void testInitialPredicate() throws Exception { + public void testInitialQuery() throws Exception { IgniteCache cache = grid(0).jcache(null); - ContinuousQuery qry = Query.continuous(); + ContinuousQuery qry = new ContinuousQuery<>(); - qry.setInitialPredicate(new ScanQuery<>(new P2() { - qry.setInitialQuery(Query.scan(new P2() { ++ qry.setInitialQuery(new ScanQuery<>(new P2() { @Override public boolean apply(Integer k, Integer v) { return k >= 5; } @@@ -659,12 -659,12 +659,12 @@@ /** * @throws Exception If failed. */ - public void testInitialPredicateAndUpdates() throws Exception { + public void testInitialQueryAndUpdates() throws Exception { IgniteCache cache = grid(0).jcache(null); - ContinuousQuery qry = Query.continuous(); + ContinuousQuery qry = new ContinuousQuery<>(); - qry.setInitialPredicate(new ScanQuery<>(new P2() { - qry.setInitialQuery(Query.scan(new P2() { ++ qry.setInitialQuery(new ScanQuery<>(new P2() { @Override public boolean apply(Integer k, Integer v) { return k >= 5; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69b8cd85/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 99232ec,e2ca05b..5dafe6d --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@@ -831,21 -831,23 +831,22 @@@ object VisorCacheCommand cacheT += ("Default Lock Timeout", defaultCfg.txLockTimeout()) cacheT += ("Default Query Timeout", defaultCfg.queryTimeout()) - cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled()) + cacheT += ("Query Indexing Enabled", bool2Str(cfg.queryIndexEnabled())) cacheT += ("Query Iterators Number", cfg.maxQueryIteratorCount()) - cacheT += ("Cache Interceptor", cfg.interceptor()) - - cacheT += ("Store Enabled", storeCfg.enabled()) - cacheT += ("Store", storeCfg.store()) - cacheT += ("Store Values In Bytes", storeCfg.valueBytes()) + cacheT += ("Metadata type count", cfg.typeMeta().size()) - cacheT += ("Indexing SPI Name", safe(cfg.indexingSpiName())) + cacheT += ("Cache Interceptor", safe(cfg.interceptor())) - cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory()) + cacheT += ("Store Enabled", bool2Str(storeCfg.enabled())) + cacheT += ("Store Сlass", safe(storeCfg.store())) + cacheT += ("Store Factory Сlass", storeCfg.storeFactory()) + cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough())) + cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough())) - cacheT += ("Write-Behind Enabled", writeBehind.enabled()) - cacheT += ("Write-Behind Flush Size", writeBehind.flushSize()) - cacheT += ("Write-Behind Frequency", writeBehind.flushFrequency()) - cacheT += ("Write-Behind Flush Threads Count", writeBehind.flushThreadCount()) - cacheT += ("Write-Behind Batch Size", writeBehind.batchSize()) + cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.enabled())) + cacheT += ("Write-Behind Flush Size", storeCfg.flushSize()) + cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency()) + cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount()) + cacheT += ("Write-Behind Batch Size", storeCfg.batchSize()) cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations()) cacheT += ("Memory Mode", cfg.memoryMode())