Merge branch 'ignite-1786-review' of https://github.com/isapego/ignite into ignite-1786
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12ad51ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12ad51ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12ad51ce Branch: refs/heads/ignite-1786 Commit: 12ad51cee08e15e61f9994e1e1cea831181f6559 Parents: abe6fdb de10055 Author: vozerov-gridgain <[email protected]> Authored: Wed Jan 27 13:29:58 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Jan 27 13:29:58 2016 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 8 +- .../ignite/configuration/OdbcConfiguration.java | 43 +- .../ignite/internal/GridKernalContext.java | 4 +- .../ignite/internal/GridKernalContextImpl.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../processors/odbc/GridOdbcColumnMeta.java | 125 -- .../processors/odbc/GridOdbcCommandHandler.java | 337 ---- .../processors/odbc/GridOdbcProcessor.java | 160 -- .../odbc/GridOdbcProtocolHandler.java | 40 - .../processors/odbc/GridOdbcTableMeta.java | 89 - .../processors/odbc/OdbcColumnMeta.java | 130 ++ .../processors/odbc/OdbcCommandHandler.java | 344 ++++ .../internal/processors/odbc/OdbcParser.java | 366 ++++ .../internal/processors/odbc/OdbcProcessor.java | 165 ++ .../processors/odbc/OdbcProtocolHandler.java | 42 + .../processors/odbc/OdbcQueryCloseRequest.java | 41 + .../processors/odbc/OdbcQueryCloseResult.java | 39 + .../odbc/OdbcQueryExecuteRequest.java | 65 + .../processors/odbc/OdbcQueryExecuteResult.java | 53 + .../processors/odbc/OdbcQueryFetchRequest.java | 53 + .../processors/odbc/OdbcQueryFetchResult.java | 65 + .../odbc/OdbcQueryGetColumnsMetaRequest.java | 65 + .../odbc/OdbcQueryGetColumnsMetaResult.java | 41 + .../odbc/OdbcQueryGetTablesMetaRequest.java | 77 + .../odbc/OdbcQueryGetTablesMetaResult.java | 41 + .../internal/processors/odbc/OdbcRequest.java | 54 + .../internal/processors/odbc/OdbcResponse.java | 95 + .../internal/processors/odbc/OdbcTableMeta.java | 91 + .../processors/odbc/OdbcTcpNioListener.java | 95 + .../internal/processors/odbc/OdbcTcpServer.java | 177 ++ .../odbc/protocol/GridOdbcParser.java | 345 ---- .../odbc/protocol/GridTcpOdbcNioListener.java | 102 -- .../odbc/protocol/GridTcpOdbcServer.java | 191 -- .../odbc/request/GridOdbcRequest.java | 61 - .../odbc/request/QueryCloseRequest.java | 47 - .../odbc/request/QueryExecuteRequest.java | 85 - .../odbc/request/QueryFetchRequest.java | 66 - .../request/QueryGetColumnsMetaRequest.java | 84 - .../odbc/request/QueryGetTablesMetaRequest.java | 105 -- .../odbc/response/GridOdbcResponse.java | 107 -- .../odbc/response/QueryCloseResult.java | 39 - .../odbc/response/QueryExecuteResult.java | 55 - .../odbc/response/QueryFetchResult.java | 75 - .../response/QueryGetColumnsMetaResult.java | 43 - .../odbc/response/QueryGetTablesMetaResult.java | 43 - .../cpp/binary/project/vs/binary.vcxproj | 2 +- .../cpp/common/project/vs/common.vcxproj | 2 +- .../cpp/ignite/project/vs/ignite.vcxproj | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 55 + modules/platforms/cpp/odbc-test/README.TXT | 1 + modules/platforms/cpp/odbc-test/configure.ac | 62 + .../cpp/odbc-test/include/teamcity_messages.h | 55 + .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 189 ++ .../project/vs/odbc-test.vcxproj.filters | 79 + .../src/application_data_buffer_test.cpp | 630 +++++++ .../platforms/cpp/odbc-test/src/column_test.cpp | 290 +++ .../cpp/odbc-test/src/configuration_test.cpp | 206 +++ .../cpp/odbc-test/src/connection_info_test.cpp | 219 +++ .../platforms/cpp/odbc-test/src/cursor_test.cpp | 166 ++ .../platforms/cpp/odbc-test/src/parser_test.cpp | 94 + .../platforms/cpp/odbc-test/src/row_test.cpp | 167 ++ .../cpp/odbc-test/src/teamcity_boost.cpp | 159 ++ .../cpp/odbc-test/src/teamcity_messages.cpp | 150 ++ .../cpp/odbc-test/src/utility_test.cpp | 81 + modules/platforms/cpp/odbc/Makefile.am | 67 + modules/platforms/cpp/odbc/configure.ac | 62 + modules/platforms/cpp/odbc/ignite-odbc.pc.in | 9 + .../ignite/odbc/app/application_data_buffer.h | 342 ++++ .../odbc/include/ignite/odbc/app/parameter.h | 113 ++ .../cpp/odbc/include/ignite/odbc/column.h | 149 ++ .../cpp/odbc/include/ignite/odbc/common_types.h | 225 +++ .../include/ignite/odbc/config/configuration.h | 164 ++ .../ignite/odbc/config/connection_info.h | 98 + .../cpp/odbc/include/ignite/odbc/connection.h | 258 +++ .../cpp/odbc/include/ignite/odbc/cursor.h | 108 ++ .../cpp/odbc/include/ignite/odbc/decimal.h | 126 ++ .../ignite/odbc/diagnostic/diagnosable.h | 82 + .../odbc/diagnostic/diagnosable_adapter.h | 107 ++ .../ignite/odbc/diagnostic/diagnostic_record.h | 165 ++ .../odbc/diagnostic/diagnostic_record_storage.h | 198 ++ .../cpp/odbc/include/ignite/odbc/environment.h | 137 ++ .../cpp/odbc/include/ignite/odbc/message.h | 630 +++++++ .../odbc/include/ignite/odbc/meta/column_meta.h | 210 +++ .../include/ignite/odbc/meta/primary_key_meta.h | 188 ++ .../odbc/include/ignite/odbc/meta/table_meta.h | 166 ++ .../cpp/odbc/include/ignite/odbc/parser.h | 141 ++ .../ignite/odbc/query/column_metadata_query.h | 146 ++ .../odbc/include/ignite/odbc/query/data_query.h | 152 ++ .../ignite/odbc/query/foreign_keys_query.h | 143 ++ .../ignite/odbc/query/primary_keys_query.h | 137 ++ .../cpp/odbc/include/ignite/odbc/query/query.h | 119 ++ .../ignite/odbc/query/special_columns_query.h | 142 ++ .../ignite/odbc/query/table_metadata_query.h | 150 ++ .../include/ignite/odbc/query/type_info_query.h | 118 ++ .../cpp/odbc/include/ignite/odbc/result_page.h | 101 ++ .../cpp/odbc/include/ignite/odbc/row.h | 132 ++ .../cpp/odbc/include/ignite/odbc/statement.h | 525 ++++++ .../include/ignite/odbc/system/odbc_constants.h | 45 + .../include/ignite/odbc/system/socket_client.h | 92 + .../cpp/odbc/include/ignite/odbc/type_traits.h | 313 ++++ .../cpp/odbc/include/ignite/odbc/utility.h | 171 ++ .../platforms/cpp/odbc/odbc-driver/Makefile.am | 67 - .../platforms/cpp/odbc/odbc-driver/configure.ac | 62 - .../cpp/odbc/odbc-driver/ignite-odbc.pc.in | 9 - .../ignite/odbc/app/application_data_buffer.h | 342 ---- .../include/ignite/odbc/app/parameter.h | 113 -- .../odbc-driver/include/ignite/odbc/column.h | 149 -- .../include/ignite/odbc/common_types.h | 225 --- .../include/ignite/odbc/config/configuration.h | 164 -- .../ignite/odbc/config/connection_info.h | 98 - .../include/ignite/odbc/connection.h | 258 --- .../odbc-driver/include/ignite/odbc/cursor.h | 108 -- .../odbc-driver/include/ignite/odbc/decimal.h | 126 -- .../ignite/odbc/diagnostic/diagnosable.h | 82 - .../odbc/diagnostic/diagnosable_adapter.h | 107 -- .../ignite/odbc/diagnostic/diagnostic_record.h | 165 -- .../odbc/diagnostic/diagnostic_record_storage.h | 198 -- .../include/ignite/odbc/environment.h | 137 -- .../odbc-driver/include/ignite/odbc/message.h | 630 ------- .../include/ignite/odbc/meta/column_meta.h | 210 --- .../include/ignite/odbc/meta/primary_key_meta.h | 188 -- .../include/ignite/odbc/meta/table_meta.h | 166 -- .../odbc-driver/include/ignite/odbc/parser.h | 141 -- .../ignite/odbc/query/column_metadata_query.h | 146 -- .../include/ignite/odbc/query/data_query.h | 152 -- .../ignite/odbc/query/foreign_keys_query.h | 143 -- .../ignite/odbc/query/primary_keys_query.h | 137 -- .../include/ignite/odbc/query/query.h | 119 -- .../ignite/odbc/query/special_columns_query.h | 142 -- .../ignite/odbc/query/table_metadata_query.h | 150 -- .../include/ignite/odbc/query/type_info_query.h | 118 -- .../include/ignite/odbc/result_page.h | 101 -- .../odbc/odbc-driver/include/ignite/odbc/row.h | 132 -- .../odbc-driver/include/ignite/odbc/statement.h | 525 ------ .../include/ignite/odbc/system/odbc_constants.h | 45 - .../include/ignite/odbc/system/socket_client.h | 92 - .../include/ignite/odbc/type_traits.h | 313 ---- .../odbc-driver/include/ignite/odbc/utility.h | 171 -- .../os/linux/src/system/socket_client.cpp | 120 -- .../os/win/src/system/socket_client.cpp | 133 -- .../cpp/odbc/odbc-driver/project/README.TXT | 1 - .../cpp/odbc/odbc-driver/project/vs/README.TXT | 1 - .../cpp/odbc/odbc-driver/project/vs/module.def | 69 - .../odbc-driver/project/vs/odbc-driver.vcxproj | 233 --- .../project/vs/odbc-driver.vcxproj.filters | 229 --- .../src/app/application_data_buffer.cpp | 834 --------- .../cpp/odbc/odbc-driver/src/app/parameter.cpp | 147 -- .../cpp/odbc/odbc-driver/src/column.cpp | 454 ----- .../cpp/odbc/odbc-driver/src/common_types.cpp | 120 -- .../odbc-driver/src/config/configuration.cpp | 245 --- .../odbc-driver/src/config/connection_info.cpp | 419 ----- .../cpp/odbc/odbc-driver/src/connection.cpp | 269 --- .../cpp/odbc/odbc-driver/src/cursor.cpp | 78 - .../cpp/odbc/odbc-driver/src/decimal.cpp | 117 -- .../src/diagnostic/diagnosable_adapter.cpp | 49 - .../src/diagnostic/diagnostic_record.cpp | 241 --- .../diagnostic/diagnostic_record_storage.cpp | 242 --- .../cpp/odbc/odbc-driver/src/environment.cpp | 172 -- .../odbc/odbc-driver/src/meta/column_meta.cpp | 275 --- .../odbc/odbc-driver/src/meta/table_meta.cpp | 50 - .../platforms/cpp/odbc/odbc-driver/src/odbc.cpp | 1687 ------------------ .../src/query/column_metadata_query.cpp | 317 ---- .../odbc/odbc-driver/src/query/data_query.cpp | 277 --- .../src/query/foreign_keys_query.cpp | 131 -- .../src/query/primary_keys_query.cpp | 210 --- .../src/query/special_columns_query.cpp | 121 -- .../src/query/table_metadata_query.cpp | 242 --- .../odbc-driver/src/query/type_info_query.cpp | 394 ---- .../cpp/odbc/odbc-driver/src/result_page.cpp | 58 - .../platforms/cpp/odbc/odbc-driver/src/row.cpp | 120 -- .../cpp/odbc/odbc-driver/src/statement.cpp | 529 ------ .../cpp/odbc/odbc-driver/src/type_traits.cpp | 657 ------- .../cpp/odbc/odbc-driver/src/utility.cpp | 105 -- .../platforms/cpp/odbc/odbc-test/Makefile.am | 55 - modules/platforms/cpp/odbc/odbc-test/README.TXT | 1 - .../platforms/cpp/odbc/odbc-test/configure.ac | 62 - .../odbc/odbc-test/include/teamcity_messages.h | 55 - .../odbc/odbc-test/project/vs/odbc-test.vcxproj | 189 -- .../project/vs/odbc-test.vcxproj.filters | 79 - .../src/application_data_buffer_test.cpp | 630 ------- .../cpp/odbc/odbc-test/src/column_test.cpp | 290 --- .../odbc/odbc-test/src/configuration_test.cpp | 206 --- .../odbc/odbc-test/src/connection_info_test.cpp | 219 --- .../cpp/odbc/odbc-test/src/cursor_test.cpp | 166 -- .../cpp/odbc/odbc-test/src/parser_test.cpp | 94 - .../cpp/odbc/odbc-test/src/row_test.cpp | 167 -- .../cpp/odbc/odbc-test/src/teamcity_boost.cpp | 159 -- .../odbc/odbc-test/src/teamcity_messages.cpp | 150 -- .../cpp/odbc/odbc-test/src/utility_test.cpp | 81 - .../odbc/os/linux/src/system/socket_client.cpp | 120 ++ .../odbc/os/win/src/system/socket_client.cpp | 133 ++ modules/platforms/cpp/odbc/project/README.TXT | 1 + .../platforms/cpp/odbc/project/vs/README.TXT | 1 + .../platforms/cpp/odbc/project/vs/module.def | 69 + modules/platforms/cpp/odbc/project/vs/odbc.sln | 58 - .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 233 +++ .../cpp/odbc/project/vs/odbc.vcxproj.filters | 229 +++ .../odbc/src/app/application_data_buffer.cpp | 834 +++++++++ .../platforms/cpp/odbc/src/app/parameter.cpp | 147 ++ modules/platforms/cpp/odbc/src/column.cpp | 454 +++++ modules/platforms/cpp/odbc/src/common_types.cpp | 120 ++ .../cpp/odbc/src/config/configuration.cpp | 245 +++ .../cpp/odbc/src/config/connection_info.cpp | 419 +++++ modules/platforms/cpp/odbc/src/connection.cpp | 269 +++ modules/platforms/cpp/odbc/src/cursor.cpp | 78 + modules/platforms/cpp/odbc/src/decimal.cpp | 117 ++ .../odbc/src/diagnostic/diagnosable_adapter.cpp | 49 + .../odbc/src/diagnostic/diagnostic_record.cpp | 241 +++ .../diagnostic/diagnostic_record_storage.cpp | 242 +++ modules/platforms/cpp/odbc/src/environment.cpp | 172 ++ .../platforms/cpp/odbc/src/meta/column_meta.cpp | 275 +++ .../platforms/cpp/odbc/src/meta/table_meta.cpp | 50 + modules/platforms/cpp/odbc/src/odbc.cpp | 1687 ++++++++++++++++++ .../odbc/src/query/column_metadata_query.cpp | 317 ++++ .../platforms/cpp/odbc/src/query/data_query.cpp | 277 +++ .../cpp/odbc/src/query/foreign_keys_query.cpp | 131 ++ .../cpp/odbc/src/query/primary_keys_query.cpp | 210 +++ .../odbc/src/query/special_columns_query.cpp | 121 ++ .../cpp/odbc/src/query/table_metadata_query.cpp | 242 +++ .../cpp/odbc/src/query/type_info_query.cpp | 394 ++++ modules/platforms/cpp/odbc/src/result_page.cpp | 58 + modules/platforms/cpp/odbc/src/row.cpp | 120 ++ modules/platforms/cpp/odbc/src/statement.cpp | 529 ++++++ modules/platforms/cpp/odbc/src/type_traits.cpp | 657 +++++++ modules/platforms/cpp/odbc/src/utility.cpp | 105 ++ modules/platforms/cpp/project/vs/ignite.sln | 20 + 226 files changed, 20357 insertions(+), 20454 deletions(-) ----------------------------------------------------------------------
