|
8 | 8 | import io.cloudquery.schema.Resource; |
9 | 9 | import io.cloudquery.schema.Table; |
10 | 10 | import io.cloudquery.schema.Table.TableBuilder; |
11 | | -import io.cloudquery.types.JSONType; |
12 | 11 | import io.cloudquery.types.JSONType.JSONVector; |
13 | | -import io.cloudquery.types.UUIDType; |
14 | 12 | import io.cloudquery.types.UUIDType.UUIDVector; |
15 | 13 | import java.io.ByteArrayOutputStream; |
16 | 14 | import java.io.IOException; |
|
23 | 21 | import org.apache.arrow.vector.ipc.ArrowReader; |
24 | 22 | import org.apache.arrow.vector.ipc.ArrowStreamReader; |
25 | 23 | import org.apache.arrow.vector.ipc.ArrowStreamWriter; |
26 | | -import org.apache.arrow.vector.types.pojo.ArrowType; |
27 | 24 | import org.apache.arrow.vector.types.pojo.Field; |
28 | 25 | import org.apache.arrow.vector.types.pojo.FieldType; |
29 | 26 | import org.apache.arrow.vector.types.pojo.Schema; |
@@ -264,30 +261,12 @@ private static Column getColumn(Field field) { |
264 | 261 | boolean isIncrementalKey = |
265 | 262 | Objects.equals(field.getMetadata().get(CQ_EXTENSION_INCREMENTAL), "true"); |
266 | 263 |
|
267 | | - ArrowType fieldType = field.getType(); |
268 | | - String extensionName = |
269 | | - field.getMetadata().get(ArrowType.ExtensionType.EXTENSION_METADATA_KEY_NAME); |
270 | | - String extensionMetadata = |
271 | | - field.getMetadata().get(ArrowType.ExtensionType.EXTENSION_METADATA_KEY_METADATA); |
272 | | - |
273 | | - // We need to scan our extension types manually because of |
274 | | - // https://github.com/apache/arrow/issues/38891 |
275 | | - if (JSONType.EXTENSION_NAME.equals(extensionName) |
276 | | - && JSONType.INSTANCE.serialize().equals(extensionMetadata) |
277 | | - && JSONType.INSTANCE.storageType().equals(fieldType)) { |
278 | | - fieldType = JSONType.INSTANCE; |
279 | | - } else if (UUIDType.EXTENSION_NAME.equals(extensionName) |
280 | | - && UUIDType.INSTANCE.serialize().equals(extensionMetadata) |
281 | | - && UUIDType.INSTANCE.storageType().equals(fieldType)) { |
282 | | - fieldType = UUIDType.INSTANCE; |
283 | | - } |
284 | | - |
285 | 264 | return Column.builder() |
286 | 265 | .name(field.getName()) |
287 | 266 | .unique(isUnique) |
288 | 267 | .primaryKey(isPrimaryKey) |
289 | 268 | .incrementalKey(isIncrementalKey) |
290 | | - .type(fieldType) |
| 269 | + .type(field.getType()) |
291 | 270 | .build(); |
292 | 271 | } |
293 | 272 |
|
|
0 commit comments