Merge branch 'ignite-1786' of https://github.com/isapego/ignite into ignite-1786
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9628396c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9628396c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9628396c Branch: refs/heads/ignite-1786 Commit: 9628396c4482f803bf45c71ddc76721595b07d7d Parents: 243a857 e1a50af Author: vozerov-gridgain <[email protected]> Authored: Fri Jan 22 16:35:02 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Jan 22 16:35:02 2016 +0300 ---------------------------------------------------------------------- .gitignore | 1 - examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/IgniteConfiguration.java | 21 + .../ignite/configuration/OdbcConfiguration.java | 259 +++ .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../apache/ignite/internal/IgniteKernal.java | 2 + .../processors/odbc/GridOdbcColumnMeta.java | 125 ++ .../processors/odbc/GridOdbcCommandHandler.java | 337 ++++ .../processors/odbc/GridOdbcProcessor.java | 160 ++ .../odbc/GridOdbcProtocolHandler.java | 40 + .../processors/odbc/GridOdbcTableMeta.java | 89 + .../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 + .../visor/node/VisorIgfsConfiguration.java | 30 - .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/binary/Makefile.am | 60 + modules/platforms/cpp/binary/configure.ac | 62 + .../platforms/cpp/binary/ignite-binary.pc.in | 9 + .../platforms/cpp/binary/include/Makefile.am | 48 + .../cpp/binary/include/ignite/binary/binary.h | 34 + .../include/ignite/binary/binary_consts.h | 86 + .../include/ignite/binary/binary_containers.h | 531 ++++++ .../include/ignite/binary/binary_raw_reader.h | 355 ++++ .../include/ignite/binary/binary_raw_writer.h | 331 ++++ .../include/ignite/binary/binary_reader.h | 389 ++++ .../binary/include/ignite/binary/binary_type.h | 310 ++++ .../include/ignite/binary/binary_writer.h | 367 ++++ .../platforms/cpp/binary/include/ignite/guid.h | 143 ++ .../include/ignite/impl/binary/binary_common.h | 188 ++ .../ignite/impl/binary/binary_id_resolver.h | 106 ++ .../ignite/impl/binary/binary_reader_impl.h | 1309 ++++++++++++++ .../include/ignite/impl/binary/binary_schema.h | 136 ++ .../ignite/impl/binary/binary_type_handler.h | 102 ++ .../ignite/impl/binary/binary_type_manager.h | 120 ++ .../ignite/impl/binary/binary_type_snapshot.h | 122 ++ .../ignite/impl/binary/binary_type_updater.h | 53 + .../impl/binary/binary_type_updater_impl.h | 65 + .../include/ignite/impl/binary/binary_utils.h | 344 ++++ .../ignite/impl/binary/binary_writer_impl.h | 913 ++++++++++ .../include/ignite/impl/ignite_environment.h | 130 ++ .../include/ignite/impl/interop/interop.h | 25 + .../ignite/impl/interop/interop_input_stream.h | 250 +++ .../ignite/impl/interop/interop_memory.h | 287 +++ .../ignite/impl/interop/interop_output_stream.h | 250 +++ .../interop/interop_stream_position_guard.h | 81 + .../cpp/binary/project/vs/binary.vcxproj | 239 +++ .../binary/project/vs/binary.vcxproj.filters | 163 ++ .../cpp/binary/src/binary/binary_containers.cpp | 76 + .../cpp/binary/src/binary/binary_raw_reader.cpp | 145 ++ .../cpp/binary/src/binary/binary_raw_writer.cpp | 147 ++ .../cpp/binary/src/binary/binary_reader.cpp | 152 ++ .../cpp/binary/src/binary/binary_type.cpp | 51 + .../cpp/binary/src/binary/binary_writer.cpp | 154 ++ modules/platforms/cpp/binary/src/guid.cpp | 65 + .../src/impl/binary/binary_reader_impl.cpp | 760 ++++++++ .../binary/src/impl/binary/binary_schema.cpp | 135 ++ .../src/impl/binary/binary_type_handler.cpp | 78 + .../src/impl/binary/binary_type_manager.cpp | 201 +++ .../src/impl/binary/binary_type_snapshot.cpp | 70 + .../src/impl/binary/binary_type_updater.cpp | 32 + .../impl/binary/binary_type_updater_impl.cpp | 96 + .../cpp/binary/src/impl/binary/binary_utils.cpp | 211 +++ .../src/impl/binary/binary_writer_impl.cpp | 623 +++++++ .../cpp/binary/src/impl/ignite_environment.cpp | 167 ++ .../src/impl/interop/interop_input_stream.cpp | 235 +++ .../binary/src/impl/interop/interop_memory.cpp | 187 ++ .../src/impl/interop/interop_output_stream.cpp | 233 +++ modules/platforms/cpp/common/Makefile.am | 6 +- modules/platforms/cpp/common/configure.ac | 2 +- .../platforms/cpp/common/include/Makefile.am | 3 +- .../common/include/ignite/common/ignite_error.h | 265 +++ .../cpp/common/include/ignite/common/utils.h | 129 +- .../platforms/cpp/common/os/linux/src/utils.cpp | 439 +++++ .../platforms/cpp/common/os/win/src/utils.cpp | 453 +++++ .../cpp/common/project/vs/common.vcxproj | 9 +- .../common/project/vs/common.vcxproj.filters | 9 + .../platforms/cpp/common/src/ignite_error.cpp | 221 +++ modules/platforms/cpp/core-test/configure.ac | 2 +- .../cpp/core-test/project/vs/core-test.vcxproj | 11 +- .../cpp/core-test/src/cache_query_test.cpp | 4 +- modules/platforms/cpp/core/Makefile.am | 36 +- modules/platforms/cpp/core/configure.ac | 4 +- modules/platforms/cpp/core/include/Makefile.am | 68 +- .../cpp/core/include/ignite/binary/binary.h | 34 - .../core/include/ignite/binary/binary_consts.h | 86 - .../include/ignite/binary/binary_containers.h | 530 ------ .../include/ignite/binary/binary_raw_reader.h | 355 ---- .../include/ignite/binary/binary_raw_writer.h | 331 ---- .../core/include/ignite/binary/binary_reader.h | 389 ---- .../core/include/ignite/binary/binary_type.h | 310 ---- .../core/include/ignite/binary/binary_writer.h | 367 ---- .../cpp/core/include/ignite/cache/cache.h | 2 +- .../include/ignite/cache/query/query_cursor.h | 2 +- .../ignite/cache/query/query_fields_cursor.h | 2 +- .../ignite/cache/query/query_fields_row.h | 2 +- .../platforms/cpp/core/include/ignite/guid.h | 117 -- .../core/include/ignite/ignite_configuration.h | 2 +- .../cpp/core/include/ignite/ignite_error.h | 265 --- .../cpp/core/include/ignite/ignition.h | 2 +- .../include/ignite/impl/binary/binary_common.h | 188 -- .../ignite/impl/binary/binary_id_resolver.h | 106 -- .../ignite/impl/binary/binary_reader_impl.h | 1309 -------------- .../include/ignite/impl/binary/binary_schema.h | 136 -- .../ignite/impl/binary/binary_type_handler.h | 102 -- .../ignite/impl/binary/binary_type_manager.h | 120 -- .../ignite/impl/binary/binary_type_snapshot.h | 122 -- .../ignite/impl/binary/binary_type_updater.h | 53 - .../impl/binary/binary_type_updater_impl.h | 65 - .../include/ignite/impl/binary/binary_utils.h | 344 ---- .../ignite/impl/binary/binary_writer_impl.h | 913 ---------- .../impl/cache/query/query_fields_row_impl.h | 2 +- .../ignite/impl/cache/query/query_impl.h | 2 +- .../include/ignite/impl/ignite_environment.h | 130 -- .../cpp/core/include/ignite/impl/ignite_impl.h | 8 +- .../core/include/ignite/impl/interop/interop.h | 25 - .../ignite/impl/interop/interop_input_stream.h | 250 --- .../ignite/impl/interop/interop_memory.h | 280 --- .../ignite/impl/interop/interop_output_stream.h | 250 --- .../interop/interop_stream_position_guard.h | 79 - .../cpp/core/os/linux/include/Makefile.am | 23 - .../core/os/linux/include/ignite/impl/utils.h | 155 -- .../cpp/core/os/linux/src/impl/utils.cpp | 439 ----- .../cpp/core/os/win/include/ignite/impl/utils.h | 155 -- .../cpp/core/os/win/src/impl/utils.cpp | 453 ----- .../platforms/cpp/core/project/vs/core.vcxproj | 73 +- .../cpp/core/project/vs/core.vcxproj.filters | 159 -- .../cpp/core/src/binary/binary_containers.cpp | 76 - .../cpp/core/src/binary/binary_raw_reader.cpp | 145 -- .../cpp/core/src/binary/binary_raw_writer.cpp | 147 -- .../cpp/core/src/binary/binary_reader.cpp | 152 -- .../cpp/core/src/binary/binary_type.cpp | 51 - .../cpp/core/src/binary/binary_writer.cpp | 154 -- modules/platforms/cpp/core/src/guid.cpp | 65 - modules/platforms/cpp/core/src/ignite_error.cpp | 222 --- modules/platforms/cpp/core/src/ignition.cpp | 4 +- .../core/src/impl/binary/binary_reader_impl.cpp | 760 -------- .../cpp/core/src/impl/binary/binary_schema.cpp | 135 -- .../src/impl/binary/binary_type_handler.cpp | 78 - .../src/impl/binary/binary_type_manager.cpp | 201 --- .../src/impl/binary/binary_type_snapshot.cpp | 70 - .../src/impl/binary/binary_type_updater.cpp | 32 - .../impl/binary/binary_type_updater_impl.cpp | 96 - .../cpp/core/src/impl/binary/binary_utils.cpp | 211 --- .../core/src/impl/binary/binary_writer_impl.cpp | 623 ------- .../cpp/core/src/impl/cache/cache_impl.cpp | 4 +- .../cpp/core/src/impl/ignite_environment.cpp | 167 -- .../src/impl/interop/interop_input_stream.cpp | 235 --- .../core/src/impl/interop/interop_memory.cpp | 182 -- .../src/impl/interop/interop_output_stream.cpp | 233 --- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../cpp/ignite/project/vs/ignite.vcxproj | 27 +- .../ignite/project/vs/ignite.vcxproj.filters | 8 - modules/platforms/cpp/ignite/src/ignite.cpp | 8 +- .../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 + modules/platforms/cpp/odbc/project/vs/odbc.sln | 58 + modules/platforms/cpp/project/vs/ignite.sln | 19 + modules/platforms/cpp/project/vs/ignite.slnrel | 13 + .../platforms/cpp/project/vs/ignite_x86.slnrel | 13 + .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 317 files changed, 33902 insertions(+), 12973 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9628396c/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9628396c/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9628396c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9628396c/pom.xml ----------------------------------------------------------------------
