ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/50] [abbrv] ignite git commit: Merge branches 'ignite-1.7.2' and 'master'.
Date Thu, 08 Sep 2016 15:41:17 GMT
Merge branches 'ignite-1.7.2' and 'master'.


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

Branch: refs/heads/ignite-961
Commit: 8f697876a3a3ab491434289864a17ea3c3f82ce9
Parents: d98cd30 31dbc5d
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Aug 31 10:29:53 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Aug 31 10:29:53 2016 +0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCache.java     |  15 +
 .../processors/cache/CacheLazyEntry.java        |   2 +
 .../EntryProcessorResourceInjectorProxy.java    | 105 ++++
 .../processors/cache/GridCacheMapEntry.java     |  13 +-
 .../processors/cache/IgniteCacheProxy.java      | 112 +++-
 .../GridNearAtomicSingleUpdateFuture.java       |  17 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   8 +-
 .../local/atomic/GridLocalAtomicCache.java      |  18 +-
 .../processors/cache/query/CacheQuery.java      |  11 +-
 .../query/GridCacheDistributedQueryManager.java |  22 +-
 .../cache/query/GridCacheLocalQueryManager.java |   3 +-
 .../cache/query/GridCacheQueryAdapter.java      |  69 ++-
 .../cache/query/GridCacheQueryBean.java         |   8 +-
 .../cache/query/GridCacheQueryInfo.java         |   8 +-
 .../cache/query/GridCacheQueryManager.java      | 125 ++--
 .../cache/query/GridCacheQueryRequest.java      |   6 +-
 .../transactions/IgniteTxLocalAdapter.java      |   5 +-
 .../processors/odbc/escape/OdbcEscapeUtils.java | 115 ++--
 .../processors/resource/GridResourceIoc.java    | 438 ++++++++++----
 .../resource/GridResourceProcessor.java         | 396 ++++++-------
 .../cache/GridCacheAbstractFullApiSelfTest.java | 393 +++++++++++--
 .../cache/GridCacheAbstractSelfTest.java        | 140 ++++-
 .../GridCacheTransformEventSelfTest.java        |  66 ++-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   2 +
 .../GridCacheQueryTransformerSelfTest.java      | 570 +++++++++++++++++++
 .../odbc/OdbcEscapeSequenceSelfTest.java        | 164 +++++-
 .../multijvm/IgniteCacheProcessProxy.java       |   6 +
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../odbc-test/config/queries-test-noodbc.xml    |  48 +-
 .../cpp/odbc-test/config/queries-test.xml       |  50 +-
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   1 +
 .../project/vs/odbc-test.vcxproj.filters        |   3 +
 .../cpp/odbc-test/src/queries_test.cpp          |  64 +--
 .../odbc-test/src/sql_test_suite_fixture.cpp    |  14 +-
 .../GridTransformSpringInjectionSelfTest.java   | 186 ++++++
 .../testsuites/IgniteSpringTestSuite.java       |   7 +-
 .../commands/cache/VisorCacheStopCommand.scala  |   5 +-
 .../IgniteInvokeWithInjectionBenchmark.java     |  74 +++
 .../IgniteInvokeWithInjectionTxBenchmark.java   |  30 +
 39 files changed, 2632 insertions(+), 689 deletions(-)
----------------------------------------------------------------------



Mime
View raw message