Merge branch ignite-1.7.2 to master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cfdae56d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cfdae56d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cfdae56d Branch: refs/heads/ignite-comm-opts1 Commit: cfdae56db683a709924719e878ebadfe1e984b4a Parents: 563c276 f30b79c Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Sep 14 16:18:49 2016 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Sep 14 16:18:49 2016 +0700 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 71 ++++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 21 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 14 +- .../org/apache/ignite/igfs/IgfsPathSummary.java | 3 +- .../local/LocalIgfsSecondaryFileSystem.java | 2 +- .../igfs/common/IgfsControlResponse.java | 19 +- .../internal/igfs/common/IgfsMarshaller.java | 14 +- .../internal/processors/igfs/IgfsAsyncImpl.java | 12 +- .../internal/processors/igfs/IgfsContext.java | 27 +++ .../processors/igfs/IgfsDataManager.java | 19 +- .../ignite/internal/processors/igfs/IgfsEx.java | 18 -- .../internal/processors/igfs/IgfsFileImpl.java | 5 +- .../internal/processors/igfs/IgfsImpl.java | 227 ++++--------------- .../processors/igfs/IgfsInputStreamAdapter.java | 51 ----- .../processors/igfs/IgfsInputStreamImpl.java | 120 +++++----- .../processors/igfs/IgfsIpcHandler.java | 7 +- .../processors/igfs/IgfsModeResolver.java | 3 +- .../processors/igfs/IgfsOutputStreamImpl.java | 8 +- .../internal/processors/igfs/IgfsPathIds.java | 2 +- .../internal/processors/igfs/IgfsPaths.java | 5 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 21 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 70 +++++- ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 12 +- .../apache/ignite/igfs/IgfsPathSelfTest.java | 6 - .../igfs/IgfsAbstractBaseSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 12 +- .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsDualAbstractSelfTest.java | 28 ++- .../igfs/IgfsMetaManagerSelfTest.java | 4 +- .../processors/igfs/IgfsMetricsSelfTest.java | 21 +- .../internal/processors/igfs/IgfsMock.java | 15 +- .../igfs/IgfsModeResolverSelfTest.java | 4 +- .../processors/igfs/IgfsStreamsSelfTest.java | 4 +- .../hadoop/igfs/HadoopIgfsInProc.java | 12 +- .../hadoop/HadoopCommandLineTest.java | 4 +- .../query-example/src/query_example.cpp | 54 +++++ .../cpp/odbc/install/ignite-odbc-install.ini | 1 + .../cpp/odbc/install/install_amd64.cmd | 22 +- .../platforms/cpp/odbc/install/install_x86.cmd | 11 +- 40 files changed, 460 insertions(+), 499 deletions(-) ----------------------------------------------------------------------
