You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/06 08:40:41 UTC
[44/50] ignite git commit: Merge branch 'ignite-1.8'
Merge branch 'ignite-1.8'
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d348aed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d348aed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d348aed
Branch: refs/heads/ignite-comm-balance-master
Commit: 6d348aedaff492758111c17460d93fa904b90b9e
Parents: 6e8c35b 97a6515
Author: devozerov <vo...@gridgain.com>
Authored: Mon Dec 5 15:37:15 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Dec 5 15:37:15 2016 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 22 +
assembly/dependencies-fabric-lgpl.xml | 1 +
assembly/dependencies-fabric.xml | 1 +
assembly/release-fabric-base.xml | 1 +
.../examples/datagrid/CacheQueryDmlExample.java | 163 +++
.../CacheExamplesMultiNodeSelfTest.java | 7 +
.../ignite/examples/CacheExamplesSelfTest.java | 8 +
modules/cassandra/pom.xml | 16 +
modules/cassandra/serializers/README.txt | 7 +-
.../clients/src/test/config/jdbc-bin-config.xml | 54 +
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 263 +++++
.../JdbcAbstractUpdateStatementSelfTest.java | 37 +
...BinaryMarshallerInsertStatementSelfTest.java | 37 +
...cBinaryMarshallerMergeStatementSelfTest.java | 37 +
.../jdbc2/JdbcDeleteStatementSelfTest.java | 49 +
.../jdbc2/JdbcInsertStatementSelfTest.java | 122 ++
.../jdbc2/JdbcMergeStatementSelfTest.java | 91 ++
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 40 +-
.../internal/jdbc2/JdbcResultSetSelfTest.java | 18 +
.../tcp/redis/RedisProtocolSelfTest.java | 101 +-
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 5 +
.../java/org/apache/ignite/IgniteCache.java | 2 +
.../apache/ignite/IgniteSystemProperties.java | 2 +-
.../binary/BinaryAbstractIdentityResolver.java | 53 +
.../binary/BinaryArrayIdentityResolver.java | 224 ++++
.../binary/BinaryFieldIdentityResolver.java | 307 +++++
.../ignite/binary/BinaryIdentityResolver.java | 42 +
.../ignite/binary/BinaryTypeConfiguration.java | 27 +-
.../org/apache/ignite/cache/QueryEntity.java | 27 +
.../ignite/cache/query/SqlFieldsQuery.java | 2 +-
.../configuration/CacheConfiguration.java | 19 +-
.../internal/binary/BinaryClassDescriptor.java | 15 +
.../ignite/internal/binary/BinaryContext.java | 76 +-
.../ignite/internal/binary/BinaryFieldImpl.java | 10 +-
.../internal/binary/BinaryObjectExImpl.java | 90 +-
.../internal/binary/BinaryObjectImpl.java | 48 +-
.../binary/BinaryObjectOffheapImpl.java | 42 +-
.../internal/binary/BinaryPrimitives.java | 24 +
.../binary/BinarySerializedFieldComparator.java | 343 ++++++
.../ignite/internal/binary/BinaryUtils.java | 2 +-
.../internal/binary/BinaryWriterExImpl.java | 47 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 6 +
.../streams/BinaryAbstractInputStream.java | 5 +
.../streams/BinaryAbstractOutputStream.java | 5 +
.../binary/streams/BinaryHeapInputStream.java | 5 +
.../binary/streams/BinaryHeapOutputStream.java | 5 +
.../streams/BinaryOffheapInputStream.java | 10 +
.../streams/BinaryOffheapOutputStream.java | 4 +-
.../internal/binary/streams/BinaryStream.java | 12 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 17 +
.../internal/jdbc2/JdbcPreparedStatement.java | 71 +-
.../ignite/internal/jdbc2/JdbcQueryTask.java | 5 +-
.../ignite/internal/jdbc2/JdbcQueryTaskV2.java | 406 +++++++
.../ignite/internal/jdbc2/JdbcResultSet.java | 72 +-
.../internal/jdbc2/JdbcSqlFieldsQuery.java | 49 +
.../ignite/internal/jdbc2/JdbcStatement.java | 213 +++-
.../apache/ignite/internal/jdbc2/JdbcUtils.java | 25 +-
.../processors/cache/QueryCursorImpl.java | 31 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 1 +
.../cache/query/GridCacheTwoStepQuery.java | 253 ----
.../cache/query/IgniteQueryErrorCode.java | 91 ++
.../cache/transactions/IgniteTxManager.java | 7 +-
.../processors/odbc/OdbcMessageParser.java | 16 +
.../processors/odbc/OdbcNioListener.java | 2 +-
.../odbc/OdbcQueryGetParamsMetaRequest.java | 60 +
.../odbc/OdbcQueryGetParamsMetaResult.java | 40 +
.../internal/processors/odbc/OdbcRequest.java | 3 +
.../processors/odbc/OdbcRequestHandler.java | 151 ++-
.../internal/processors/odbc/OdbcUtils.java | 4 +-
.../memory/PlatformInputStreamImpl.java | 10 +
.../memory/PlatformOutputStreamImpl.java | 12 +
.../processors/query/GridQueryIndexing.java | 23 +-
.../processors/query/GridQueryProcessor.java | 589 ++++++++--
.../processors/query/GridQueryProperty.java | 20 +
.../query/GridQueryTypeDescriptor.java | 25 +
.../processors/query/IgniteSQLException.java | 89 ++
.../string/GridRedisGetCommandHandler.java | 27 +-
.../string/GridRedisIncrDecrCommandHandler.java | 63 +-
.../string/GridRedisSetCommandHandler.java | 24 +-
.../tcp/redis/GridRedisNioListener.java | 4 +-
.../apache/ignite/internal/util/GridUnsafe.java | 2 +-
.../util/lang/IgniteSingletonIterator.java | 56 +
.../BinaryArrayIdentityResolverSelfTest.java | 300 +++++
.../BinaryFieldIdentityResolverSelfTest.java | 333 ++++++
...ryIdentityResolverConfigurationSelfTest.java | 138 +++
.../BinarySerialiedFieldComparatorSelfTest.java | 568 +++++++++
.../GridCacheBinaryObjectsAbstractSelfTest.java | 260 ++++-
.../IgniteBinaryObjectsTestSuite.java | 10 +
.../cache/query/GridCacheTwoStepQuery.java | 253 ++++
.../query/h2/DmlStatementsProcessor.java | 1083 ++++++++++++++++++
.../query/h2/GridH2ResultSetIterator.java | 3 +-
.../processors/query/h2/IgniteH2Indexing.java | 130 ++-
.../query/h2/dml/FastUpdateArgument.java | 27 +
.../query/h2/dml/FastUpdateArguments.java | 53 +
.../query/h2/dml/KeyValueSupplier.java | 30 +
.../processors/query/h2/dml/UpdateMode.java | 36 +
.../processors/query/h2/dml/UpdatePlan.java | 128 +++
.../query/h2/dml/UpdatePlanBuilder.java | 486 ++++++++
.../processors/query/h2/dml/package-info.java | 22 +
.../query/h2/opt/GridH2RowDescriptor.java | 23 +
.../query/h2/opt/GridH2TreeIndex.java | 2 +-
.../processors/query/h2/sql/DmlAstUtils.java | 616 ++++++++++
.../processors/query/h2/sql/GridSqlArray.java | 8 +
.../processors/query/h2/sql/GridSqlConst.java | 6 +
.../processors/query/h2/sql/GridSqlDelete.java | 68 ++
.../query/h2/sql/GridSqlFunction.java | 5 +-
.../processors/query/h2/sql/GridSqlInsert.java | 149 +++
.../processors/query/h2/sql/GridSqlKeyword.java | 46 +
.../processors/query/h2/sql/GridSqlMerge.java | 143 +++
.../processors/query/h2/sql/GridSqlQuery.java | 44 +-
.../query/h2/sql/GridSqlQueryParser.java | 323 +++++-
.../query/h2/sql/GridSqlQuerySplitter.java | 6 +-
.../processors/query/h2/sql/GridSqlSelect.java | 3 +-
.../query/h2/sql/GridSqlStatement.java | 64 ++
.../processors/query/h2/sql/GridSqlUpdate.java | 105 ++
.../h2/twostep/GridReduceQueryExecutor.java | 28 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 559 +++++++++
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 243 ++++
.../IgniteCacheDeleteSqlQuerySelfTest.java | 106 ++
.../IgniteCacheInsertSqlQuerySelfTest.java | 203 ++++
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 153 +++
.../IgniteCacheUpdateSqlQuerySelfTest.java | 472 ++++++++
.../IgniteCacheAtomicFieldsQuerySelfTest.java | 21 -
.../h2/GridIndexingSpiAbstractSelfTest.java | 40 +-
.../query/h2/sql/GridQueryParsingTest.java | 109 +-
.../IgniteCacheQuerySelfTestSuite.java | 9 +
.../cpp/core-test/config/cache-query.xml | 10 +
.../odbc-example/config/example-odbc.xml | 38 +-
.../project/vs/odbc-example.vcxproj | 7 +-
.../project/vs/odbc-example.vcxproj.filters | 8 +
.../examples/odbc-example/src/odbc_example.cpp | 514 +++++++--
.../query-example/src/query_example.cpp | 2 +-
.../odbc-test/config/queries-test-noodbc.xml | 4 +
.../cpp/odbc-test/config/queries-test.xml | 4 +
.../src/application_data_buffer_test.cpp | 2 +-
.../cpp/odbc-test/src/queries_test.cpp | 336 ++++++
.../platforms/cpp/odbc/include/ignite/odbc.h | 14 +-
.../ignite/odbc/app/application_data_buffer.h | 4 +-
.../odbc/include/ignite/odbc/app/parameter.h | 2 +-
.../cpp/odbc/include/ignite/odbc/common_types.h | 3 +
.../cpp/odbc/include/ignite/odbc/message.h | 138 ++-
.../odbc/include/ignite/odbc/query/data_query.h | 12 +-
.../cpp/odbc/include/ignite/odbc/query/query.h | 44 +-
.../cpp/odbc/include/ignite/odbc/statement.h | 83 +-
.../cpp/odbc/include/ignite/odbc/type_traits.h | 2 +-
.../cpp/odbc/include/ignite/odbc/utility.h | 11 +-
.../odbc/src/app/application_data_buffer.cpp | 57 +-
.../platforms/cpp/odbc/src/app/parameter.cpp | 3 +-
modules/platforms/cpp/odbc/src/connection.cpp | 4 +-
modules/platforms/cpp/odbc/src/entry_points.cpp | 32 +-
modules/platforms/cpp/odbc/src/odbc.cpp | 25 +-
.../odbc/src/query/column_metadata_query.cpp | 2 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 6 +-
.../cpp/odbc/src/query/foreign_keys_query.cpp | 2 +-
.../cpp/odbc/src/query/primary_keys_query.cpp | 2 +-
.../odbc/src/query/special_columns_query.cpp | 2 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 2 +-
.../cpp/odbc/src/query/type_info_query.cpp | 2 +-
modules/platforms/cpp/odbc/src/statement.cpp | 230 +++-
modules/platforms/cpp/odbc/src/utility.cpp | 22 +-
.../Apache.Ignite.AspNet.nuspec | 4 +-
.../Examples/Example.cs | 6 +-
.../Examples/ExamplesTest.cs | 7 +-
.../Process/IgniteProcess.cs | 40 +-
.../Datagrid/MultiTieredCacheExample.cs | 8 +-
.../config/benchmark-bin-identity.properties | 94 ++
.../config/benchmark-multicast.properties | 15 +
.../config/benchmark-sql-dml.properties | 72 ++
modules/yardstick/config/ignite-base-config.xml | 73 +-
.../config/ignite-bin-multicast-config.xml | 86 ++
.../cache/IgniteBinaryIdentityBenchmark.java | 108 ++
.../cache/IgniteBinaryIdentityGetBenchmark.java | 34 +
.../cache/IgniteBinaryIdentityPutBenchmark.java | 35 +
.../IgniteFieldsBinaryIdentityGetBenchmark.java | 30 +
.../IgniteFieldsBinaryIdentityPutBenchmark.java | 30 +
.../IgniteLegacyBinaryIdentityGetBenchmark.java | 30 +
.../IgniteLegacyBinaryIdentityPutBenchmark.java | 30 +
...IgnitePutIfAbsentIndexedValue1Benchmark.java | 45 +
.../IgniteReplaceIndexedValue1Benchmark.java | 79 ++
.../cache/dml/IgniteSqlDeleteBenchmark.java | 83 ++
.../dml/IgniteSqlDeleteFilteredBenchmark.java | 88 ++
.../IgniteSqlInsertIndexedValue1Benchmark.java | 48 +
.../IgniteSqlInsertIndexedValue2Benchmark.java | 48 +
.../IgniteSqlInsertIndexedValue8Benchmark.java | 48 +
.../cache/dml/IgniteSqlMergeAllBenchmark.java | 82 ++
.../cache/dml/IgniteSqlMergeBenchmark.java | 42 +
.../IgniteSqlMergeIndexedValue1Benchmark.java | 43 +
.../IgniteSqlMergeIndexedValue2Benchmark.java | 43 +
.../IgniteSqlMergeIndexedValue8Benchmark.java | 43 +
.../cache/dml/IgniteSqlMergeQueryBenchmark.java | 116 ++
.../cache/dml/IgniteSqlUpdateBenchmark.java | 82 ++
.../dml/IgniteSqlUpdateFilteredBenchmark.java | 88 ++
.../yardstick/cache/model/SampleValue.java | 2 +
193 files changed, 14608 insertions(+), 1112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d348aed/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d348aed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d348aed/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
index ded66af,aac4170..cc7008f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
@@@ -44,14 -46,21 +46,21 @@@ public class GridRedisGetCommandHandle
GET
);
+ /** Grid context. */
+ private final GridKernalContext ctx;
+
/**
- * Constructor.
+ * Handler constructor.
*
- * @param log Logger.
- * @param hnd Handler.
+ * @param log Logger to use.
+ * @param hnd Rest handler.
+ * @param ctx Context.
*/
- public GridRedisGetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
+ public GridRedisGetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd,
+ GridKernalContext ctx) {
super(log, hnd);
+
+ this.ctx = ctx;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d348aed/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d348aed/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
index 9e53055,2eea0e1..8a7adf4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
@@@ -52,14 -55,21 +55,21 @@@ public class GridRedisSetCommandHandle
/** Value position in Redis message. */
private static final int VAL_POS = 2;
+ /** Grid context. */
+ private final GridKernalContext ctx;
+
/**
- * Constructor.
+ * Handler constructor.
*
- * @param log Logger.
- * @param hnd Handler.
+ * @param log Logger to use.
+ * @param hnd Rest handler.
+ * @param ctx Context.
*/
- public GridRedisSetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
+ public GridRedisSetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd,
+ GridKernalContext ctx) {
super(log, hnd);
+
+ this.ctx = ctx;
}
/** {@inheritDoc} */