You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/08/14 10:30:27 UTC
[17/50] ignite git commit: Merge branch 'ignite-6027' into ignite-5991
Merge branch 'ignite-6027' into ignite-5991
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9dc947d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9dc947d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9dc947d8
Branch: refs/heads/ignite-5991-6019
Commit: 9dc947d8c5a0cec22890a1dde86d91cd1ceea685
Parents: 3bc3e4b 00ccadb
Author: devozerov <vo...@gridgain.com>
Authored: Thu Aug 10 17:17:19 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Aug 10 17:17:19 2017 +0300
----------------------------------------------------------------------
.../internal/pagemem/store/PageStore.java | 5 +
.../cache/persistence/file/FilePageStore.java | 54 ++++++---
.../persistence/file/FilePageStoreFactory.java | 35 ++++++
.../persistence/file/FilePageStoreManager.java | 17 +--
.../cache/persistence/file/FilePageStoreV2.java | 53 +++++++++
.../file/FileVersionCheckingFactory.java | 116 +++++++++++++++++++
.../messages/GridQueryNextPageResponse.java | 36 +++++-
.../IgniteOptimisticTxSuspendResumeTest.java | 11 +-
...gnitePdsRecoveryAfterFileCorruptionTest.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 6 +-
.../query/h2/twostep/GridMergeIndex.java | 7 +-
.../impl/cache/query/query_fields_row_impl.h | 2 +-
.../cpp/odbc-test/include/test_utils.h | 9 ++
.../cpp/odbc-test/src/meta_queries_test.cpp | 100 ++++++++++++++++
.../platforms/cpp/odbc-test/src/test_utils.cpp | 13 +++
.../ignite/odbc/query/column_metadata_query.h | 3 +
.../ignite/odbc/query/table_metadata_query.h | 3 +
.../include/ignite/odbc/query/type_info_query.h | 3 +
.../cpp/odbc/src/query/batch_query.cpp | 7 +-
.../odbc/src/query/column_metadata_query.cpp | 16 ++-
.../platforms/cpp/odbc/src/query/data_query.cpp | 7 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 16 ++-
.../cpp/odbc/src/query/type_info_query.cpp | 16 ++-
23 files changed, 484 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc947d8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------