You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2016/09/14 10:53:40 UTC
[35/35] ignite git commit: Merge remote-tracking branch
'remotes/upstream/master' into ignite-3199-1
Merge remote-tracking branch 'remotes/upstream/master' into ignite-3199-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73217c28
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73217c28
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73217c28
Branch: refs/heads/ignite-3199-1
Commit: 73217c2857be73d02f4eca116fcdfafcbd496cc0
Parents: 68e4cd0 cfdae56
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Sep 14 13:52:27 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Sep 14 13:52:27 2016 +0300
----------------------------------------------------------------------
modules/cassandra/README.txt | 8 +-
modules/cassandra/licenses/apache-2.0.txt | 202 ---
modules/cassandra/pom.xml | 319 +---
modules/cassandra/serializers/README.txt | 33 +
.../serializers/licenses/apache-2.0.txt | 202 +++
modules/cassandra/serializers/pom.xml | 129 ++
.../cassandra/serializer/KryoSerializer.java | 95 ++
.../apache/ignite/tests/KryoSerializerTest.java | 70 +
.../java/org/apache/ignite/tests/MyPojo.java | 102 ++
.../store/cassandra/CassandraCacheStore.java | 409 -----
.../cassandra/CassandraCacheStoreFactory.java | 200 ---
.../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/common/package-info.java | 21 -
.../store/cassandra/datasource/Credentials.java | 37 -
.../store/cassandra/datasource/DataSource.java | 550 -------
.../cassandra/datasource/PlainCredentials.java | 50 -
.../cassandra/datasource/package-info.java | 21 -
.../cache/store/cassandra/package-info.java | 21 -
.../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/persistence/package-info.java | 21 -
.../cassandra/serializer/JavaSerializer.java | 81 -
.../cassandra/serializer/KryoSerializer.java | 93 --
.../store/cassandra/serializer/Serializer.java | 43 -
.../cassandra/serializer/package-info.java | 21 -
.../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 --
.../store/cassandra/session/package-info.java | 21 -
.../cassandra/session/pool/SessionPool.java | 173 --
.../cassandra/session/pool/SessionWrapper.java | 71 -
.../cassandra/session/pool/package-info.java | 21 -
.../store/cassandra/utils/DDLGenerator.java | 64 -
.../store/cassandra/utils/package-info.java | 21 -
.../cassandra/src/test/bootstrap/aws/README.txt | 13 -
.../aws/cassandra/cassandra-bootstrap.sh | 336 ----
.../bootstrap/aws/cassandra/cassandra-env.sh | 287 ----
.../bootstrap/aws/cassandra/cassandra-start.sh | 217 ---
.../aws/cassandra/cassandra-template.yaml | 888 -----------
.../cassandra/src/test/bootstrap/aws/common.sh | 1481 ------------------
modules/cassandra/src/test/bootstrap/aws/env.sh | 113 --
.../test/bootstrap/aws/ganglia/agent-start.sh | 75 -
.../bootstrap/aws/ganglia/ganglia-bootstrap.sh | 417 -----
.../bootstrap/aws/ignite/ignite-bootstrap.sh | 336 ----
.../ignite/ignite-cassandra-server-template.xml | 190 ---
.../src/test/bootstrap/aws/ignite/ignite-env.sh | 29 -
.../test/bootstrap/aws/ignite/ignite-start.sh | 266 ----
.../src/test/bootstrap/aws/logs-collector.sh | 173 --
.../tests/ignite-cassandra-client-template.xml | 192 ---
.../test/bootstrap/aws/tests/tests-bootstrap.sh | 317 ----
.../test/bootstrap/aws/tests/tests-manager.sh | 458 ------
.../test/bootstrap/aws/tests/tests-report.sh | 499 ------
.../CassandraDirectPersistenceLoadTest.java | 107 --
.../tests/CassandraDirectPersistenceTest.java | 371 -----
.../apache/ignite/tests/DDLGeneratorTest.java | 43 -
.../tests/IgnitePersistentStoreLoadTest.java | 111 --
.../ignite/tests/IgnitePersistentStoreTest.java | 369 -----
.../LoadTestsCassandraArtifactsCreator.java | 104 --
.../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/cassandra/package-info.java | 21 -
.../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 -
.../ignite/tests/load/ignite/package-info.java | 21 -
.../apache/ignite/tests/load/package-info.java | 21 -
.../org/apache/ignite/tests/package-info.java | 21 -
.../org/apache/ignite/tests/pojos/Person.java | 246 ---
.../org/apache/ignite/tests/pojos/PersonId.java | 110 --
.../apache/ignite/tests/pojos/package-info.java | 21 -
.../ignite/tests/utils/CacheStoreHelper.java | 64 -
.../tests/utils/CassandraAdminCredentials.java | 36 -
.../ignite/tests/utils/CassandraHelper.java | 358 -----
.../tests/utils/CassandraLifeCycleBean.java | 149 --
.../utils/CassandraRegularCredentials.java | 36 -
.../ignite/tests/utils/TestCacheSession.java | 91 --
.../apache/ignite/tests/utils/TestsHelper.java | 375 -----
.../apache/ignite/tests/utils/package-info.java | 21 -
.../src/test/resources/log4j.properties | 119 --
.../tests/cassandra/connection-settings.xml | 52 -
.../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 | 94 --
.../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 | 113 --
.../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 | 94 --
.../primitive/ignite-remote-client-config.xml | 99 --
.../primitive/ignite-remote-server-config.xml | 110 --
.../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 -
.../scripts/recreate-cassandra-artifacts.bat | 41 -
.../scripts/recreate-cassandra-artifacts.sh | 39 -
modules/cassandra/store/README.txt | 32 +
modules/cassandra/store/licenses/apache-2.0.txt | 202 +++
modules/cassandra/store/pom.xml | 305 ++++
.../store/cassandra/CassandraCacheStore.java | 409 +++++
.../cassandra/CassandraCacheStoreFactory.java | 200 +++
.../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/common/package-info.java | 21 +
.../store/cassandra/datasource/Credentials.java | 39 +
.../store/cassandra/datasource/DataSource.java | 647 ++++++++
.../cassandra/datasource/PlainCredentials.java | 53 +
.../cassandra/datasource/package-info.java | 21 +
.../cache/store/cassandra/package-info.java | 21 +
.../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/persistence/package-info.java | 21 +
.../cassandra/serializer/JavaSerializer.java | 80 +
.../store/cassandra/serializer/Serializer.java | 43 +
.../cassandra/serializer/package-info.java | 21 +
.../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 ++
.../store/cassandra/session/package-info.java | 21 +
.../cassandra/session/pool/SessionPool.java | 173 ++
.../cassandra/session/pool/SessionWrapper.java | 71 +
.../cassandra/session/pool/package-info.java | 21 +
.../store/cassandra/utils/DDLGenerator.java | 64 +
.../store/cassandra/utils/package-info.java | 21 +
.../store/src/test/bootstrap/aws/README.txt | 13 +
.../aws/cassandra/cassandra-bootstrap.sh | 336 ++++
.../bootstrap/aws/cassandra/cassandra-env.sh | 287 ++++
.../bootstrap/aws/cassandra/cassandra-start.sh | 217 +++
.../aws/cassandra/cassandra-template.yaml | 888 +++++++++++
.../store/src/test/bootstrap/aws/common.sh | 1481 ++++++++++++++++++
.../store/src/test/bootstrap/aws/env.sh | 113 ++
.../test/bootstrap/aws/ganglia/agent-start.sh | 75 +
.../bootstrap/aws/ganglia/ganglia-bootstrap.sh | 417 +++++
.../bootstrap/aws/ignite/ignite-bootstrap.sh | 336 ++++
.../ignite/ignite-cassandra-server-template.xml | 190 +++
.../src/test/bootstrap/aws/ignite/ignite-env.sh | 29 +
.../test/bootstrap/aws/ignite/ignite-start.sh | 266 ++++
.../src/test/bootstrap/aws/logs-collector.sh | 173 ++
.../tests/ignite-cassandra-client-template.xml | 192 +++
.../test/bootstrap/aws/tests/tests-bootstrap.sh | 317 ++++
.../test/bootstrap/aws/tests/tests-manager.sh | 458 ++++++
.../test/bootstrap/aws/tests/tests-report.sh | 499 ++++++
.../CassandraDirectPersistenceLoadTest.java | 107 ++
.../tests/CassandraDirectPersistenceTest.java | 371 +++++
.../apache/ignite/tests/DDLGeneratorTest.java | 43 +
.../tests/DatasourceSerializationTest.java | 158 ++
.../tests/IgnitePersistentStoreLoadTest.java | 111 ++
.../ignite/tests/IgnitePersistentStoreTest.java | 369 +++++
.../LoadTestsCassandraArtifactsCreator.java | 104 ++
.../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/cassandra/package-info.java | 21 +
.../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 +
.../ignite/tests/load/ignite/package-info.java | 21 +
.../apache/ignite/tests/load/package-info.java | 21 +
.../org/apache/ignite/tests/package-info.java | 21 +
.../org/apache/ignite/tests/pojos/Person.java | 246 +++
.../org/apache/ignite/tests/pojos/PersonId.java | 110 ++
.../apache/ignite/tests/pojos/package-info.java | 21 +
.../ignite/tests/utils/CacheStoreHelper.java | 64 +
.../tests/utils/CassandraAdminCredentials.java | 38 +
.../ignite/tests/utils/CassandraHelper.java | 358 +++++
.../tests/utils/CassandraLifeCycleBean.java | 149 ++
.../utils/CassandraRegularCredentials.java | 38 +
.../ignite/tests/utils/TestCacheSession.java | 91 ++
.../apache/ignite/tests/utils/TestsHelper.java | 375 +++++
.../apache/ignite/tests/utils/package-info.java | 21 +
.../store/src/test/resources/log4j.properties | 119 ++
.../tests/cassandra/connection-settings.xml | 52 +
.../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 | 94 ++
.../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 | 113 ++
.../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 | 94 ++
.../primitive/ignite-remote-client-config.xml | 99 ++
.../primitive/ignite-remote-server-config.xml | 110 ++
.../primitive/persistence-settings-1.xml | 21 +
.../primitive/persistence-settings-2.xml | 21 +
.../store/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 +
.../store/src/test/scripts/ignite-load-tests.sh | 39 +
.../cassandra/store/src/test/scripts/jvm-opt.sh | 21 +
.../store/src/test/scripts/jvm-opts.bat | 24 +
.../scripts/recreate-cassandra-artifacts.bat | 41 +
.../scripts/recreate-cassandra-artifacts.sh | 39 +
.../store/jdbc/CacheAbstractJdbcStore.java | 71 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 21 +-
.../java/org/apache/ignite/igfs/IgfsPath.java | 14 +-
.../org/apache/ignite/igfs/IgfsPathSummary.java | 3 +-
.../local/LocalIgfsSecondaryFileSystem.java | 2 +-
.../igfs/common/IgfsControlResponse.java | 19 +-
.../internal/igfs/common/IgfsMarshaller.java | 14 +-
.../internal/processors/igfs/IgfsAsyncImpl.java | 12 +-
.../internal/processors/igfs/IgfsContext.java | 27 +
.../processors/igfs/IgfsDataManager.java | 19 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 18 -
.../internal/processors/igfs/IgfsFileImpl.java | 5 +-
.../internal/processors/igfs/IgfsImpl.java | 227 +--
.../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 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 70 +-
...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 12 +-
.../apache/ignite/igfs/IgfsPathSelfTest.java | 6 -
.../igfs/IgfsAbstractBaseSelfTest.java | 2 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 12 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsDualAbstractSelfTest.java | 28 +-
.../igfs/IgfsMetaManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 21 +-
.../internal/processors/igfs/IgfsMock.java | 15 +-
.../igfs/IgfsModeResolverSelfTest.java | 4 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../hadoop/igfs/HadoopIgfsInProc.java | 12 +-
.../hadoop/HadoopCommandLineTest.java | 4 +-
.../query-example/src/query_example.cpp | 54 +
.../cpp/odbc/install/ignite-odbc-install.ini | 1 +
.../cpp/odbc/install/install_amd64.cmd | 22 +-
.../platforms/cpp/odbc/install/install_x86.cmd | 11 +-
.../cache/IgniteAtomicSequenceBenchmark.java | 45 +
297 files changed, 19512 insertions(+), 18661 deletions(-)
----------------------------------------------------------------------