Merge remote-tracking branch 'remotes/origin/ignite-1.6'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9bf15f21 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9bf15f21 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9bf15f21 Branch: refs/heads/master Commit: 9bf15f210a468740a5e49211333315fea3f17827 Parents: 7755c80 49c5124 Author: Anton Vinogradov <[email protected]> Authored: Wed May 11 13:53:27 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed May 11 13:53:27 2016 +0300 ---------------------------------------------------------------------- .gitignore | 1 + .../processors/cache/GridCacheAdapter.java | 195 +++++- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../ignite/impl/binary/binary_reader_impl.h | 6 +- .../src/impl/binary/binary_reader_impl.cpp | 4 +- .../common/include/ignite/common/concurrent.h | 13 +- modules/platforms/cpp/core-test/Makefile.am | 1 + .../cpp/core-test/config/cache-test.xml | 6 + .../cpp/core-test/project/vs/core-test.vcxproj | 1 + .../project/vs/core-test.vcxproj.filters | 3 + .../cpp/core-test/src/transactions_test.cpp | 639 +++++++++++++++++++ modules/platforms/cpp/core/Makefile.am | 7 +- modules/platforms/cpp/core/include/Makefile.am | 9 +- .../cpp/core/include/ignite/cache/cache.h | 8 +- .../cpp/core/include/ignite/cache/cache_entry.h | 29 +- .../include/ignite/cache/query/query_cursor.h | 55 +- .../ignite/cache/query/query_fields_cursor.h | 39 +- .../ignite/cache/query/query_fields_row.h | 39 +- .../include/ignite/cache/query/query_scan.h | 2 +- .../core/include/ignite/cache/query/query_sql.h | 4 +- .../include/ignite/cache/query/query_text.h | 2 +- .../platforms/cpp/core/include/ignite/ignite.h | 22 +- .../core/include/ignite/impl/cache/cache_impl.h | 71 +-- .../impl/cache/query/query_fields_row_impl.h | 16 +- .../cpp/core/include/ignite/impl/ignite_impl.h | 47 +- .../ignite/impl/interop/interop_target.h | 142 +++++ .../cpp/core/include/ignite/impl/operations.h | 83 ++- .../ignite/impl/transactions/transaction_impl.h | 220 +++++++ .../impl/transactions/transactions_impl.h | 138 ++++ .../include/ignite/transactions/transaction.h | 214 +++++++ .../ignite/transactions/transaction_consts.h | 92 +++ .../ignite/transactions/transaction_metrics.h | 174 +++++ .../include/ignite/transactions/transactions.h | 164 +++++ modules/platforms/cpp/core/namespaces.dox | 10 +- .../platforms/cpp/core/project/vs/core.vcxproj | 12 + .../cpp/core/project/vs/core.vcxproj.filters | 42 ++ modules/platforms/cpp/core/src/ignite.cpp | 10 + .../cpp/core/src/impl/cache/cache_impl.cpp | 131 +--- .../platforms/cpp/core/src/impl/ignite_impl.cpp | 28 +- .../core/src/impl/interop/interop_target.cpp | 142 +++++ .../src/impl/transactions/transaction_impl.cpp | 196 ++++++ .../src/impl/transactions/transactions_impl.cpp | 200 ++++++ .../cpp/core/src/transactions/transaction.cpp | 204 ++++++ .../cpp/core/src/transactions/transactions.cpp | 142 +++++ .../platforms/cpp/jni/include/ignite/jni/java.h | 14 +- modules/platforms/cpp/jni/src/java.cpp | 35 +- .../cpp/odbc/include/ignite/odbc/column.h | 6 + .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 1 - .../cpp/odbc/project/vs/odbc.vcxproj.filters | 1 - .../config/benchmark-cache-load-win.properties | 2 +- .../config/benchmark-cache-load.properties | 4 +- modules/yardstick/config/queries.sql | 2 + modules/yardstick/config/queries.txt | 2 - parent/pom.xml | 1 + 55 files changed, 3343 insertions(+), 296 deletions(-) ----------------------------------------------------------------------
