Merge branch 'master' into ignite-1786

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

Branch: refs/heads/ignite-1786
Commit: 29a340a9656a2b16d27e8a4acd80264a121a3bd6
Parents: 5a75eb4 97cf2b3
Author: vozerov-gridgain <[email protected]>
Authored: Mon Apr 25 11:03:41 2016 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Mon Apr 25 11:03:41 2016 +0300

----------------------------------------------------------------------
 examples/config/filesystem/example-igfs.xml     |    3 -
 .../CacheContinuousAsyncQueryExample.java       |  138 ++
 .../datagrid/CacheContinuousQueryExample.java   |   13 +-
 .../main/java/org/apache/ignite/Ignition.java   |   19 +-
 .../ignite/cache/query/ContinuousQuery.java     |   27 +
 .../configuration/ConnectorConfiguration.java   |    3 +
 .../configuration/IgniteConfiguration.java      |   35 +
 .../ignite/internal/GridKernalContext.java      |    8 +
 .../ignite/internal/GridKernalContextImpl.java  |   12 +
 .../apache/ignite/internal/IgniteKernal.java    |   34 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   76 +-
 .../processors/cache/CacheOperationFilter.java  |   61 +
 .../processors/cache/GridCacheAtomicFuture.java |    5 -
 .../processors/cache/GridCacheEntryEx.java      |    5 +-
 .../processors/cache/GridCacheMapEntry.java     |   49 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  205 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  126 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   33 +-
 .../GridNearAtomicAbstractUpdateFuture.java     |  244 +++
 .../GridNearAtomicSingleUpdateFuture.java       |  645 ++++++
 .../dht/atomic/GridNearAtomicUpdateFuture.java  | 1392 +++++-------
 .../distributed/near/GridNearAtomicCache.java   |    3 +-
 .../continuous/CacheContinuousQueryEvent.java   |    7 +
 .../continuous/CacheContinuousQueryHandler.java |  446 +++-
 .../CacheContinuousQueryListener.java           |    6 +-
 .../continuous/CacheContinuousQueryManager.java |   62 +-
 .../processors/clock/GridClockServer.java       |    3 +-
 .../closure/GridClosureProcessor.java           |    6 +
 .../rest/protocols/tcp/GridTcpRestProtocol.java |    7 +-
 .../apache/ignite/lang/IgniteAsyncCallback.java |  111 +
 .../communication/tcp/TcpCommunicationSpi.java  |    4 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   36 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    2 +
 .../thread/IgniteStripedThreadPoolExecutor.java |  164 +-
 modules/core/src/test/config/igfs-loopback.xml  |    7 -
 modules/core/src/test/config/igfs-shmem.xml     |    7 -
 .../processors/cache/GridCacheTestEntryEx.java  |    4 +-
 ...FailoverAtomicPrimaryWriteOrderSelfTest.java |   50 +
 ...sQueryAsyncFailoverTxReplicatedSelfTest.java |   37 +
 ...eContinuousQueryAsyncFailoverTxSelfTest.java |   44 +
 ...eContinuousQueryAsyncFilterListenerTest.java |  986 +++++++++
 ...ryFactoryAsyncFilterRandomOperationTest.java |  131 ++
 ...usQueryFactoryFilterRandomOperationTest.java |  725 +++++++
 .../CacheContinuousQueryFactoryFilterTest.java  |  714 -------
 ...ContinuousQueryFailoverAbstractSelfTest.java |   63 +-
 .../CacheContinuousQueryLostPartitionTest.java  |   14 +
 ...ontinuousQueryOperationFromCallbackTest.java |  627 ++++++
 .../CacheContinuousQueryOrderingEventTest.java  |  722 +++++++
 ...acheContinuousQueryRandomOperationsTest.java |   23 +
 ...gniteComputeConfigVariationsFullApiTest.java | 2009 ++++++++++++++++++
 .../GridTcpCommunicationSpiConfigSelfTest.java  |   22 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  148 +-
 .../tcp/TcpDiscoverySpiConfigSelfTest.java      |   22 +
 .../configvariations/ConfigVariations.java      |    2 +-
 .../junits/GridTestKernalContext.java           |    1 +
 .../IgniteConfigVariationsAbstractTest.java     |   43 +-
 ...teBasicConfigVariationsFullApiTestSuite.java |   72 +
 .../cache/AtomicBinaryOffheapBatchTest.java     |  384 ++++
 .../IgniteBinaryCacheQueryTestSuite.java        |    2 -
 .../IgniteCacheQuerySelfTestSuite3.java         |   14 +-
 .../IgniteCacheQuerySelfTestSuite4.java         |    7 +
 .../http/jetty/GridJettyRestProtocol.java       |    4 +-
 .../ignite/schema/generator/CodeGenerator.java  |   26 +-
 .../ignite/schema/generator/GeneratorUtils.java |   17 +
 .../ignite/schema/generator/XmlGenerator.java   |   45 +-
 .../schema/parser/DatabaseMetadataParser.java   |    6 +-
 .../ignite/schema/ui/SchemaImportApp.java       |   30 +-
 .../schema/test/AbstractSchemaImportTest.java   |   10 +-
 .../schema/test/generator/XmlGeneratorTest.java |    4 +-
 .../apache/ignite/schema/test/model/Objects.txt |   31 +-
 .../ignite/schema/test/model/Primitives.txt     |   31 +-
 .../org/apache/ignite/schema/test/model/Tst.txt |   31 +-
 .../schema/test/model/ignite-type-metadata.xml  |   42 +
 .../test/parser/DbMetadataParserTest.java       |    2 +-
 .../org/apache/ignite/spark/IgniteContext.scala |   73 +-
 .../apache/ignite/spark/JavaIgniteContext.scala |   14 +-
 .../spark/JavaEmbeddedIgniteRDDSelfTest.java    |  343 +++
 .../ignite/spark/JavaIgniteRDDSelfTest.java     |  302 ---
 .../spark/JavaStandaloneIgniteRDDSelfTest.java  |  302 +++
 .../ignite/testsuites/IgniteRDDTestSuite.java   |   40 +
 .../ignite/internal/GridFactorySelfTest.java    |   85 +
 .../ignite/cache/websession/WebSession.java     |    7 +-
 .../internal/websession/WebSessionSelfTest.java |   88 +-
 .../config/benchmark-cache-load-win.properties  |   56 +
 .../config/benchmark-cache-load.properties      |   86 +
 .../config/ignite-base-load-config.xml          |  256 +++
 .../config/ignite-cache-load-config.xml         |   70 +
 .../yardstick/IgniteBenchmarkArguments.java     |   14 +-
 .../cache/CacheEntryEventAsyncProbe.java        |   61 +
 .../yardstick/cache/CacheEntryEventProbe.java   |   33 +-
 .../IgniteCacheRandomOperationBenchmark.java    |  941 ++++++++
 .../yardstick/cache/load/model/ModelUtil.java   |  147 ++
 .../cache/load/model/key/Identifier.java        |  107 +
 .../yardstick/cache/load/model/key/Mark.java    |  108 +
 .../yardstick/cache/load/model/value/Car.java   |  120 ++
 .../yardstick/cache/load/model/value/Color.java |   50 +
 .../yardstick/cache/load/model/value/Truck.java |   63 +
 97 files changed, 12020 insertions(+), 2495 deletions(-)
----------------------------------------------------------------------


Reply via email to