Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ paimon-format/test/main/java/org/apache/paimon/format/parquet/newReader/DeltaLen
paimon-common/src/main/java/org/apache/paimon/data/variant/ShreddingUtils.java
paimon-common/src/main/java/org/apache/paimon/data/variant/VariantSchema.java
paimon-common/src/main/java/org/apache/paimon/data/variant/VariantShreddingWriter.java
paimon-common/src/main/java/org/apache/paimon/data/variant/BaseVariantReader.java
from https://spark.apache.org/ version 4.0.0-preview2

MIT License
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

package org.apache.paimon.data.variant;

import org.apache.paimon.data.variant.VariantPathSegment.ArrayExtraction;
import org.apache.paimon.data.variant.VariantPathSegment.ObjectExtraction;
import org.apache.paimon.types.DataType;

import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonFactory;
import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;

Expand Down Expand Up @@ -134,13 +138,9 @@ public static GenericVariant fromJson(String json) {
}
}

@Override
public String toJson() {
return toJson(ZoneOffset.UTC);
}

// Stringify the variant in JSON format.
// Throw `MALFORMED_VARIANT` if the variant is malformed.
@Override
public String toJson(ZoneId zoneId) {
StringBuilder sb = new StringBuilder();
toJsonImpl(value, metadata, pos, sb, zoneId);
Expand All @@ -152,39 +152,19 @@ public String toString() {
return toJson();
}

public Object variantGet(String path) {
public Object variantGet(String path, DataType dataType, VariantCastArgs castArgs) {
GenericVariant v = this;
PathSegment[] parsedPath = PathSegment.parse(path);
for (PathSegment pathSegment : parsedPath) {
if (pathSegment.isKey() && v.getType() == Type.OBJECT) {
v = v.getFieldByKey(pathSegment.getKey());
} else if (pathSegment.isIndex() && v.getType() == Type.ARRAY) {
v = v.getElementAtIndex(pathSegment.getIndex());
VariantPathSegment[] parsedPath = VariantPathSegment.parse(path);
for (VariantPathSegment pathSegment : parsedPath) {
if (pathSegment instanceof ObjectExtraction && v.getType() == Type.OBJECT) {
v = v.getFieldByKey(((ObjectExtraction) pathSegment).getKey());
} else if (pathSegment instanceof ArrayExtraction && v.getType() == Type.ARRAY) {
v = v.getElementAtIndex(((ArrayExtraction) pathSegment).getIndex());
} else {
return null;
}
}

switch (v.getType()) {
case OBJECT:
case ARRAY:
return v.toJson();
case STRING:
return v.getString();
case LONG:
return v.getLong();
case DOUBLE:
return v.getDouble();
case DECIMAL:
return v.getDecimal();
case BOOLEAN:
return v.getBoolean();
case NULL:
return null;
default:
// todo: support other types
throw new IllegalArgumentException("Unsupported type: " + v.getType());
}
return VariantGet.cast(v, dataType, castArgs);
}

@Override
Expand Down
Loading
Loading