Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A418C10B35 for ; Mon, 21 Dec 2015 12:29:42 +0000 (UTC) Received: (qmail 26741 invoked by uid 500); 21 Dec 2015 12:29:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26663 invoked by uid 500); 21 Dec 2015 12:29:42 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 26215 invoked by uid 99); 21 Dec 2015 12:29:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2015 12:29:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45CC7E04EB; Mon, 21 Dec 2015 12:29:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 21 Dec 2015 12:29:57 -0000 Message-Id: <95c2da3409174b5a9ed867fc5df04862@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/17] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889 Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/192762b2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/192762b2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/192762b2 Branch: refs/heads/ignite-gg-10889 Commit: 192762b25dae9cc1757593b18d58789943ed5d09 Parents: 71de23a 6edeccd Author: Alexey Kuznetsov Authored: Mon Dec 21 19:29:59 2015 +0700 Committer: Alexey Kuznetsov Committed: Mon Dec 21 19:29:59 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 1 + ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 10 +- .../datagrid/CacheEntryProcessorExample.java | 157 ++++++ .../examples/datagrid/CacheQueryExample.java | 4 +- .../apache/ignite/examples/model/Address.java | 72 +++ .../apache/ignite/examples/model/Employee.java | 93 ++++ .../ignite/examples/model/EmployeeKey.java | 93 ++++ .../ignite/examples/model/Organization.java | 85 +++- .../ignite/examples/model/OrganizationType.java | 32 ++ .../apache/ignite/examples/model/Person.java | 2 +- .../ignite/examples/model/binary/Address.java | 72 --- .../ignite/examples/model/binary/Employee.java | 93 ---- .../examples/model/binary/EmployeeKey.java | 93 ---- .../examples/model/binary/Organization.java | 93 ---- .../examples/model/binary/OrganizationType.java | 32 -- .../ignite/examples/model/package-info.java | 23 + .../datagrid/CacheEntryProcessorExample.java | 147 ++++++ .../ScalarCacheEntryProcessorExample.scala | 125 +++++ .../ignite/examples/CacheExamplesSelfTest.java | 8 + .../java8/examples/CacheExamplesSelfTest.java | 8 + .../tests/examples/ScalarExamplesSelfTest.scala | 5 + .../ClientAbstractConnectivitySelfTest.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 5 +- .../ignite/internal/binary/BinaryContext.java | 16 +- .../ignite/internal/binary/BinaryWriteMode.java | 3 + .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../discovery/GridDiscoveryManager.java | 4 +- .../processors/cache/CacheObjectAdapter.java | 3 + .../dht/preloader/GridDhtPreloader.java | 31 +- .../processors/task/GridTaskWorker.java | 8 +- .../internal/util/lang/GridNodePredicate.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 11 +- .../util/nio/GridSelectorNioSessionImpl.java | 7 + .../ignite/spi/discovery/tcp/ClientImpl.java | 48 +- .../TcpDiscoveryMulticastIpFinder.java | 12 +- .../ignite/internal/ClusterGroupSelfTest.java | 32 +- .../IgniteClientReconnectCacheTest.java | 33 +- .../ignite/internal/TaskNodeRestartTest.java | 230 +++++++++ ...IgniteCacheBinaryEntryProcessorSelfTest.java | 4 +- .../cache/IgniteCachePutAllRestartTest.java | 2 +- .../IgniteCacheSizeFailoverTest.java | 4 +- .../random/RandomEvictionPolicySelfTest.java | 4 +- .../GridServiceProcessorStopSelfTest.java | 18 +- .../IgniteMessagingWithClientTest.java | 2 - .../GridSessionCheckpointAbstractSelfTest.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +- .../testsuites/IgniteComputeGridTestSuite.java | 2 + .../cache/BinarySerializationQuerySelfTest.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 ++- .../query/IgniteSqlSplitterSelfTest.java | 3 +- modules/platforms/cpp/core/impl/doxygen.h | 53 -- .../cpp/core/include/ignite/binary/binary.h | 5 + .../core/include/ignite/binary/binary_consts.h | 5 + .../include/ignite/binary/binary_containers.h | 5 + .../include/ignite/binary/binary_raw_reader.h | 5 + .../include/ignite/binary/binary_raw_writer.h | 5 + .../core/include/ignite/binary/binary_reader.h | 5 + .../core/include/ignite/binary/binary_type.h | 17 + .../core/include/ignite/binary/binary_writer.h | 5 + .../cpp/core/include/ignite/cache/cache.h | 5 + .../cpp/core/include/ignite/cache/cache_entry.h | 5 + .../core/include/ignite/cache/cache_peek_mode.h | 5 + .../cpp/core/include/ignite/cache/query/query.h | 5 + .../include/ignite/cache/query/query_argument.h | 6 + .../include/ignite/cache/query/query_cursor.h | 5 + .../ignite/cache/query/query_fields_cursor.h | 5 + .../ignite/cache/query/query_fields_row.h | 5 + .../include/ignite/cache/query/query_scan.h | 5 + .../core/include/ignite/cache/query/query_sql.h | 5 + .../ignite/cache/query/query_sql_fields.h | 5 + .../include/ignite/cache/query/query_text.h | 5 + .../platforms/cpp/core/include/ignite/guid.h | 5 + .../platforms/cpp/core/include/ignite/ignite.h | 5 + .../core/include/ignite/ignite_configuration.h | 5 + .../cpp/core/include/ignite/ignite_error.h | 5 + .../cpp/core/include/ignite/ignition.h | 5 + modules/platforms/cpp/core/namespaces.dox | 53 ++ .../Binary/IBinaryRawReader.cs | 4 +- .../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 +- .../Impl/Binary/BinaryReader.cs | 13 +- .../Impl/Binary/BinaryUtils.cs | 4 +- .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/test/AbstractSchemaImportTest.java | 18 + .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++++++++++++++++++ .../apache/ignite/schema/test/model/TstKey.txt | 96 ++++ .../schema/test/model/ignite-type-metadata.xml | 180 +++++++ .../test/parser/DbMetadataParserTest.java | 17 +- 89 files changed, 2351 insertions(+), 603 deletions(-) ----------------------------------------------------------------------