You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/14 08:53:37 UTC
[43/50] [abbrv] ignite git commit: Merge branch master into
ignite-3477-master
Merge branch master into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/922b2582
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/922b2582
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/922b2582
Branch: refs/heads/ignite-4929
Commit: 922b2582d0053455b7616afd5ff35a59027871e4
Parents: b6b3d37 7e106cd
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Apr 13 21:35:09 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Apr 13 21:35:09 2017 +0300
----------------------------------------------------------------------
.../include/ignite/binary/binary_consts.h | 86 +++--
.../include/ignite/binary/binary_containers.h | 12 +-
.../include/ignite/binary/binary_raw_reader.h | 6 +-
.../include/ignite/binary/binary_raw_writer.h | 16 +-
.../include/ignite/binary/binary_reader.h | 6 +-
.../include/ignite/binary/binary_writer.h | 13 +-
.../ignite/impl/binary/binary_reader_impl.h | 31 +-
.../include/ignite/impl/binary/binary_schema.h | 19 +-
.../ignite/impl/binary/binary_writer_impl.h | 18 +-
.../cpp/binary/src/binary/binary_raw_reader.cpp | 2 +-
.../cpp/binary/src/binary/binary_reader.cpp | 2 +-
.../src/impl/binary/binary_reader_impl.cpp | 50 +--
.../binary/src/impl/binary/binary_schema.cpp | 17 +-
.../src/impl/binary/binary_writer_impl.cpp | 14 +-
.../src/binary_reader_writer_raw_test.cpp | 34 +-
.../core-test/src/binary_reader_writer_test.cpp | 96 ++---
.../cpp/core-test/src/cache_store_test.cpp | 6 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 24 +-
.../cpp/core-test/src/transactions_test.cpp | 76 ++--
.../cpp/core/include/ignite/cache/cache.h | 12 +-
.../core/include/ignite/cache/cache_peek_mode.h | 67 ++--
.../cpp/core/include/ignite/ignite_binding.h | 4 +-
.../cpp/core/include/ignite/impl/bindings.h | 4 +-
.../impl/cache/cache_entry_processor_holder.h | 37 +-
.../include/ignite/impl/ignite_binding_impl.h | 11 +-
.../ignite/impl/interop/interop_target.h | 21 +-
.../ignite/impl/transactions/transaction_impl.h | 4 +-
.../impl/transactions/transactions_impl.h | 10 +-
.../include/ignite/transactions/transaction.h | 12 +-
.../ignite/transactions/transaction_consts.h | 181 ++++-----
.../include/ignite/transactions/transactions.h | 16 +-
.../impl/binary/binary_type_updater_impl.cpp | 17 +-
.../continuous/continuous_query_handle_impl.cpp | 13 +-
.../src/impl/cluster/cluster_group_impl.cpp | 9 +-
.../cpp/core/src/impl/ignite_environment.cpp | 42 +-
.../core/src/impl/interop/interop_target.cpp | 12 +-
.../src/impl/transactions/transaction_impl.cpp | 18 +-
.../src/impl/transactions/transactions_impl.cpp | 92 +++--
.../cpp/core/src/transactions/transaction.cpp | 8 +-
.../cpp/core/src/transactions/transactions.cpp | 20 +-
.../src/application_data_buffer_test.cpp | 94 ++---
.../platforms/cpp/odbc-test/src/column_test.cpp | 56 +--
.../cpp/odbc-test/src/connection_info_test.cpp | 72 ++--
.../platforms/cpp/odbc-test/src/row_test.cpp | 16 +-
.../ignite/odbc/app/application_data_buffer.h | 6 +-
.../cpp/odbc/include/ignite/odbc/column.h | 2 +-
.../cpp/odbc/include/ignite/odbc/common_types.h | 350 +++++++++--------
.../ignite/odbc/config/connection_info.h | 2 +-
.../cpp/odbc/include/ignite/odbc/connection.h | 18 +-
.../ignite/odbc/diagnostic/diagnosable.h | 4 +-
.../odbc/diagnostic/diagnosable_adapter.h | 8 +-
.../ignite/odbc/diagnostic/diagnostic_record.h | 4 +-
.../odbc/diagnostic/diagnostic_record_storage.h | 8 +-
.../cpp/odbc/include/ignite/odbc/environment.h | 10 +-
.../cpp/odbc/include/ignite/odbc/message.h | 56 +--
.../ignite/odbc/query/column_metadata_query.h | 10 +-
.../odbc/include/ignite/odbc/query/data_query.h | 23 +-
.../ignite/odbc/query/foreign_keys_query.h | 8 +-
.../ignite/odbc/query/primary_keys_query.h | 8 +-
.../cpp/odbc/include/ignite/odbc/query/query.h | 32 +-
.../ignite/odbc/query/special_columns_query.h | 8 +-
.../ignite/odbc/query/table_metadata_query.h | 10 +-
.../include/ignite/odbc/query/type_info_query.h | 8 +-
.../cpp/odbc/include/ignite/odbc/row.h | 2 +-
.../cpp/odbc/include/ignite/odbc/statement.h | 52 +--
.../odbc/system/ui/dsn_configuration_window.h | 35 +-
.../cpp/odbc/include/ignite/odbc/type_traits.h | 91 ++---
.../ignite/odbc/system/ui/custom_window.h | 12 +-
.../odbc/os/win/src/system/ui/custom_window.cpp | 4 +-
.../src/system/ui/dsn_configuration_window.cpp | 42 +-
.../cpp/odbc/os/win/src/system_dsn.cpp | 2 +-
.../odbc/src/app/application_data_buffer.cpp | 386 +++++++++----------
.../platforms/cpp/odbc/src/app/parameter.cpp | 6 +-
modules/platforms/cpp/odbc/src/column.cpp | 14 +-
modules/platforms/cpp/odbc/src/common_types.cpp | 54 +--
.../cpp/odbc/src/config/connection_info.cpp | 12 +-
modules/platforms/cpp/odbc/src/connection.cpp | 74 ++--
.../odbc/src/diagnostic/diagnosable_adapter.cpp | 4 +-
.../odbc/src/diagnostic/diagnostic_record.cpp | 46 +--
.../diagnostic/diagnostic_record_storage.cpp | 78 ++--
modules/platforms/cpp/odbc/src/environment.cpp | 62 +--
modules/platforms/cpp/odbc/src/odbc.cpp | 20 +-
.../odbc/src/query/column_metadata_query.cpp | 123 +++---
.../platforms/cpp/odbc/src/query/data_query.cpp | 102 ++---
.../cpp/odbc/src/query/foreign_keys_query.cpp | 26 +-
.../cpp/odbc/src/query/primary_keys_query.cpp | 71 ++--
.../odbc/src/query/special_columns_query.cpp | 26 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 81 ++--
.../cpp/odbc/src/query/type_info_query.cpp | 231 +++++------
modules/platforms/cpp/odbc/src/row.cpp | 4 +-
modules/platforms/cpp/odbc/src/statement.cpp | 258 ++++++-------
modules/platforms/cpp/odbc/src/type_traits.cpp | 46 +--
92 files changed, 2004 insertions(+), 1911 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/922b2582/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/922b2582/modules/platforms/cpp/core-test/src/cache_store_test.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/922b2582/modules/platforms/cpp/core-test/src/cache_test.cpp
----------------------------------------------------------------------
diff --cc modules/platforms/cpp/core-test/src/cache_test.cpp
index ab29797,d3f73be..cfbd86a
--- a/modules/platforms/cpp/core-test/src/cache_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_test.cpp
@@@ -129,9 -125,9 +129,9 @@@ BOOST_AUTO_TEST_CASE(TestRemoveAllKeys
cache.RemoveAll();
- size = cache.Size(cache::IGNITE_PEEK_MODE_ONHEAP);
+ size = cache.Size(cache::CachePeekMode::ALL);
- BOOST_REQUIRE(0 == size);
+ BOOST_CHECK_EQUAL(0, size);
cache.Put(1, 1);
cache.Put(2, 2);
@@@ -152,9 -148,9 +152,9 @@@ BOOST_AUTO_TEST_CASE(TestRemoveAllKeysI
{
cache::Cache<int, int> cache = Cache();
- int size = cache.Size(cache::IGNITE_PEEK_MODE_ONHEAP);
+ int size = cache.Size(cache::CachePeekMode::ALL);
- BOOST_REQUIRE(0 == size);
+ BOOST_CHECK_EQUAL(0, size);
cache.Put(1, 1);
cache.Put(2, 2);
@@@ -175,9 -171,9 +175,9 @@@ BOOST_AUTO_TEST_CASE(TestRemoveAllKeysI
{
cache::Cache<int, int> cache = Cache();
- int size = cache.Size(cache::IGNITE_PEEK_MODE_ONHEAP);
+ int size = cache.Size(cache::CachePeekMode::ALL);
- BOOST_REQUIRE(0 == size);
+ BOOST_CHECK_EQUAL(0, size);
cache.Put(1, 1);
cache.Put(2, 2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/922b2582/modules/platforms/cpp/core-test/src/transactions_test.cpp
----------------------------------------------------------------------