ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ivasilin...@apache.org
Subject [26/27] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Date Thu, 23 Jul 2015 13:51:24 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-961


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

Branch: refs/heads/ignite-961
Commit: ba389520ef238e1a7738f54cbf2367068a59d290
Parents: b901574 c4a4bd4
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Jul 23 16:44:31 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Jul 23 16:44:31 2015 +0300

----------------------------------------------------------------------
 modules/apache-license-gen/pom.xml              |  13 -
 .../apache/ignite/IgniteSystemProperties.java   |   8 +
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  14 +
 .../distributed/dht/GridDhtTxFinishFuture.java  |  13 +-
 .../GridDhtPartitionsExchangeFuture.java        |  10 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   4 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 +-
 .../near/GridNearTxFinishFuture.java            |  17 +-
 .../cache/transactions/IgniteTxManager.java     |   5 +-
 .../ignite/internal/util/IgniteUtils.java       |   6 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  58 +--
 .../cache/GridCachePutAllFailoverSelfTest.java  |   3 +
 .../GridCacheAbstractNodeRestartSelfTest.java   |   9 +
 ...NearDisabledOptimisticTxNodeRestartTest.java |  31 ++
 .../GridCachePartitionedFailoverSelfTest.java   |   5 -
 ...ePartitionedOptimisticTxNodeRestartTest.java |  12 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   2 +
 .../IgniteCacheFailoverTestSuite2.java          |   4 +
 .../testsuites/IgniteCacheRestartTestSuite.java |   5 +-
 .../processors/query/h2/sql/GridSqlAlias.java   |   4 +
 .../processors/query/h2/sql/GridSqlColumn.java  |   4 +
 .../processors/query/h2/sql/GridSqlConst.java   |   4 +
 .../processors/query/h2/sql/GridSqlElement.java |  40 +-
 .../query/h2/sql/GridSqlFunction.java           |   2 +
 .../processors/query/h2/sql/GridSqlJoin.java    |   4 +
 .../query/h2/sql/GridSqlOperation.java          |  21 +-
 .../query/h2/sql/GridSqlOperationType.java      |   2 +
 .../query/h2/sql/GridSqlParameter.java          |   4 +
 .../query/h2/sql/GridSqlPlaceholder.java        |   4 +
 .../processors/query/h2/sql/GridSqlQuery.java   |  25 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  11 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      | 405 ++++++++++++-------
 .../processors/query/h2/sql/GridSqlSelect.java  |  91 ++---
 .../query/h2/sql/GridSqlSubquery.java           |   4 +
 .../processors/query/h2/sql/GridSqlTable.java   |   4 +
 .../processors/query/h2/sql/GridSqlType.java    |  10 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |  11 -
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  77 +---
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |   5 +
 .../IgniteCacheQueryNodeRestartSelfTest.java    |   5 -
 .../org/apache/ignite/spark/IgniteContext.scala |  14 +
 42 files changed, 532 insertions(+), 442 deletions(-)
----------------------------------------------------------------------



Mime
View raw message