Merge branch 'ignite-1.5' into ignite-1956
Conflicts:
modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java
modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45eea775
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45eea775
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45eea775
Branch: refs/heads/ignite-1956
Commit: 45eea775685f93a64d748f52a2aea3db147d6104
Parents: 8dfd7f9 e386798
Author: vozerov-gridgain <[email protected]>
Authored: Thu Nov 26 12:54:12 2015 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Thu Nov 26 12:54:12 2015 +0300
----------------------------------------------------------------------
.../config/binary/example-ignite-binary.xml | 44 ----
examples/config/example-ignite.xml | 10 +-
.../ignite/examples/binary/EmployeeKey.java | 3 +
.../binary/ExampleBinaryNodeStartup.java | 36 ---
...ComputeClientBinaryTaskExecutionExample.java | 6 +-
.../CacheClientBinaryPutGetExample.java | 6 +-
.../datagrid/CacheClientBinaryQueryExample.java | 6 +-
.../scalar/examples/ScalarCacheExample.scala | 19 +-
.../ignite/codegen/MessageCodeGenerator.java | 1 +
.../java/org/apache/ignite/IgniteBinary.java | 15 +-
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../apache/ignite/binary/BinaryIdMapper.java | 3 +-
.../org/apache/ignite/binary/BinaryObject.java | 9 +-
.../org/apache/ignite/binary/BinaryType.java | 9 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 2 +
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 3 +-
.../configuration/CacheConfiguration.java | 6 +-
.../internal/GridEventConsumeHandler.java | 5 +
.../internal/GridMessageListenHandler.java | 5 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../ignite/internal/NodeStoppingException.java | 35 +++
.../internal/portable/BinaryFieldImpl.java | 6 +-
.../internal/portable/BinaryMarshaller.java | 144 +++++++++++
.../internal/portable/BinaryObjectEx.java | 230 +----------------
.../internal/portable/BinaryObjectExImpl.java | 245 +++++++++++++++++++
.../internal/portable/BinaryObjectImpl.java | 2 +-
.../portable/BinaryObjectOffheapImpl.java | 2 +-
.../internal/portable/BinaryTypeImpl.java | 5 +
.../portable/PortableClassDescriptor.java | 2 +-
.../internal/portable/PortableContext.java | 36 ++-
.../ignite/internal/portable/PortableUtils.java | 2 +-
.../builder/BinaryObjectBuilderImpl.java | 9 +-
.../builder/PortableBuilderSerializer.java | 4 +-
.../processors/cache/CacheObjectContext.java | 2 +-
.../cache/GridCacheDeploymentManager.java | 6 +-
.../processors/cache/GridCacheEventManager.java | 38 ++-
.../processors/cache/GridCacheIoManager.java | 6 +
.../processors/cache/GridCacheMessage.java | 3 +-
.../processors/cache/GridCacheMvccManager.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 11 +-
.../processors/cache/IgniteCacheProxy.java | 14 +-
.../cache/affinity/GridCacheAffinityImpl.java | 3 +-
.../distributed/dht/GridDhtLockFuture.java | 19 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 1 +
.../dht/GridPartitionedSingleGetFuture.java | 3 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +-
.../CacheObjectBinaryProcessorImpl.java | 33 ++-
.../cache/portable/IgniteBinaryImpl.java | 9 +-
.../continuous/CacheContinuousQueryEntry.java | 50 +++-
.../continuous/CacheContinuousQueryEvent.java | 6 +-
.../continuous/CacheContinuousQueryHandler.java | 32 ++-
.../CacheContinuousQueryListener.java | 5 +
.../continuous/CacheContinuousQueryManager.java | 57 +++--
.../cache/store/CacheOsStoreManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 29 ++-
.../processors/cacheobject/NoOpBinary.java | 8 +-
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java | 10 +-
.../StartRoutineDiscoveryMessage.java | 13 +-
.../cpp/PlatformCppConfigurationClosure.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 2 +-
.../processors/query/GridQueryProcessor.java | 28 ++-
.../marshaller/portable/BinaryMarshaller.java | 146 -----------
...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 85 +++++++
...JdbcPojoStorePortableMarshallerSelfTest.java | 85 -------
.../portable/BinaryFieldsAbstractSelfTest.java | 13 +-
.../portable/BinaryFieldsHeapSelfTest.java | 4 +-
.../portable/BinaryFieldsOffheapSelfTest.java | 3 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 5 +-
.../BinaryFooterOffsetsHeapSelfTest.java | 4 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 3 +-
.../portable/BinaryMarshallerSelfTest.java | 17 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 7 +-
.../portable/BinaryObjectBuilderSelfTest.java | 102 +++++---
.../GridPortableAffinityKeySelfTest.java | 13 +-
...idPortableMarshallerCtxDisabledSelfTest.java | 1 -
.../portable/GridPortableMetaDataSelfTest.java | 11 +-
.../portable/GridPortableWildcardsSelfTest.java | 1 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 97 ++++++++
...IgniteCacheAbstractExecutionContextTest.java | 2 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +
...naryObjectsAbstractDataStreamerSelfTest.java | 2 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 2 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 10 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 6 +-
.../GridCachePortableStoreAbstractSelfTest.java | 2 +-
...ridPortableCacheEntryMemorySizeSelfTest.java | 2 +-
...leDuplicateIndexObjectsAbstractSelfTest.java | 2 +-
.../DataStreamProcessorPortableSelfTest.java | 2 +-
.../GridDataStreamerImplSelfTest.java | 2 +-
...ridCacheAffinityRoutingPortableSelfTest.java | 2 +-
.../GridCacheMemoryModePortableSelfTest.java | 2 +-
...acheOffHeapTieredAtomicPortableSelfTest.java | 2 +-
...eapTieredEvictionAtomicPortableSelfTest.java | 2 +-
...heOffHeapTieredEvictionPortableSelfTest.java | 2 +-
.../GridCacheOffHeapTieredPortableSelfTest.java | 2 +-
...sNearPartitionedByteArrayValuesSelfTest.java | 2 +-
...sPartitionedOnlyByteArrayValuesSelfTest.java | 2 +-
.../PlatformComputeBinarizableArgTask.java | 8 +-
.../ignite/testframework/junits/IgniteMock.java | 39 ++-
.../IgniteBinaryObjectsCacheTestSuite2.java | 33 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../IgnitePortableCacheFullApiTestSuite.java | 2 +-
.../IgnitePortableCacheTestSuite.java | 2 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 23 ++
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 -
.../IgnitePortableCacheQueryTestSuite.java | 2 +-
.../Config/Compute/compute-grid1.xml | 5 -
.../Config/marshaller-explicit.xml | 2 +-
.../Examples/ExamplesTest.cs | 5 +-
.../Messaging/MessagingExample.cs | 9 +-
.../test/resources/spring-ping-pong-partner.xml | 18 --
117 files changed, 1290 insertions(+), 845 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
index bd83cb6,30db9d9..a1c656b
--- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
@@@ -349,14 -350,5 +350,14 @@@ public interface IgniteBinary
* @return Metadata.
* @throws org.apache.ignite.binary.BinaryObjectException In case of
error.
*/
- public Collection<BinaryType> metadata() throws BinaryObjectException;
+ public Collection<BinaryType> types() throws BinaryObjectException;
+
+ /**
+ * Create enum object.
+ *
+ * @param typeName Type name.
+ * @param ord Ordinal.
+ * @return Enum object.
+ */
+ public BinaryObject buildEnum(String typeName, int ord);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
index 346ee5a,f683ed9..87a03dc
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
@@@ -64,8 -64,11 +64,8 @@@ import static org.apache.ignite.interna
* Portable object implementation.
*/
@IgniteCodeGeneratingFail // Fields arr and start should not be generated by
MessageCodeGenerator.
- public final class BinaryObjectImpl extends BinaryObjectEx implements
Externalizable, KeyCacheObject {
+ public final class BinaryObjectImpl extends BinaryObjectExImpl implements
Externalizable, KeyCacheObject {
/** */
- public static final byte TYPE_BINARY = 100;
-
- /** */
private static final long serialVersionUID = 0L;
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index d66666e,765babc..0b0ff3a
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@@ -311,8 -300,19 +312,19 @@@ public class PortableContext implement
}
for (TypeDescriptor desc : descs.descriptors()) {
- registerUserType(desc.clsName, desc.idMapper, desc.serializer,
desc.affKeyFieldName);
+ registerUserType(desc.clsName, desc.idMapper, desc.serializer,
desc.affKeyFieldName, desc.isEnum);
}
+
+ BinaryInternalIdMapper dfltMapper =
BinaryInternalIdMapper.create(globalIdMapper);
+
+ // Put affinity field names for unconfigured types.
+ for (Map.Entry<String, String> entry : affFields.entrySet()) {
+ String typeName = entry.getKey();
+
+ int typeId = dfltMapper.typeId(typeName);
+
+ affKeyFieldNames.putIfAbsent(typeId, entry.getValue());
+ }
}
/**
@@@ -531,7 -533,7 +545,8 @@@
Collection<PortableSchema> schemas = desc.schema() != null ?
Collections.singleton(desc.schema()) : null;
- metaHnd.addMeta(typeId, new BinaryMetadata(typeId, typeName,
desc.fieldsMeta(), null, schemas, desc.isEnum()).wrap(this));
- metaHnd.addMeta(typeId, new BinaryMetadata(typeId, typeName,
desc.fieldsMeta(), affFieldName, schemas).wrap(this));
++ metaHnd.addMeta(typeId,
++ new BinaryMetadata(typeId, typeName, desc.fieldsMeta(),
addFieldName, schemas, desc.isEnum()).wrap(this));
// perform put() instead of putIfAbsent() because "registered" flag
might have been changed or class loader
// might have reloaded described class.
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java
index bb7da19,ee7bd65..52f84c6
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderSerializer.java
@@@ -18,10 -18,8 +18,10 @@@
package org.apache.ignite.internal.portable.builder;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.internal.portable.BinaryMetadata;
import org.apache.ignite.internal.portable.GridPortableMarshaller;
- import org.apache.ignite.internal.portable.BinaryObjectEx;
+ import org.apache.ignite.internal.portable.BinaryObjectExImpl;
+import org.apache.ignite.internal.portable.PortableContext;
import org.apache.ignite.internal.portable.PortableUtils;
import org.apache.ignite.internal.portable.BinaryWriterExImpl;
import org.apache.ignite.internal.util.*;
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
index 4bff81a,eef39be..5b70f2a
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
@@@ -30,9 -30,9 +30,10 @@@ import org.apache.ignite.cluster.Cluste
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.portable.BinaryEnumObjectImpl;
import org.apache.ignite.internal.portable.BinaryMetadata;
import org.apache.ignite.internal.portable.BinaryMetadataHandler;
+ import org.apache.ignite.internal.portable.BinaryObjectEx;
import org.apache.ignite.internal.portable.BinaryObjectImpl;
import org.apache.ignite.internal.portable.BinaryObjectOffheapImpl;
import org.apache.ignite.internal.portable.BinaryTypeImpl;
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgniteBinaryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45eea775/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
