Merge remote-tracking branch 'remotes/origin/master' into ignite-1534

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

Branch: refs/heads/ignite-1534
Commit: 9bc077ed0d984ded0aa4129194bfcee0535d2fbd
Parents: 9bb4411 c6ec7e1
Author: sboikov <[email protected]>
Authored: Wed Sep 30 15:45:07 2015 +0300
Committer: sboikov <[email protected]>
Committed: Wed Sep 30 15:45:07 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    |  70 +++---
 .../internal/processors/igfs/IgfsFileInfo.java  |   2 +-
 .../internal/processors/igfs/IgfsImpl.java      |  57 +----
 .../processors/igfs/IgfsMetaManager.java        | 251 +++++++++++++++----
 .../ignite/internal/util/GridArgumentCheck.java |   5 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |   4 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   2 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   3 +
 .../GridCacheAbstractRemoveFailureTest.java     |   3 +
 .../cache/IgniteCacheCreateRestartSelfTest.java |   3 +
 ...acheAsyncOperationsFailoverAbstractTest.java |  11 +
 .../CachePutAllFailoverAbstractTest.java        |  11 +
 .../IgniteCachePutGetRestartAbstractTest.java   |   3 +
 .../IgniteCacheSizeFailoverTest.java            |   3 +
 ...gniteAtomicLongChangingTopologySelfTest.java |  29 +--
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   3 +
 .../processors/igfs/IgfsAbstractSelfTest.java   |  80 ++++--
 .../igfs/IgfsMetaManagerSelfTest.java           |   6 -
 .../processors/igfs/IgfsMetricsSelfTest.java    |   2 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  29 +--
 .../igfs/UniversalFileSystemAdapter.java        |   1 -
 .../processors/hadoop/igfs/HadoopIgfsUtils.java |  36 +++
 ...oopFileSystemUniversalFileSystemAdapter.java |   4 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   7 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   5 +-
 .../processors/query/h2/sql/GridSqlArray.java   |  52 ++++
 .../processors/query/h2/sql/GridSqlElement.java |   2 +-
 .../query/h2/sql/GridSqlFunction.java           |  60 +++--
 .../query/h2/sql/GridSqlFunctionType.java       |   3 +
 .../query/h2/sql/GridSqlPlaceholder.java        |   7 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  84 ++++---
 .../processors/query/h2/sql/GridSqlType.java    |  29 ++-
 .../query/h2/sql/GridQueryParsingTest.java      |  27 ++
 34 files changed, 633 insertions(+), 263 deletions(-)
----------------------------------------------------------------------


Reply via email to