Merge remote-tracking branch 'professional/ignite-1.6.11' into ignite-1.6.11
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2c82ca4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2c82ca4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2c82ca4 Branch: refs/heads/ignite-4242 Commit: c2c82ca44befe4570325dd6cf2ba885e0d90596c Parents: e821dc0 3d19bfc Author: Dmitriy Govorukhin <[email protected]> Authored: Tue Nov 8 15:10:10 2016 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Nov 8 15:10:10 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/job/GridJobWorker.java | 10 +- .../service/GridServiceProcessor.java | 61 +++++++- .../internal/util/SerializableTransient.java | 58 +++++++ .../ignite/marshaller/MarshallerUtils.java | 22 +++ .../optimized/OptimizedClassDescriptor.java | 90 ++++++++++- modules/platforms/cpp/binary/Makefile.am | 4 +- modules/platforms/cpp/core/Makefile.am | 4 +- .../cpp/examples/odbc-example/Makefile.am | 4 +- .../cpp/examples/putget-example/Makefile.am | 4 +- .../cpp/examples/query-example/Makefile.am | 4 +- modules/platforms/cpp/ignite/Makefile.am | 4 +- modules/platforms/cpp/jni/Makefile.am | 4 +- .../cpp/odbc-test/src/api_robustness_test.cpp | 63 ++++++++ .../cpp/odbc-test/src/queries_test.cpp | 9 +- modules/platforms/cpp/odbc/Makefile.am | 4 +- .../cpp/odbc/include/ignite/odbc/statement.h | 42 ++++++ modules/platforms/cpp/odbc/src/odbc.cpp | 116 +------------- modules/platforms/cpp/odbc/src/statement.cpp | 151 +++++++++++++++++++ 18 files changed, 526 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
