Merge branch 'ignite-1.6.4' to 'ignite-1.7.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6d6286d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6d6286d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6d6286d Branch: refs/heads/ignite-3443 Commit: e6d6286d5bd680c1b11e91cf3ad31416d2ca59bd Parents: d65f794 ae23dab Author: Alexey Kuznetsov <[email protected]> Authored: Wed Aug 3 17:56:16 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Aug 3 17:56:42 2016 +0700 ---------------------------------------------------------------------- .../internal/visor/query/VisorQueryJob.java | 38 +++++++++--- .../query/VisorQueryScanSubstringFilter.java | 63 ++++++++++++++++++++ .../internal/visor/query/VisorQueryUtils.java | 6 ++ .../resources/META-INF/classnames.properties | 20 +++++-- 4 files changed, 113 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e6d6286d/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e6d6286d/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --cc modules/core/src/main/resources/META-INF/classnames.properties index 57762c7,57762c7..ade21ce --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@@ -18,6 -18,6 +18,7 @@@ org.apache.ignite.IgniteAuthenticationException org.apache.ignite.IgniteCheckedException org.apache.ignite.IgniteClientDisconnectedException ++org.apache.ignite.IgniteDataStreamerTimeoutException org.apache.ignite.IgniteDeploymentException org.apache.ignite.IgniteException org.apache.ignite.IgniteIllegalStateException @@@ -88,6 -88,6 +89,8 @@@ org.apache.ignite.cache.store.jdbc.Jdbc org.apache.ignite.cache.store.jdbc.JdbcTypeDefaultHasher org.apache.ignite.cache.store.jdbc.JdbcTypeField org.apache.ignite.cache.store.jdbc.JdbcTypeHasher ++org.apache.ignite.cache.store.jdbc.JdbcTypesDefaultTransformer ++org.apache.ignite.cache.store.jdbc.JdbcTypesTransformer org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$1 org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$2 @@@ -389,11 -389,11 +392,12 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cache.GridCacheAdapter$64 org.apache.ignite.internal.processors.cache.GridCacheAdapter$65 org.apache.ignite.internal.processors.cache.GridCacheAdapter$66 --org.apache.ignite.internal.processors.cache.GridCacheAdapter$68 ++org.apache.ignite.internal.processors.cache.GridCacheAdapter$67 org.apache.ignite.internal.processors.cache.GridCacheAdapter$69 --org.apache.ignite.internal.processors.cache.GridCacheAdapter$69$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$70 ++org.apache.ignite.internal.processors.cache.GridCacheAdapter$70$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$71 ++org.apache.ignite.internal.processors.cache.GridCacheAdapter$72 org.apache.ignite.internal.processors.cache.GridCacheAdapter$9 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1$1 @@@ -409,6 -409,6 +413,8 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadCacheJobV2 org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadKeysCallable org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadKeysCallableV2 ++org.apache.ignite.internal.processors.cache.GridCacheAdapter$PartitionSizeLongJob ++org.apache.ignite.internal.processors.cache.GridCacheAdapter$PartitionSizeLongTask org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeJob org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeLongJob org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeLongTask @@@ -841,6 -841,6 +847,8 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$3 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$OffheapIteratorClosure org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$PeekValueExpiryAwareIterator ++org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap ++org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsKey org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest @@@ -948,7 -948,7 +956,6 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage org.apache.ignite.internal.processors.clock.GridClockDeltaVersion --org.apache.ignite.internal.processors.closure.GridClosurePolicy org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLAV2 @@@ -1180,6 -1180,6 +1187,7 @@@ org.apache.ignite.internal.processors.p org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessorImpl org.apache.ignite.internal.processors.platform.cache.PlatformCachePartialUpdateException org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinity$1 ++org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryImpl @@@ -1231,9 -1231,9 +1239,6 @@@ org.apache.ignite.internal.processors.q org.apache.ignite.internal.processors.query.GridQueryProcessor$4 org.apache.ignite.internal.processors.query.GridQueryProcessor$5 org.apache.ignite.internal.processors.query.GridQueryProcessor$6 --org.apache.ignite.internal.processors.query.GridQueryProcessor$7 --org.apache.ignite.internal.processors.query.GridQueryProcessor$8 --org.apache.ignite.internal.processors.query.GridQueryProcessor$9 org.apache.ignite.internal.processors.query.GridQueryProcessor$IndexType org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse @@@ -1749,6 -1749,6 +1754,7 @@@ org.apache.ignite.internal.visor.node.V org.apache.ignite.internal.visor.node.VisorSpisConfiguration org.apache.ignite.internal.visor.node.VisorTransactionConfiguration org.apache.ignite.internal.visor.query.VisorQueryArg ++org.apache.ignite.internal.visor.query.VisorQueryArgV2 org.apache.ignite.internal.visor.query.VisorQueryCleanupTask org.apache.ignite.internal.visor.query.VisorQueryCleanupTask$VisorQueryCleanupJob org.apache.ignite.internal.visor.query.VisorQueryField @@@ -1757,6 -1757,6 +1763,7 @@@ org.apache.ignite.internal.visor.query. org.apache.ignite.internal.visor.query.VisorQueryNextPageTask$VisorQueryNextPageJob org.apache.ignite.internal.visor.query.VisorQueryResult org.apache.ignite.internal.visor.query.VisorQueryResultEx ++org.apache.ignite.internal.visor.query.VisorQueryScanSubstringFilter org.apache.ignite.internal.visor.query.VisorQueryTask org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException org.apache.ignite.internal.visor.util.VisorEventMapper @@@ -1783,6 -1783,6 +1790,7 @@@ org.apache.ignite.lifecycle.LifecycleEv org.apache.ignite.marshaller.jdk.JdkMarshallerDummySerializable org.apache.ignite.marshaller.optimized.OptimizedFieldType org.apache.ignite.messaging.MessagingListenActor ++org.apache.ignite.platform.dotnet.PlatformDotNetAffinityFunction org.apache.ignite.platform.dotnet.PlatformDotNetCacheStoreFactory org.apache.ignite.platform.dotnet.PlatformDotNetCacheStoreFactoryNative org.apache.ignite.plugin.CachePluginConfiguration
