This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 897f809ee48 [MINOR] More cleanup binary writer (#12028)
897f809ee48 is described below
commit 897f809ee486707af52580da95b4acfde5b381e4
Author: Nikolay <[email protected]>
AuthorDate: Tue Apr 22 19:19:39 2025 +0300
[MINOR] More cleanup binary writer (#12028)
---
.../internal/binary/BinaryClassDescriptor.java | 4 +-
.../internal/binary/BinaryFieldAccessor.java | 54 ++---
.../ignite/internal/binary/BinaryWriterExImpl.java | 236 +++------------------
.../binary/builder/BinaryPlainBinaryObject.java | 2 +-
4 files changed, 59 insertions(+), 237 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index a8ec88c4210..78fe947a468 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -805,7 +805,7 @@ public class BinaryClassDescriptor {
break;
case CLASS:
- writer.doWriteClass((Class)obj);
+ writer.writeClass((Class)obj);
break;
@@ -815,7 +815,7 @@ public class BinaryClassDescriptor {
break;
case BINARY_OBJ:
- writer.doWriteBinaryObject((BinaryObjectImpl)obj);
+ writer.writeBinaryObject((BinaryObjectImpl)obj);
break;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 60d1c090d22..81a7365356e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -547,127 +547,127 @@ abstract class BinaryFieldAccessor {
break;
case DECIMAL:
- writer.writeDecimalField((BigDecimal)val);
+ writer.writeDecimal((BigDecimal)val);
break;
case STRING:
- writer.writeStringField((String)val);
+ writer.writeString((String)val);
break;
case UUID:
- writer.writeUuidField((UUID)val);
+ writer.writeUuid((UUID)val);
break;
case DATE:
- writer.writeDateField((Date)val);
+ writer.writeDate((Date)val);
break;
case TIMESTAMP:
- writer.writeTimestampField((Timestamp)val);
+ writer.writeTimestamp((Timestamp)val);
break;
case TIME:
- writer.writeTimeField((Time)val);
+ writer.writeTime((Time)val);
break;
case BYTE_ARR:
- writer.writeByteArrayField((byte[])val);
+ writer.writeByteArray((byte[])val);
break;
case SHORT_ARR:
- writer.writeShortArrayField((short[])val);
+ writer.writeShortArray((short[])val);
break;
case INT_ARR:
- writer.writeIntArrayField((int[])val);
+ writer.writeIntArray((int[])val);
break;
case LONG_ARR:
- writer.writeLongArrayField((long[])val);
+ writer.writeLongArray((long[])val);
break;
case FLOAT_ARR:
- writer.writeFloatArrayField((float[])val);
+ writer.writeFloatArray((float[])val);
break;
case DOUBLE_ARR:
- writer.writeDoubleArrayField((double[])val);
+ writer.writeDoubleArray((double[])val);
break;
case CHAR_ARR:
- writer.writeCharArrayField((char[])val);
+ writer.writeCharArray((char[])val);
break;
case BOOLEAN_ARR:
- writer.writeBooleanArrayField((boolean[])val);
+ writer.writeBooleanArray((boolean[])val);
break;
case DECIMAL_ARR:
- writer.writeDecimalArrayField((BigDecimal[])val);
+ writer.writeDecimalArray((BigDecimal[])val);
break;
case STRING_ARR:
- writer.writeStringArrayField((String[])val);
+ writer.writeStringArray((String[])val);
break;
case UUID_ARR:
- writer.writeUuidArrayField((UUID[])val);
+ writer.writeUuidArray((UUID[])val);
break;
case DATE_ARR:
- writer.writeDateArrayField((Date[])val);
+ writer.writeDateArray((Date[])val);
break;
case TIMESTAMP_ARR:
- writer.writeTimestampArrayField((Timestamp[])val);
+ writer.writeTimestampArray((Timestamp[])val);
break;
case TIME_ARR:
- writer.writeTimeArrayField((Time[])val);
+ writer.writeTimeArray((Time[])val);
break;
case OBJECT_ARR:
- writer.writeObjectArrayField((Object[])val);
+ writer.writeObjectArray((Object[])val);
break;
case COL:
- writer.writeCollectionField((Collection<?>)val);
+ writer.writeCollection((Collection<?>)val);
break;
case MAP:
- writer.writeMapField((Map<?, ?>)val);
+ writer.writeMap((Map<?, ?>)val);
break;
case BINARY_OBJ:
- writer.writeBinaryObjectField((BinaryObjectImpl)val);
+ writer.writeBinaryObject((BinaryObjectImpl)val);
break;
case ENUM:
- writer.writeEnumField((Enum<?>)val);
+ writer.writeEnum((Enum<?>)val);
break;
@@ -677,7 +677,7 @@ abstract class BinaryFieldAccessor {
break;
case ENUM_ARR:
- writer.writeEnumArrayField((Object[])val);
+ writer.doWriteEnumArray((Object[])val);
break;
@@ -689,7 +689,7 @@ abstract class BinaryFieldAccessor {
break;
case CLASS:
- writer.writeClassField((Class)val);
+ writer.writeClass((Class)val);
break;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index 6a176c39cff..ded0d41cce0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -943,7 +943,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Class.
*/
- void doWriteClass(@Nullable Class val) {
+ private void doWriteClass(@Nullable Class val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -998,7 +998,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param po Binary object.
*/
- public void doWriteBinaryObject(@Nullable BinaryObjectImpl po) {
+ private void doWriteBinaryObject(@Nullable BinaryObjectImpl po) {
if (po == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -1036,7 +1036,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Class.
*/
- void writeClassField(@Nullable Class val) {
+ void writeClass(@Nullable Class val) {
doWriteClass(val);
}
@@ -1180,48 +1180,6 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
writeBooleanFieldPrimitive(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 val Value.
- */
- void writeTimeField(@Nullable Time val) {
- doWriteTime(val);
- }
-
/**
* @param obj Object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
@@ -1230,147 +1188,11 @@ public class BinaryWriterExImpl implements
BinaryWriter, BinaryRawWriterEx, Obje
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.
- */
- void writeTimeArrayField(@Nullable Time[] val) {
- doWriteTimeArray(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 val Value.
- */
- void writeEnumField(@Nullable Enum<?> val) {
- doWriteEnum(val);
- }
-
- /**
- * @param val Value.
- */
- void writeEnumArrayField(@Nullable Object[] val) {
- doWriteEnumArray(val);
- }
-
/**
* @param po Binary object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void writeBinaryObjectField(@Nullable BinaryObjectImpl po) throws
BinaryObjectException {
+ public void writeBinaryObject(@Nullable BinaryObjectImpl po) throws
BinaryObjectException {
doWriteBinaryObject(po);
}
@@ -1465,7 +1287,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeDecimal(String fieldName, @Nullable BigDecimal
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeDecimalField(val);
+ writeDecimal(val);
}
/** {@inheritDoc} */
@@ -1476,7 +1298,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeString(String fieldName, @Nullable String val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeStringField(val);
+ writeString(val);
}
/** {@inheritDoc} */
@@ -1487,7 +1309,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeUuid(String fieldName, @Nullable UUID val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeUuidField(val);
+ writeUuid(val);
}
/** {@inheritDoc} */
@@ -1498,7 +1320,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeDate(String fieldName, @Nullable Date val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeDateField(val);
+ writeDate(val);
}
/** {@inheritDoc} */
@@ -1509,7 +1331,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeTimestamp(String fieldName, @Nullable Timestamp
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeTimestampField(val);
+ writeTimestamp(val);
}
/** {@inheritDoc} */
@@ -1520,7 +1342,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeTime(String fieldName, @Nullable Time val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeTimeField(val);
+ writeTime(val);
}
/** {@inheritDoc} */
@@ -1555,7 +1377,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeByteArray(String fieldName, @Nullable byte[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeByteArrayField(val);
+ writeByteArray(val);
}
/** {@inheritDoc} */
@@ -1566,7 +1388,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeShortArray(String fieldName, @Nullable short[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeShortArrayField(val);
+ writeShortArray(val);
}
/** {@inheritDoc} */
@@ -1577,7 +1399,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeIntArray(String fieldName, @Nullable int[] val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeIntArrayField(val);
+ writeIntArray(val);
}
/** {@inheritDoc} */
@@ -1588,7 +1410,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeLongArray(String fieldName, @Nullable long[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeLongArrayField(val);
+ writeLongArray(val);
}
/** {@inheritDoc} */
@@ -1599,7 +1421,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeFloatArray(String fieldName, @Nullable float[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeFloatArrayField(val);
+ writeFloatArray(val);
}
/** {@inheritDoc} */
@@ -1611,7 +1433,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public void writeDoubleArray(String fieldName, @Nullable
double[] val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeDoubleArrayField(val);
+ writeDoubleArray(val);
}
/** {@inheritDoc} */
@@ -1622,7 +1444,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeCharArray(String fieldName, @Nullable char[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeCharArrayField(val);
+ writeCharArray(val);
}
/** {@inheritDoc} */
@@ -1634,7 +1456,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public void writeBooleanArray(String fieldName, @Nullable
boolean[] val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeBooleanArrayField(val);
+ writeBooleanArray(val);
}
/** {@inheritDoc} */
@@ -1646,7 +1468,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public void writeDecimalArray(String fieldName, @Nullable
BigDecimal[] val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeDecimalArrayField(val);
+ writeDecimalArray(val);
}
/** {@inheritDoc} */
@@ -1658,7 +1480,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public void writeStringArray(String fieldName, @Nullable
String[] val)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeStringArrayField(val);
+ writeStringArray(val);
}
/** {@inheritDoc} */
@@ -1669,7 +1491,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeUuidArray(String fieldName, @Nullable UUID[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeUuidArrayField(val);
+ writeUuidArray(val);
}
/** {@inheritDoc} */
@@ -1680,7 +1502,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeDateArray(String fieldName, @Nullable Date[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeDateArrayField(val);
+ writeDateArray(val);
}
/** {@inheritDoc} */
@@ -1691,7 +1513,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeTimestampArray(String fieldName, @Nullable
Timestamp[] val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeTimestampArrayField(val);
+ writeTimestampArray(val);
}
/** {@inheritDoc} */
@@ -1702,7 +1524,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeTimeArray(String fieldName, @Nullable Time[]
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeTimeArrayField(val);
+ writeTimeArray(val);
}
/** {@inheritDoc} */
@@ -1713,7 +1535,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public void writeObjectArray(String fieldName, @Nullable
Object[] val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeObjectArrayField(val);
+ writeObjectArray(val);
}
/** {@inheritDoc} */
@@ -1725,7 +1547,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public <T> void writeCollection(String fieldName, @Nullable
Collection<T> col)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeCollectionField(col);
+ writeCollection(col);
}
/** {@inheritDoc} */
@@ -1737,7 +1559,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
@Override public <K, V> void writeMap(String fieldName, @Nullable Map<K,
V> map)
throws BinaryObjectException {
writeFieldId(fieldName);
- writeMapField(map);
+ writeMap(map);
}
/** {@inheritDoc} */
@@ -1748,7 +1570,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public <T extends Enum<?>> void writeEnum(String fieldName, T
val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeEnumField(val);
+ writeEnum(val);
}
/** {@inheritDoc} */
@@ -1759,7 +1581,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/** {@inheritDoc} */
@Override public <T extends Enum<?>> void writeEnumArray(String fieldName,
T[] val) throws BinaryObjectException {
writeFieldId(fieldName);
- writeEnumArrayField(val);
+ doWriteEnumArray(val);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
index b57eb0254c5..c3bacc934d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
@@ -43,6 +43,6 @@ class BinaryPlainBinaryObject implements BinaryLazyValue {
/** {@inheritDoc} */
@Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
-
writer.doWriteBinaryObject((BinaryObjectImpl)BinaryUtils.unwrapTemporary(binaryObj));
+
writer.writeBinaryObject((BinaryObjectImpl)BinaryUtils.unwrapTemporary(binaryObj));
}
}
