ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [6/7] ignite git commit: Merge branch 'ignite-1282' into ignite-1847
Date Wed, 11 Nov 2015 07:44:52 GMT
Merge branch 'ignite-1282' into ignite-1847

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f6a5880
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f6a5880
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f6a5880

Branch: refs/heads/ignite-1847
Commit: 8f6a58803c1d6a5083e05a2ea4b3a9ea40cd0121
Parents: 326c1f1 0dc8902
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Nov 11 10:44:18 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Nov 11 10:44:18 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteBinary.java    |  2 +-
 .../apache/ignite/binary/BinaryIdMapper.java    | 56 ++++++++++++++++++++
 .../org/apache/ignite/binary/BinaryReader.java  |  2 +-
 .../ignite/binary/BinaryTypeConfiguration.java  |  6 +--
 .../ignite/binary/BinaryTypeIdMapper.java       | 56 --------------------
 .../org/apache/ignite/binary/BinaryWriter.java  |  2 +-
 .../internal/portable/BinaryReaderExImpl.java   |  4 +-
 .../internal/portable/BinaryWriterExImpl.java   |  4 +-
 .../portable/PortableClassDescriptor.java       |  8 +--
 .../internal/portable/PortableContext.java      | 42 +++++++--------
 .../marshaller/portable/PortableMarshaller.java |  8 +--
 .../GridBinaryObjectBuilderSelfTest.java        |  4 +-
 .../GridPortableMarshallerSelfTest.java         | 26 ++++-----
 .../portable/GridPortableWildcardsSelfTest.java | 35 ++++++------
 .../cpp/common/include/ignite/common/java.h     |  2 +-
 modules/platforms/cpp/common/src/java.cpp       |  6 +--
 16 files changed, 133 insertions(+), 130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/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 377273c,f779706..f721f12
--- 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
@@@ -128,13 -128,13 +128,13 @@@ public class PortableContext implement
      private final Map<Class<? extends Map>, Byte> mapTypes = new HashMap<>();
  
      /** */
-     private final ConcurrentMap<Integer, BinaryTypeIdMapper> mappers = new ConcurrentHashMap8<>(0);
+     private final ConcurrentMap<Integer, BinaryIdMapper> mappers = new ConcurrentHashMap8<>(0);
  
      /** */
-     private final Map<String, BinaryTypeIdMapper> typeMappers = new ConcurrentHashMap8<>(0);
+     private final Map<String, BinaryIdMapper> typeMappers = new ConcurrentHashMap8<>(0);
  
      /** */
 -    private PortableMetaDataHandler metaHnd;
 +    private BinaryMetadataHandler metaHnd;
  
      /** */
      private MarshallerContext marshCtx;

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
index 1b036d1,7522bf9..bc901fa
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
@@@ -23,11 -23,11 +23,14 @@@ import org.apache.ignite.configuration.
  import org.apache.ignite.internal.util.typedef.internal.U;
  import org.apache.ignite.marshaller.MarshallerContextTestImpl;
  import org.apache.ignite.marshaller.portable.PortableMarshaller;
 -import org.apache.ignite.binary.BinaryIdMapper;
++import org.apache.ignite.binary.BinaryTypeIdMapper;
+ import org.apache.ignite.binary.BinaryType;
+ import org.apache.ignite.binary.BinaryTypeConfiguration;
  import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
  
 +import java.util.Arrays;
 +import java.util.Map;
 +
  /**
   * Wildcards test.
   */


Mime
View raw message