IGNITE-1847: WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6e21482 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6e21482 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6e21482 Branch: refs/heads/ignite-1847 Commit: a6e214820183207edf3dcbc4d4c08f957e0ff16d Parents: efe211b Author: vozerov-gridgain <[email protected]> Authored: Tue Nov 10 13:34:51 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Nov 10 13:34:51 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/binary/BinaryType.java | 11 ++++++++++- .../ignite/internal/portable/BinaryObjectEx.java | 4 ++-- .../ignite/internal/portable/BinaryTypeImpl.java | 18 ++++++------------ ...GridBinaryObjectBuilderAdditionalSelfTest.java | 2 +- .../portable/GridBinaryObjectBuilderSelfTest.java | 4 ++-- .../portable/GridPortableMetaDataSelfTest.java | 12 ++++++------ ...ientNodeBinaryObjectMetadataMultinodeTest.java | 4 ++-- ...idCacheClientNodeBinaryObjectMetadataTest.java | 5 +---- .../platform/PlatformComputePortableArgTask.java | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java index d149fd4..52bb212 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryType.java @@ -38,7 +38,7 @@ public interface BinaryType { * * @return Collection of all field names for this binary type. */ - public Collection<String> fields(); + public Collection<String> fieldNames(); /** * Gets name of the field type for a given field. @@ -49,6 +49,15 @@ public interface BinaryType { public String fieldTypeName(String fieldName); /** + * Get {@link BinaryField} for the given field name. Later this field can be used for fast field's value + * retrieval from concrete {@link BinaryObject}. + * + * @param fieldName Field name. + * @return Binary field. + */ + public BinaryField field(String fieldName); + + /** * Binary objects can optionally specify custom key-affinity mapping in the * configuration. This method returns the name of the field which should be * used for the key-affinity mapping. http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java index 50b9d42..b3512ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java @@ -176,10 +176,10 @@ public abstract class BinaryObjectEx implements BinaryObject { SB buf = new SB(meta.typeName()); - if (meta.fields() != null) { + if (meta.fieldNames() != null) { buf.a(" [hash=").a(idHash); - for (String name : meta.fields()) { + for (String name : meta.fieldNames()) { Object val = field(ctx, name); buf.a(", ").a(name).a('='); http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java index d1af2fe..9effdce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java @@ -48,7 +48,7 @@ public class BinaryTypeImpl implements BinaryType { } /** {@inheritDoc} */ - @Override public Collection<String> fields() { + @Override public Collection<String> fieldNames() { return meta.fields(); } @@ -58,7 +58,11 @@ public class BinaryTypeImpl implements BinaryType { } /** {@inheritDoc} */ - @Override public String affinityKeyFieldName() { + @Override public BinaryFieldImpl field(String fieldName) { + return ctx.createField(meta.typeId(), fieldName); + } + + public String affinityKeyFieldName() { return meta.affinityKeyFieldName(); } @@ -68,14 +72,4 @@ public class BinaryTypeImpl implements BinaryType { public BinaryMetaDataImpl metadata() { return meta; } - - /** - * Create field. - * - * @param fieldName Field name. - * @return Field. - */ - public BinaryFieldImpl field(String fieldName) { - return ctx.createField(meta.typeId(), fieldName); - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderAdditionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderAdditionalSelfTest.java index e62d12e..11b54ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderAdditionalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderAdditionalSelfTest.java @@ -998,7 +998,7 @@ public class GridBinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstrac BinaryType metadata = portables().metadata(c.getClass()); - assertTrue(metadata.fields().containsAll(Arrays.asList("intField", "intArrField", "arrField", "strField", + assertTrue(metadata.fieldNames().containsAll(Arrays.asList("intField", "intArrField", "arrField", "strField", "colField", "mapField", "enumField", "enumArrField"))); assertEquals("int", metadata.fieldTypeName("intField")); http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java index c697510..3c69440 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java @@ -789,7 +789,7 @@ public class GridBinaryObjectBuilderSelfTest extends GridCommonAbstractTest { assertEquals("MetaTest", meta.typeName()); - Collection<String> fields = meta.fields(); + Collection<String> fields = meta.fieldNames(); assertEquals(2, fields.size()); @@ -812,7 +812,7 @@ public class GridBinaryObjectBuilderSelfTest extends GridCommonAbstractTest { assertEquals("MetaTest", meta.typeName()); - fields = meta.fields(); + fields = meta.fieldNames(); assertEquals(3, fields.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java index c0e2563..2a367a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java @@ -93,7 +93,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { switch (meta.typeName()) { case "TestObject1": - fields = meta.fields(); + fields = meta.fieldNames(); assertEquals(7, fields.size()); @@ -116,7 +116,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { break; case "TestObject2": - fields = meta.fields(); + fields = meta.fieldNames(); assertEquals(7, fields.size()); @@ -165,7 +165,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { assertEquals("TestObject1", meta.typeName()); - Collection<String> fields = meta.fields(); + Collection<String> fields = meta.fieldNames(); assertEquals(7, fields.size()); @@ -198,7 +198,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { assertEquals("TestObject2", meta.typeName()); - Collection<String> fields = meta.fields(); + Collection<String> fields = meta.fieldNames(); assertEquals(7, fields.size()); @@ -235,7 +235,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { assertEquals("TestObject2", meta.typeName()); - Collection<String> fields = meta.fields(); + Collection<String> fields = meta.fieldNames(); assertEquals(9, fields.size()); @@ -284,7 +284,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest { assertEquals("TestObject1", meta.typeName()); - Collection<String> fields = meta.fields(); + Collection<String> fields = meta.fieldNames(); assertEquals(7, fields.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java index a33eb7b..d19c1ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java @@ -169,7 +169,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertNull(meta.affinityKeyFieldName()); - assertEquals(10, meta.fields().size()); + assertEquals(10, meta.fieldNames().size()); } assertEquals(allTypes.size(), names.size()); @@ -255,7 +255,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo assertNull(meta.affinityKeyFieldName()); - assertEquals(1, meta.fields().size()); + assertEquals(1, meta.fieldNames().size()); } assertEquals(1000, names.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java index b20adb8..10c06a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.portable; import java.util.Arrays; import java.util.Collection; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheKeyConfiguration; import org.apache.ignite.cache.CacheMode; @@ -29,9 +28,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -127,7 +124,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra for (BinaryType m2 : meta1) { if (m1.typeName().equals(m2.typeName())) { assertEquals(m1.affinityKeyFieldName(), m2.affinityKeyFieldName()); - assertEquals(m1.fields(), m2.fields()); + assertEquals(m1.fieldNames(), m2.fieldNames()); found = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/a6e21482/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java index 1e3c499..cae7a6f 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java @@ -94,7 +94,7 @@ public class PlatformComputePortableArgTask extends ComputeTaskAdapter<Object, I if (meta == null) throw new IgniteException("Metadata doesn't exist."); - if (meta.fields() == null || !meta.fields().contains("Field")) + if (meta.fieldNames() == null || !meta.fieldNames().contains("Field")) throw new IgniteException("Field metadata doesn't exist."); if (!F.eq("int", meta.fieldTypeName("Field")))
