Merge branch 'sprint-2' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-406


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

Branch: refs/heads/ignite-406
Commit: 59a99918879fcc161cc718c57d30c232e558f7eb
Parents: 8a1c4e6 cfec83f
Author: iveselovskiy <iveselovs...@gridgain.com>
Authored: Thu Mar 12 16:42:26 2015 +0300
Committer: iveselovskiy <iveselovs...@gridgain.com>
Committed: Thu Mar 12 16:42:26 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |    2 +-
 LICENSE.txt                                     |    2 +-
 .../datagrid/CacheDataLoaderExample.java        |   85 --
 .../datagrid/CacheDataStreamerExample.java      |   85 ++
 .../datagrid/CachePopularNumbersExample.java    |   10 +-
 .../ScalarCachePopularNumbersExample.scala      |   14 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |    6 +-
 .../ignite/codegen/MessageCodeGenerator.java    |    4 +-
 modules/core/licenses/snaptree-bsd-license.txt  |   35 +
 modules/core/licenses/snaptree-license.txt      |   35 -
 modules/core/licenses/sun-bcl-license.txt       |   50 -
 .../src/main/java/org/apache/ignite/Ignite.java |   10 +-
 .../org/apache/ignite/IgniteDataLoader.java     |  379 -----
 .../org/apache/ignite/IgniteDataStreamer.java   |  401 +++++
 .../ignite/internal/GridKernalContext.java      |    8 +-
 .../ignite/internal/GridKernalContextImpl.java  |   12 +-
 .../org/apache/ignite/internal/GridTopic.java   |    2 +-
 .../apache/ignite/internal/IgniteKernal.java    |    8 +-
 .../communication/GridIoMessageFactory.java     |    8 +-
 .../processors/cache/GridCacheAdapter.java      |   22 +-
 .../GridDistributedCacheAdapter.java            |   10 +-
 .../version/GridCacheRawVersionedEntry.java     |    4 +-
 .../dataload/GridDataLoadCacheUpdaters.java     |  206 ---
 .../dataload/GridDataLoadRequest.java           |  451 ------
 .../dataload/GridDataLoadResponse.java          |  166 ---
 .../dataload/GridDataLoadUpdateJob.java         |  150 --
 .../dataload/GridDataLoaderFuture.java          |   62 -
 .../dataload/GridDataLoaderProcessor.java       |  307 ----
 .../dataload/IgniteDataLoaderEntry.java         |  170 ---
 .../dataload/IgniteDataLoaderImpl.java          | 1391 -----------------
 .../internal/processors/dataload/package.html   |   24 -
 .../datastreamer/DataStreamProcessor.java       |  307 ++++
 .../datastreamer/DataStreamerCacheUpdaters.java |  206 +++
 .../datastreamer/DataStreamerEntry.java         |  170 +++
 .../datastreamer/DataStreamerFuture.java        |   60 +
 .../datastreamer/DataStreamerImpl.java          | 1403 ++++++++++++++++++
 .../datastreamer/DataStreamerRequest.java       |  451 ++++++
 .../datastreamer/DataStreamerResponse.java      |  166 +++
 .../datastreamer/DataStreamerUpdateJob.java     |  150 ++
 .../processors/datastreamer/package.html        |   24 +
 .../dr/GridDrDataLoadCacheUpdater.java          |   92 --
 .../dr/IgniteDrDataStreamerCacheUpdater.java    |   92 ++
 .../processors/igfs/IgfsDataManager.java        |   25 +-
 .../internal/processors/igfs/IgfsImpl.java      |    2 +-
 .../processors/streamer/IgniteStreamerImpl.java |    4 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |    2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    8 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |    2 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |    2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |  208 ---
 .../dataload/GridDataLoaderPerformanceTest.java |  197 ---
 .../GridDataLoaderProcessorSelfTest.java        |  971 ------------
 .../DataStreamProcessorSelfTest.java            |  970 ++++++++++++
 .../datastreamer/DataStreamerImplSelfTest.java  |  205 +++
 .../IgniteDataStreamerPerformanceTest.java      |  197 +++
 .../loadtests/colocation/GridTestMain.java      |    4 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |    2 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    2 +-
 .../mapper/GridContinuousMapperLoadTest2.java   |    2 +-
 .../ignite/testframework/junits/IgniteMock.java |    4 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |    7 +-
 .../scala/org/apache/ignite/scalar/scalar.scala |   16 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    4 +-
 .../cache/IgniteSqlQueryBenchmark.java          |    2 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |    2 +-
 pom.xml                                         |    4 +-
 66 files changed, 5030 insertions(+), 5052 deletions(-)
----------------------------------------------------------------------


Reply via email to