Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BugFix][Spark-translation] map type cast error #6552

Merged
merged 1 commit into from
Mar 21, 2024
Merged

[BugFix][Spark-translation] map type cast error #6552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...-e2e/seatunnel-connector-v2-e2e/connector-fake-e2e/src/test/resources/fake_to_assert.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,17 @@ source {
}
}

transform {
Sql {
source_table_name = "fake"
result_table_name = "tmp1"
query = """select * from fake"""
}
}

sink {
Assert {
source_table_name = "tmp1"
rules {
row_rules = [
{
Expand Down
20 changes: 10 additions & 10 deletions ...main/java/org/apache/seatunnel/translation/spark/serialization/SeaTunnelRowConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.spark.unsafe.types.UTF8String;

import scala.Tuple2;
import scala.collection.immutable.HashMap.HashTrieMap;
import scala.collection.immutable.AbstractMap;
import scala.collection.mutable.WrappedArray;

import java.io.IOException;
Expand Down Expand Up @@ -179,7 +179,7 @@ private Object reconvert(Object field, SeaTunnelDataType<?> dataType) {
case STRING:
return field.toString();
case MAP:
return reconvertMap((HashTrieMap<?, ?>) field, (MapType<?, ?>) dataType);
return reconvertMap((AbstractMap<?, ?>) field, (MapType<?, ?>) dataType);
case ARRAY:
return reconvertArray((WrappedArray.ofRef<?>) field, (ArrayType<?, ?>) dataType);
default:
Expand All @@ -206,23 +206,23 @@ private SeaTunnelRow reconvert(SeaTunnelRow engineRow, SeaTunnelRowType rowType)
}

/**
* Convert HashTrieMap to LinkedHashMap
* Convert AbstractMap to LinkedHashMap
*
* @param hashTrieMap HashTrieMap data
* @param abstractMap AbstractMap data
* @param mapType fields type map
* @return java.util.LinkedHashMap
* @see HashTrieMap
* @see AbstractMap
*/
private Map<Object, Object> reconvertMap(HashTrieMap<?, ?> hashTrieMap, MapType<?, ?> mapType) {
if (hashTrieMap == null || hashTrieMap.size() == 0) {
private Map<Object, Object> reconvertMap(AbstractMap<?, ?> abstractMap, MapType<?, ?> mapType) {
if (abstractMap == null || abstractMap.size() == 0) {
return Collections.emptyMap();
}
int num = hashTrieMap.size();
int num = abstractMap.size();
Map<Object, Object> newMap = new LinkedHashMap<>(num);
SeaTunnelDataType<?> keyType = mapType.getKeyType();
SeaTunnelDataType<?> valueType = mapType.getValueType();
scala.collection.immutable.List<?> keyList = hashTrieMap.keySet().toList();
scala.collection.immutable.List<?> valueList = hashTrieMap.values().toList();
scala.collection.immutable.List<?> keyList = abstractMap.keySet().toList();
scala.collection.immutable.List<?> valueList = abstractMap.values().toList();
for (int i = 0; i < num; i++) {
Object key = keyList.apply(i);
Object value = valueList.apply(i);
Expand Down