http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java new file mode 100644 index 0000000..c1d9e6e --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryWriterExImpl.java @@ -0,0 +1,1915 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.portable; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.binary.BinaryTypeIdMapper; +import org.apache.ignite.internal.portable.streams.PortableHeapOutputStream; +import org.apache.ignite.internal.portable.streams.PortableOutputStream; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryRawWriter; +import org.apache.ignite.binary.BinaryWriter; +import org.jetbrains.annotations.Nullable; + +import java.io.IOException; +import java.io.ObjectOutput; +import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Timestamp; +import java.util.Collection; +import java.util.Date; +import java.util.IdentityHashMap; +import java.util.Map; +import java.util.UUID; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.CHAR_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLASS; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.COL; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DATE_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DECIMAL_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.DOUBLE_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.ENUM_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLAGS_POS; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.FLOAT_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.INT_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.LONG_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.MAP_ENTRY; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.NULL; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.OBJ_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.OPTM_MARSH; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.PORTABLE_OBJ; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.SCHEMA_ID_POS; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.SCHEMA_OR_RAW_OFF_POS; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.SHORT_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.STRING_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.TIMESTAMP; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.TIMESTAMP_ARR; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.TOTAL_LEN_POS; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.UNREGISTERED_TYPE_ID; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID; +import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID_ARR; + +/** + * Portable writer implementation. + */ +public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, ObjectOutput { + /** Length: integer. */ + private static final int LEN_INT = 4; + + /** */ + private static final int INIT_CAP = 1024; + + /** FNV1 hash offset basis. */ + private static final int FNV1_OFFSET_BASIS = 0x811C9DC5; + + /** FNV1 hash prime. */ + private static final int FNV1_PRIME = 0x01000193; + + /** Maximum offset which fits in 1 byte. */ + private static final int MAX_OFFSET_1 = 1 << 8; + + /** Maximum offset which fits in 2 bytes. */ + private static final int MAX_OFFSET_2 = 1 << 16; + + /** Thread-local schema. */ + private static final ThreadLocal<SchemaHolder> SCHEMA = new ThreadLocal<>(); + + /** */ + private final PortableContext ctx; + + /** */ + private final int start; + + /** */ + private Class<?> cls; + + /** */ + private int typeId; + + /** Raw offset position. */ + private int rawOffPos; + + /** */ + private boolean metaEnabled; + + /** */ + private int metaHashSum; + + /** Handles. */ + private Map<Object, Integer> handles; + + /** Output stream. */ + private PortableOutputStream out; + + /** Schema. */ + private SchemaHolder schema; + + /** Schema ID. */ + private int schemaId; + + /** Amount of written fields. */ + private int fieldCnt; + + /** ID mapper. */ + private BinaryTypeIdMapper idMapper; + + /** + * @param ctx Context. + */ + BinaryWriterExImpl(PortableContext ctx) { + this(ctx, new PortableHeapOutputStream(INIT_CAP)); + } + + /** + * @param ctx Context. + * @param out Output stream. + */ + BinaryWriterExImpl(PortableContext ctx, PortableOutputStream out) { + this(ctx, out, new IdentityHashMap<Object, Integer>()); + } + + /** + * @param ctx Context. + * @param out Output stream. + * @param handles Handles. + */ + private BinaryWriterExImpl(PortableContext ctx, PortableOutputStream out, Map<Object, Integer> handles) { + this.ctx = ctx; + this.out = out; + this.handles = handles; + + start = out.position(); + } + + /** + * @param ctx Context. + * @param typeId Type ID. + */ + public BinaryWriterExImpl(PortableContext ctx, int typeId, boolean metaEnabled) { + this(ctx); + + this.typeId = typeId; + this.metaEnabled = metaEnabled; + } + + /** + * Close the writer releasing resources if necessary. + */ + @Override public void close() { + out.close(); + } + + /** + * @return Meta data hash sum or {@code null} if meta data is disabled. + */ + @Nullable Integer metaDataHashSum() { + return metaEnabled ? metaHashSum : null; + } + + /** + * @param obj Object. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void marshal(Object obj) throws BinaryObjectException { + marshal(obj, true); + } + + /** + * @param obj Object. + * @param enableReplace Object replacing enabled flag. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void marshal(Object obj, boolean enableReplace) throws BinaryObjectException { + assert obj != null; + + cls = obj.getClass(); + + PortableClassDescriptor desc = ctx.descriptorForClass(cls); + + if (desc == null) + throw new BinaryObjectException("Object is not portable: [class=" + cls + ']'); + + if (desc.excluded()) { + doWriteByte(NULL); + return; + } + + if (desc.useOptimizedMarshaller()) { + writeByte(OPTM_MARSH); + + try { + byte[] arr = ctx.optimizedMarsh().marshal(obj); + + writeInt(arr.length); + + write(arr); + } + catch (IgniteCheckedException e) { + throw new BinaryObjectException("Failed to marshal object with optimized marshaller: " + obj, e); + } + + return; + } + + if (enableReplace && desc.getWriteReplaceMethod() != null) { + Object replacedObj; + + try { + replacedObj = desc.getWriteReplaceMethod().invoke(obj); + } + catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + catch (InvocationTargetException e) { + if (e.getTargetException() instanceof BinaryObjectException) + throw (BinaryObjectException)e.getTargetException(); + + throw new BinaryObjectException("Failed to execute writeReplace() method on " + obj, e); + } + + if (replacedObj == null) { + doWriteByte(NULL); + return; + } + + marshal(replacedObj, false); + + return; + } + + typeId = desc.typeId(); + + metaEnabled = ctx.isMetaDataEnabled(typeId); + + desc.write(obj, this); + } + + /** + * @param obj Object. + * @return Handle. + */ + int handle(Object obj) { + assert obj != null; + + Integer h = handles.get(obj); + + if (h != null) + return out.position() - h; + else { + handles.put(obj, out.position()); + + return -1; + } + } + + /** + * @return Array. + */ + public byte[] array() { + return out.arrayCopy(); + } + + /** + * @return Stream current position. + */ + int position() { + return out.position(); + } + + /** + * Sets new position. + * + * @param pos Position. + */ + void position(int pos) { + out.position(pos); + } + + /** + * @param bytes Number of bytes to reserve. + * @return Offset. + */ + public int reserve(int bytes) { + int pos = out.position(); + + out.position(pos + bytes); + + return pos; + } + + /** + * Perform post-write activity. This includes: + * - writing object length; + * - writing schema offset; + * - writing schema to the tail. + * + * @param userType User type flag. + */ + public void postWrite(boolean userType) { + if (schema != null) { + // Write schema ID. + out.writeInt(start + SCHEMA_ID_POS, schemaId); + + // Write schema offset. + out.writeInt(start + SCHEMA_OR_RAW_OFF_POS, out.position() - start); + + // Write the schema. + int offsetByteCnt = schema.write(this, fieldCnt); + + // Write raw offset if needed. + if (rawOffPos != 0) + out.writeInt(rawOffPos - start); + + if (offsetByteCnt == PortableUtils.OFFSET_1) { + int flags = (userType ? PortableUtils.FLAG_USR_TYP : 0) | PortableUtils.FLAG_OFFSET_ONE_BYTE; + + out.writeShort(start + FLAGS_POS, (short)flags); + } + else if (offsetByteCnt == PortableUtils.OFFSET_2) { + int flags = (userType ? PortableUtils.FLAG_USR_TYP : 0) | PortableUtils.FLAG_OFFSET_TWO_BYTES; + + out.writeShort(start + FLAGS_POS, (short)flags); + } + } + else { + // Write raw-only flag is needed. + int flags = (userType ? PortableUtils.FLAG_USR_TYP : 0) | PortableUtils.FLAG_RAW_ONLY; + + out.writeShort(start + FLAGS_POS, (short)flags); + + // If there are no schema, we are free to write raw offset to schema offset. + out.writeInt(start + SCHEMA_OR_RAW_OFF_POS, (rawOffPos == 0 ? out.position() : rawOffPos) - start); + } + + // 5. Write length. + out.writeInt(start + TOTAL_LEN_POS, out.position() - start); + } + + /** + * Pop schema. + */ + public void popSchema() { + if (schema != null) { + assert fieldCnt > 0; + + schema.pop(fieldCnt); + } + } + + /** + * @param val Byte array. + */ + public void write(byte[] val) { + assert val != null; + + out.writeByteArray(val); + } + + /** + * @param val Byte array. + * @param off Offset. + * @param len Length. + */ + public void write(byte[] val, int off, int len) { + assert val != null; + + out.write(val, off, len); + } + + /** + * @param val Value. + */ + public void doWriteByte(byte val) { + out.writeByte(val); + } + + /** + * @param val Value. + */ + public void doWriteShort(short val) { + out.writeShort(val); + } + + /** + * @param val Value. + */ + public void doWriteInt(int val) { + out.writeInt(val); + } + + /** + * @param val Value. + */ + public void doWriteLong(long val) { + out.writeLong(val); + } + + /** + * @param val Value. + */ + public void doWriteFloat(float val) { + out.writeFloat(val); + } + + /** + * @param val Value. + */ + public void doWriteDouble(double val) { + out.writeDouble(val); + } + + /** + * @param val Value. + */ + public void doWriteChar(char val) { + out.writeChar(val); + } + + /** + * @param val Value. + */ + public void doWriteBoolean(boolean val) { + out.writeBoolean(val); + } + + /** + * @param val String value. + */ + public void doWriteDecimal(@Nullable BigDecimal val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(DECIMAL); + + BigInteger intVal = val.unscaledValue(); + + if (intVal.signum() == -1) { + intVal = intVal.negate(); + + out.writeInt(val.scale() | 0x80000000); + } + else + out.writeInt(val.scale()); + + byte[] vals = intVal.toByteArray(); + + out.writeInt(vals.length); + out.writeByteArray(vals); + } + } + + /** + * @param val String value. + */ + public void doWriteString(@Nullable String val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(STRING); + + if (ctx.isConvertString()) { + doWriteBoolean(true); + + byte[] strArr = val.getBytes(UTF_8); + + doWriteInt(strArr.length); + + out.writeByteArray(strArr); + } + else { + doWriteBoolean(false); + + char[] strArr = val.toCharArray(); + + doWriteInt(strArr.length); + + out.writeCharArray(strArr); + } + } + } + + /** + * @param uuid UUID. + */ + public void doWriteUuid(@Nullable UUID uuid) { + if (uuid == null) + doWriteByte(NULL); + else { + doWriteByte(UUID); + doWriteLong(uuid.getMostSignificantBits()); + doWriteLong(uuid.getLeastSignificantBits()); + } + } + + /** + * @param date Date. + */ + public void doWriteDate(@Nullable Date date) { + if (date == null) + doWriteByte(NULL); + else { + doWriteByte(DATE); + doWriteLong(date.getTime()); + } + } + + /** + * @param ts Timestamp. + */ + public void doWriteTimestamp(@Nullable Timestamp ts) { + if (ts== null) + doWriteByte(NULL); + else { + doWriteByte(TIMESTAMP); + doWriteLong(ts.getTime()); + doWriteInt(ts.getNanos() % 1000000); + } + } + + /** + * Write object. + * + * @param obj Object. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + public void doWriteObject(@Nullable Object obj) throws BinaryObjectException { + if (obj == null) + doWriteByte(NULL); + else { + BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out, handles); + + writer.marshal(obj); + } + } + + /** + * @param val Byte array. + */ + void doWriteByteArray(@Nullable byte[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(BYTE_ARR); + doWriteInt(val.length); + + out.writeByteArray(val); + } + } + + /** + * @param val Short array. + */ + void doWriteShortArray(@Nullable short[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(SHORT_ARR); + doWriteInt(val.length); + + out.writeShortArray(val); + } + } + + /** + * @param val Integer array. + */ + void doWriteIntArray(@Nullable int[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(INT_ARR); + doWriteInt(val.length); + + out.writeIntArray(val); + } + } + + /** + * @param val Long array. + */ + void doWriteLongArray(@Nullable long[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(LONG_ARR); + doWriteInt(val.length); + + out.writeLongArray(val); + } + } + + /** + * @param val Float array. + */ + void doWriteFloatArray(@Nullable float[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(FLOAT_ARR); + doWriteInt(val.length); + + out.writeFloatArray(val); + } + } + + /** + * @param val Double array. + */ + void doWriteDoubleArray(@Nullable double[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(DOUBLE_ARR); + doWriteInt(val.length); + + out.writeDoubleArray(val); + } + } + + /** + * @param val Char array. + */ + void doWriteCharArray(@Nullable char[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(CHAR_ARR); + doWriteInt(val.length); + + out.writeCharArray(val); + } + } + + /** + * @param val Boolean array. + */ + void doWriteBooleanArray(@Nullable boolean[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(BOOLEAN_ARR); + doWriteInt(val.length); + + out.writeBooleanArray(val); + } + } + + /** + * @param val Array of strings. + */ + void doWriteDecimalArray(@Nullable BigDecimal[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(DECIMAL_ARR); + doWriteInt(val.length); + + for (BigDecimal str : val) + doWriteDecimal(str); + } + } + + /** + * @param val Array of strings. + */ + void doWriteStringArray(@Nullable String[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(STRING_ARR); + doWriteInt(val.length); + + for (String str : val) + doWriteString(str); + } + } + + /** + * @param val Array of UUIDs. + */ + void doWriteUuidArray(@Nullable UUID[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(UUID_ARR); + doWriteInt(val.length); + + for (UUID uuid : val) + doWriteUuid(uuid); + } + } + + /** + * @param val Array of dates. + */ + void doWriteDateArray(@Nullable Date[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(DATE_ARR); + doWriteInt(val.length); + + for (Date date : val) + doWriteDate(date); + } + } + + /** + * @param val Array of timestamps. + */ + void doWriteTimestampArray(@Nullable Timestamp[] val) { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + doWriteByte(TIMESTAMP_ARR); + doWriteInt(val.length); + + for (Timestamp ts : val) + doWriteTimestamp(ts); + } + } + + /** + * @param val Array of objects. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void doWriteObjectArray(@Nullable Object[] val) throws BinaryObjectException { + if (val == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(val)) + return; + + PortableClassDescriptor desc = ctx.descriptorForClass(val.getClass().getComponentType()); + + doWriteByte(OBJ_ARR); + + if (desc.registered()) + doWriteInt(desc.typeId()); + else { + doWriteInt(UNREGISTERED_TYPE_ID); + doWriteString(val.getClass().getComponentType().getName()); + } + + doWriteInt(val.length); + + for (Object obj : val) + doWriteObject(obj); + } + } + + /** + * @param col Collection. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void doWriteCollection(@Nullable Collection<?> col) throws BinaryObjectException { + if (col == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(col)) + return; + + doWriteByte(COL); + doWriteInt(col.size()); + doWriteByte(ctx.collectionType(col.getClass())); + + for (Object obj : col) + doWriteObject(obj); + } + } + + /** + * @param map Map. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void doWriteMap(@Nullable Map<?, ?> map) throws BinaryObjectException { + if (map == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(map)) + return; + + doWriteByte(MAP); + doWriteInt(map.size()); + doWriteByte(ctx.mapType(map.getClass())); + + for (Map.Entry<?, ?> e : map.entrySet()) { + doWriteObject(e.getKey()); + doWriteObject(e.getValue()); + } + } + } + + /** + * @param e Map entry. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void doWriteMapEntry(@Nullable Map.Entry<?, ?> e) throws BinaryObjectException { + if (e == null) + doWriteByte(NULL); + else { + if (tryWriteAsHandle(e)) + return; + + doWriteByte(MAP_ENTRY); + doWriteObject(e.getKey()); + doWriteObject(e.getValue()); + } + } + + /** + * @param val Value. + */ + void doWriteEnum(@Nullable Enum<?> val) { + if (val == null) + doWriteByte(NULL); + else { + PortableClassDescriptor desc = ctx.descriptorForClass(val.getClass()); + + doWriteByte(ENUM); + + if (desc.registered()) + doWriteInt(desc.typeId()); + else { + doWriteInt(UNREGISTERED_TYPE_ID); + doWriteString(val.getClass().getName()); + } + + doWriteInt(val.ordinal()); + } + } + + /** + * @param val Array. + */ + void doWriteEnumArray(@Nullable Object[] val) { + assert val == null || val.getClass().getComponentType().isEnum(); + + if (val == null) + doWriteByte(NULL); + else { + PortableClassDescriptor desc = ctx.descriptorForClass(val.getClass().getComponentType()); + doWriteByte(ENUM_ARR); + + if (desc.registered()) + doWriteInt(desc.typeId()); + else { + doWriteInt(UNREGISTERED_TYPE_ID); + doWriteString(val.getClass().getComponentType().getName()); + } + + doWriteInt(val.length); + + // TODO: Denis: Redundant data for each element of the array. + for (Object o : val) + doWriteEnum((Enum<?>)o); + } + } + + /** + * @param val Class. + */ + void doWriteClass(@Nullable Class val) { + if (val == null) + doWriteByte(NULL); + else { + PortableClassDescriptor desc = ctx.descriptorForClass(val); + + doWriteByte(CLASS); + + if (desc.registered()) + doWriteInt(desc.typeId()); + else { + doWriteInt(UNREGISTERED_TYPE_ID); + doWriteString(val.getClass().getName()); + } + } + } + + /** + * @param po Portable object. + */ + public void doWritePortableObject(@Nullable BinaryObjectImpl po) { + if (po == null) + doWriteByte(NULL); + else { + doWriteByte(PORTABLE_OBJ); + + byte[] poArr = po.array(); + + doWriteInt(poArr.length); + + out.writeByteArray(poArr); + + doWriteInt(po.start()); + } + } + + /** + * @param val Value. + */ + void writeByteField(@Nullable Byte val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(BYTE); + doWriteByte(val); + } + } + + /** + * @param val Class. + */ + void writeClassField(@Nullable Class val) { + doWriteClass(val); + } + + /** + * @param val Value. + */ + void writeShortField(@Nullable Short val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(SHORT); + doWriteShort(val); + } + } + + /** + * @param val Value. + */ + void writeIntField(@Nullable Integer val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(INT); + doWriteInt(val); + } + } + + /** + * @param val Value. + */ + void writeLongField(@Nullable Long val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(LONG); + doWriteLong(val); + } + } + + /** + * @param val Value. + */ + void writeFloatField(@Nullable Float val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(FLOAT); + doWriteFloat(val); + } + } + + /** + * @param val Value. + */ + void writeDoubleField(@Nullable Double val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(DOUBLE); + doWriteDouble(val); + } + } + + /** + * @param val Value. + */ + void writeCharField(@Nullable Character val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(CHAR); + doWriteChar(val); + } + } + + /** + * @param val Value. + */ + void writeBooleanField(@Nullable Boolean val) { + if (val == null) + doWriteByte(NULL); + else { + doWriteByte(BOOLEAN); + doWriteBoolean(val); + } + } + + /** + * @param val Value. + */ + void writeDecimalField(@Nullable BigDecimal val) { + doWriteDecimal(val); + } + + /** + * @param val Value. + */ + void writeStringField(@Nullable String val) { + doWriteString(val); + } + + /** + * @param val Value. + */ + void writeUuidField(@Nullable UUID val) { + doWriteUuid(val); + } + + /** + * @param val Value. + */ + void writeDateField(@Nullable Date val) { + doWriteDate(val); + } + + /** + * @param val Value. + */ + void writeTimestampField(@Nullable Timestamp val) { + doWriteTimestamp(val); + } + + /** + * @param obj Object. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writeObjectField(@Nullable Object obj) throws BinaryObjectException { + doWriteObject(obj); + } + + /** + * @param val Value. + */ + void writeByteArrayField(@Nullable byte[] val) { + doWriteByteArray(val); + } + + /** + * @param val Value. + */ + void writeShortArrayField(@Nullable short[] val) { + doWriteShortArray(val); + } + + /** + * @param val Value. + */ + void writeIntArrayField(@Nullable int[] val) { + doWriteIntArray(val); + } + + /** + * @param val Value. + */ + void writeLongArrayField(@Nullable long[] val) { + doWriteLongArray(val); + } + + /** + * @param val Value. + */ + void writeFloatArrayField(@Nullable float[] val) { + doWriteFloatArray(val); + } + + /** + * @param val Value. + */ + void writeDoubleArrayField(@Nullable double[] val) { + doWriteDoubleArray(val); + } + + /** + * @param val Value. + */ + void writeCharArrayField(@Nullable char[] val) { + doWriteCharArray(val); + } + + /** + * @param val Value. + */ + void writeBooleanArrayField(@Nullable boolean[] val) { + doWriteBooleanArray(val); + } + + /** + * @param val Value. + */ + void writeDecimalArrayField(@Nullable BigDecimal[] val) { + doWriteDecimalArray(val); + } + + /** + * @param val Value. + */ + void writeStringArrayField(@Nullable String[] val) { + doWriteStringArray(val); + } + + /** + * @param val Value. + */ + void writeUuidArrayField(@Nullable UUID[] val) { + doWriteUuidArray(val); + } + + /** + * @param val Value. + */ + void writeDateArrayField(@Nullable Date[] val) { + doWriteDateArray(val); + } + + /** + * @param val Value. + */ + void writeTimestampArrayField(@Nullable Timestamp[] val) { + doWriteTimestampArray(val); + } + + /** + * @param val Value. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writeObjectArrayField(@Nullable Object[] val) throws BinaryObjectException { + doWriteObjectArray(val); + } + + /** + * @param col Collection. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writeCollectionField(@Nullable Collection<?> col) throws BinaryObjectException { + doWriteCollection(col); + } + + /** + * @param map Map. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writeMapField(@Nullable Map<?, ?> map) throws BinaryObjectException { + doWriteMap(map); + } + + /** + * @param e Map entry. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writeMapEntryField(@Nullable Map.Entry<?, ?> e) throws BinaryObjectException { + doWriteMapEntry(e); + } + + /** + * @param val Value. + */ + void writeEnumField(@Nullable Enum<?> val) { + doWriteEnum(val); + } + + /** + * @param val Value. + */ + void writeEnumArrayField(@Nullable Object[] val) { + doWriteEnumArray(val); + } + + /** + * @param po Portable object. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. + */ + void writePortableObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException { + doWritePortableObject(po); + } + + /** {@inheritDoc} */ + @Override public void writeByte(String fieldName, byte val) throws BinaryObjectException { + writeFieldId(fieldName, BYTE); + writeByteField(val); + } + + /** {@inheritDoc} */ + @Override public void writeByte(byte val) throws BinaryObjectException { + doWriteByte(val); + } + + /** {@inheritDoc} */ + @Override public void writeShort(String fieldName, short val) throws BinaryObjectException { + writeFieldId(fieldName, SHORT); + writeShortField(val); + } + + /** {@inheritDoc} */ + @Override public void writeShort(short val) throws BinaryObjectException { + doWriteShort(val); + } + + /** {@inheritDoc} */ + @Override public void writeInt(String fieldName, int val) throws BinaryObjectException { + writeFieldId(fieldName, INT); + writeIntField(val); + } + + /** {@inheritDoc} */ + @Override public void writeInt(int val) throws BinaryObjectException { + doWriteInt(val); + } + + /** {@inheritDoc} */ + @Override public void writeLong(String fieldName, long val) throws BinaryObjectException { + writeFieldId(fieldName, LONG); + writeLongField(val); + } + + /** {@inheritDoc} */ + @Override public void writeLong(long val) throws BinaryObjectException { + doWriteLong(val); + } + + /** {@inheritDoc} */ + @Override public void writeFloat(String fieldName, float val) throws BinaryObjectException { + writeFieldId(fieldName, FLOAT); + writeFloatField(val); + } + + /** {@inheritDoc} */ + @Override public void writeFloat(float val) throws BinaryObjectException { + doWriteFloat(val); + } + + /** {@inheritDoc} */ + @Override public void writeDouble(String fieldName, double val) throws BinaryObjectException { + writeFieldId(fieldName, DOUBLE); + writeDoubleField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDouble(double val) throws BinaryObjectException { + doWriteDouble(val); + } + + /** {@inheritDoc} */ + @Override public void writeChar(String fieldName, char val) throws BinaryObjectException { + writeFieldId(fieldName, CHAR); + writeCharField(val); + } + + /** {@inheritDoc} */ + @Override public void writeChar(char val) throws BinaryObjectException { + doWriteChar(val); + } + + /** {@inheritDoc} */ + @Override public void writeBoolean(String fieldName, boolean val) throws BinaryObjectException { + writeFieldId(fieldName, BOOLEAN); + writeBooleanField(val); + } + + /** {@inheritDoc} */ + @Override public void writeBoolean(boolean val) throws BinaryObjectException { + doWriteBoolean(val); + } + + /** {@inheritDoc} */ + @Override public void writeDecimal(String fieldName, @Nullable BigDecimal val) throws BinaryObjectException { + writeFieldId(fieldName, DECIMAL); + writeDecimalField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDecimal(@Nullable BigDecimal val) throws BinaryObjectException { + doWriteDecimal(val); + } + + /** {@inheritDoc} */ + @Override public void writeString(String fieldName, @Nullable String val) throws BinaryObjectException { + writeFieldId(fieldName, STRING); + writeStringField(val); + } + + /** {@inheritDoc} */ + @Override public void writeString(@Nullable String val) throws BinaryObjectException { + doWriteString(val); + } + + /** {@inheritDoc} */ + @Override public void writeUuid(String fieldName, @Nullable UUID val) throws BinaryObjectException { + writeFieldId(fieldName, UUID); + writeUuidField(val); + } + + /** {@inheritDoc} */ + @Override public void writeUuid(@Nullable UUID val) throws BinaryObjectException { + doWriteUuid(val); + } + + /** {@inheritDoc} */ + @Override public void writeDate(String fieldName, @Nullable Date val) throws BinaryObjectException { + writeFieldId(fieldName, DATE); + writeDateField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDate(@Nullable Date val) throws BinaryObjectException { + doWriteDate(val); + } + + /** {@inheritDoc} */ + @Override public void writeTimestamp(String fieldName, @Nullable Timestamp val) throws BinaryObjectException { + writeFieldId(fieldName, TIMESTAMP); + writeTimestampField(val); + } + + /** {@inheritDoc} */ + @Override public void writeTimestamp(@Nullable Timestamp val) throws BinaryObjectException { + doWriteTimestamp(val); + } + + /** {@inheritDoc} */ + @Override public void writeObject(String fieldName, @Nullable Object obj) throws BinaryObjectException { + writeFieldId(fieldName, OBJ); + writeObjectField(obj); + } + + /** {@inheritDoc} */ + @Override public void writeObject(@Nullable Object obj) throws BinaryObjectException { + doWriteObject(obj); + } + + /** {@inheritDoc} */ + @Override public void writeObjectDetached(@Nullable Object obj) throws BinaryObjectException { + if (obj == null) + doWriteByte(NULL); + else { + BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out, new IdentityHashMap<Object, Integer>()); + + writer.marshal(obj); + } + } + + /** {@inheritDoc} */ + @Override public void writeByteArray(String fieldName, @Nullable byte[] val) throws BinaryObjectException { + writeFieldId(fieldName, BYTE_ARR); + writeByteArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeByteArray(@Nullable byte[] val) throws BinaryObjectException { + doWriteByteArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeShortArray(String fieldName, @Nullable short[] val) throws BinaryObjectException { + writeFieldId(fieldName, SHORT_ARR); + writeShortArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeShortArray(@Nullable short[] val) throws BinaryObjectException { + doWriteShortArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeIntArray(String fieldName, @Nullable int[] val) throws BinaryObjectException { + writeFieldId(fieldName, INT_ARR); + writeIntArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeIntArray(@Nullable int[] val) throws BinaryObjectException { + doWriteIntArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeLongArray(String fieldName, @Nullable long[] val) throws BinaryObjectException { + writeFieldId(fieldName, LONG_ARR); + writeLongArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeLongArray(@Nullable long[] val) throws BinaryObjectException { + doWriteLongArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeFloatArray(String fieldName, @Nullable float[] val) throws BinaryObjectException { + writeFieldId(fieldName, FLOAT_ARR); + writeFloatArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeFloatArray(@Nullable float[] val) throws BinaryObjectException { + doWriteFloatArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeDoubleArray(String fieldName, @Nullable double[] val) + throws BinaryObjectException { + writeFieldId(fieldName, DOUBLE_ARR); + writeDoubleArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDoubleArray(@Nullable double[] val) throws BinaryObjectException { + doWriteDoubleArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeCharArray(String fieldName, @Nullable char[] val) throws BinaryObjectException { + writeFieldId(fieldName, CHAR_ARR); + writeCharArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeCharArray(@Nullable char[] val) throws BinaryObjectException { + doWriteCharArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeBooleanArray(String fieldName, @Nullable boolean[] val) + throws BinaryObjectException { + writeFieldId(fieldName, BOOLEAN_ARR); + writeBooleanArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeBooleanArray(@Nullable boolean[] val) throws BinaryObjectException { + doWriteBooleanArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeDecimalArray(String fieldName, @Nullable BigDecimal[] val) + throws BinaryObjectException { + writeFieldId(fieldName, DECIMAL_ARR); + writeDecimalArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDecimalArray(@Nullable BigDecimal[] val) throws BinaryObjectException { + doWriteDecimalArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeStringArray(String fieldName, @Nullable String[] val) + throws BinaryObjectException { + writeFieldId(fieldName, STRING_ARR); + writeStringArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeStringArray(@Nullable String[] val) throws BinaryObjectException { + doWriteStringArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeUuidArray(String fieldName, @Nullable UUID[] val) throws BinaryObjectException { + writeFieldId(fieldName, UUID_ARR); + writeUuidArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeUuidArray(@Nullable UUID[] val) throws BinaryObjectException { + doWriteUuidArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeDateArray(String fieldName, @Nullable Date[] val) throws BinaryObjectException { + writeFieldId(fieldName, DATE_ARR); + writeDateArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeDateArray(@Nullable Date[] val) throws BinaryObjectException { + doWriteDateArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeTimestampArray(String fieldName, @Nullable Timestamp[] val) throws BinaryObjectException { + writeFieldId(fieldName, TIMESTAMP_ARR); + writeTimestampArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeTimestampArray(@Nullable Timestamp[] val) throws BinaryObjectException { + doWriteTimestampArray(val); + } + + /** {@inheritDoc} */ + @Override public void writeObjectArray(String fieldName, @Nullable Object[] val) throws BinaryObjectException { + writeFieldId(fieldName, OBJ_ARR); + writeObjectArrayField(val); + } + + /** {@inheritDoc} */ + @Override public void writeObjectArray(@Nullable Object[] val) throws BinaryObjectException { + doWriteObjectArray(val); + } + + /** {@inheritDoc} */ + @Override public <T> void writeCollection(String fieldName, @Nullable Collection<T> col) + throws BinaryObjectException { + writeFieldId(fieldName, COL); + writeCollectionField(col); + } + + /** {@inheritDoc} */ + @Override public <T> void writeCollection(@Nullable Collection<T> col) throws BinaryObjectException { + doWriteCollection(col); + } + + /** {@inheritDoc} */ + @Override public <K, V> void writeMap(String fieldName, @Nullable Map<K, V> map) + throws BinaryObjectException { + writeFieldId(fieldName, MAP); + writeMapField(map); + } + + /** {@inheritDoc} */ + @Override public <K, V> void writeMap(@Nullable Map<K, V> map) throws BinaryObjectException { + doWriteMap(map); + } + + /** {@inheritDoc} */ + @Override public <T extends Enum<?>> void writeEnum(String fieldName, T val) throws BinaryObjectException { + writeFieldId(fieldName, ENUM); + writeEnumField(val); + } + + /** {@inheritDoc} */ + @Override public <T extends Enum<?>> void writeEnum(T val) throws BinaryObjectException { + doWriteEnum(val); + } + + /** {@inheritDoc} */ + @Override public <T extends Enum<?>> void writeEnumArray(String fieldName, T[] val) throws BinaryObjectException { + writeFieldId(fieldName, ENUM_ARR); + writeEnumArrayField(val); + } + + /** {@inheritDoc} */ + @Override public <T extends Enum<?>> void writeEnumArray(T[] val) throws BinaryObjectException { + doWriteEnumArray(val); + } + + /** {@inheritDoc} */ + @Override public BinaryRawWriter rawWriter() { + if (rawOffPos == 0) + rawOffPos = out.position(); + + return this; + } + + /** {@inheritDoc} */ + @Override public PortableOutputStream out() { + return out; + } + + /** {@inheritDoc} */ + @SuppressWarnings("NullableProblems") + @Override public void writeBytes(String s) throws IOException { + int len = s.length(); + + writeInt(len); + + for (int i = 0; i < len; i++) + writeByte(s.charAt(i)); + } + + /** {@inheritDoc} */ + @SuppressWarnings("NullableProblems") + @Override public void writeChars(String s) throws IOException { + int len = s.length(); + + writeInt(len); + + for (int i = 0; i < len; i++) + writeChar(s.charAt(i)); + } + + /** {@inheritDoc} */ + @SuppressWarnings("NullableProblems") + @Override public void writeUTF(String s) throws IOException { + writeString(s); + } + + /** {@inheritDoc} */ + @Override public void writeByte(int v) throws IOException { + doWriteByte((byte) v); + } + + /** {@inheritDoc} */ + @Override public void writeShort(int v) throws IOException { + doWriteShort((short) v); + } + + /** {@inheritDoc} */ + @Override public void writeChar(int v) throws IOException { + doWriteChar((char) v); + } + + /** {@inheritDoc} */ + @Override public void write(int b) throws IOException { + doWriteByte((byte) b); + } + + /** {@inheritDoc} */ + @Override public void flush() throws IOException { + // No-op. + } + + /** {@inheritDoc} */ + @Override public int reserveInt() { + return reserve(LEN_INT); + } + + /** {@inheritDoc} */ + @Override public void writeInt(int pos, int val) throws BinaryObjectException { + out.writeInt(pos, val); + } + + /** + * @param fieldName Field name. + * @throws org.apache.ignite.binary.BinaryObjectException If fields are not allowed. + */ + private void writeFieldId(String fieldName, byte fieldType) throws BinaryObjectException { + A.notNull(fieldName, "fieldName"); + + if (rawOffPos != 0) + throw new BinaryObjectException("Individual field can't be written after raw writer is acquired " + + "via rawWriter() method. Consider fixing serialization logic for class: " + cls.getName()); + + if (idMapper == null) + idMapper = ctx.userTypeIdMapper(typeId); + + int id = idMapper.fieldId(typeId, fieldName); + + writeFieldId(id); + + if (metaEnabled) + metaHashSum = 31 * metaHashSum + (id + fieldType); + } + + /** + * Write field ID. + * @param fieldId Field ID. + */ + public void writeFieldId(int fieldId) { + int fieldOff = out.position() - start; + + if (schema == null) { + schema = SCHEMA.get(); + + if (schema == null) { + schema = new SchemaHolder(); + + SCHEMA.set(schema); + } + + // Initialize offset when the first field is written. + schemaId = FNV1_OFFSET_BASIS; + } + + // Advance schema hash. + int schemaId0 = schemaId ^ (fieldId & 0xFF); + schemaId0 = schemaId0 * FNV1_PRIME; + schemaId0 = schemaId0 ^ ((fieldId >> 8) & 0xFF); + schemaId0 = schemaId0 * FNV1_PRIME; + schemaId0 = schemaId0 ^ ((fieldId >> 16) & 0xFF); + schemaId0 = schemaId0 * FNV1_PRIME; + schemaId0 = schemaId0 ^ ((fieldId >> 24) & 0xFF); + schemaId0 = schemaId0 * FNV1_PRIME; + + schemaId = schemaId0; + + schema.push(fieldId, fieldOff); + + fieldCnt++; + } + + /** + * Attempts to write the object as a handle. + * + * @param obj Object to write. + * @return {@code true} if the object has been written as a handle. + */ + boolean tryWriteAsHandle(Object obj) { + int handle = handle(obj); + + if (handle >= 0) { + doWriteByte(GridPortableMarshaller.HANDLE); + doWriteInt(handle); + + return true; + } + + return false; + } + + /** + * Create new writer with same context. + * + * @param typeId type + * @return New writer. + */ + public BinaryWriterExImpl newWriter(int typeId) { + BinaryWriterExImpl res = new BinaryWriterExImpl(ctx, out, handles); + + res.typeId = typeId; + + return res; + } + + /** + * @return Portable context. + */ + public PortableContext context() { + return ctx; + } + + /** + * Schema holder. + */ + private static class SchemaHolder { + /** Grow step. */ + private static final int GROW_STEP = 64; + + /** Maximum stable size. */ + private static final int MAX_SIZE = 1024; + + /** Data. */ + private int[] data; + + /** Index. */ + private int idx; + + /** + * Constructor. + */ + public SchemaHolder() { + data = new int[GROW_STEP]; + } + + /** + * Push another frame. + * + * @param id Field ID. + * @param off Field offset. + */ + public void push(int id, int off) { + if (idx == data.length) { + int[] data0 = new int[data.length + GROW_STEP]; + + System.arraycopy(data, 0, data0, 0, data.length); + + data = data0; + } + + data[idx] = id; + data[idx + 1] = off; + + idx += 2; + } + + /** + * Write collected frames and pop them. + * + * @param writer Writer. + * @param fieldCnt Count. + * @return Amount of bytes dedicated to + */ + public int write(BinaryWriterExImpl writer, int fieldCnt) { + int startIdx = idx - fieldCnt * 2; + + assert startIdx >= 0; + + int lastOffset = data[idx - 1]; + + int res; + + if (lastOffset < MAX_OFFSET_1) { + for (int idx0 = startIdx; idx0 < idx; ) { + writer.writeInt(data[idx0++]); + writer.writeByte((byte) data[idx0++]); + } + + res = PortableUtils.OFFSET_1; + } + else if (lastOffset < MAX_OFFSET_2) { + for (int idx0 = startIdx; idx0 < idx; ) { + writer.writeInt(data[idx0++]); + writer.writeShort((short)data[idx0++]); + } + + res = PortableUtils.OFFSET_2; + } + else { + for (int idx0 = startIdx; idx0 < idx; ) { + writer.writeInt(data[idx0++]); + writer.writeInt(data[idx0++]); + } + + res = PortableUtils.OFFSET_4; + } + + return res; + } + + /** + * Pop current object's frame. + */ + public void pop(int fieldCnt) { + idx = idx - fieldCnt * 2; + + // Shrink data array if needed. + if (idx == 0 && data.length > MAX_SIZE) + data = new int[MAX_SIZE]; + } + } +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java index 9afe2ee..056a7c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.portable; import org.apache.ignite.internal.portable.streams.PortableInputStream; import org.apache.ignite.internal.portable.streams.PortableOutputStream; -import org.apache.ignite.portable.PortableException; +import org.apache.ignite.binary.BinaryObjectException; import org.jetbrains.annotations.Nullable; /** @@ -232,13 +232,13 @@ public class GridPortableMarshaller { /** * @param obj Object to marshal. * @return Byte array. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ - public byte[] marshal(@Nullable Object obj) throws PortableException { + public byte[] marshal(@Nullable Object obj) throws BinaryObjectException { if (obj == null) return new byte[] { NULL }; - try (PortableWriterExImpl writer = new PortableWriterExImpl(ctx)) { + try (BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx)) { writer.marshal(obj); return writer.array(); @@ -248,13 +248,13 @@ public class GridPortableMarshaller { /** * @param bytes Bytes array. * @return Portable object. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ @SuppressWarnings("unchecked") - @Nullable public <T> T unmarshal(byte[] bytes, @Nullable ClassLoader clsLdr) throws PortableException { + @Nullable public <T> T unmarshal(byte[] bytes, @Nullable ClassLoader clsLdr) throws BinaryObjectException { assert bytes != null; - PortableReaderExImpl reader = new PortableReaderExImpl(ctx, bytes, 0, clsLdr); + BinaryReaderExImpl reader = new BinaryReaderExImpl(ctx, bytes, 0, clsLdr); return (T)reader.unmarshal(); } @@ -262,10 +262,10 @@ public class GridPortableMarshaller { /** * @param in Input stream. * @return Portable object. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ @SuppressWarnings("unchecked") - @Nullable public <T> T unmarshal(PortableInputStream in) throws PortableException { + @Nullable public <T> T unmarshal(PortableInputStream in) throws BinaryObjectException { return (T)reader(in).unmarshal(); } @@ -273,17 +273,17 @@ public class GridPortableMarshaller { * @param arr Byte array. * @param ldr Class loader. * @return Deserialized object. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ @SuppressWarnings("unchecked") - @Nullable public <T> T deserialize(byte[] arr, @Nullable ClassLoader ldr) throws PortableException { + @Nullable public <T> T deserialize(byte[] arr, @Nullable ClassLoader ldr) throws BinaryObjectException { assert arr != null; assert arr.length > 0; if (arr[0] == NULL) return null; - PortableReaderExImpl reader = new PortableReaderExImpl(ctx, arr, 0, ldr); + BinaryReaderExImpl reader = new BinaryReaderExImpl(ctx, arr, 0, ldr); return (T)reader.deserialize(); } @@ -294,8 +294,8 @@ public class GridPortableMarshaller { * @param out Output stream. * @return Writer. */ - public PortableWriterExImpl writer(PortableOutputStream out) { - return new PortableWriterExImpl(ctx, out); + public BinaryWriterExImpl writer(PortableOutputStream out) { + return new BinaryWriterExImpl(ctx, out); } /** @@ -304,9 +304,9 @@ public class GridPortableMarshaller { * @param in Input stream. * @return Reader. */ - public PortableReaderExImpl reader(PortableInputStream in) { + public BinaryReaderExImpl reader(PortableInputStream in) { // TODO: IGNITE-1272 - Is class loader needed here? - return new PortableReaderExImpl(ctx, in, in.position(), null); + return new BinaryReaderExImpl(ctx, in, in.position(), null); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java index aa72017..b95dc3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java @@ -23,10 +23,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableIdMapper; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableSerializer; import org.jetbrains.annotations.Nullable; import java.io.Externalizable; @@ -47,6 +43,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.UUID; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryTypeIdMapper; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.binary.BinarySerializer; import static java.lang.reflect.Modifier.isStatic; import static java.lang.reflect.Modifier.isTransient; @@ -62,10 +62,10 @@ public class PortableClassDescriptor { private final Class<?> cls; /** */ - private final PortableSerializer serializer; + private final BinarySerializer serializer; /** ID mapper. */ - private final PortableIdMapper idMapper; + private final BinaryTypeIdMapper idMapper; /** */ private final Mode mode; @@ -118,7 +118,7 @@ public class PortableClassDescriptor { * @param keepDeserialized Keep deserialized flag. * @param registered Whether typeId has been successfully registered by MarshallerContext or not. * @param predefined Whether the class is predefined or not. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ PortableClassDescriptor( PortableContext ctx, @@ -126,13 +126,13 @@ public class PortableClassDescriptor { boolean userType, int typeId, String typeName, - @Nullable PortableIdMapper idMapper, - @Nullable PortableSerializer serializer, + @Nullable BinaryTypeIdMapper idMapper, + @Nullable BinarySerializer serializer, boolean metaDataEnabled, boolean keepDeserialized, boolean registered, boolean predefined - ) throws PortableException { + ) throws BinaryObjectException { assert ctx != null; assert cls != null; @@ -225,12 +225,12 @@ public class PortableClassDescriptor { String name = f.getName(); if (!names.add(name)) - throw new PortableException("Duplicate field name: " + name); + throw new BinaryObjectException("Duplicate field name: " + name); int fieldId = idMapper.fieldId(typeId, name); if (!ids.add(fieldId)) - throw new PortableException("Duplicate field ID: " + name); + throw new BinaryObjectException("Duplicate field ID: " + name); FieldInfo fieldInfo = new FieldInfo(f, fieldId); @@ -246,7 +246,7 @@ public class PortableClassDescriptor { default: // Should never happen. - throw new PortableException("Invalid mode: " + mode); + throw new BinaryObjectException("Invalid mode: " + mode); } if (mode == Mode.PORTABLE || mode == Mode.EXTERNALIZABLE || mode == Mode.OBJECT) { @@ -316,7 +316,7 @@ public class PortableClassDescriptor { * * @return ID mapper. */ - public PortableIdMapper idMapper() { + public BinaryTypeIdMapper idMapper() { return idMapper; } @@ -337,9 +337,9 @@ public class PortableClassDescriptor { /** * @param obj Object. * @param writer Writer. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ - void write(Object obj, PortableWriterExImpl writer) throws PortableException { + void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException { assert obj != null; assert writer != null; @@ -423,62 +423,62 @@ public class PortableClassDescriptor { break; case SHORT_ARR: - writer.doWriteShortArray((short[]) obj); + writer.doWriteShortArray((short[])obj); break; case INT_ARR: - writer.doWriteIntArray((int[]) obj); + writer.doWriteIntArray((int[])obj); break; case LONG_ARR: - writer.doWriteLongArray((long[]) obj); + writer.doWriteLongArray((long[])obj); break; case FLOAT_ARR: - writer.doWriteFloatArray((float[]) obj); + writer.doWriteFloatArray((float[])obj); break; case DOUBLE_ARR: - writer.doWriteDoubleArray((double[]) obj); + writer.doWriteDoubleArray((double[])obj); break; case CHAR_ARR: - writer.doWriteCharArray((char[]) obj); + writer.doWriteCharArray((char[])obj); break; case BOOLEAN_ARR: - writer.doWriteBooleanArray((boolean[]) obj); + writer.doWriteBooleanArray((boolean[])obj); break; case DECIMAL_ARR: - writer.doWriteDecimalArray((BigDecimal[]) obj); + writer.doWriteDecimalArray((BigDecimal[])obj); break; case STRING_ARR: - writer.doWriteStringArray((String[]) obj); + writer.doWriteStringArray((String[])obj); break; case UUID_ARR: - writer.doWriteUuidArray((UUID[]) obj); + writer.doWriteUuidArray((UUID[])obj); break; case DATE_ARR: - writer.doWriteDateArray((Date[]) obj); + writer.doWriteDateArray((Date[])obj); break; case TIMESTAMP_ARR: - writer.doWriteTimestampArray((Timestamp[]) obj); + writer.doWriteTimestampArray((Timestamp[])obj); break; @@ -518,7 +518,7 @@ public class PortableClassDescriptor { break; case PORTABLE_OBJ: - writer.doWritePortableObject((PortableObjectImpl)obj); + writer.doWritePortableObject((BinaryObjectImpl)obj); break; @@ -526,9 +526,9 @@ public class PortableClassDescriptor { if (writeHeader(obj, writer)) { try { if (serializer != null) - serializer.writePortable(obj, writer); + serializer.writeBinary(obj, writer); else - ((PortableMarshalAware) obj).writePortable(writer); + ((Binarylizable)obj).writeBinary(writer); writer.postWrite(userType); } @@ -536,14 +536,14 @@ public class PortableClassDescriptor { writer.popSchema(); } - if (obj.getClass() != PortableMetaDataImpl.class + if (obj.getClass() != BinaryMetaDataImpl.class && ctx.isMetaDataChanged(typeId, writer.metaDataHashSum())) { - PortableMetaDataCollector metaCollector = new PortableMetaDataCollector(typeName); + BinaryMetaDataCollector metaCollector = new BinaryMetaDataCollector(typeName); if (serializer != null) - serializer.writePortable(obj, metaCollector); + serializer.writeBinary(obj, metaCollector); else - ((PortableMarshalAware)obj).writePortable(metaCollector); + ((Binarylizable)obj).writeBinary(metaCollector); ctx.updateMetaData(typeId, typeName, metaCollector.meta()); } @@ -561,7 +561,7 @@ public class PortableClassDescriptor { writer.postWrite(userType); } catch (IOException e) { - throw new PortableException("Failed to write Externalizable object: " + obj, e); + throw new BinaryObjectException("Failed to write Externalizable object: " + obj, e); } finally { writer.popSchema(); @@ -593,9 +593,9 @@ public class PortableClassDescriptor { /** * @param reader Reader. * @return Object. - * @throws PortableException If failed. + * @throws org.apache.ignite.binary.BinaryObjectException If failed. */ - Object read(PortableReaderExImpl reader) throws PortableException { + Object read(BinaryReaderExImpl reader) throws BinaryObjectException { assert reader != null; Object res; @@ -607,9 +607,9 @@ public class PortableClassDescriptor { reader.setHandler(res); if (serializer != null) - serializer.readPortable(res, reader); + serializer.readBinary(res, reader); else - ((PortableMarshalAware)res).readPortable(reader); + ((Binarylizable)res).readBinary(reader); break; @@ -622,7 +622,7 @@ public class PortableClassDescriptor { ((Externalizable)res).readExternal(reader); } catch (IOException | ClassNotFoundException e) { - throw new PortableException("Failed to read Externalizable object: " + + throw new BinaryObjectException("Failed to read Externalizable object: " + res.getClass().getName(), e); } @@ -654,10 +654,10 @@ public class PortableClassDescriptor { throw new RuntimeException(e); } catch (InvocationTargetException e) { - if (e.getTargetException() instanceof PortableException) - throw (PortableException)e.getTargetException(); + if (e.getTargetException() instanceof BinaryObjectException) + throw (BinaryObjectException)e.getTargetException(); - throw new PortableException("Failed to execute readResolve() method on " + res, e); + throw new BinaryObjectException("Failed to execute readResolve() method on " + res, e); } } @@ -669,7 +669,7 @@ public class PortableClassDescriptor { * @param writer Writer. * @return Whether further write is needed. */ - private boolean writeHeader(Object obj, PortableWriterExImpl writer) { + private boolean writeHeader(Object obj, BinaryWriterExImpl writer) { if (writer.tryWriteAsHandle(obj)) return false; @@ -686,25 +686,25 @@ public class PortableClassDescriptor { /** * @return Instance. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ - private Object newInstance() throws PortableException { + private Object newInstance() throws BinaryObjectException { assert ctor != null; try { return ctor.newInstance(); } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) { - throw new PortableException("Failed to instantiate instance: " + cls, e); + throw new BinaryObjectException("Failed to instantiate instance: " + cls, e); } } /** * @param cls Class. * @return Constructor. - * @throws PortableException If constructor doesn't exist. + * @throws org.apache.ignite.binary.BinaryObjectException If constructor doesn't exist. */ - @Nullable private static Constructor<?> constructor(Class<?> cls) throws PortableException { + @Nullable private static Constructor<?> constructor(Class<?> cls) throws BinaryObjectException { assert cls != null; try { @@ -715,7 +715,7 @@ public class PortableClassDescriptor { return ctor; } catch (IgniteCheckedException e) { - throw new PortableException("Failed to get constructor for class: " + cls.getName(), e); + throw new BinaryObjectException("Failed to get constructor for class: " + cls.getName(), e); } } @@ -807,9 +807,9 @@ public class PortableClassDescriptor { return Mode.TIMESTAMP_ARR; else if (cls.isArray()) return cls.getComponentType().isEnum() ? Mode.ENUM_ARR : Mode.OBJ_ARR; - else if (cls == PortableObjectImpl.class) + else if (cls == BinaryObjectImpl.class) return Mode.PORTABLE_OBJ; - else if (PortableMarshalAware.class.isAssignableFrom(cls)) + else if (Binarylizable.class.isAssignableFrom(cls)) return Mode.PORTABLE; else if (Externalizable.class.isAssignableFrom(cls)) return Mode.EXTERNALIZABLE; @@ -819,7 +819,7 @@ public class PortableClassDescriptor { return Mode.COL; else if (Map.class.isAssignableFrom(cls)) return Mode.MAP; - else if (cls == PortableObjectImpl.class) + else if (cls == BinaryObjectImpl.class) return Mode.PORTABLE_OBJ; else if (cls.isEnum()) return Mode.ENUM; @@ -865,9 +865,9 @@ public class PortableClassDescriptor { /** * @param obj Object. * @param writer Writer. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ - public void write(Object obj, PortableWriterExImpl writer) throws PortableException { + public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException { assert obj != null; assert writer != null; @@ -879,7 +879,7 @@ public class PortableClassDescriptor { val = field.get(obj); } catch (IllegalAccessException e) { - throw new PortableException("Failed to get value for field: " + field, e); + throw new BinaryObjectException("Failed to get value for field: " + field, e); } switch (mode) { @@ -954,62 +954,62 @@ public class PortableClassDescriptor { break; case SHORT_ARR: - writer.writeShortArrayField((short[]) val); + writer.writeShortArrayField((short[])val); break; case INT_ARR: - writer.writeIntArrayField((int[]) val); + writer.writeIntArrayField((int[])val); break; case LONG_ARR: - writer.writeLongArrayField((long[]) val); + writer.writeLongArrayField((long[])val); break; case FLOAT_ARR: - writer.writeFloatArrayField((float[]) val); + writer.writeFloatArrayField((float[])val); break; case DOUBLE_ARR: - writer.writeDoubleArrayField((double[]) val); + writer.writeDoubleArrayField((double[])val); break; case CHAR_ARR: - writer.writeCharArrayField((char[]) val); + writer.writeCharArrayField((char[])val); break; case BOOLEAN_ARR: - writer.writeBooleanArrayField((boolean[]) val); + writer.writeBooleanArrayField((boolean[])val); break; case DECIMAL_ARR: - writer.writeDecimalArrayField((BigDecimal[]) val); + writer.writeDecimalArrayField((BigDecimal[])val); break; case STRING_ARR: - writer.writeStringArrayField((String[]) val); + writer.writeStringArrayField((String[])val); break; case UUID_ARR: - writer.writeUuidArrayField((UUID[]) val); + writer.writeUuidArrayField((UUID[])val); break; case DATE_ARR: - writer.writeDateArrayField((Date[]) val); + writer.writeDateArrayField((Date[])val); break; case TIMESTAMP_ARR: - writer.writeTimestampArrayField((Timestamp[]) val); + writer.writeTimestampArrayField((Timestamp[])val); break; @@ -1034,7 +1034,7 @@ public class PortableClassDescriptor { break; case PORTABLE_OBJ: - writer.writePortableObjectField((PortableObjectImpl)val); + writer.writePortableObjectField((BinaryObjectImpl)val); break; @@ -1068,9 +1068,9 @@ public class PortableClassDescriptor { /** * @param obj Object. * @param reader Reader. - * @throws PortableException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ - public void read(Object obj, PortableReaderExImpl reader) throws PortableException { + public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException { Object val = null; switch (mode) { @@ -1260,7 +1260,7 @@ public class PortableClassDescriptor { field.set(obj, val); } catch (IllegalAccessException e) { - throw new PortableException("Failed to set value for field: " + field, e); + throw new BinaryObjectException("Failed to set value for field: " + field, e); } } }
