ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/7] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.6.8' into ignite-3601p
Date Tue, 27 Sep 2016 11:17:23 GMT
Merge remote-tracking branch 'remotes/community/ignite-1.6.8' into ignite-3601p


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24a884c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24a884c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24a884c6

Branch: refs/heads/ignite-3601p
Commit: 24a884c60bd1198ac8a9d8217e7ac82c65022c06
Parents: 4838b07 147ab9c
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Sep 19 15:48:04 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Sep 19 15:48:04 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCache.java     |  15 +
 .../store/jdbc/CacheAbstractJdbcStore.java      |  71 ++-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  22 +-
 .../store/jdbc/dialect/SQLServerDialect.java    |   2 +-
 .../configuration/CacheConfiguration.java       |  35 +-
 .../ignite/configuration/OdbcConfiguration.java |  98 +++-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |  14 +-
 .../org/apache/ignite/igfs/IgfsPathSummary.java |   3 +-
 .../local/LocalIgfsSecondaryFileSystem.java     |  15 +-
 .../internal/GridEventConsumeHandler.java       |   5 -
 .../apache/ignite/internal/GridLoggerProxy.java |   3 +-
 .../internal/GridMessageListenHandler.java      |   5 -
 .../org/apache/ignite/internal/IgnitionEx.java  |  17 +-
 .../ignite/internal/binary/BinaryContext.java   |   3 +
 .../internal/binary/BinaryMarshaller.java       |  28 +-
 .../internal/binary/BinaryObjectExImpl.java     | 161 ++++--
 .../internal/binary/BinaryReaderExImpl.java     |  24 +
 .../internal/binary/BinaryReaderHandles.java    |   2 +-
 .../internal/binary/BinaryWriterExImpl.java     |  18 +
 .../binary/builder/BinaryObjectBuilderImpl.java |   2 +-
 .../client/GridClientConfiguration.java         |   1 -
 .../internal/cluster/ClusterGroupAdapter.java   |   2 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |   3 +-
 .../igfs/common/IgfsControlResponse.java        |  19 +-
 .../internal/igfs/common/IgfsMarshaller.java    |  14 +-
 .../processors/cache/CacheLazyEntry.java        |   2 +
 .../EntryProcessorResourceInjectorProxy.java    | 105 ++++
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../processors/cache/GridCacheEntryEx.java      |   8 +
 .../processors/cache/GridCacheMapEntry.java     |  22 +-
 .../processors/cache/GridCacheProcessor.java    |   5 +-
 .../processors/cache/GridCacheTtlManager.java   |  24 +-
 .../processors/cache/IgniteCacheProxy.java      | 153 ++++-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  40 +-
 .../GridDistributedTxRemoteAdapter.java         |   6 +
 .../distributed/dht/GridDhtTxPrepareFuture.java |  36 +-
 .../GridNearAtomicSingleUpdateFuture.java       |  17 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   8 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   2 +-
 .../local/atomic/GridLocalAtomicCache.java      |  18 +-
 .../processors/cache/query/CacheQuery.java      |  11 +-
 .../query/GridCacheDistributedQueryManager.java |  22 +-
 .../cache/query/GridCacheLocalQueryManager.java |   3 +-
 .../cache/query/GridCacheQueryAdapter.java      |  69 ++-
 .../cache/query/GridCacheQueryBean.java         |   8 +-
 .../cache/query/GridCacheQueryInfo.java         |   8 +-
 .../cache/query/GridCacheQueryManager.java      | 134 +++--
 .../cache/query/GridCacheQueryRequest.java      |   6 +-
 .../cache/query/GridCacheSqlQuery.java          |  11 +-
 .../continuous/CacheContinuousQueryHandler.java |   5 -
 .../cache/transactions/IgniteTxEntry.java       |  44 +-
 .../transactions/IgniteTxLocalAdapter.java      |  13 +-
 .../continuous/GridContinuousHandler.java       |   8 -
 .../continuous/GridContinuousProcessor.java     |  33 +-
 .../datastreamer/DataStreamerImpl.java          |  88 ++-
 .../internal/processors/igfs/IgfsAsyncImpl.java |  12 +-
 .../internal/processors/igfs/IgfsContext.java   |  27 +
 .../processors/igfs/IgfsDataManager.java        |  21 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |  18 -
 .../internal/processors/igfs/IgfsFileImpl.java  |   5 +-
 .../internal/processors/igfs/IgfsImpl.java      | 441 ++++++--------
 .../processors/igfs/IgfsInputStreamAdapter.java |  51 --
 .../processors/igfs/IgfsInputStreamImpl.java    | 120 ++--
 .../processors/igfs/IgfsIpcHandler.java         |   7 +-
 .../processors/igfs/IgfsModeResolver.java       |   3 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |   8 +-
 .../internal/processors/igfs/IgfsPathIds.java   |   2 +-
 .../internal/processors/igfs/IgfsPaths.java     |   5 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |   2 +-
 .../internal/processors/igfs/IgfsUtils.java     |  21 +-
 .../local/LocalFileSystemSizeVisitor.java       |  60 ++
 .../processors/odbc/OdbcHandshakeRequest.java   |   8 +-
 .../processors/odbc/OdbcHandshakeResult.java    |  17 +-
 .../processors/odbc/OdbcMessageParser.java      |  32 +-
 .../internal/processors/odbc/OdbcProcessor.java |  54 +-
 .../processors/odbc/OdbcProtocolVersion.java    | 106 ++++
 .../processors/odbc/OdbcRequestHandler.java     |  48 +-
 .../processors/odbc/escape/OdbcEscapeType.java  |  13 +-
 .../processors/odbc/escape/OdbcEscapeUtils.java | 161 +++---
 .../query/PlatformAbstractQueryCursor.java      |  11 +-
 .../cache/query/PlatformFieldsQueryCursor.java  |   6 +
 .../processors/resource/GridResourceIoc.java    | 438 ++++++++++----
 .../resource/GridResourceProcessor.java         | 396 ++++++-------
 .../processors/task/GridTaskWorker.java         |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |  60 +-
 .../ignite/marshaller/AbstractMarshaller.java   |  41 +-
 .../AbstractNodeNameAwareMarshaller.java        | 142 +++++
 .../ignite/marshaller/MarshallerUtils.java      |  58 ++
 .../ignite/marshaller/jdk/JdkMarshaller.java    |  40 +-
 .../optimized/OptimizedMarshaller.java          |  12 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   7 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  11 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  29 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  20 +-
 .../ignite/stream/socket/SocketStreamer.java    |  18 +-
 .../CacheJdbcPojoStoreAbstractSelfTest.java     |  70 ++-
 ...heJdbcPojoStoreBinaryMarshallerSelfTest.java |  12 +-
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |   6 -
 .../ignite/internal/ClusterGroupSelfTest.java   |   2 +-
 .../internal/GridEventStorageSelfTest.java      |  97 +++-
 .../binary/BinaryMarshallerSelfTest.java        |  38 ++
 .../BinaryObjectBuilderAdditionalSelfTest.java  |  14 +
 .../binary/BinaryObjectToStringSelfTest.java    |  75 +++
 .../cache/GridCacheAbstractFullApiSelfTest.java | 404 +++++++++++--
 .../cache/GridCacheAbstractSelfTest.java        | 140 ++++-
 .../processors/cache/GridCacheTestEntryEx.java  |   4 +
 .../cache/GridLocalIgniteSerializationTest.java | 378 ++++++++++++
 .../IgniteCacheInterceptorSelfTestSuite.java    |   5 +
 .../CacheLateAffinityAssignmentTest.java        |   4 -
 .../GridCacheTransformEventSelfTest.java        |  66 ++-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   2 +
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  14 +-
 .../GridCacheQueryTransformerSelfTest.java      | 575 +++++++++++++++++++
 ...ContinuousQueryFailoverAbstractSelfTest.java |  99 ++++
 ...eContinuousQueryMultiNodesFilteringTest.java | 161 ++++++
 .../igfs/IgfsAbstractBaseSelfTest.java          |   9 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  43 +-
 .../igfs/IgfsDataManagerSelfTest.java           |   6 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |  28 +-
 ...SecondaryFileSystemDualAbstractSelfTest.java |  63 +-
 .../processors/igfs/IgfsMaxSizeSelfTest.java    | 122 ++++
 .../igfs/IgfsMetaManagerSelfTest.java           |   4 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    |  21 +-
 .../internal/processors/igfs/IgfsMock.java      |  15 +-
 .../igfs/IgfsModeResolverSelfTest.java          |   4 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  11 +-
 .../processors/igfs/IgfsProxySelfTest.java      |  32 ++
 .../processors/igfs/IgfsStreamsSelfTest.java    |   4 +-
 .../odbc/OdbcEscapeSequenceSelfTest.java        | 370 +++++++++++-
 .../odbc/OdbcProcessorValidationSelfTest.java   |  37 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../multijvm/IgniteCacheProcessProxy.java       |   6 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../IgniteBinaryObjectsTestSuite.java           |   2 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   3 +
 .../hadoop/fs/BasicHadoopFileSystemFactory.java |  17 +-
 .../processors/hadoop/HadoopClassLoader.java    |   6 +-
 .../processors/hadoop/HadoopClasspathMain.java  |   2 +-
 .../processors/hadoop/HadoopClasspathUtils.java | 230 ++++++--
 .../processors/hadoop/HadoopDefaultJobInfo.java |   1 -
 .../internal/processors/hadoop/HadoopUtils.java |  53 +-
 .../hadoop/igfs/HadoopIgfsInProc.java           |  12 +-
 .../processors/hadoop/v2/HadoopV2Job.java       |  32 +-
 .../hadoop/v2/HadoopV2JobResourceManager.java   |   5 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |  15 +-
 .../igfs/HadoopFIleSystemFactorySelfTest.java   |  10 -
 .../hadoop/HadoopCommandLineTest.java           |   4 +-
 .../processors/hadoop/HadoopTestUtils.java      |  73 ++-
 .../hadoop/HadoopUserLibsSelfTest.java          | 260 +++++++++
 .../testsuites/IgniteHadoopTestSuite.java       |   3 +
 .../query/h2/opt/GridH2ValueCacheObject.java    |   9 -
 ...niteBinaryObjectLocalQueryArgumentsTest.java |  28 +
 ...aryObjectQueryArgumentsOffheapLocalTest.java |  28 +
 ...teBinaryObjectQueryArgumentsOffheapTest.java |  30 +
 .../IgniteBinaryObjectQueryArgumentsTest.java   | 472 ++++++++++++++-
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |   6 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   4 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  13 +-
 .../IgniteCacheQuerySelfTestSuite.java          |  11 +
 .../ignite/impl/binary/binary_reader_impl.h     |   2 +-
 .../common/include/ignite/common/concurrent.h   |   5 +-
 .../cpp/common/include/ignite/common/utils.h    |  25 +
 .../cpp/common/include/ignite/ignite_error.h    |  11 +-
 .../cpp/common/os/win/src/common/utils.cpp      |  20 +
 .../platforms/cpp/common/src/ignite_error.cpp   |   2 +-
 .../cpp/core-test/src/cache_query_test.cpp      | 243 +++++---
 modules/platforms/cpp/core/Makefile.am          |   1 +
 modules/platforms/cpp/core/include/Makefile.am  |   1 +
 .../include/ignite/cache/query/query_cursor.h   |   6 +-
 .../ignite/cache/query/query_fields_cursor.h    |   4 +-
 .../ignite/impl/cache/query/query_batch.h       | 148 +++++
 .../impl/cache/query/query_fields_row_impl.h    |  30 +-
 .../ignite/impl/cache/query/query_impl.h        |  30 +-
 .../platforms/cpp/core/project/vs/core.vcxproj  |   2 +
 .../cpp/core/project/vs/core.vcxproj.filters    |   6 +
 .../core/src/impl/cache/query/query_batch.cpp   |  52 ++
 .../core/src/impl/cache/query/query_impl.cpp    | 180 +++---
 modules/platforms/cpp/odbc-test/Makefile.am     |   3 +
 .../odbc-test/config/queries-test-noodbc.xml    | 103 ++++
 .../cpp/odbc-test/config/queries-test.xml       |  31 +-
 .../odbc-test/include/sql_test_suite_fixture.h  |   6 +
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   4 +
 .../project/vs/odbc-test.vcxproj.filters        |  12 +
 .../cpp/odbc-test/src/configuration_test.cpp    | 168 ++++--
 .../cpp/odbc-test/src/queries_test.cpp          | 123 ++--
 .../src/sql_date_time_functions_test.cpp        | 213 +++++++
 .../cpp/odbc-test/src/sql_outer_join_test.cpp   | 498 ++++++++++++++++
 .../odbc-test/src/sql_string_functions_test.cpp |  63 ++
 .../odbc-test/src/sql_test_suite_fixture.cpp    |  39 +-
 modules/platforms/cpp/odbc/Makefile.am          |   2 +
 modules/platforms/cpp/odbc/include/Makefile.am  |   2 +
 .../cpp/odbc/include/ignite/odbc/common_types.h |   3 +
 .../include/ignite/odbc/config/configuration.h  | 244 +++++++-
 .../cpp/odbc/include/ignite/odbc/connection.h   |  47 +-
 .../ignite/odbc/diagnostic/diagnostic_record.h  |   2 +-
 .../cpp/odbc/include/ignite/odbc/dsn_config.h   |  61 ++
 .../cpp/odbc/include/ignite/odbc/parser.h       |   3 -
 .../odbc/include/ignite/odbc/protocol_version.h | 168 ++++++
 .../cpp/odbc/include/ignite/odbc/result_page.h  |   3 -
 .../include/ignite/odbc/system/odbc_constants.h |   4 -
 .../odbc/system/ui/dsn_configuration_window.h   | 144 +++++
 .../cpp/odbc/install/ignite-odbc-install.ini    |   1 +
 .../cpp/odbc/install/install_amd64.cmd          |  22 +-
 .../platforms/cpp/odbc/install/install_x86.cmd  |  11 +-
 .../ignite/odbc/system/ui/custom_window.h       | 189 ++++++
 .../win/include/ignite/odbc/system/ui/window.h  | 201 +++++++
 .../odbc/os/win/src/system/ui/custom_window.cpp | 184 ++++++
 .../src/system/ui/dsn_configuration_window.cpp  | 233 ++++++++
 .../cpp/odbc/os/win/src/system/ui/window.cpp    | 192 +++++++
 .../cpp/odbc/os/win/src/system_dsn.cpp          | 218 +++++++
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |  27 +-
 .../cpp/odbc/project/vs/odbc.vcxproj.filters    |  36 ++
 modules/platforms/cpp/odbc/src/column.cpp       |  14 +-
 .../cpp/odbc/src/config/configuration.cpp       | 268 +++++----
 .../cpp/odbc/src/config/connection_info.cpp     |  24 +-
 modules/platforms/cpp/odbc/src/connection.cpp   |  66 ++-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |   8 +-
 .../diagnostic/diagnostic_record_storage.cpp    |   2 +-
 modules/platforms/cpp/odbc/src/dsn_config.cpp   | 117 ++++
 modules/platforms/cpp/odbc/src/entry_points.cpp |   8 -
 modules/platforms/cpp/odbc/src/odbc.cpp         |  83 +--
 .../platforms/cpp/odbc/src/protocol_version.cpp | 131 +++++
 .../platforms/cpp/odbc/src/query/data_query.cpp |   2 +-
 .../Impl/Cache/Query/FieldsQueryCursor.cs       |   3 +
 .../GridTransformSpringInjectionSelfTest.java   | 186 ++++++
 .../testsuites/IgniteSpringTestSuite.java       |   7 +-
 .../commands/cache/VisorCacheStopCommand.scala  |   5 +-
 .../IgniteInvokeWithInjectionBenchmark.java     |  74 +++
 .../IgniteInvokeWithInjectionTxBenchmark.java   |  30 +
 230 files changed, 11074 insertions(+), 2284 deletions(-)
----------------------------------------------------------------------



Mime
View raw message