ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/13] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Date Wed, 31 May 2017 12:47:20 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
#	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
#	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
#	modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56af0611
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56af0611
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56af0611

Branch: refs/heads/ignite-5075
Commit: 56af06118f53af39e72638dfecba771055f19abe
Parents: ae93227 b0e49ad
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 31 15:32:34 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 31 15:32:34 2017 +0300

----------------------------------------------------------------------
 doap_Ignite.rdf                                 |    2 +
 examples/config/filesystem/example-igfs.xml     |    4 +
 .../datagrid/CacheClientBinaryQueryExample.java |    4 +-
 .../examples/datagrid/CacheQueryExample.java    |    2 +-
 modules/clients/src/test/config/jdbc-config.xml |    6 -
 .../jdbc2/JdbcAbstractDmlStatementSelfTest.java |   50 +-
 .../JdbcAbstractUpdateStatementSelfTest.java    |   11 +-
 .../ignite/internal/jdbc2/JdbcBlobTest.java     |  485 ++++
 .../jdbc2/JdbcInsertStatementSelfTest.java      |   16 +-
 .../jdbc2/JdbcMergeStatementSelfTest.java       |   16 +-
 .../internal/jdbc2/JdbcMetadataSelfTest.java    |    5 +-
 .../internal/jdbc2/JdbcNoDefaultCacheTest.java  |    2 -
 .../jdbc2/JdbcPreparedStatementSelfTest.java    |   47 +
 .../internal/jdbc2/JdbcResultSetSelfTest.java   |   24 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |    4 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |  121 +-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   10 +-
 .../jdbc/thin/JdbcConnectionSelfTest.java       |  195 ++
 .../src/main/java/org/apache/ignite/Ignite.java |   18 +-
 .../java/org/apache/ignite/IgniteBinary.java    |   23 +-
 .../java/org/apache/ignite/IgniteCache.java     |   13 +
 .../org/apache/ignite/IgniteJdbcThinDriver.java |  312 +++
 .../apache/ignite/IgniteSystemProperties.java   |    2 +-
 .../ignite/binary/BinaryBasicNameMapper.java    |    2 +-
 .../org/apache/ignite/binary/BinaryObject.java  |    8 +
 .../org/apache/ignite/binary/BinaryType.java    |    5 +
 .../ignite/binary/BinaryTypeConfiguration.java  |   26 +
 .../cache/affinity/AffinityKeyMapper.java       |    3 +
 .../ignite/cache/query/FieldsQueryCursor.java   |   39 +
 .../configuration/AtomicConfiguration.java      |   25 +
 .../configuration/CacheConfiguration.java       |   16 +-
 .../configuration/MemoryConfiguration.java      |    3 +-
 .../MemoryPolicyConfiguration.java              |  100 +-
 .../ignite/internal/GridKernalContext.java      |    9 +-
 .../ignite/internal/GridKernalContextImpl.java  |   13 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   27 +
 .../apache/ignite/internal/IgniteKernal.java    |   44 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |    1 +
 .../binary/BinaryCachingMetadataHandler.java    |    5 +
 .../internal/binary/BinaryClassDescriptor.java  |    5 +-
 .../ignite/internal/binary/BinaryContext.java   |  118 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |   41 +-
 .../internal/binary/BinaryFieldAccessor.java    |   10 +
 .../ignite/internal/binary/BinaryMetadata.java  |   93 +-
 .../internal/binary/BinaryMetadataHandler.java  |    9 +
 .../binary/BinaryNoopMetadataHandler.java       |    5 +
 .../internal/binary/BinaryObjectExImpl.java     |    5 +
 .../internal/binary/BinaryObjectImpl.java       |   24 +-
 .../binary/BinaryObjectOffheapImpl.java         |    9 +-
 .../internal/binary/BinaryReaderExImpl.java     |   18 +
 .../ignite/internal/binary/BinaryTypeImpl.java  |   15 +
 .../ignite/internal/binary/BinaryTypeProxy.java |    6 +
 .../ignite/internal/binary/BinaryUtils.java     |  104 +-
 .../internal/binary/BinaryWriterExImpl.java     |   34 +-
 .../internal/binary/GridBinaryMarshaller.java   |    3 +
 .../binary/builder/BinaryBuilderSerializer.java |   10 +-
 .../binary/builder/BinaryObjectBuilderImpl.java |    2 +-
 .../GridClientOptimizedMarshaller.java          |    2 +-
 .../GridClientZipOptimizedMarshaller.java       |    2 +-
 .../internal/jdbc/thin/JdbcConnection.java      |  529 ++++
 .../ignite/internal/jdbc/thin/JdbcTcpIo.java    |  207 ++
 .../apache/ignite/internal/jdbc2/JdbcBlob.java  |  191 ++
 .../ignite/internal/jdbc2/JdbcConnection.java   |    5 +-
 .../internal/jdbc2/JdbcPreparedStatement.java   |    4 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java    |    8 +-
 .../managers/communication/GridIoManager.java   |  380 ++-
 .../communication/IgniteIoTestMessage.java      |  362 ++-
 .../managers/indexing/GridIndexingManager.java  |   19 +-
 .../optimized/OptimizedClassDescriptor.java     |    2 +-
 .../optimized/OptimizedMarshaller.java          |    2 +-
 .../marshaller/optimized/package-info.java      |   22 +
 .../mem/unsafe/UnsafeMemoryProvider.java        |   18 +-
 .../pagemem/impl/PageMemoryNoStoreImpl.java     |   22 +-
 .../internal/processors/cache/CacheObject.java  |    8 +-
 .../processors/cache/CacheObjectAdapter.java    |    4 +-
 .../cache/CacheObjectByteArrayImpl.java         |    8 +-
 .../processors/cache/CacheObjectContext.java    |  197 +-
 .../processors/cache/CacheObjectImpl.java       |   31 +-
 .../processors/cache/CacheObjectUtils.java      |  173 ++
 .../cache/CacheObjectValueContext.java          |   50 +
 .../processors/cache/ClusterCachesInfo.java     |   19 +-
 .../processors/cache/ExchangeActions.java       |    2 +-
 .../processors/cache/GridCacheContext.java      |   12 +-
 .../processors/cache/GridCacheEventManager.java |    2 +-
 .../processors/cache/GridCacheIoManager.java    |    6 +-
 .../processors/cache/GridCacheMapEntry.java     |   13 +-
 .../GridCachePartitionExchangeManager.java      |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   67 +-
 .../processors/cache/IgniteCacheProxy.java      |   24 +-
 .../processors/cache/KeyCacheObjectImpl.java    |   10 +-
 .../processors/cache/QueryCursorImpl.java       |   19 +-
 .../cache/binary/CacheObjectBinaryContext.java  |    6 +-
 .../binary/CacheObjectBinaryProcessor.java      |   21 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  100 +-
 .../cache/binary/IgniteBinaryImpl.java          |   26 +
 .../cache/database/CacheDataRowAdapter.java     |    8 +-
 .../IgniteCacheDatabaseSharedManager.java       |   91 +-
 .../cache/database/MemoryMetricsImpl.java       |   31 +-
 .../cache/database/tree/BPlusTree.java          |   64 +-
 .../dht/GridClientPartitionTopology.java        |   31 +-
 .../dht/GridDhtPartitionTopology.java           |    9 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   59 +-
 .../GridDhtPartitionsExchangeFuture.java        |   50 +-
 .../cache/distributed/near/GridNearTxLocal.java |    3 +-
 .../cache/query/GridCacheQueryManager.java      |   32 +-
 .../cache/query/GridCacheQueryRequest.java      |   14 +-
 .../CacheContinuousQueryAcknowledgeBuffer.java  |  120 +
 .../CacheContinuousQueryDeployableObject.java   |  110 +
 .../continuous/CacheContinuousQueryEntry.java   |  117 +-
 .../CacheContinuousQueryEventBuffer.java        |  483 ++++
 .../continuous/CacheContinuousQueryHandler.java |  733 +-----
 .../CacheContinuousQueryHandlerV2.java          |    6 +-
 .../continuous/CacheContinuousQueryManager.java |   16 +-
 .../CacheContinuousQueryPartitionRecovery.java  |  267 +++
 .../cache/transactions/TxDeadlock.java          |    7 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |    6 +-
 .../IgniteCacheObjectProcessorImpl.java         |   39 +-
 .../processors/cacheobject/NoOpBinary.java      |   12 +
 .../continuous/GridContinuousBatchAdapter.java  |    2 +-
 .../continuous/GridContinuousProcessor.java     |   19 +-
 .../continuous/GridContinuousQueryBatch.java    |   16 +-
 .../processors/odbc/OdbcNioListener.java        |  242 --
 .../internal/processors/odbc/OdbcProcessor.java |  199 --
 .../odbc/SqlListenerAbstractMessageParser.java  |  265 +++
 .../odbc/SqlListenerAbstractObjectReader.java   |  137 ++
 .../odbc/SqlListenerAbstractObjectWriter.java   |  111 +
 .../processors/odbc/SqlListenerNioListener.java |  263 ++
 .../processors/odbc/SqlListenerProcessor.java   |  191 ++
 .../odbc/SqlListenerRequestHandlerImpl.java     |  494 ++++
 .../processors/odbc/jdbc/JdbcMessageParser.java |   50 +
 .../processors/odbc/jdbc/JdbcObjectReader.java  |   33 +
 .../processors/odbc/jdbc/JdbcObjectWriter.java  |   33 +
 .../processors/odbc/odbc/OdbcMessageParser.java |  249 +-
 .../processors/odbc/odbc/OdbcObjectReader.java  |   33 +
 .../processors/odbc/odbc/OdbcObjectWriter.java  |   32 +
 .../odbc/odbc/OdbcRequestHandler.java           |  513 ----
 .../platform/PlatformContextImpl.java           |   29 +-
 .../binary/PlatformBinaryProcessor.java         |   25 +
 .../query/CacheQueryObjectValueContext.java     |   64 +
 .../query/GridQueryCacheObjectsIterator.java    |   16 +-
 .../processors/query/GridQueryIndexing.java     |  107 +-
 .../processors/query/GridQueryProcessor.java    |  408 ++--
 .../query/GridQueryTypeDescriptor.java          |   15 +
 .../processors/query/GridRunningQueryInfo.java  |   16 +-
 .../processors/query/QueryIndexKey.java         |   28 +-
 .../internal/processors/query/QuerySchema.java  |    2 +-
 .../query/QueryTypeDescriptorImpl.java          |   25 +-
 .../processors/query/QueryTypeIdKey.java        |   26 +-
 .../processors/query/QueryTypeNameKey.java      |   12 +-
 .../internal/processors/query/QueryUtils.java   |  294 ++-
 .../query/property/QueryBinaryProperty.java     |    2 +-
 .../schema/SchemaIndexCacheVisitorImpl.java     |   12 +-
 .../processors/query/schema/SchemaKey.java      |   59 -
 .../message/SchemaProposeDiscoveryMessage.java  |    7 +-
 .../operation/SchemaAbstractOperation.java      |   27 +-
 .../operation/SchemaIndexAbstractOperation.java |    7 +-
 .../operation/SchemaIndexCreateOperation.java   |    8 +-
 .../operation/SchemaIndexDropOperation.java     |    7 +-
 .../handlers/GridRestCommandHandlerAdapter.java |    3 +
 .../handlers/cache/GridCacheCommandHandler.java |   10 +-
 .../handlers/query/QueryCommandHandler.java     |   13 +-
 .../ignite/internal/util/IgniteUtils.java       |   17 +
 .../query/VisorRunningQueriesCollectorTask.java |    2 +-
 .../apache/ignite/marshaller/Marshaller.java    |    3 -
 .../ignite/marshaller/jdk/JdkMarshaller.java    |    5 +-
 .../communication/tcp/TcpCommunicationSpi.java  |    4 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |    9 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    8 +-
 .../spi/indexing/IndexingQueryFilter.java       |    8 +-
 .../apache/ignite/spi/indexing/IndexingSpi.java |   17 +-
 .../spi/indexing/noop/NoopIndexingSpi.java      |    6 +-
 modules/core/src/test/config/example-cache.xml  |    5 +-
 .../src/test/config/spring-start-nodes-attr.xml |    4 +-
 .../core/src/test/config/spring-start-nodes.xml |    4 +-
 .../config/websession/example-cache-base.xml    |    5 +-
 .../IgniteExternalizableAbstractTest.java       |   15 +-
 ...dbcPojoStoreOptimizedMarshallerSelfTest.java |   31 -
 ...ptimizedMarshallerWithSqlEscapeSelfTest.java |   28 -
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |    7 +-
 .../internal/GridAffinityNoCacheSelfTest.java   |   10 +-
 .../internal/GridLifecycleAwareSelfTest.java    |    3 +-
 .../internal/binary/BinaryEnumsSelfTest.java    |  146 +-
 .../BinarySimpleNameTestPropertySelfTest.java   |   17 +
 .../binary/TestCachingMetadataHandler.java      |    5 +
 .../managers/GridManagerStopSelfTest.java       |    3 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |    2 +-
 .../optimized/OptimizedMarshallerTest.java      |    8 +
 .../marshaller/optimized/package-info.java      |   22 +
 .../pagemem/impl/PageMemoryNoLoadSelfTest.java  |   31 +-
 .../AtomicCacheAffinityConfigurationTest.java   |  175 ++
 .../CacheStartupInDeploymentModesTest.java      |   37 -
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    2 +-
 ...ridCacheStoreManagerDeserializationTest.java |    4 +-
 .../cache/GridCacheVersionSelfTest.java         |    7 +-
 .../IgniteIncompleteCacheObjectSelfTest.java    |   10 +-
 ...iteMarshallerCacheClassNameConflictTest.java |    9 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |    6 +-
 .../cache/MemoryPolicyConfigValidationTest.java |   62 +-
 .../BinaryAtomicCacheLocalEntriesSelfTest.java  |   30 +
 .../BinaryTxCacheLocalEntriesSelfTest.java      |   84 +
 .../distributed/CacheAffinityEarlyTest.java     |    7 +-
 .../CacheGetFutureHangsSelfTest.java            |    6 +-
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  |    7 +-
 .../distributed/IgniteCacheCreatePutTest.java   |    7 +-
 .../IgniteCachePartitionLossPolicySelfTest.java |    1 +
 .../paged/PageEvictionMultinodeTest.java        |   22 +-
 .../BinaryAtomicCacheLocalEntriesSelfTest.java  |   30 -
 .../BinaryTxCacheLocalEntriesSelfTest.java      |   84 -
 .../cache/query/IndexingSpiQuerySelfTest.java   |   14 +-
 .../cache/query/IndexingSpiQueryTxSelfTest.java |    6 +-
 ...tinuousQueryAsyncFailoverAtomicSelfTest.java |    1 -
 ...nuousQueryConcurrentPartitionUpdateTest.java |  304 +++
 .../CacheContinuousQueryEventBufferTest.java    |  217 ++
 ...ContinuousQueryFailoverAbstractSelfTest.java |   79 +-
 .../CacheEntryProcessorNonSerializableTest.java |    5 +-
 ...niteCacheContinuousQueryBackupQueueTest.java |   13 +-
 ...eCacheContinuousQueryImmutableEntryTest.java |    6 +-
 .../database/FreeListImplSelfTest.java          |   10 +-
 .../igfs/IgfsAbstractBaseSelfTest.java          |   10 -
 .../processors/igfs/IgfsFileInfoSelfTest.java   |   16 +-
 .../processors/igfs/IgfsIgniteMock.java         |   24 +
 .../IgfsPrimaryOptimziedMarshallerSelfTest.java |   28 -
 .../odbc/OdbcProcessorValidationSelfTest.java   |  182 --
 .../SqlListenerProcessorValidationSelfTest.java |  184 ++
 .../service/ClosureServiceClientsNodesTest.java |    4 +-
 ...namicProxySerializationMultiJvmSelfTest.java |   13 -
 .../GridMarshallerPerformanceTest.java          |    8 +-
 .../IgniteMessagingWithClientTest.java          |    4 +-
 .../platform/PlatformComputeEchoTask.java       |   13 +
 ...pClientDiscoveryMarshallerCheckSelfTest.java |    4 +-
 .../TcpDiscoveryMarshallerCheckSelfTest.java    |    4 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |    4 +-
 .../ignite/testframework/GridTestUtils.java     |    8 +-
 .../config/GridTestProperties.java              |    4 +-
 .../configvariations/ConfigVariations.java      |   14 +-
 .../testframework/junits/GridAbstractTest.java  |   33 +
 .../ignite/testframework/junits/IgniteMock.java |    5 +
 .../junits/IgniteTestResources.java             |    8 +-
 .../multijvm/IgniteCacheProcessProxy.java       |    8 +
 .../junits/multijvm/IgniteProcessProxy.java     |   18 +
 ...naryObjectsTxDeadlockDetectionTestSuite.java |   37 -
 .../ignite/testsuites/IgniteBasicTestSuite.java |   17 +-
 .../testsuites/IgniteBinaryBasicTestSuite.java  |   75 +-
 .../IgniteBinaryCacheFullApiTestSuite.java      |   37 -
 .../testsuites/IgniteBinaryCacheTestSuite.java  |    4 -
 ...ObjectsCacheDataStructuresSelfTestSuite.java |   42 -
 ...BinaryObjectsCacheExpiryPolicyTestSuite.java |   38 -
 ...gniteBinaryObjectsCacheRestartTestSuite.java |   37 -
 .../IgniteBinaryObjectsCacheTestSuite2.java     |   37 -
 .../IgniteBinaryObjectsCacheTestSuite3.java     |    2 -
 .../IgniteBinaryObjectsCacheTestSuite4.java     |   37 -
 ...IgniteBinaryObjectsComputeGridTestSuite.java |    4 -
 .../IgniteBinaryObjectsTestSuite.java           |    4 +-
 ...iteBinarySimpleNameMapperBasicTestSuite.java |    3 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |    3 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    4 -
 ...teBasicConfigVariationsFullApiTestSuite.java |    2 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |    3 -
 .../testsuites/IgniteKernalSelfTestSuite.java   |    4 -
 .../IgniteMarshallerSelfTestSuite.java          |    8 +-
 ...essagingConfigVariationFullApiTestSuite.java |    2 +-
 ...ServiceConfigVariationsFullApiTestSuite.java |    2 +-
 .../webapp/META-INF/ignite-webapp-config.xml    |   15 +-
 .../query/h2/H2IndexingAbstractGeoSelfTest.java |   26 +-
 .../query/h2/H2IndexingBinaryGeoSelfTest.java   |   30 -
 .../H2IndexingBinarySegmentedGeoSelfTest.java   |   30 -
 .../query/h2/H2IndexingGeoSelfTest.java         |    2 +-
 .../h2/H2IndexingSegmentedGeoSelfTest.java      |    2 +-
 .../testsuites/GeoSpatialIndexingTestSuite.java |    5 -
 .../test/config/hadoop-fs-open-test/grid-0.xml  |    3 +-
 .../test/config/hadoop-fs-open-test/grid-1.xml  |    3 +-
 .../test/config/hadoop-fs-open-test/grid-2.xml  |    3 +-
 .../test/config/igfs-cli-config-dual-async.xml  |    3 +-
 .../test/config/igfs-cli-config-dual-sync.xml   |    3 +-
 .../src/test/config/igfs-cli-config-primary.xml |    3 +-
 .../src/test/config/igfs-cli-config-proxy.xml   |    3 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |    4 +-
 .../collections/HadoopSkipListSelfTest.java     |   37 -
 .../query/h2/DmlStatementsProcessor.java        |   89 +-
 .../query/h2/GridH2ResultSetIterator.java       |  191 --
 .../query/h2/H2ConnectionWrapper.java           |   67 +
 .../processors/query/h2/H2DatabaseType.java     |  161 ++
 .../processors/query/h2/H2DmlPlanKey.java       |   66 +
 .../processors/query/h2/H2FieldsIterator.java   |   50 +
 .../processors/query/h2/H2KeyValueIterator.java |   48 +
 .../query/h2/H2ResultSetIterator.java           |  189 ++
 .../processors/query/h2/H2RowDescriptor.java    |  478 ++++
 .../internal/processors/query/h2/H2Schema.java  |  151 ++
 .../processors/query/h2/H2SqlFieldMetadata.java |  111 +
 .../processors/query/h2/H2StatementCache.java   |   73 +
 .../processors/query/h2/H2TableDescriptor.java  |  355 +++
 .../processors/query/h2/H2TableEngine.java      |   89 +
 .../query/h2/H2TwoStepCachedQuery.java          |   63 +
 .../query/h2/H2TwoStepCachedQueryKey.java       |  100 +
 .../internal/processors/query/h2/H2Utils.java   |  244 ++
 .../processors/query/h2/IgniteH2Indexing.java   | 2249 +++---------------
 .../query/h2/database/H2PkHashIndex.java        |    4 +-
 .../query/h2/database/H2TreeIndex.java          |    4 +-
 .../query/h2/ddl/DdlStatementsProcessor.java    |  112 +-
 .../query/h2/opt/GridH2CollocationModel.java    |    6 +-
 .../query/h2/opt/GridH2IndexBase.java           |   12 +-
 .../processors/query/h2/opt/GridH2Table.java    |  155 +-
 .../query/h2/opt/GridH2TreeIndex.java           |    2 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   32 +-
 .../query/h2/opt/GridLuceneIndex.java           |   17 +-
 .../query/h2/sql/GridSqlCreateTable.java        |  153 ++
 .../query/h2/sql/GridSqlDropIndex.java          |   14 +-
 .../query/h2/sql/GridSqlDropTable.java          |   79 +
 .../query/h2/sql/GridSqlQueryParser.java        |  262 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |    4 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   28 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  182 +-
 .../query/h2/twostep/ReduceQueryRun.java        |  157 ++
 .../query/h2/twostep/msg/GridH2CacheObject.java |   39 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   12 +-
 .../IgniteCacheInsertSqlQuerySelfTest.java      |   27 +-
 .../cache/IgniteCacheNoClassQuerySelfTest.java  |    4 +-
 .../cache/SqlFieldsQuerySelfTest.java           |   12 +-
 .../cache/index/AbstractSchemaSelfTest.java     |  123 +-
 .../DynamicIndexAbstractBasicSelfTest.java      |   93 +-
 .../DynamicIndexAbstractConcurrentSelfTest.java |  102 +-
 .../index/DynamicIndexAbstractSelfTest.java     |   30 +-
 .../index/H2DynamicIndexAbstractSelfTest.java   |   48 +-
 .../cache/index/H2DynamicTableSelfTest.java     |  320 +++
 .../cache/index/SchemaExchangeSelfTest.java     |   13 +-
 .../query/IgniteQueryDedicatedPoolTest.java     |    6 +-
 .../query/IgniteSqlSchemaIndexingTest.java      |   18 +-
 .../query/IgniteSqlSegmentedIndexSelfTest.java  |   25 +
 .../query/IgniteSqlSplitterSelfTest.java        |   59 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  159 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      |    4 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |   12 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  292 ++-
 .../query/h2/sql/H2CompareBigQueryTest.java     |    2 +-
 .../FetchingQueryCursorStressTest.java          |    4 +-
 .../IgniteBinaryCacheQueryTestSuite.java        |    4 -
 .../IgniteBinaryCacheQueryTestSuite2.java       |    4 -
 .../IgniteBinaryCacheQueryTestSuite3.java       |   39 -
 .../IgniteBinaryCacheQueryTestSuite4.java       |   39 -
 .../IgniteCacheQuerySelfTestSuite.java          |    2 +
 .../IgniteCacheQuerySelfTestSuite3.java         |    5 +
 .../processors/query/h2/sql/bigQuery.sql        |    8 +-
 modules/platforms/cpp/binary/Makefile.am        |   67 +-
 .../platforms/cpp/binary/include/Makefile.am    |   55 +-
 .../binary/include/ignite/binary/binary_type.h  |    2 +-
 .../ignite/impl/binary/binary_type_impl.h       |   61 +
 .../ignite/impl/binary/binary_writer_impl.h     |    4 +-
 .../cpp/binary/project/vs/binary.vcxproj        |    2 +
 .../binary/project/vs/binary.vcxproj.filters    |    6 +
 .../binary/src/impl/binary/binary_type_impl.cpp |   61 +
 modules/platforms/cpp/common/Makefile.am        |   54 +-
 .../platforms/cpp/common/include/Makefile.am    |    1 +
 .../common/include/ignite/common/cancelable.h   |   65 +
 .../cpp/common/include/ignite/common/promise.h  |   18 +
 .../common/include/ignite/common/shared_state.h |   51 +
 .../cpp/common/include/ignite/future.h          |   60 +-
 .../cpp/common/include/ignite/ignite_error.h    |    3 +
 .../cpp/common/project/vs/common.vcxproj        |    1 +
 .../common/project/vs/common.vcxproj.filters    |    3 +
 modules/platforms/cpp/core-test/Makefile.am     |  101 +-
 .../cpp/core-test/include/ignite/test_utils.h   |   24 +-
 .../cpp/core-test/project/vs/core-test.vcxproj  |    1 +
 .../project/vs/core-test.vcxproj.filters        |   10 +-
 .../cpp/core-test/src/cache_invoke_test.cpp     |    2 +-
 .../cpp/core-test/src/cluster_test.cpp          |    2 +-
 .../cpp/core-test/src/compute_test.cpp          |  337 +++
 .../cpp/core-test/src/continuous_query_test.cpp |    2 +-
 .../platforms/cpp/core-test/src/test_utils.cpp  |    9 +
 modules/platforms/cpp/core/Makefile.am          |   82 +-
 modules/platforms/cpp/core/include/Makefile.am  |  107 +-
 .../cpp/core/include/ignite/cache/cache.h       |    4 +-
 .../cpp/core/include/ignite/cache/query/query.h |    1 -
 .../cpp/core/include/ignite/compute/compute.h   |  136 ++
 .../core/include/ignite/compute/compute_func.h  |   65 +
 .../platforms/cpp/core/include/ignite/ignite.h  |   19 +-
 .../cpp/core/include/ignite/ignite_binding.h    |   25 +
 .../include/ignite/ignite_binding_context.h     |    2 +-
 .../cpp/core/include/ignite/impl/bindings.h     |   24 +
 .../ignite/impl/cluster/cluster_group_impl.h    |   31 +-
 .../ignite/impl/compute/cancelable_impl.h       |   70 +
 .../include/ignite/impl/compute/compute_impl.h  |  118 +
 .../ignite/impl/compute/compute_job_holder.h    |  139 ++
 .../ignite/impl/compute/compute_job_result.h    |  161 ++
 .../ignite/impl/compute/compute_task_holder.h   |  213 ++
 .../include/ignite/impl/ignite_binding_impl.h   |    2 +
 .../include/ignite/impl/ignite_environment.h    |   69 +
 .../cpp/core/include/ignite/impl/ignite_impl.h  |   23 +-
 .../ignite/impl/interop/interop_target.h        |   11 +-
 .../platforms/cpp/core/project/vs/core.vcxproj  |    9 +
 .../cpp/core/project/vs/core.vcxproj.filters    |   33 +
 modules/platforms/cpp/core/src/ignite.cpp       |    5 +
 .../src/impl/cluster/cluster_group_impl.cpp     |   23 +-
 .../core/src/impl/compute/cancelable_impl.cpp   |   59 +
 .../cpp/core/src/impl/compute/compute_impl.cpp  |   35 +
 .../cpp/core/src/impl/ignite_environment.cpp    |  260 +-
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   15 +-
 .../core/src/impl/interop/interop_target.cpp    |   20 +
 .../src/impl/transactions/transactions_impl.cpp |   10 -
 .../platforms/cpp/jni/include/ignite/jni/java.h |    1 +
 modules/platforms/cpp/jni/src/java.cpp          |   10 +
 .../cpp/odbc/include/ignite/odbc/message.h      |   10 +
 .../Apache.Ignite.Core.Tests.csproj             |   10 +
 .../Binary/BinaryBuilderSelfTest.cs             |   88 +-
 .../Binary/TypeNameParserTest.cs                |    8 +-
 .../Cache/CacheConfigurationTest.cs             |    6 +-
 .../Cache/Query/CacheLinqTest.cs                |  199 +-
 .../Cache/Query/CacheLinqTestSqlEscapeAll.cs    |   34 +
 .../Compute/BinarizableClosureTaskTest.cs       |    7 +-
 .../Compute/ClosureTaskTest.cs                  |    6 +-
 .../Compute/ComputeApiTest.cs                   |   45 +-
 .../Compute/IgniteExceptionTaskSelfTest.cs      |    8 +-
 .../Compute/SerializableClosureTaskTest.cs      |    5 +-
 .../Deployment/GetAddressFunc.cs                |   35 +
 .../PeerAssemblyLoadingAllApisTest.cs           |  167 ++
 .../Deployment/PeerAssemblyLoadingTest.cs       |  192 ++
 .../PeerAssemblyLoadingVersioningTest.cs        |  164 ++
 .../Deployment/ProcessNameFunc.cs               |   50 +
 .../Deployment/ProcessNameTask.cs               |   74 +
 .../Deployment/peer_assembly_app.config         |   35 +
 .../IgniteConfigurationSerializerTest.cs        |   10 +-
 .../Log/CustomLoggerTest.cs                     |    5 +-
 .../Apache.Ignite.Core.Tests/MarshallerTest.cs  |    2 +-
 .../Process/IgniteProcess.cs                    |   12 +-
 .../Apache.Ignite.Core.csproj                   |   10 +
 .../Binary/BinaryTypeConfiguration.cs           |    3 +-
 .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs |   24 +
 .../Apache.Ignite.Core/Binary/IBinaryObject.cs  |    8 +
 .../Apache.Ignite.Core/Binary/IBinaryType.cs    |    6 +
 .../Cache/Configuration/QueryEntity.cs          |   64 +-
 .../Deployment/PeerAssemblyLoadingMode.cs       |   55 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   16 +
 .../IgniteConfigurationSection.xsd              |   12 +
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   18 +-
 .../Impl/Binary/BinarizableSerializer.cs        |    5 +-
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |   68 +-
 .../Impl/Binary/BinaryEnum.cs                   |   11 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |    1 -
 .../Impl/Binary/BinaryObject.cs                 |   13 +-
 .../Impl/Binary/BinaryProcessor.cs              |   67 +-
 .../Impl/Binary/BinaryReader.cs                 |   76 +-
 .../Impl/Binary/BinaryReflectiveActions.cs      |    7 +-
 .../BinaryReflectiveSerializerInternal.cs       |    5 +-
 .../Impl/Binary/BinarySystemHandlers.cs         |   25 +-
 .../Impl/Binary/BinarySystemTypeSerializer.cs   |    2 +-
 .../Impl/Binary/BinaryUtils.cs                  |   19 +
 .../Impl/Binary/BinaryWriter.cs                 |   28 +-
 .../Impl/Binary/BinaryWriterExtensions.cs       |    9 +-
 .../Impl/Binary/IBinarySerializerInternal.cs    |   10 +-
 .../Impl/Binary/Marshaller.cs                   |  117 +-
 .../Impl/Binary/Metadata/BinaryType.cs          |  179 +-
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs    |   44 +-
 .../Impl/Binary/SerializableSerializer.cs       |   14 +-
 .../Impl/Binary/TypeResolver.cs                 |    6 +-
 .../Impl/Binary/UserSerializerProxy.cs          |    5 +-
 .../Impl/Cache/IQueryEntityInternal.cs          |   31 +
 .../Common/CopyOnWriteConcurrentDictionary.cs   |    8 -
 .../Apache.Ignite.Core/Impl/Common/Future.cs    |   13 +-
 .../Impl/Common/LoadedAssembliesResolver.cs     |    8 +-
 .../Impl/Compute/Closure/ComputeActionJob.cs    |    7 +-
 .../Impl/Compute/Closure/ComputeFuncJob.cs      |    5 +-
 .../Impl/Compute/ComputeFunc.cs                 |    5 +-
 .../Impl/Compute/ComputeImpl.cs                 |    1 -
 .../Impl/Compute/ComputeJob.cs                  |    3 +-
 .../Impl/Compute/ComputeOutFunc.cs              |    3 +-
 .../Impl/Deployment/AssemblyLoader.cs           |  105 +
 .../Impl/Deployment/AssemblyRequest.cs          |   68 +
 .../Impl/Deployment/AssemblyRequestResult.cs    |   80 +
 .../Impl/Deployment/GetAssemblyFunc.cs          |   77 +
 .../Impl/Deployment/PeerAssemblyResolver.cs     |  189 ++
 .../Impl/Deployment/PeerLoadingExtensions.cs    |   65 +
 .../Impl/Deployment/PeerLoadingObjectHolder.cs  |   90 +
 .../PeerLoadingObjectHolderSerializer.cs        |   49 +
 modules/platforms/dotnet/Apache.Ignite.FxCop    |    3 +-
 .../Apache.Ignite.Linq.csproj                   |    3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs       |   65 +
 .../Impl/CacheFieldsQueryExecutor.cs            |   39 -
 .../Impl/CacheFieldsQueryProvider.cs            |    9 +
 .../Impl/CacheQueryExpressionVisitor.cs         |   76 +-
 .../Impl/CacheQueryModelVisitor.cs              |   73 +-
 .../Apache.Ignite.Linq/Impl/CacheQueryParser.cs |   21 +-
 .../Impl/CacheQueryableBase.cs                  |   14 +-
 .../Impl/Dml/RemoveAllExpressionNode.cs         |   88 +
 .../Impl/Dml/RemoveAllResultOperator.cs         |   61 +
 .../Apache.Ignite.Linq/Impl/ExpressionWalker.cs |    7 +-
 .../Impl/ICacheQueryableInternal.cs             |    6 -
 .../Apache.Ignite.Linq/Impl/MethodVisitor.cs    |    7 +-
 .../dotnet/Apache.Ignite.Linq/Impl/QueryData.cs |   17 +-
 .../dotnet/Apache.Ignite.sln.DotSettings        |    1 +
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |    1 -
 .../Apache.Ignite/Service/ServiceDescription.cs |   32 -
 modules/spring/pom.xml                          |    7 +
 .../org/apache/ignite/IgniteSpringBean.java     |    7 +
 .../apache/ignite/cache/spring/SpringCache.java |   60 +-
 .../ignite/cache/spring/SpringCacheManager.java |   51 +-
 .../GridSpringCacheManagerMultiJvmSelfTest.java |  134 ++
 .../GridSpringDynamicCacheTestService.java      |   13 +
 .../ignite/cache/spring/SpringCacheTest.java    |    2 +-
 .../ignite/cache/spring/spring-caching1.xml     |   56 +
 .../ignite/cache/spring/spring-caching2.xml     |   56 +
 .../GridSpringBeanSerializationSelfTest.java    |   15 +-
 modules/web-console/frontend/.babelrc           |    9 +-
 modules/web-console/frontend/.gitignore         |    1 -
 modules/web-console/frontend/app/app.js         |   18 +-
 .../components/web-console-header/component.js  |    6 +-
 .../app/modules/agent/AgentManager.service.js   |    2 -
 .../frontend/gulpfile.babel.js/index.js         |   26 -
 .../frontend/gulpfile.babel.js/paths.js         |   64 -
 .../frontend/gulpfile.babel.js/tasks/build.js   |   21 -
 .../frontend/gulpfile.babel.js/tasks/bundle.js  |   36 -
 .../frontend/gulpfile.babel.js/tasks/clean.js   |   32 -
 .../frontend/gulpfile.babel.js/tasks/copy.js    |   33 -
 .../gulpfile.babel.js/tasks/ignite-modules.js   |   55 -
 .../frontend/gulpfile.babel.js/tasks/watch.js   |   30 -
 .../gulpfile.babel.js/webpack/common.js         |  205 --
 .../webpack/environments/development.js         |   60 -
 .../webpack/environments/production.js          |   41 -
 .../webpack/environments/test.js                |   44 -
 .../frontend/gulpfile.babel.js/webpack/index.js |   36 -
 .../frontend/ignite_modules/index.js            |    7 +-
 modules/web-console/frontend/package.json       |  104 +-
 .../frontend/test/karma.conf.babel.js           |   13 +-
 modules/web-console/frontend/test/karma.conf.js |    2 +-
 .../frontend/webpack/webpack.common.js          |  188 ++
 .../frontend/webpack/webpack.dev.babel.js       |  100 +
 .../frontend/webpack/webpack.prod.babel.js      |   64 +
 .../frontend/webpack/webpack.test.js            |   33 +
 .../webapp2/META-INF/ignite-webapp-config.xml   |   15 +-
 .../ignite-int-max-values-onheap-config.xml     |    4 +-
 modules/yardstick/config/ignite-jdbc-config.xml |    4 +-
 .../yardstick/IgniteBenchmarkArguments.java     |    4 +
 .../org/apache/ignite/yardstick/IgniteNode.java |    5 +
 .../apache/ignite/yardstick/io/FileUtils.java   |   64 +
 532 files changed, 20829 insertions(+), 8649 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 96ae0b9,2eec8f6..5c466f4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@@ -1300,15 -1306,15 +1300,15 @@@ public class GridCachePartitionExchange
  
                      GridDhtPartitionTopology top = null;
  
 -                    if (cacheCtx == null)
 -                        top = clientTops.get(cacheId);
 -                    else if (!cacheCtx.isLocal())
 -                        top = cacheCtx.topology();
 +                    if (grp == null)
 +                        top = clientTops.get(grpId);
 +                    else if (!grp.isLocal())
 +                        top = grp.topology();
  
                      if (top != null) {
-                         updated |= top.update(null, entry.getValue(), null) != null;
+                         updated |= top.update(null, entry.getValue()) != null;
  
 -                        cctx.affinity().checkRebalanceState(top, cacheId);
 +                        cctx.affinity().checkRebalanceState(top, grpId);
                      }
                  }
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a5f6f1e,9a25672..eb04711
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -1222,12 -1174,10 +1232,8 @@@ public class GridCacheProcessor extend
  
          cacheCtx.onStarted();
  
