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/11/21 15:38:18 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-zk' into ignite-zk
Merge remote-tracking branch 'origin/ignite-zk' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4090eb71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4090eb71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4090eb71
Branch: refs/heads/ignite-zk
Commit: 4090eb717f25331c2967645a802714830ac0d4f7
Parents: 7ba0feb 18527db
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 21 18:37:35 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 21 18:37:35 2017 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryDdlExample.java | 2 +-
.../ignite/examples/datagrid/JdbcExample.java | 2 +-
.../thin/JdbcThinAutoCloseServerCursorTest.java | 4 +-
.../thin/JdbcThinComplexDmlDdlSelfTest.java | 5 +-
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 155 +--
.../org/apache/ignite/IgniteJdbcDriver.java | 29 +-
.../org/apache/ignite/IgniteJdbcThinDriver.java | 35 +-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../configuration/CacheConfiguration.java | 5 +-
.../jdbc/thin/ConnectionProperties.java | 148 +++
.../jdbc/thin/ConnectionPropertiesImpl.java | 637 +++++++++++++
.../internal/jdbc/thin/JdbcThinConnection.java | 163 +---
.../internal/jdbc/thin/JdbcThinTcpIo.java | 195 +---
.../internal/jdbc/thin/JdbcThinUtils.java | 79 +-
.../cache/GridCacheAffinityManager.java | 7 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 4 +-
.../CacheDataStructuresManager.java | 12 +
.../near/GridNearOptimisticTxPrepareFuture.java | 14 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +-
.../cache/query/GridCacheQueryManager.java | 5 +-
.../cache/store/CacheStoreManager.java | 12 +-
.../store/GridCacheStoreManagerAdapter.java | 7 +
.../cache/store/GridCacheWriteBehindStore.java | 10 +-
.../datastreamer/DataStreamerImpl.java | 20 +-
.../datastructures/GridCacheQueueAdapter.java | 5 +
.../odbc/jdbc/JdbcQueryExecuteRequest.java | 2 +-
.../processors/odbc/jdbc/JdbcStatementType.java | 13 +
.../processors/odbc/odbc/OdbcMessageParser.java | 14 +-
.../odbc/odbc/OdbcQueryExecuteBatchRequest.java | 16 +-
.../odbc/odbc/OdbcQueryExecuteRequest.java | 16 +-
.../odbc/odbc/OdbcRequestHandler.java | 9 +-
.../platform/PlatformAbstractBootstrap.java | 18 +-
.../processors/platform/PlatformBootstrap.java | 7 +-
.../processors/platform/PlatformIgnition.java | 4 +-
.../platform/cache/PlatformCache.java | 2 +-
.../platform/client/ClientMessageParser.java | 83 +-
.../platform/client/ClientStatus.java | 3 +
.../ClientCacheConfigurationSerializer.java | 180 ++++
...ientCacheCreateWithConfigurationRequest.java | 58 ++
.../cache/ClientCacheCreateWithNameRequest.java | 56 ++
.../client/cache/ClientCacheDestroyRequest.java | 49 +
.../cache/ClientCacheEntryQueryCursor.java | 46 +
.../cache/ClientCacheFieldsQueryCursor.java | 53 ++
.../ClientCacheGetConfigurationRequest.java | 47 +
.../ClientCacheGetConfigurationResponse.java | 51 +
.../cache/ClientCacheGetNamesRequest.java | 46 +
.../cache/ClientCacheGetNamesResponse.java | 56 ++
...acheGetOrCreateWithConfigurationRequest.java | 58 ++
.../ClientCacheGetOrCreateWithNameRequest.java | 49 +
.../client/cache/ClientCacheQueryCursor.java | 141 +++
.../cache/ClientCacheQueryNextPageRequest.java | 49 +
.../cache/ClientCacheQueryNextPageResponse.java | 50 +
.../client/cache/ClientCacheQueryResponse.java | 52 ++
.../client/cache/ClientCacheRequest.java | 30 +-
.../cache/ClientCacheScanQueryCursor.java | 135 ---
.../ClientCacheScanQueryNextPageRequest.java | 49 -
.../ClientCacheScanQueryNextPageResponse.java | 50 -
.../cache/ClientCacheScanQueryRequest.java | 5 +-
.../cache/ClientCacheScanQueryResponse.java | 52 --
.../cache/ClientCacheSqlFieldsQueryRequest.java | 126 +++
.../ClientCacheSqlFieldsQueryResponse.java | 75 ++
.../cache/ClientCacheSqlQueryRequest.java | 79 ++
.../dotnet/PlatformDotNetBootstrap.java | 26 +-
.../PlatformDotNetConfigurationClosure.java | 22 +-
.../utils/PlatformConfigurationUtils.java | 24 +-
.../processors/query/GridQueryIndexing.java | 5 +-
.../processors/query/GridQueryProcessor.java | 19 +-
.../apache/ignite/internal/sql/SqlKeyword.java | 3 +
.../ignite/internal/sql/SqlParserUtils.java | 25 +-
.../sql/command/SqlCreateIndexCommand.java | 41 +-
.../cache/VisorCacheMetricsCollectorTask.java | 5 +-
.../visor/node/VisorGridConfiguration.java | 6 +-
...reSessionListenerWriteBehindEnabledTest.java | 117 ++-
.../cache/IgniteCacheDynamicStopSelfTest.java | 2 +-
...IgniteClientCacheInitializationFailTest.java | 2 +-
.../GridCacheQueueClientDisconnectTest.java | 117 +++
.../datastreamer/DataStreamerImplSelfTest.java | 60 ++
.../sql/SqlParserCreateIndexSelfTest.java | 23 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 2 +
.../hadoop/impl/v1/HadoopV1MapTask.java | 6 +-
.../hadoop/impl/v1/HadoopV1Reporter.java | 8 +-
.../processors/query/h2/IgniteH2Indexing.java | 33 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 1 +
.../processors/query/h2/opt/GridH2Table.java | 15 +-
.../query/h2/sql/GridSqlQueryParser.java | 12 +-
.../h2/twostep/GridReduceQueryExecutor.java | 11 +-
...CheckClusterStateBeforeExecuteQueryTest.java | 89 ++
.../IgniteCacheQueryNodeRestartSelfTest2.java | 75 +-
.../IgniteCacheQueryNodeRestartTxSelfTest.java | 36 +
.../cache/index/AbstractSchemaSelfTest.java | 22 +-
...ynamicColumnsAbstractConcurrentSelfTest.java | 25 +-
.../cache/index/DynamicColumnsAbstractTest.java | 180 +---
.../DynamicIndexAbstractBasicSelfTest.java | 147 ++-
.../DynamicIndexAbstractConcurrentSelfTest.java | 29 +-
.../H2DynamicColumnsAbstractBasicSelfTest.java | 35 +-
.../index/H2DynamicIndexingComplexTest.java | 4 +-
.../cache/index/H2DynamicTableSelfTest.java | 49 +-
.../cache/index/SchemaExchangeSelfTest.java | 2 +-
.../query/h2/sql/GridQueryParsingTest.java | 21 +-
.../IgniteCacheQuerySelfTestSuite.java | 3 +
.../IgniteCacheQuerySelfTestSuite2.java | 2 +
.../clustering/KMeansDistributedClusterer.java | 13 +-
.../ignite/ml/math/distributed/CacheUtils.java | 278 +++---
.../math/distributed/keys/BlockMatrixKey.java | 38 -
.../distributed/keys/DataStructureCacheKey.java | 35 +
.../math/distributed/keys/MatrixBlockKey.java | 38 +
.../math/distributed/keys/MatrixCacheKey.java | 35 -
.../math/distributed/keys/RowColMatrixKey.java | 2 +-
.../math/distributed/keys/VectorBlockKey.java | 34 +
.../distributed/keys/impl/BlockMatrixKey.java | 164 ----
.../distributed/keys/impl/MatrixBlockKey.java | 162 ++++
.../distributed/keys/impl/SparseMatrixKey.java | 14 +-
.../distributed/keys/impl/VectorBlockKey.java | 151 +++
.../ignite/ml/math/functions/Functions.java | 3 +-
.../ml/math/impls/matrix/AbstractMatrix.java | 24 +-
.../ignite/ml/math/impls/matrix/BlockEntry.java | 50 -
.../ml/math/impls/matrix/MatrixBlockEntry.java | 50 +
.../matrix/SparseBlockDistributedMatrix.java | 153 ++-
.../impls/matrix/SparseDistributedMatrix.java | 102 +-
.../storage/matrix/BlockMatrixStorage.java | 96 +-
.../storage/matrix/BlockVectorStorage.java | 374 ++++++++
.../impls/storage/matrix/MapWrapperStorage.java | 5 +-
.../matrix/SparseDistributedMatrixStorage.java | 21 +-
.../vector/SparseDistributedVectorStorage.java | 280 ++++++
.../vector/SparseBlockDistributedVector.java | 139 +++
.../impls/vector/SparseDistributedVector.java | 157 ++++
.../ml/math/impls/vector/VectorBlockEntry.java | 49 +
.../apache/ignite/ml/math/util/MatrixUtil.java | 4 +-
.../ml/math/MathImplDistributedTestSuite.java | 16 +-
.../SparseDistributedBlockMatrixTest.java | 86 +-
.../matrix/SparseDistributedMatrixTest.java | 27 +-
.../SparseDistributedVectorStorageTest.java | 121 +++
.../SparseBlockDistributedVectorTest.java | 181 ++++
.../vector/SparseDistributedVectorTest.java | 192 ++++
...tedBlockOLSMultipleLinearRegressionTest.java | 926 ++++++++++++++++++
...tributedOLSMultipleLinearRegressionTest.java | 934 +++++++++++++++++++
.../OLSMultipleLinearRegressionTest.java | 1 +
.../ml/regressions/RegressionsTestSuite.java | 2 +-
.../cpp/odbc-test/src/attributes_test.cpp | 44 +
.../platforms/cpp/odbc-test/src/parser_test.cpp | 2 +-
.../cpp/odbc-test/src/queries_test.cpp | 113 +++
.../cpp/odbc/include/ignite/odbc/common_types.h | 3 +
.../cpp/odbc/include/ignite/odbc/connection.h | 81 +-
.../cpp/odbc/include/ignite/odbc/message.h | 33 +-
.../cpp/odbc/include/ignite/odbc/parser.h | 2 +-
.../include/ignite/odbc/query/batch_query.h | 8 +-
.../odbc/include/ignite/odbc/query/data_query.h | 8 +-
.../cpp/odbc/include/ignite/odbc/statement.h | 4 +
.../include/ignite/odbc/system/socket_client.h | 75 +-
.../odbc/os/linux/src/system/socket_client.cpp | 265 +++++-
.../odbc/os/win/src/system/socket_client.cpp | 312 ++++++-
modules/platforms/cpp/odbc/src/connection.cpp | 143 ++-
.../odbc/src/diagnostic/diagnostic_record.cpp | 6 +
modules/platforms/cpp/odbc/src/message.cpp | 34 +-
.../cpp/odbc/src/query/batch_query.cpp | 21 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 21 +-
modules/platforms/cpp/odbc/src/statement.cpp | 43 +-
.../Apache.Ignite.AspNet.csproj | 3 +-
.../Apache.Ignite.Core.Tests.csproj | 6 +
.../Binary/BinarySelfTest.cs | 88 ++
.../Cache/CacheConfigurationTest.cs | 9 +-
.../Cache/MemoryMetricsTest.cs | 1 +
.../Cache/PersistentStoreTestObsolete.cs | 7 +-
.../Cache/Query/CacheQueriesTest.cs | 2 +
.../Cache/Query/Linq/CacheLinqTest.Base.cs | 3 +-
.../Cache/Query/Linq/CacheLinqTest.Join.cs | 110 ++-
.../Cache/Query/Linq/CacheLinqTest.Misc.cs | 11 +-
.../Client/Cache/CacheTestNoMeta.cs | 11 +-
.../Cache/ClientCacheConfigurationTest.cs | 211 +++++
.../Client/Cache/CreateCacheTest.cs | 209 +++++
.../Client/Cache/Person.cs | 29 +
.../Client/Cache/SqlQueryTest.cs | 268 ++++++
.../Client/ClientTestBase.cs | 18 +-
.../Compute/ComputeApiTestFullFooter.cs | 2 +
.../Config/full-config.xml | 2 +-
.../ConsoleRedirectTest.cs | 74 +-
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 137 ++-
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 18 +-
.../IgniteConfigurationSerializerTest.cs | 1 +
.../IgniteConfigurationTest.cs | 3 +
.../IgniteStartStopTest.cs | 12 +-
.../MultiAppDomainTest.cs | 171 ++++
.../Process/ListDataReader.cs | 52 ++
.../Apache.Ignite.Core.Tests/TestUtils.cs | 34 +-
.../Apache.Ignite.Core.csproj | 65 +-
.../Cache/Configuration/QueryEntity.cs | 10 +-
.../Cache/Query/IFieldsQueryCursor.cs | 34 +
.../Client/Cache/CacheClientConfiguration.cs | 420 +++++++++
.../Client/Cache/ICacheClient.cs | 19 +
.../Apache.Ignite.Core/Client/IIgniteClient.cs | 50 +
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 1 -
.../Apache.Ignite.Core/IgniteConfiguration.cs | 23 +
.../IgniteConfigurationSection.xsd | 5 +
.../dotnet/Apache.Ignite.Core/Ignition.cs | 28 +-
.../Impl/Binary/BinaryReaderExtensions.cs | 18 +
.../Impl/Binary/BinaryReflectiveActions.cs | 16 +
.../Impl/Binary/BinarySystemHandlers.cs | 13 +-
.../Impl/Binary/BinaryUtils.cs | 41 +-
.../Impl/Binary/Marshaller.cs | 1 +
.../Impl/Binary/MultidimensionalArrayHolder.cs | 132 +++
.../Binary/MultidimensionalArraySerializer.cs | 48 +
.../Impl/Cache/Query/FieldsQueryCursor.cs | 29 +-
.../Impl/Cache/Query/PlatformQueryQursorBase.cs | 8 +-
.../Impl/Cache/Query/QueryCursor.cs | 16 +-
.../Impl/Cache/Query/QueryCursorBase.cs | 22 +-
.../Impl/Client/Cache/CacheClient.cs | 86 +-
.../Cache/ClientCacheConfigurationSerializer.cs | 261 ++++++
.../Cache/Query/ClientFieldsQueryCursor.cs | 79 ++
.../Client/Cache/Query/ClientQueryCursor.cs | 62 +-
.../Client/Cache/Query/ClientQueryCursorBase.cs | 89 ++
.../Impl/Client/Cache/Query/StatementType.cs | 42 +
.../Apache.Ignite.Core/Impl/Client/ClientOp.cs | 13 +-
.../Impl/Client/ClientStatus.cs | 1 +
.../Impl/Client/IgniteClient.cs | 85 ++
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 20 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 4 +-
.../Apache.Ignite.Core/Impl/IgniteManager.cs | 83 +-
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 82 +-
.../Impl/PlatformJniTarget.cs | 248 +++--
.../Impl/Unmanaged/IUnmanagedTarget.cs | 42 -
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 96 --
.../Impl/Unmanaged/Jni/AppDomains.cs | 135 +++
.../Impl/Unmanaged/Jni/CallbackDelegates.cs | 52 ++
.../Impl/Unmanaged/Jni/Callbacks.cs | 292 ++++++
.../Impl/Unmanaged/Jni/ConsoleWriter.cs | 47 +
.../Impl/Unmanaged/Jni/Env.cs | 500 ++++++++++
.../Impl/Unmanaged/Jni/EnvDelegates.cs | 109 +++
.../Impl/Unmanaged/Jni/EnvInterface.cs | 263 ++++++
.../Impl/Unmanaged/Jni/GlobalRef.cs | 87 ++
.../Impl/Unmanaged/Jni/JniResult.cs | 35 +
.../Impl/Unmanaged/Jni/Jvm.cs | 335 +++++++
.../Impl/Unmanaged/Jni/JvmDelegates.cs | 31 +
.../Impl/Unmanaged/Jni/JvmInterface.cs | 40 +
.../Impl/Unmanaged/Jni/MethodId.cs | 157 ++++
.../Impl/Unmanaged/Jni/NativeMethod.cs | 48 +
.../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 38 -
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 243 ++---
.../Impl/Unmanaged/UnmanagedContext.cs | 53 --
.../Unmanaged/UnmanagedNonReleaseableTarget.cs | 70 --
.../Impl/Unmanaged/UnmanagedTarget.cs | 77 --
.../Impl/Unmanaged/UnmanagedUtils.cs | 256 ++---
.../dotnet/Apache.Ignite.Core/build-common.ps1 | 77 --
.../Apache.Ignite.EntityFramework.csproj | 3 +-
.../Impl/CacheQueryModelVisitor.cs | 28 +-
.../Apache.Ignite.Log4Net.csproj | 4 +-
modules/platforms/dotnet/Apache.Ignite.ndproj | 8 +-
modules/platforms/dotnet/Apache.Ignite.sln | 143 ---
.../dotnet/Apache.Ignite/IgniteRunner.cs | 8 +-
modules/platforms/dotnet/DEVNOTES.txt | 15 +-
modules/platforms/dotnet/build.ps1 | 10 +-
.../examples/Apache.Ignite.Examples/App.config | 4 -
.../ThinClient/ThinClientPutGetExample.cs | 5 +-
.../ThinClient/ThinClientQueryExample.cs | 4 +-
.../commands/cache/VisorCacheCommandSpec.scala | 44 +-
modules/web-console/.gitignore | 11 +-
modules/web-console/DEVNOTES.txt | 33 +-
modules/web-console/assembly/README.txt | 60 ++
modules/web-console/assembly/direct-install.xml | 91 ++
modules/web-console/backend/.gitignore | 6 -
modules/web-console/backend/app/apiServer.js | 76 +-
.../web-console/backend/app/browsersHandler.js | 442 +++++----
modules/web-console/backend/app/mongo.js | 73 +-
modules/web-console/backend/app/nconf.js | 44 +-
modules/web-console/backend/app/routes.js | 26 +-
modules/web-console/backend/app/settings.js | 84 +-
modules/web-console/backend/index.js | 25 +-
modules/web-console/backend/injector.js | 4 +-
modules/web-console/backend/package.json | 22 +-
.../compose/frontend/nginx/web-console.conf | 1 -
.../docker/standalone/nginx/web-console.conf | 1 -
modules/web-console/frontend/.gitignore | 8 +-
.../generator/JavaTransformer.service.js | 2 +
.../frontend/app/modules/sql/sql.controller.js | 72 +-
.../frontend/app/utils/SimpleWorkerPool.js | 4 +-
.../frontend/public/stylesheets/style.scss | 10 +
.../web-console/frontend/views/sql/sql.tpl.pug | 84 +-
.../frontend/webpack/webpack.dev.babel.js | 5 +-
modules/web-console/pom.xml | 103 +-
.../agent/handlers/AbstractListener.java | 2 +-
.../discovery/zk/internal/ZkAliveNodeData.java | 37 +
.../zk/internal/ZkDiscoveryEventData.java | 38 +
.../zk/internal/ZkDiscoveryEventsData.java | 5 +-
.../discovery/zk/internal/ZkEventAckFuture.java | 142 +++
.../discovery/zk/internal/ZkIgnitePaths.java | 128 +++
.../spi/discovery/zk/internal/ZkPaths.java | 116 ---
.../discovery/zk/internal/ZookeeperClient.java | 156 +++-
.../zk/internal/ZookeeperDiscoveryImpl.java | 541 ++++++++---
.../zk/ZookeeperDiscoverySpiBasicTest.java | 49 +
.../zk/internal/ZookeeperClientTest.java | 23 +
289 files changed, 16335 insertions(+), 4067 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4090eb71/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
----------------------------------------------------------------------