You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by GitBox <gi...@apache.org> on 2020/08/10 08:55:58 UTC
[GitHub] [iceberg] openinx commented on a change in pull request #1299: Flink: support to RowData partition.
openinx commented on a change in pull request #1299:
URL: https://github.com/apache/iceberg/pull/1299#discussion_r467672087
##########
File path: flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
##########
@@ -0,0 +1,138 @@
+/*
+ * 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.iceberg.flink;
+
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.time.LocalDateTime;
+import java.util.UUID;
+import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.data.TimestampData;
+import org.apache.flink.table.types.logical.DecimalType;
+import org.apache.flink.table.types.logical.LocalZonedTimestampType;
+import org.apache.flink.table.types.logical.LogicalType;
+import org.apache.flink.table.types.logical.RowType;
+import org.apache.flink.table.types.logical.TimestampType;
+import org.apache.iceberg.StructLike;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.DateTimeUtil;
+
+class RowDataWrapper implements StructLike {
+
+ private final LogicalType[] types;
+ private final PositionalGetter<?>[] getters;
+ private RowData rowData = null;
+
+ RowDataWrapper(RowType rowType, Types.StructType struct) {
+ int size = rowType.getFieldCount();
+
+ types = (LogicalType[]) Array.newInstance(LogicalType.class, size);
+ getters = (PositionalGetter[]) Array.newInstance(PositionalGetter.class, size);
+
+ for (int i = 0; i < size; i++) {
+ types[i] = rowType.getTypeAt(i);
+ getters[i] = buildGetter(types[i], struct.fields().get(i).type());
+ }
+ }
+
+ RowDataWrapper wrap(RowData data) {
+ this.rowData = data;
+ return this;
+ }
+
+ @Override
+ public int size() {
+ return types.length;
+ }
+
+ @Override
+ public <T> T get(int pos, Class<T> javaClass) {
+ if (rowData.isNullAt(pos)) {
+ return null;
+ } else if (getters[pos] != null) {
+ return javaClass.cast(getters[pos].get(rowData, pos));
+ }
+
+ Object value = RowData.createFieldGetter(types[pos], pos).getFieldOrNull(rowData);
+ return javaClass.cast(value);
+ }
+
+ @Override
+ public <T> void set(int pos, T value) {
+ throw new UnsupportedOperationException("Could not set a field in the RowDataWrapper because rowData is read-only");
+ }
+
+ private interface PositionalGetter<T> {
+ T get(RowData data, int pos);
+ }
+
+ private static PositionalGetter<?> buildGetter(LogicalType logicalType, Type type) {
+ switch (type.typeId()) {
+ case STRING:
+ return (row, pos) -> row.getString(pos).toString();
+
+ case FIXED:
+ case BINARY:
+ return (row, pos) -> ByteBuffer.wrap(row.getBinary(pos));
+
+ case UUID:
+ return (row, pos) -> UUID.nameUUIDFromBytes(row.getBinary(pos));
+
+ case DECIMAL:
+ DecimalType decimalType = (DecimalType) logicalType;
+ return (row, pos) -> row.getDecimal(pos, decimalType.getPrecision(), decimalType.getScale()).toBigDecimal();
+
+ case TIME:
+ return (row, pos) -> (long) row.getInt(pos);
Review comment:
You are right. Flink's time type is milliseconds, here we need microseconds. Will add unit tests to address this bug.
##########
File path: flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
##########
@@ -0,0 +1,138 @@
+/*
+ * 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.iceberg.flink;
+
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.time.LocalDateTime;
+import java.util.UUID;
+import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.data.TimestampData;
+import org.apache.flink.table.types.logical.DecimalType;
+import org.apache.flink.table.types.logical.LocalZonedTimestampType;
+import org.apache.flink.table.types.logical.LogicalType;
+import org.apache.flink.table.types.logical.RowType;
+import org.apache.flink.table.types.logical.TimestampType;
+import org.apache.iceberg.StructLike;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.DateTimeUtil;
+
+class RowDataWrapper implements StructLike {
+
+ private final LogicalType[] types;
+ private final PositionalGetter<?>[] getters;
+ private RowData rowData = null;
+
+ RowDataWrapper(RowType rowType, Types.StructType struct) {
+ int size = rowType.getFieldCount();
+
+ types = (LogicalType[]) Array.newInstance(LogicalType.class, size);
+ getters = (PositionalGetter[]) Array.newInstance(PositionalGetter.class, size);
+
+ for (int i = 0; i < size; i++) {
+ types[i] = rowType.getTypeAt(i);
+ getters[i] = buildGetter(types[i], struct.fields().get(i).type());
+ }
+ }
+
+ RowDataWrapper wrap(RowData data) {
+ this.rowData = data;
+ return this;
+ }
+
+ @Override
+ public int size() {
+ return types.length;
+ }
+
+ @Override
+ public <T> T get(int pos, Class<T> javaClass) {
+ if (rowData.isNullAt(pos)) {
+ return null;
+ } else if (getters[pos] != null) {
+ return javaClass.cast(getters[pos].get(rowData, pos));
+ }
+
+ Object value = RowData.createFieldGetter(types[pos], pos).getFieldOrNull(rowData);
+ return javaClass.cast(value);
+ }
+
+ @Override
+ public <T> void set(int pos, T value) {
+ throw new UnsupportedOperationException("Could not set a field in the RowDataWrapper because rowData is read-only");
+ }
+
+ private interface PositionalGetter<T> {
+ T get(RowData data, int pos);
+ }
+
+ private static PositionalGetter<?> buildGetter(LogicalType logicalType, Type type) {
+ switch (type.typeId()) {
+ case STRING:
+ return (row, pos) -> row.getString(pos).toString();
+
+ case FIXED:
+ case BINARY:
+ return (row, pos) -> ByteBuffer.wrap(row.getBinary(pos));
+
+ case UUID:
+ return (row, pos) -> UUID.nameUUIDFromBytes(row.getBinary(pos));
+
+ case DECIMAL:
+ DecimalType decimalType = (DecimalType) logicalType;
+ return (row, pos) -> row.getDecimal(pos, decimalType.getPrecision(), decimalType.getScale()).toBigDecimal();
+
+ case TIME:
+ return (row, pos) -> (long) row.getInt(pos);
+
+ case TIMESTAMP:
+ switch (logicalType.getTypeRoot()) {
+ case TIMESTAMP_WITHOUT_TIME_ZONE:
+ TimestampType timestampType = (TimestampType) logicalType;
+ return (row, pos) -> {
+ LocalDateTime localDateTime = row.getTimestamp(pos, timestampType.getPrecision()).toLocalDateTime();
+ return DateTimeUtil.microsFromTimestamp(localDateTime);
+ };
+
+ case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
+ LocalZonedTimestampType lzTs = (LocalZonedTimestampType) logicalType;
+ return (row, pos) -> {
+ TimestampData timestampData = row.getTimestamp(pos, lzTs.getPrecision());
+ return timestampData.getMillisecond() * 1000 + Math.floorDiv(timestampData.getNanoOfMillisecond(), 1000);
Review comment:
It's true.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org