-         if (log.isInfoEnabled()) {
-             log.info("Started cache [name=" + cfg.getName() +
-                 (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
-                 ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
-                 ", mode=" + cfg.getCacheMode() + ']');
-         }
 -        if (log.isInfoEnabled())
 -            log.info("Started cache [name=" + U.maskName(cfg.getName()) +
 -                ", memoryPolicyName=" + cfg.getMemoryPolicyName() + ", mode=" + cfg.getCacheMode()
+
 -                ", atomicity=" + cfg.getAtomicityMode() + ']');
++        if (log.isInfoEnabled()){
++            log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null
? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName()
+ ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');}
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 6725773,72c5bbc..bc6f8c7
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -55,11 -55,10 +55,11 @@@ import org.apache.ignite.internal.pagem
  import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
  import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
  import org.apache.ignite.internal.processors.cache.CacheAffinityChangeMessage;
 +import org.apache.ignite.internal.processors.cache.CacheGroupInfrastructure;
  import org.apache.ignite.internal.processors.cache.CacheInvalidStateException;
+ import org.apache.ignite.internal.processors.cache.CachePartitionExchangeWorkerTask;
  import org.apache.ignite.internal.processors.cache.ClusterState;
  import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch;
- import org.apache.ignite.internal.processors.cache.CachePartitionExchangeWorkerTask;
  import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
  import org.apache.ignite.internal.processors.cache.ExchangeActions;
  import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@@ -1138,9 -1111,21 +1145,21 @@@ public class GridDhtPartitionsExchangeF
      @Override public boolean onDone(@Nullable AffinityTopologyVersion res, @Nullable Throwable
err) {
          boolean realExchange = !dummy && !forcePreload;
  
+         if (err == null &&
+             realExchange &&
+             !cctx.kernalContext().clientNode() &&
+             (serverNodeDiscoveryEvent() || affChangeMsg != null)) {
+             for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
+                 if (!cacheCtx.affinityNode() || cacheCtx.isLocal())
+                     continue;
+ 
+                 cacheCtx.continuousQueries().flushBackupQueue(exchId.topologyVersion());
+             }
+        }
+ 
          if (err == null && realExchange) {
 -            for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
 -                if (cacheCtx.isLocal())
 +            for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) {
 +                if (grp.isLocal())
                      continue;
  
                  try {
@@@ -1824,13 -1816,13 +1862,13 @@@
          msgs.put(node.id(), msg);
  
          for (Map.Entry<Integer, GridDhtPartitionMap> entry : msg.partitions().entrySet())
{
 -            Integer cacheId = entry.getKey();
 -            GridCacheContext cacheCtx = cctx.cacheContext(cacheId);
 +            Integer grpId = entry.getKey();
 +            CacheGroupInfrastructure grp = cctx.cache().cacheGroup(grpId);
  
 -            GridDhtPartitionTopology top = cacheCtx != null ? cacheCtx.topology() :
 -                cctx.exchange().clientTopology(cacheId, this);
 +            GridDhtPartitionTopology top = grp != null ? grp.topology() :
 +                cctx.exchange().clientTopology(grpId, this);
  
-             top.update(exchId, entry.getValue(), msg.partitionUpdateCounters(grpId));
+             top.update(exchId, entry.getValue());
          }
      }
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index bba5fca,5c8870e..55238d4
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@@ -1049,12 -1046,12 +1046,12 @@@ public class GridReduceQueryExecutor 
      private Set<ClusterNode> replicatedUnstableDataNodes(GridCacheContext<?,?>
cctx) {
          assert cctx.isReplicated() : cctx.name() + " must be replicated";
  
-         String space = cctx.name();
+         String cacheName = cctx.name();
  
 -        Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(cacheName, NONE));
 +        Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(cctx.groupId(),
NONE));
  
          if (dataNodes.isEmpty())
-             throw new CacheException("Failed to find data nodes for cache: " + space);
+             throw new CacheException("Failed to find data nodes for cache: " + cacheName);
  
          // Find all the nodes owning all the partitions for replicated cache.
          for (int p = 0, parts = cctx.affinity().partitions(); p < parts; p++) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
index d50cb4c,e0148b3..770770e
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
@@@ -24,7 -26,8 +24,7 @@@ import org.apache.ignite.cache.QueryEnt
  import org.apache.ignite.cache.QueryIndex;
  import org.apache.ignite.configuration.CacheConfiguration;
  import org.apache.ignite.configuration.IgniteConfiguration;
- import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
 -import org.apache.ignite.configuration.NearCacheConfiguration;
+ import org.apache.ignite.internal.binary.BinaryMarshaller;
  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;

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/56af0611/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------


Mime
View raw message