Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4680-sb
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca40eb2e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca40eb2e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca40eb2e Branch: refs/heads/ignite-4680-sb Commit: ca40eb2e0f4b4603df234af5155d741e1c7a4045 Parents: fa97ced 99bb87a Author: sboikov <[email protected]> Authored: Tue Mar 21 11:05:07 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Mar 21 11:05:07 2017 +0300 ---------------------------------------------------------------------- assembly/release-fabric-base.xml | 6 + .../internal/managers/GridManagerAdapter.java | 4 + .../cache/DynamicCacheChangeBatch.java | 14 ++ .../processors/query/GridQueryProcessor.java | 3 + .../service/GridServiceProcessor.java | 50 +++-- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../ignite/spi/discovery/tcp/ClientImpl.java | 32 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 19 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 + .../tcp/internal/TcpDiscoveryNode.java | 6 +- .../GridServiceContinuousQueryRedeployTest.java | 167 +++++++++++++++++ ...veryNodeAttributesUpdateOnReconnectTest.java | 110 +++++++++++ .../TcpDiscoverySslSecuredUnsecuredTest.java | 185 +++++++++++++++++++ .../tcp/TestReconnectPluginProvider.java | 111 +++++++++++ .../discovery/tcp/TestReconnectProcessor.java | 93 ++++++++++ .../testframework/GridSpiTestContext.java | 5 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../org.apache.ignite.plugin.PluginProvider | 1 + .../processors/query/h2/IgniteH2Indexing.java | 1 + modules/platforms/cpp/core/include/Makefile.am | 2 +- .../include/ignite/cache/query/query_argument.h | 134 -------------- .../core/include/ignite/cache/query/query_sql.h | 16 +- .../ignite/cache/query/query_sql_fields.h | 16 +- .../ignite/impl/cache/query/query_argument.h | 137 ++++++++++++++ .../platforms/cpp/core/project/vs/core.vcxproj | 2 +- .../cpp/core/project/vs/core.vcxproj.filters | 6 +- .../cpp/odbc/install/install_amd64.cmd | 10 +- .../platforms/cpp/odbc/install/install_x86.cmd | 6 +- parent/pom.xml | 1 + 31 files changed, 974 insertions(+), 186 deletions(-) ----------------------------------------------------------------------
