Skip to content

Commit 428d870

Browse files
committed
Fix GeoParquet geography support
1 parent ddbde25 commit 428d870

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/row/ParquetRowDataWriterTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -295,31 +295,31 @@ void testGeoParquetMixedSchemaRoundTrip(@TempDir java.nio.file.Path folder) thro
295295
byte[] polygonWkb =
296296
bytesFromHex(
297297
"010300000001000000050000000000000000000000000000000000000000000000"
298-
+ "00000000000000000000000F03F000000000000F03F000000000000F03F"
299-
+ "000000000000F03F000000000000000000000000000000000000000000000000");
298+
+ "0000000000000000000000F03F000000000000F03F000000000000F03F"
299+
+ "000000000000F03F0000000000000000000000000000000000000000000000");
300300
byte[] multiPointWkb =
301301
bytesFromHex(
302302
"0104000000020000000101000000000000000000F03F000000000000F03F"
303303
+ "010100000000000000000000400000000000000040");
304304
byte[] multiLineStringWkb =
305305
bytesFromHex(
306306
"010500000002000000010200000002000000000000000000000000000000000000"
307-
+ "000000000000000F03F000000000000F03F010200000002000000000000"
307+
+ "00000000000000F03F000000000000F03F010200000002000000000000"
308308
+ "0000000040000000000000004000000000000008400000000000000840");
309309
byte[] multiPolygonWkb =
310310
bytesFromHex(
311311
"010600000002000000010300000001000000050000000000000000000000000000"
312-
+ "000000000000000000000000000000000000000000F03F000000000000F03F"
313-
+ "000000000000F03F000000000000F03F00000000000000000000000000000000"
314-
+ "00000000000000000103000000010000000500000000000000000000040000000"
315-
+ "00000000040000000000000004000000000000008400000000000000840000000"
316-
+ "0000000840000000000000084000000000000000400000000000000040000000"
317-
+ "0000000040");
312+
+ "00000000000000000000000000000000000000F03F000000000000F03F0000"
313+
+ "00000000F03F000000000000F03F0000000000000000000000000000000000"
314+
+ "00000000000000010300000001000000050000000000000000000040000000"
315+
+ "00000000400000000000000040000000000000084000000000000008400000"
316+
+ "000000000840000000000000084000000000000000400000000000000040"
317+
+ "0000000000000040");
318318
byte[] geometryCollectionWkb =
319319
bytesFromHex(
320320
"0107000000020000000101000000000000000000F03F0000000000000040"
321321
+ "010200000002000000000000000000000000000000000000000000000000"
322-
+ "0000F03F000000000000F03F");
322+
+ "00F03F000000000000F03F");
323323

324324
List<RowData> rows = new ArrayList<>();
325325
rows.add(

flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryGeographyData.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ private static void validatePayload(MemorySegment[] segments, int offset, int si
115115
"Malformed ISO WKB payload. Found %d trailing byte(s).",
116116
endOffset - consumedOffset));
117117
}
118-
return header.subtypeId;
119118
}
120119

121120
private static int readSubtypeId(MemorySegment[] segments, int offset, int sizeInBytes) {

flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkCalciteSqlValidatorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
import org.junit.jupiter.params.ParameterizedTest;
3535
import org.junit.jupiter.params.provider.ValueSource;
3636

37-
import static org.assertj.core.api.Assertions.assertThat;
3837
import static org.assertj.core.api.Assertions.assertThatThrownBy;
39-
import static org.assertj.core.api.Assertions.catchThrowable;
4038
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
4139

4240
/** Test for {@link FlinkCalciteSqlValidator}. */

0 commit comments

Comments
 (0)