ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [23/23] ignite git commit: Merge branch 'master' into ignite-5896
Date Tue, 05 Sep 2017 08:53:04 GMT
Merge branch 'master' into ignite-5896

# Conflicts:
#	modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj


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

Branch: refs/heads/ignite-5896
Commit: 4f8f08522af1595582552da8348a1f31cf5b5192
Parents: 50f6bdc e791254
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Tue Sep 5 11:52:31 2017 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Tue Sep 5 11:52:31 2017 +0300

----------------------------------------------------------------------
 .../internal/jdbc2/JdbcMetadataSelfTest.java    |  19 ++
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../JdbcThinMissingLongArrayResultsTest.java    | 341 +++++++++++++++++++
 .../org/apache/ignite/cache/QueryIndex.java     |   5 +-
 .../configuration/MemoryConfiguration.java      |   4 +-
 .../internal/DuplicateTypeIdException.java      |  74 ++++
 .../apache/ignite/internal/IgniteKernal.java    |  22 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   3 +
 .../ignite/internal/MarshallerContextImpl.java  |  24 +-
 .../ignite/internal/binary/BinaryContext.java   |  52 ++-
 .../binary/builder/BinaryObjectBuilderImpl.java |   2 +
 .../internal/jdbc/JdbcDatabaseMetadata.java     |   2 +-
 .../jdbc/thin/JdbcThinDatabaseMetadata.java     |   2 +-
 .../internal/jdbc2/JdbcDatabaseMetadata.java    |  35 +-
 .../discovery/GridDiscoveryManager.java         |  49 ++-
 .../cache/binary/BinaryMetadataTransport.java   |  14 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   1 -
 .../dht/preloader/GridDhtPartitionMap.java      |  24 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +-
 .../local/atomic/GridLocalAtomicCache.java      |   8 +-
 .../GridCacheDatabaseSharedManager.java         |  39 ++-
 .../processors/odbc/SqlListenerUtils.java       |   6 +
 .../odbc/odbc/OdbcRequestHandler.java           |  17 +-
 .../processors/odbc/odbc/OdbcUtils.java         |  22 ++
 .../apache/ignite/internal/util/typedef/X.java  |   4 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  16 +-
 .../BinaryObjectBuilderAdditionalSelfTest.java  |  22 ++
 .../binary/BinaryMetadataUpdatesFlowTest.java   |  48 +++
 ...pClientDiscoveryMarshallerCheckSelfTest.java |  84 ++++-
 modules/platforms/cpp/odbc-test/Makefile.am     |   3 +-
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   8 +-
 .../cpp/odbc-test/src/queries_test.cpp          | 126 ++++++-
 .../cpp/odbc/include/ignite/odbc/cursor.h       |   7 +
 modules/platforms/cpp/odbc/src/cursor.cpp       |   5 +
 .../platforms/cpp/odbc/src/query/data_query.cpp |   2 +-
 modules/platforms/cpp/odbc/src/statement.cpp    |  32 +-
 .../Compute/ComputeApiTest.cs                   |   6 +
 .../Apache.Ignite.Core.csproj                   |   1 +
 .../Configuration/MemoryPolicyConfiguration.cs  |   4 +-
 .../Impl/Binary/BinaryObjectBuilder.cs          | 132 +++----
 .../Impl/Binary/BinaryObjectSchemaSerializer.cs |   2 +-
 .../Impl/Binary/BinaryProcessor.cs              |   2 +-
 .../Impl/Binary/BinaryReader.cs                 | 110 +++---
 .../Impl/Binary/BinarySystemHandlers.cs         | 157 +++------
 .../Impl/Binary/BinaryTypeId.cs                 | 228 +++++++++++++
 .../Impl/Binary/BinaryUtils.cs                  | 155 +--------
 .../Impl/Binary/BinaryWriter.cs                 | 152 ++++-----
 .../Impl/Binary/Marshaller.cs                   |  28 +-
 .../Impl/Binary/Metadata/BinaryType.cs          |  62 ++--
 modules/platforms/dotnet/README.md              |   2 +-
 .../cache/jdbc/JdbcAbstractBenchmark.java       |   4 +-
 .../yardstick/cache/jdbc/RdbmsBenchmark.java    |   6 +-
 52 files changed, 1537 insertions(+), 640 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4f8f0852/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 760ea38,241e1c6..2ac2cea
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@@ -97,17 -97,10 +97,18 @@@
      <Compile Include="Cache\Configuration\MemoryPolicyConfiguration.cs" />
      <Compile Include="Cache\Configuration\PartitionLossPolicy.cs" />
      <Compile Include="Cache\IMemoryMetrics.cs" />
 +    <Compile Include="Client\IgniteClientConfiguration.cs" />
      <Compile Include="Common\ExceptionFactory.cs" />
      <Compile Include="Configuration\Package-Info.cs" />
+     <Compile Include="Impl\Binary\BinaryTypeId.cs" />
 +    <Compile Include="Impl\Binary\BinaryProcessorClient.cs" />
 +    <Compile Include="Impl\Binary\IBinaryProcessor.cs" />
      <Compile Include="Impl\IIgniteInternal.cs" />
 +    <Compile Include="Impl\Cache\CacheClient.cs" />
 +    <Compile Include="Impl\Client\ClientOp.cs" />
 +    <Compile Include="Impl\Client\ClientProtocolVersion.cs" />
 +    <Compile Include="Impl\Client\ClientSocket.cs" />
 +    <Compile Include="Impl\Client\IgniteClient.cs" />
      <Compile Include="Impl\IPlatformTargetInternal.cs" />
      <Compile Include="Impl\PersistentStore\PersistentStoreMetrics.cs" />
      <Compile Include="Impl\PlatformDisposableTargetAdapter.cs" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/4f8f0852/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryProcessor.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/4f8f0852/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/4f8f0852/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Marshaller.cs
----------------------------------------------------------------------


Mime
View raw message