You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/11/26 10:30:15 UTC
[06/24] ignite git commit: Merge branch 'ignite-1.5' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1294394
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1294394
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1294394
Branch: refs/heads/ignite-1.5
Commit: a129439413b8ad440c70d339b5bc1c4b250d1232
Parents: 01c24e7 e4109f9
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Nov 24 09:52:05 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 24 09:52:05 2015 +0300
----------------------------------------------------------------------
examples/schema-import/bin/db-init.sql | 3 +-
.../org/apache/ignite/schema/CacheConfig.java | 7 +-
.../java/org/apache/ignite/schema/Demo.java | 20 +-
.../org/apache/ignite/cache/QueryIndex.java | 53 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 638 +++++++----
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 14 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 444 +++++---
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 277 ++++-
.../ignite/cache/store/jdbc/JdbcType.java | 255 +++++
.../cache/store/jdbc/JdbcTypeDefaultHasher.java | 43 +
.../ignite/cache/store/jdbc/JdbcTypeField.java | 172 +++
.../ignite/cache/store/jdbc/JdbcTypeHasher.java | 34 +
.../internal/GridEventConsumeHandler.java | 6 +-
.../internal/GridMessageListenHandler.java | 6 +-
.../internal/portable/BinaryObjectImpl.java | 32 +-
.../portable/BinaryObjectOffheapImpl.java | 27 +-
.../internal/portable/BinaryReaderExImpl.java | 1015 ++----------------
.../portable/BinaryReaderHandlesHolder.java | 46 +
.../portable/BinaryReaderHandlesHolderImpl.java | 44 +
.../portable/GridPortableMarshaller.java | 23 +-
.../portable/PortableClassDescriptor.java | 8 +-
.../ignite/internal/portable/PortableUtils.java | 861 ++++++++++++++-
.../portable/builder/PortableBuilderReader.java | 21 +-
.../processors/cache/GridCacheMapEntry.java | 3 +-
.../continuous/CacheContinuousQueryHandler.java | 6 +-
.../continuous/GridContinuousHandler.java | 6 +-
.../continuous/GridContinuousProcessor.java | 50 +-
.../platform/PlatformContextImpl.java | 4 +-
.../processors/query/GridQueryProcessor.java | 6 +-
.../ignite/internal/visor/cache/VisorCache.java | 4 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 395 +++++++
...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 +
...JdbcPojoStorePortableMarshallerSelfTest.java | 85 ++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 200 ++--
...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +-
...chePartitionedAtomicSetFailoverSelfTest.java | 5 +
...ContinuousQueryFailoverAbstractSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 2 +-
.../platform/PlatformComputeEchoTask.java | 18 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +-
.../Binary/BinarySelfTest.cs | 35 +
.../Compute/ComputeApiTest.cs | 51 +-
.../Impl/Binary/BinarySystemHandlers.cs | 2 +-
.../Impl/Binary/BinaryUtils.cs | 36 +-
.../Impl/Binary/BinaryWriter.cs | 32 +-
modules/schema-import/README.txt | 176 +--
.../ignite/schema/generator/CodeGenerator.java | 281 ++---
.../ignite/schema/generator/XmlGenerator.java | 101 +-
.../apache/ignite/schema/model/IndexItem.java | 54 -
.../ignite/schema/model/PojoDescriptor.java | 72 +-
.../ignite/schema/model/SchemaDescriptor.java | 6 +-
.../schema/parser/DatabaseMetadataParser.java | 12 +-
.../apache/ignite/schema/parser/DbTable.java | 37 +-
.../parser/dialect/DatabaseMetadataDialect.java | 32 +-
.../parser/dialect/JdbcMetadataDialect.java | 22 +-
.../parser/dialect/OracleMetadataDialect.java | 24 +-
.../apache/ignite/schema/ui/ModalDialog.java | 6 +-
.../ignite/schema/ui/SchemaImportApp.java | 13 +-
.../schema/test/AbstractSchemaImportTest.java | 4 +-
.../schema/test/model/ignite-type-metadata.xml | 610 ++++++-----
.../yardstick/config/ignite-store-config.xml | 50 +-
.../IgniteAtomicInvokeRetryBenchmark.java | 2 +-
.../failover/IgniteConsistencyException.java | 64 ++
...IgniteTransactionalInvokeRetryBenchmark.java | 2 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 135 ++-
.../IgniteTransactionalWriteReadBenchmark.java | 2 +-
66 files changed, 4336 insertions(+), 2399 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
index 68b83ea,3d6e266..900835a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousHandler.java
@@@ -140,14 -140,9 +140,14 @@@ public interface GridContinuousHandler
/**
* @return {@code True} if for continuous queries.
*/
- public boolean isForQuery();
+ public boolean isQuery();
/**
+ * @return {@code True} if Ignite Binary objects should be passed to the listener and filter.
+ */
+ public boolean keepBinary();
+
+ /**
* @return Cache name if this is a continuous query handler.
*/
public String cacheName();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1294394/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------