ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [46/46] ignite git commit: Merge ignite-1.7.2 to master.
Date Mon, 12 Sep 2016 08:27:00 GMT
Merge ignite-1.7.2 to master.


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

Branch: refs/heads/master
Commit: 04514fe062025ce412bad762e691b37cdeb83729
Parents: 241b793 35d6a56
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Sep 12 15:27:04 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Sep 12 15:27:04 2016 +0700

----------------------------------------------------------------------
 .../ignite/configuration/OdbcConfiguration.java |  98 +++-
 .../local/LocalIgfsSecondaryFileSystem.java     |  15 +-
 .../apache/ignite/internal/GridLoggerProxy.java |   3 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  17 +-
 .../ignite/internal/binary/BinaryContext.java   |   3 +
 .../internal/binary/BinaryMarshaller.java       |  28 +-
 .../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 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../processors/cache/GridCacheProcessor.java    |   5 +-
 .../processors/cache/GridCacheTtlManager.java   |  24 +-
 .../processors/cache/IgniteCacheProxy.java      |  41 ++
 .../binary/CacheObjectBinaryProcessorImpl.java  |  40 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   2 +-
 .../cache/query/GridCacheSqlQuery.java          |  11 +-
 .../datastreamer/DataStreamerImpl.java          |  88 ++--
 .../processors/igfs/IgfsDataManager.java        |   2 +-
 .../internal/processors/igfs/IgfsImpl.java      | 216 +++++---
 .../local/LocalFileSystemSizeVisitor.java       |  60 +++
 .../processors/odbc/OdbcMessageParser.java      |  10 +-
 .../internal/processors/odbc/OdbcProcessor.java |  54 +-
 .../processors/odbc/OdbcRequestHandler.java     |  31 +-
 .../processors/odbc/escape/OdbcEscapeType.java  |  13 +-
 .../processors/odbc/escape/OdbcEscapeUtils.java |  58 ++-
 .../query/PlatformAbstractQueryCursor.java      |  11 +-
 .../cache/query/PlatformFieldsQueryCursor.java  |   6 +
 .../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 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |   2 +-
 .../internal/GridEventStorageSelfTest.java      |  97 +++-
 .../binary/BinaryMarshallerSelfTest.java        |  38 ++
 .../BinaryObjectBuilderAdditionalSelfTest.java  |  14 +
 .../cache/GridLocalIgniteSerializationTest.java | 378 ++++++++++++++
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  14 +-
 .../GridCacheQueryTransformerSelfTest.java      |   9 +-
 .../igfs/IgfsAbstractBaseSelfTest.java          |   7 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  31 +-
 ...SecondaryFileSystemDualAbstractSelfTest.java |  63 ++-
 .../processors/igfs/IgfsMaxSizeSelfTest.java    | 122 +++++
 .../processors/igfs/IgfsProcessorSelfTest.java  |  11 +-
 .../processors/igfs/IgfsProxySelfTest.java      |  32 ++
 .../processors/igfs/IgfsStreamsSelfTest.java    |   2 +-
 .../odbc/OdbcEscapeSequenceSelfTest.java        | 210 +++++++-
 .../odbc/OdbcProcessorValidationSelfTest.java   |  37 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   3 +
 .../query/h2/opt/GridH2ValueCacheObject.java    |   8 -
 ...niteBinaryObjectLocalQueryArgumentsTest.java |  28 ++
 ...aryObjectQueryArgumentsOffheapLocalTest.java |  28 ++
 ...teBinaryObjectQueryArgumentsOffheapTest.java |  30 ++
 .../IgniteBinaryObjectQueryArgumentsTest.java   | 472 +++++++++++++++++-
 .../query/h2/sql/GridQueryParsingTest.java      |   2 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   9 +
 .../ignite/impl/binary/binary_reader_impl.h     |   2 +-
 .../common/include/ignite/common/concurrent.h   |   5 +-
 .../cpp/common/include/ignite/ignite_error.h    |  11 +-
 .../platforms/cpp/common/src/ignite_error.cpp   |   2 +-
 .../cpp/core-test/src/cache_query_test.cpp      | 300 ++++++++---
 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     |   2 +
 .../odbc-test/include/sql_test_suite_fixture.h  |   6 +
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   2 +
 .../project/vs/odbc-test.vcxproj.filters        |   6 +
 .../cpp/odbc-test/src/configuration_test.cpp    |  14 +-
 .../cpp/odbc-test/src/queries_test.cpp          |   1 +
 .../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    |  25 +-
 .../include/ignite/odbc/config/configuration.h  |  52 +-
 .../cpp/odbc/include/ignite/odbc/result_page.h  |   3 -
 .../odbc/system/ui/dsn_configuration_window.h   |   8 +
 .../src/system/ui/dsn_configuration_window.cpp  |  23 +-
 .../cpp/odbc/os/win/src/system/ui/window.cpp    |   2 +-
 modules/platforms/cpp/odbc/src/column.cpp       |  14 +-
 .../cpp/odbc/src/config/configuration.cpp       |  30 +-
 .../cpp/odbc/src/config/connection_info.cpp     |  24 +-
 modules/platforms/cpp/odbc/src/dsn_config.cpp   |  14 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |   2 +-
 .../Impl/Cache/Query/FieldsQueryCursor.cs       |   3 +
 .../docker/compose/docker-compose.yml           |  14 +-
 108 files changed, 4161 insertions(+), 621 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/04514fe0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/04514fe0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/04514fe0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 846f6ea,62c2eb3..2717b06
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@@ -126,9 -126,10 +127,10 @@@ public class IgniteBasicTestSuite exten
          GridTestUtils.addTestIfNeeded(suite, IgniteDaemonNodeMarshallerCacheTest.class,
ignoredTests);
          suite.addTestSuite(IgniteMarshallerCacheConcurrentReadWriteTest.class);
          suite.addTestSuite(GridNodeMetricsLogSelfTest.class);
+         suite.addTestSuite(GridLocalIgniteSerializationTest.class);
  
          suite.addTestSuite(IgniteExceptionInNioWorkerSelfTest.class);
 -
 +        suite.addTestSuite(IgniteLocalNodeMapBeforeStartTest.class);
          suite.addTestSuite(OdbcProcessorValidationSelfTest.class);
          suite.addTestSuite(OdbcEscapeSequenceSelfTest.class);
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/04514fe0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java
----------------------------------------------------------------------


Mime
View raw message