nevdmitry commented on code in PR #4142:
URL: https://github.com/apache/ignite-3/pull/4142#discussion_r1713935616
##########
modules/compute/src/main/java/org/apache/ignite/internal/compute/messaging/ComputeMessaging.java:
##########
@@ -238,7 +238,7 @@ private void processJobResultRequest(JobResultRequest
request, ClusterNode sende
private void sendJobResultResponse(@Nullable Object result, @Nullable
Throwable ex, ClusterNode sender, long correlationId) {
JobResultResponse jobResultResponse =
messagesFactory.jobResultResponse()
- .result(result)
+ .result(result) // todo: marshal?
Review Comment:
do not forget to resolve
##########
modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/inlineschema/TupleWithSchemaMarshalling.java:
##########
@@ -0,0 +1,358 @@
+/*
+ * 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.binarytuple.inlineschema;
+
+import static org.apache.ignite.lang.ErrorGroups.Client.PROTOCOL_ERR;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
+import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
+import org.apache.ignite.lang.IgniteException;
+import org.apache.ignite.marshalling.UnmarshallingException;
+import org.apache.ignite.marshalling.UnsupportedObjectTypeMarshallingException;
+import org.apache.ignite.sql.ColumnType;
+import org.apache.ignite.table.Tuple;
+import org.jetbrains.annotations.Nullable;
+
+/** Tuple with schema marshalling. */
+public final class TupleWithSchemaMarshalling {
+ private static final ByteOrder BYTE_ORDER = ByteOrder.LITTLE_ENDIAN;
+
+ /**
+ * Marshal tuple is the following format (LITTLE_ENDIAN): marshalledTuple
:= | size | valuePosition | binaryTupleWithSchema | size
+ * := int32 valuePosition := int32 binaryTupleWithSchema
:= | schemaBinaryTuple | valueBinaryTuple | schemaBinaryTuple
+ * := | column1 | ... | columnN | column := | columnName |
columnType | columnName := string columnType
+ * := int32 valueBinaryTuple := | value1 | ... | valueN |.
+ */
+ public static byte @Nullable [] marshal(@Nullable Tuple tup) {
+ if (tup == null) {
+ return null;
+ }
+
+ // Allocate all the memory we need upfront.
+ int size = tup.columnCount();
+ Object[] values = new Object[size];
+ String[] columns = new String[size];
+ ColumnType[] types = new ColumnType[size];
+
+ // Fill in the values, column names, and types.
+ for (int i = 0; i < size; i++) {
+ var value = tup.value(i);
+ values[i] = value;
+ columns[i] = tup.columnName(i);
+ types[i] = inferType(value);
+ }
+
+ BinaryTupleBuilder schemaBuilder = schemaBuilder(columns, types);
+ BinaryTupleBuilder valueBuilder = valueBuilder(columns, types, values);
+
+ byte[] schemaBt = schemaBuilder.build().array();
+ byte[] valueBt = valueBuilder.build().array();
+ // Size: int32 (tuple size), int32 (value offset), schema, value.
+ byte[] result = new byte[4 + 4 + schemaBt.length + valueBt.length];
+ ByteBuffer buff = ByteBuffer.wrap(result).order(BYTE_ORDER);
+
+ // Put the size of the schema in the first 4 bytes.
+ buff.putInt(0, size);
+
+ // Put the value offset in the second 4 bytes.
+ int offset = schemaBt.length + 8;
+ buff.putInt(4, offset);
+
+ System.arraycopy(schemaBt, 0, result, 8, schemaBt.length);
+ System.arraycopy(valueBt, 0, result, schemaBt.length + 8,
valueBt.length);
+
+ return result;
+ }
+
+ /**
+ * Unmarshal tuple (LITTLE_ENDIAN).
+ *
+ * @param raw byte[] bytes that are marshaled by {@link #marshal(Tuple)}.
+ */
+ public static @Nullable Tuple unmarshal(byte @Nullable [] raw) {
+ if (raw == null) {
+ return null;
+ }
+ if (raw.length < 8) {
+ throw new UnmarshallingException("byte[] length can not be less
than 8");
+ }
+
+ // Read first int32.
+ ByteBuffer buff = ByteBuffer.wrap(raw).order(BYTE_ORDER);
+ int size = buff.getInt(0);
+ if (size < 0) {
+ throw new UnmarshallingException("Size of the tuple can not be
less than zero");
+ }
+
+ // Read second int32.
+ int valueOffset = buff.getInt(4);
+ if (valueOffset < 0) {
+ throw new UnmarshallingException("valueOffset can not be less than
zero");
+ }
+ if (valueOffset > raw.length) {
+ throw new UnmarshallingException(
+ "valueOffset can not be greater than byte[] length,
valueOffset: "
+ + valueOffset + ", length: " + raw.length
+ );
+ }
+
+ ByteBuffer schemaBuff = buff
+ .position(8).limit(valueOffset)
+ .slice().order(BYTE_ORDER);
+ ByteBuffer valueBuff = buff
+ .position(valueOffset).limit(raw.length)
+ .slice().order(BYTE_ORDER);
+
+ BinaryTupleReader schemaReader = new BinaryTupleReader(size * 2,
schemaBuff);
+ BinaryTupleReader valueReader = new BinaryTupleReader(size, valueBuff);
+
+ String[] columns = new String[size];
+ ColumnType[] types = new ColumnType[size];
+ Tuple tup = Tuple.create(size);
+
+ int readerInd = 0;
+ int i = 0;
+ while (i < size) {
+ String colName = schemaReader.stringValue(readerInd++);
+ int colTypeId = schemaReader.intValue(readerInd++);
+
+ columns[i] = colName;
+ types[i] = ColumnType.getById(colTypeId);
+
+ i += 1;
+ }
+
+ int k = 0;
+ while (k < size) {
+ setColumnValue(valueReader, tup, columns[k], types[k].id(), k);
+ k += 1;
+ }
+
+ return tup;
+ }
+
+ private static BinaryTupleBuilder schemaBuilder(String[] columns,
ColumnType[] types) {
+ BinaryTupleBuilder builder = new BinaryTupleBuilder(columns.length *
2, columns.length * 2);
+
+ for (int i = 0; i < columns.length; i++) {
+ builder.appendString(columns[i]);
+ builder.appendInt(types[i].id());
+ }
+
+ return builder;
+ }
+
+ private static BinaryTupleBuilder valueBuilder(String[] columnNames,
ColumnType[] types, Object[] values) {
+ BinaryTupleBuilder builder = new BinaryTupleBuilder(values.length,
values.length);
+
+ for (int i = 0; i < values.length; i++) {
+ ColumnType type = types[i];
+ Object v = values[i];
+
+ appender(type, columnNames[i]).accept(builder, v);
+ }
+
+ return builder;
+ }
+
+ private static BiConsumer<BinaryTupleBuilder, Object> appender(ColumnType
type, String name) {
+ try {
+ switch (type) {
+ case NULL:
+ return (b, v) -> b.appendNull();
+ case BOOLEAN:
+ return (b, v) -> b.appendBoolean((Boolean) v);
+ case INT8:
+ return (b, v) -> b.appendByte((Byte) v);
+ case INT16:
+ return (b, v) -> b.appendShort((Short) v);
+ case INT32:
+ return (b, v) -> b.appendInt((Integer) v);
+ case INT64:
+ return (b, v) -> b.appendLong((Long) v);
+ case FLOAT:
+ return (b, v) -> b.appendFloat((Float) v);
+ case DOUBLE:
+ return (b, v) -> b.appendDouble((Double) v);
+ case STRING:
+ return (b, v) -> b.appendString((String) v);
+ case DECIMAL:
+ return (b, v) -> {
+ BigDecimal d = (BigDecimal) v;
+ b.appendDecimal(d, d.scale());
+ };
+ case DATE:
+ return (b, v) -> b.appendDate((LocalDate) v);
+ case TIME:
+ return (b, v) -> b.appendTime((LocalTime) v);
+ case DATETIME:
+ return (b, v) -> b.appendDateTime((LocalDateTime) v);
+ case TIMESTAMP:
+ return (b, v) -> b.appendTimestamp((Instant) v);
+ case UUID:
+ return (b, v) -> b.appendUuid((UUID) v);
+ case BYTE_ARRAY:
+ return (b, v) -> b.appendBytes((byte[]) v);
+ case PERIOD:
+ return (b, v) -> b.appendPeriod((Period) v);
+ case DURATION:
+ return (b, v) -> b.appendDuration((Duration) v);
+ default:
+ throw new IllegalArgumentException("Unsupported type: " +
type);
+ }
+ } catch (ClassCastException e) {
+ throw new IgniteException(PROTOCOL_ERR, "Column's type mismatch ["
+ + "column=" + name
+ + ", expectedType=" + type.javaClass(),
+ e
+ );
+ }
+ }
+
+ private static ColumnType inferType(@Nullable Object value) {
+ if (value == null) {
+ return ColumnType.NULL;
+ }
+ if (value instanceof Boolean) {
+ return ColumnType.BOOLEAN;
+ }
+ if (value instanceof Byte) {
+ return ColumnType.INT8;
+ }
+ if (value instanceof Short) {
+ return ColumnType.INT16;
+ }
+ if (value instanceof Integer) {
+ return ColumnType.INT32;
+ }
+ if (value instanceof Long) {
+ return ColumnType.INT64;
+ }
+ if (value instanceof Float) {
+ return ColumnType.FLOAT;
+ }
+ if (value instanceof Double) {
+ return ColumnType.DOUBLE;
+ }
+ if (value instanceof String) {
+ return ColumnType.STRING;
+ }
+ if (value instanceof BigDecimal) {
+ return ColumnType.DECIMAL;
+ }
+ if (value instanceof LocalDate) {
+ return ColumnType.DATE;
+ }
+ if (value instanceof LocalTime) {
+ return ColumnType.TIME;
+ }
+ if (value instanceof LocalDateTime) {
+ return ColumnType.DATETIME;
+ }
+ if (value instanceof Instant) {
+ return ColumnType.TIMESTAMP;
+ }
+ if (value instanceof UUID) {
+ return ColumnType.UUID;
+ }
+ if (value instanceof byte[]) {
+ return ColumnType.BYTE_ARRAY;
+ }
+ if (value instanceof Period) {
+ return ColumnType.PERIOD;
+ }
+ if (value instanceof Duration) {
+ return ColumnType.DURATION;
+ }
+ throw new UnsupportedObjectTypeMarshallingException("Tuple field is of
unsupported type: " + value.getClass());
+ }
+
+
+ private static void setColumnValue(BinaryTupleReader reader, Tuple tup,
String colName, int colTypeId, int i) {
+ switch (ColumnType.getById(colTypeId)) {
+ case NULL:
+ tup.set(colName, null);
Review Comment:
it doesn't make sense to shrink the param name Tuple here. Let's use tuple
instead of tup here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
