Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F261D2009EE for ; Wed, 18 May 2016 13:51:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F14E9160A00; Wed, 18 May 2016 11:51:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D6E17160A33 for ; Wed, 18 May 2016 13:51:06 +0200 (CEST) Received: (qmail 73222 invoked by uid 500); 18 May 2016 11:51:06 -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 72699 invoked by uid 99); 18 May 2016 11:51:05 -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; Wed, 18 May 2016 11:51:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2309E094B; Wed, 18 May 2016 11:51:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 18 May 2016 11:51:22 -0000 Message-Id: <0a2bc30ce93f459fa37e6a0dfb14e025@git.apache.org> In-Reply-To: <474eb5ac11f348fead99a2df4b840cb1@git.apache.org> References: <474eb5ac11f348fead99a2df4b840cb1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/18] ignite git commit: Merge branch 'ignite-1.6' archived-at: Wed, 18 May 2016 11:51:08 -0000 Merge branch 'ignite-1.6' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b104c63e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b104c63e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b104c63e Branch: refs/heads/master Commit: b104c63eaa7fda9abdd6b568cef75e0e9ec304e1 Parents: da49670 0aaa1c7 Author: vozerov-gridgain Authored: Wed May 18 14:50:54 2016 +0300 Committer: vozerov-gridgain Committed: Wed May 18 14:50:54 2016 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 7 +- modules/cassandra/README.txt | 32 + modules/cassandra/licenses/apache-2.0.txt | 202 +++++ modules/cassandra/pom.xml | 340 +++++++ .../store/cassandra/CassandraCacheStore.java | 409 +++++++++ .../cassandra/CassandraCacheStoreFactory.java | 200 +++++ .../cassandra/bean/CassandraLifeCycleBean.java | 149 ++++ .../store/cassandra/common/CassandraHelper.java | 133 +++ .../cassandra/common/PropertyMappingHelper.java | 220 +++++ .../store/cassandra/common/RandomSleeper.java | 104 +++ .../store/cassandra/common/SystemHelper.java | 46 + .../store/cassandra/datasource/Credentials.java | 37 + .../store/cassandra/datasource/DataSource.java | 550 ++++++++++++ .../cassandra/datasource/PlainCredentials.java | 50 ++ .../persistence/KeyPersistenceSettings.java | 274 ++++++ .../KeyValuePersistenceSettings.java | 478 ++++++++++ .../persistence/PersistenceController.java | 421 +++++++++ .../persistence/PersistenceSettings.java | 335 +++++++ .../persistence/PersistenceStrategy.java | 62 ++ .../store/cassandra/persistence/PojoField.java | 219 +++++ .../cassandra/persistence/PojoKeyField.java | 91 ++ .../cassandra/persistence/PojoValueField.java | 152 ++++ .../persistence/ValuePersistenceSettings.java | 107 +++ .../cassandra/serializer/JavaSerializer.java | 81 ++ .../cassandra/serializer/KryoSerializer.java | 93 ++ .../store/cassandra/serializer/Serializer.java | 43 + .../session/BatchExecutionAssistant.java | 95 ++ .../cassandra/session/BatchLoaderAssistant.java | 47 + .../cassandra/session/CassandraSession.java | 60 ++ .../cassandra/session/CassandraSessionImpl.java | 832 +++++++++++++++++ .../cassandra/session/ExecutionAssistant.java | 77 ++ .../session/GenericBatchExecutionAssistant.java | 71 ++ .../session/LoadCacheCustomQueryWorker.java | 105 +++ .../cassandra/session/pool/SessionPool.java | 173 ++++ .../cassandra/session/pool/SessionWrapper.java | 71 ++ .../store/cassandra/utils/DDLGenerator.java | 64 ++ .../aws/cassandra/cassandra-bootstrap.sh | 373 ++++++++ .../bootstrap/aws/cassandra/cassandra-env.sh | 283 ++++++ .../bootstrap/aws/cassandra/cassandra-start.sh | 550 ++++++++++++ .../aws/cassandra/cassandra-template.yaml | 889 +++++++++++++++++++ .../bootstrap/aws/ignite/ignite-bootstrap.sh | 384 ++++++++ .../ignite/ignite-cassandra-server-template.xml | 177 ++++ .../src/test/bootstrap/aws/ignite/ignite-env.sh | 25 + .../test/bootstrap/aws/ignite/ignite-start.sh | 637 +++++++++++++ .../src/test/bootstrap/aws/logs-collector.sh | 102 +++ .../tests/ignite-cassandra-client-template.xml | 173 ++++ .../test/bootstrap/aws/tests/tests-bootstrap.sh | 379 ++++++++ .../test/bootstrap/aws/tests/tests-report.sh | 590 ++++++++++++ .../src/test/bootstrap/aws/tests/tests-run.sh | 715 +++++++++++++++ .../CassandraDirectPersistenceLoadTest.java | 107 +++ .../tests/CassandraDirectPersistenceTest.java | 371 ++++++++ .../apache/ignite/tests/DDLGeneratorTest.java | 43 + .../tests/IgnitePersistentStoreLoadTest.java | 111 +++ .../ignite/tests/IgnitePersistentStoreTest.java | 369 ++++++++ .../org/apache/ignite/tests/load/Generator.java | 27 + .../apache/ignite/tests/load/IntGenerator.java | 33 + .../ignite/tests/load/LoadTestDriver.java | 238 +++++ .../apache/ignite/tests/load/LongGenerator.java | 28 + .../ignite/tests/load/PersonGenerator.java | 43 + .../ignite/tests/load/PersonIdGenerator.java | 31 + .../ignite/tests/load/StringGenerator.java | 28 + .../org/apache/ignite/tests/load/Worker.java | 429 +++++++++ .../tests/load/cassandra/BulkReadWorker.java | 63 ++ .../tests/load/cassandra/BulkWriteWorker.java | 52 ++ .../ignite/tests/load/cassandra/ReadWorker.java | 51 ++ .../tests/load/cassandra/WriteWorker.java | 51 ++ .../tests/load/ignite/BulkReadWorker.java | 52 ++ .../tests/load/ignite/BulkWriteWorker.java | 52 ++ .../ignite/tests/load/ignite/ReadWorker.java | 51 ++ .../ignite/tests/load/ignite/WriteWorker.java | 51 ++ .../org/apache/ignite/tests/pojos/Person.java | 246 +++++ .../org/apache/ignite/tests/pojos/PersonId.java | 110 +++ .../ignite/tests/utils/CacheStoreHelper.java | 64 ++ .../tests/utils/CassandraAdminCredentials.java | 36 + .../ignite/tests/utils/CassandraHelper.java | 358 ++++++++ .../utils/CassandraRegularCredentials.java | 36 + .../ignite/tests/utils/TestCacheSession.java | 91 ++ .../apache/ignite/tests/utils/TestsHelper.java | 375 ++++++++ .../src/test/resources/log4j.properties | 119 +++ .../tests/cassandra/connection-settings.xml | 48 + .../tests/cassandra/connection.properties | 17 + .../tests/cassandra/credentials.properties | 22 + .../tests/cassandra/embedded-cassandra.yaml | 119 +++ .../ignite/tests/cassandra/keyspaces.properties | 17 + .../tests/persistence/blob/ignite-config.xml | 100 +++ .../persistence/blob/persistence-settings-1.xml | 21 + .../persistence/blob/persistence-settings-2.xml | 21 + .../persistence/blob/persistence-settings-3.xml | 29 + .../tests/persistence/pojo/ignite-config.xml | 119 +++ .../persistence/pojo/persistence-settings-1.xml | 21 + .../persistence/pojo/persistence-settings-2.xml | 21 + .../persistence/pojo/persistence-settings-3.xml | 173 ++++ .../persistence/primitive/ignite-config.xml | 100 +++ .../primitive/ignite-remote-client-config.xml | 95 ++ .../primitive/ignite-remote-server-config.xml | 106 +++ .../primitive/persistence-settings-1.xml | 21 + .../primitive/persistence-settings-2.xml | 21 + .../src/test/resources/tests.properties | 50 ++ .../src/test/scripts/cassandra-load-tests.bat | 41 + .../src/test/scripts/cassandra-load-tests.sh | 39 + .../src/test/scripts/ignite-load-tests.bat | 41 + .../src/test/scripts/ignite-load-tests.sh | 39 + modules/cassandra/src/test/scripts/jvm-opt.sh | 21 + modules/cassandra/src/test/scripts/jvm-opts.bat | 24 + .../hadoop/v2/HadoopV2JobResourceManager.java | 6 +- modules/web-console/DEVNOTES.txt | 6 +- parent/pom.xml | 5 +- pom.xml | 9 + 108 files changed, 16758 insertions(+), 17 deletions(-) ----------------------------------------------------------------------