This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch release-0.8.1 in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit b8ff5eff67a38fde41bd988cd246b8c2dc71682d Author: Bertil Chapuis <[email protected]> AuthorDate: Sun Nov 24 14:26:41 2024 +0100 Improve third party licensing --- NOTICE | 8 + .../data/collection/MemoryAlignedDataMap.java | 11 +- .../baremaps/data/collection/MonotonicDataMap.java | 11 +- .../data/collection/MonotonicFixedSizeDataMap.java | 11 +- .../data/collection/MonotonicPairedDataMap.java | 6 + .../java/org/apache/baremaps/dem/MartiniTest.java | 5 +- .../openstreetmap/stream/BufferedSpliterator.java | 13 +- .../apache/baremaps/postgres/copy/CopyWriter.java | 755 +++++++++++---------- pom.xml | 8 + 9 files changed, 424 insertions(+), 404 deletions(-) diff --git a/NOTICE b/NOTICE index fdea1050d..a5d099b00 100644 --- a/NOTICE +++ b/NOTICE @@ -54,6 +54,13 @@ https://github.com/palantir/streams/blob/develop/LICENSE The derived files are: - baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java +This product includes code derived from PgBulkInsert. +MIT License. +Please visit the following URL for the full text of the PgBulkInsert license: +https://github.com/PgBulkInsert/PgBulkInsert/blob/master/LICENSE +The derived files are: +- baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java + This product includes code derived from Planetiler. Apache License 2.0. Please visit the following URL for the full text of the Planetiler license: @@ -62,6 +69,7 @@ The derived files are: - baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java - baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java - baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java +- baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedSizeDataMap.java This product includes test data copied from PMTiles. BSD-3-Clause license. diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java index 0bec5dcf4..aeeea0107 100644 --- a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java +++ b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java @@ -1,12 +1,9 @@ /* - * 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 + * Licensed 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 + * 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, diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java index 25094823b..f590e815c 100644 --- a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java +++ b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java @@ -1,12 +1,9 @@ /* - * 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 + * Licensed 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 + * 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, diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java index 22625504b..f0992cb94 100644 --- a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java +++ b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java @@ -1,12 +1,9 @@ /* - * 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 + * Licensed 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 + * 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, diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java index 1912acf3f..ae64e0ddb 100644 --- a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java +++ b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java @@ -29,6 +29,12 @@ import org.apache.baremaps.data.type.PairDataType.Pair; * A {@link DataMap} that can hold a large number of variable-size data elements. The elements must * be sorted by their key and inserted in a monotonic way. The elements cannot be removed or updated * once inserted. + * + * <p> + * This code has been adapted from Planetiler (Apache license). + * + * <p> + * Copyright (c) Planetiler. */ public class MonotonicPairedDataMap<E> implements DataMap<Long, E> { diff --git a/baremaps-dem/src/test/java/org/apache/baremaps/dem/MartiniTest.java b/baremaps-dem/src/test/java/org/apache/baremaps/dem/MartiniTest.java index ade7dbcbc..10ba348f3 100644 --- a/baremaps-dem/src/test/java/org/apache/baremaps/dem/MartiniTest.java +++ b/baremaps-dem/src/test/java/org/apache/baremaps/dem/MartiniTest.java @@ -24,9 +24,7 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Path; import javax.imageio.ImageIO; - import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; class MartiniTest { @@ -35,7 +33,8 @@ class MartiniTest { @Disabled("This test requires an internet connection") void generateAMesh() throws IOException { // Download the image to a temporary file - URI uri = URI.create("https://raw.githubusercontent.com/mapbox/martini/refs/heads/main/test/fixtures/fuji.png";); + URI uri = URI.create( + "https://raw.githubusercontent.com/mapbox/martini/refs/heads/main/test/fixtures/fuji.png";); File file = File.createTempFile("fuji", ".png", Path.of("").toAbsolutePath().toFile()); file.deleteOnExit(); ImageIO.write(ImageIO.read(uri.toURL()), "png", file); diff --git a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java index cfde53df6..03e99e374 100644 --- a/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java +++ b/baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java @@ -1,12 +1,11 @@ /* - * 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 + * (c) Copyright 2017 Palantir Technologies Inc. All rights reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed 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, diff --git a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java index 8f988b472..b3e5c980f 100644 --- a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java +++ b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java @@ -1,25 +1,36 @@ /* - * 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 + * The MIT License (MIT) * - * http://www.apache.org/licenses/LICENSE-2.0 + * Copyright (c) The PgBulkInsert Team * - * 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. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ package org.apache.baremaps.postgres.copy; - import de.bytefish.pgbulkinsert.pgsql.handlers.*; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.postgresql.copy.PGCopyOutputStream; +import org.postgresql.core.Oid; + import java.io.BufferedOutputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -30,373 +41,371 @@ import java.time.LocalDateTime; import java.util.Collection; import java.util.List; import java.util.Map; -import org.locationtech.jts.geom.Envelope; -import org.locationtech.jts.geom.Geometry; -import org.postgresql.copy.PGCopyOutputStream; -import org.postgresql.core.Oid; -/** A helper for writing in a {@code PGCopyOutputStream}. */ +/** + * A helper for writing in a {@code PGCopyOutputStream}. + * + * <p> + * This code has been adapted from + * <a href="https://github.com/PgBulkInsert/PgBulkInsert";>PgBulkInsert</a> licensed under the MIT + * license. + * + * <p> + * Copyright (c) The PgBulkInsert Team. + */ public class CopyWriter implements AutoCloseable { - public static final StringValueHandler STRING_HANDLER = - new StringValueHandler(); + public static final StringValueHandler STRING_HANDLER = + new StringValueHandler(); + + public static final CollectionValueHandler<String, Collection<String>> STRING_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.TEXT, new StringValueHandler()); - public static final CollectionValueHandler<String, Collection<String>> STRING_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.TEXT, new StringValueHandler()); + public static final BooleanValueHandler BOOLEAN_HANDLER = + new BooleanValueHandler(); - public static final BooleanValueHandler BOOLEAN_HANDLER = - new BooleanValueHandler(); + public static final CollectionValueHandler<Boolean, Collection<Boolean>> BOOLEAN_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.BOOL, new BooleanValueHandler()); - public static final CollectionValueHandler<Boolean, Collection<Boolean>> BOOLEAN_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.BOOL, new BooleanValueHandler()); + public static final ByteValueHandler<Number> BYTE_HANDLER = + new ByteValueHandler<>(); - public static final ByteValueHandler<Number> BYTE_HANDLER = - new ByteValueHandler<>(); + public static final ByteArrayValueHandler BYTE_ARRAY_HANDLER = + new ByteArrayValueHandler(); - public static final ByteArrayValueHandler BYTE_ARRAY_HANDLER = - new ByteArrayValueHandler(); + public static final ShortValueHandler<Number> SHORT_HANDLER = + new ShortValueHandler<>(); - public static final ShortValueHandler<Number> SHORT_HANDLER = - new ShortValueHandler<>(); - - public static final CollectionValueHandler<Short, Collection<Short>> SHORT_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.INT2, new ShortValueHandler<>()); - - public static final IntegerValueHandler<Number> INTEGER_HANDLER = - new IntegerValueHandler<>(); - - public static final CollectionValueHandler<Integer, Collection<Integer>> INTEGER_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.INT4, new IntegerValueHandler<>()); - - public static final LongValueHandler<Number> LONG_HANDLER = - new LongValueHandler<>(); - - public static final CollectionValueHandler<Long, Collection<Long>> LONG_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.INT8, new LongValueHandler<>()); - - public static final FloatValueHandler<Number> FLOAT_HANDLER = - new FloatValueHandler<>(); - - public static final CollectionValueHandler<Float, Collection<Float>> FLOAT_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.FLOAT4, new FloatValueHandler<>()); - - public static final DoubleValueHandler<Number> DOUBLE_HANDLER = - new DoubleValueHandler<>(); - - public static final CollectionValueHandler<Double, Collection<Double>> DOUBLE_COLLECTION_HANDLER = - new CollectionValueHandler<>(Oid.FLOAT8, new DoubleValueHandler<>()); - - public static final LocalDateValueHandler LOCAL_DATE_HANDLER = - new LocalDateValueHandler(); - - public static final LocalDateTimeValueHandler LOCAL_DATE_TIME_HANDLER = - new LocalDateTimeValueHandler(); - - public static final Inet4AddressValueHandler INET_4_ADDRESS_HANDLER = - new Inet4AddressValueHandler(); - - public static final Inet6AddressValueHandler INET_6_ADDRESS_HANDLER = - new Inet6AddressValueHandler(); - - public static final HstoreValueHandler HSTORE_HANDLER = - new HstoreValueHandler(); - - public static final JsonbValueHandler JSONB_HANDLER = - new JsonbValueHandler(); - - public static final GeometryValueHandler GEOMETRY_HANDLER = - new GeometryValueHandler(); - - public static final EnvelopeValueHandler ENVELOPE_HANDLER = - new EnvelopeValueHandler(); - - private final DataOutputStream data; - - /** - * Creates a new writer with the specified {@code PGCopyOutputStream}. - * - * <p> - * This code has been adapted from - * <a href="https://github.com/PgBulkInsert/PgBulkInsert";>PgBulkInsert</a> licensed under the MIT - * license. - * - * <p> - * Copyright (c) The PgBulkInsert Team. - * - * @param data - */ - public CopyWriter(PGCopyOutputStream data) { - this.data = new DataOutputStream(new BufferedOutputStream(data, 65536)); - } - - /** - * Writes the header of the query. - * - * @throws IOException - */ - public void writeHeader() throws IOException { - // 11 bytes required header - data.writeBytes("PGCOPY\n\377\r\n\0"); - // 32 bit integer indicating no OID - data.writeInt(0); - // 32 bit header extension area length - data.writeInt(0); - } - - /** - * Writes the number of columns affected by the query. - * - * @param columns - * @throws IOException - */ - public void startRow(int columns) throws IOException { - data.writeShort(columns); - } - - /** - * Writes a null value. - * - * @throws IOException - */ - public void writeNull() throws IOException { - data.writeInt(-1); - } - - /** - * Writes a null value. - * - * @param handler the value handler - * @param value the value - */ - public <T> void write(BaseValueHandler<T> handler, T value) { - handler.handle(data, value); - } - - /** - * Writes a string value. - * - * @param value the value - */ - public void write(String value) { - STRING_HANDLER.handle(data, value); - } - - /** - * Writes a list of string values. - * - * @param value the value - */ - public void write(List<String> value) { - STRING_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a boolean value. - * - * @param value the value - */ - public void writeBoolean(Boolean value) { - BOOLEAN_HANDLER.handle(data, value); - } - - /** - * Writes a list of boolean values. - * - * @param value the value - */ - public void writeBooleanList(List<Boolean> value) { - BOOLEAN_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a byte value. - * - * @param value the value - */ - public void writeByte(Byte value) { - BYTE_HANDLER.handle(data, value); - } - - /** - * Writes a byte array value. - * - * @param value the value - */ - public void writeByteArray(byte[] value) { - BYTE_ARRAY_HANDLER.handle(data, value); - } - - /** - * Writes a short value. - * - * @param value the value - */ - public void writeShort(Short value) { - SHORT_HANDLER.handle(data, value); - } - - /** - * Writes a list of short values. - * - * @param value the value - */ - public void writeShortList(List<Short> value) { - SHORT_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes an integer value. - * - * @param value the value - */ - public void writeInteger(Integer value) { - INTEGER_HANDLER.handle(data, value); - } - - /** - * Writes a list of integer values. - * - * @param value the value - */ - public void writeIntegerList(List<Integer> value) { - INTEGER_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a long value. - * - * @param value the value - */ - public void writeLong(Long value) { - LONG_HANDLER.handle(data, value); - } - - /** - * Writes a list of long values. - * - * @param value the value - */ - public void writeLongList(List<Long> value) { - LONG_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a float value. - * - * @param value the value - */ - public void writeFloat(Float value) { - FLOAT_HANDLER.handle(data, value); - } - - /** - * Writes a list of float values. - * - * @param value the value - */ - public void writeFloatList(List<Float> value) { - FLOAT_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a double value. - * - * @param value the value - */ - public void writeDouble(Double value) { - DOUBLE_HANDLER.handle(data, value); - } - - /** - * Writes a list of double values. - * - * @param value the value - */ - public void writeDoubleArray(List<Double> value) { - DOUBLE_COLLECTION_HANDLER.handle(data, value); - } - - /** - * Writes a date value. - * - * @param value the value - */ - public void writeLocalDate(LocalDate value) { - LOCAL_DATE_HANDLER.handle(data, value); - } - - /** - * Writes a list of date values. - * - * @param value the value - */ - public void writeLocalDateTime(LocalDateTime value) { - LOCAL_DATE_TIME_HANDLER.handle(data, value); - } - - /** - * Writes an inet adress value. - * - * @param value the value - */ - public void writeInet4Adress(Inet4Address value) { - INET_4_ADDRESS_HANDLER.handle(data, value); - } - - /** - * Writes a list of inet adress values. - * - * @param value the value - */ - public void writeInet6Adress(Inet6Address value) { - INET_6_ADDRESS_HANDLER.handle(data, value); - } - - /** - * Writes a map value. - * - * @param value the value - */ - public void writeHstore(Map<String, String> value) { - HSTORE_HANDLER.handle(data, value); - } - - /** - * Writes a jsonb array - * - * @param value the value - */ - public void writeJsonb(String value) { - JSONB_HANDLER.handle(data, value); - } - - /** - * Writes a geometry value. - * - * @param value the value - */ - public void writeGeometry(Geometry value) { - GEOMETRY_HANDLER.handle(data, value); - } - - /** - * Writes an envelope value. - * - * @param value the value - */ - public void writeEnvelope(Envelope value) { - ENVELOPE_HANDLER.handle(data, value); - } - - /** - * Writes the end of the row. - * - * @throws IOException - */ - @Override - public void close() throws IOException { - data.writeShort(-1); - data.flush(); - data.close(); - } + public static final CollectionValueHandler<Short, Collection<Short>> SHORT_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.INT2, new ShortValueHandler<>()); + + public static final IntegerValueHandler<Number> INTEGER_HANDLER = + new IntegerValueHandler<>(); + + public static final CollectionValueHandler<Integer, Collection<Integer>> INTEGER_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.INT4, new IntegerValueHandler<>()); + + public static final LongValueHandler<Number> LONG_HANDLER = + new LongValueHandler<>(); + + public static final CollectionValueHandler<Long, Collection<Long>> LONG_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.INT8, new LongValueHandler<>()); + + public static final FloatValueHandler<Number> FLOAT_HANDLER = + new FloatValueHandler<>(); + + public static final CollectionValueHandler<Float, Collection<Float>> FLOAT_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.FLOAT4, new FloatValueHandler<>()); + + public static final DoubleValueHandler<Number> DOUBLE_HANDLER = + new DoubleValueHandler<>(); + + public static final CollectionValueHandler<Double, Collection<Double>> DOUBLE_COLLECTION_HANDLER = + new CollectionValueHandler<>(Oid.FLOAT8, new DoubleValueHandler<>()); + + public static final LocalDateValueHandler LOCAL_DATE_HANDLER = + new LocalDateValueHandler(); + + public static final LocalDateTimeValueHandler LOCAL_DATE_TIME_HANDLER = + new LocalDateTimeValueHandler(); + + public static final Inet4AddressValueHandler INET_4_ADDRESS_HANDLER = + new Inet4AddressValueHandler(); + + public static final Inet6AddressValueHandler INET_6_ADDRESS_HANDLER = + new Inet6AddressValueHandler(); + + public static final HstoreValueHandler HSTORE_HANDLER = + new HstoreValueHandler(); + + public static final JsonbValueHandler JSONB_HANDLER = + new JsonbValueHandler(); + + public static final GeometryValueHandler GEOMETRY_HANDLER = + new GeometryValueHandler(); + + public static final EnvelopeValueHandler ENVELOPE_HANDLER = + new EnvelopeValueHandler(); + + private final DataOutputStream data; + + /** + * Creates a new writer with the specified {@code PGCopyOutputStream}. + * + * @param data + */ + public CopyWriter(PGCopyOutputStream data) { + this.data = new DataOutputStream(new BufferedOutputStream(data, 65536)); + } + + /** + * Writes the header of the query. + * + * @throws IOException + */ + public void writeHeader() throws IOException { + // 11 bytes required header + data.writeBytes("PGCOPY\n\377\r\n\0"); + // 32 bit integer indicating no OID + data.writeInt(0); + // 32 bit header extension area length + data.writeInt(0); + } + + /** + * Writes the number of columns affected by the query. + * + * @param columns + * @throws IOException + */ + public void startRow(int columns) throws IOException { + data.writeShort(columns); + } + + /** + * Writes a null value. + * + * @throws IOException + */ + public void writeNull() throws IOException { + data.writeInt(-1); + } + + /** + * Writes a null value. + * + * @param handler the value handler + * @param value the value + */ + public <T> void write(BaseValueHandler<T> handler, T value) { + handler.handle(data, value); + } + + /** + * Writes a string value. + * + * @param value the value + */ + public void write(String value) { + STRING_HANDLER.handle(data, value); + } + + /** + * Writes a list of string values. + * + * @param value the value + */ + public void write(List<String> value) { + STRING_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a boolean value. + * + * @param value the value + */ + public void writeBoolean(Boolean value) { + BOOLEAN_HANDLER.handle(data, value); + } + + /** + * Writes a list of boolean values. + * + * @param value the value + */ + public void writeBooleanList(List<Boolean> value) { + BOOLEAN_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a byte value. + * + * @param value the value + */ + public void writeByte(Byte value) { + BYTE_HANDLER.handle(data, value); + } + + /** + * Writes a byte array value. + * + * @param value the value + */ + public void writeByteArray(byte[] value) { + BYTE_ARRAY_HANDLER.handle(data, value); + } + + /** + * Writes a short value. + * + * @param value the value + */ + public void writeShort(Short value) { + SHORT_HANDLER.handle(data, value); + } + + /** + * Writes a list of short values. + * + * @param value the value + */ + public void writeShortList(List<Short> value) { + SHORT_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes an integer value. + * + * @param value the value + */ + public void writeInteger(Integer value) { + INTEGER_HANDLER.handle(data, value); + } + + /** + * Writes a list of integer values. + * + * @param value the value + */ + public void writeIntegerList(List<Integer> value) { + INTEGER_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a long value. + * + * @param value the value + */ + public void writeLong(Long value) { + LONG_HANDLER.handle(data, value); + } + + /** + * Writes a list of long values. + * + * @param value the value + */ + public void writeLongList(List<Long> value) { + LONG_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a float value. + * + * @param value the value + */ + public void writeFloat(Float value) { + FLOAT_HANDLER.handle(data, value); + } + + /** + * Writes a list of float values. + * + * @param value the value + */ + public void writeFloatList(List<Float> value) { + FLOAT_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a double value. + * + * @param value the value + */ + public void writeDouble(Double value) { + DOUBLE_HANDLER.handle(data, value); + } + + /** + * Writes a list of double values. + * + * @param value the value + */ + public void writeDoubleArray(List<Double> value) { + DOUBLE_COLLECTION_HANDLER.handle(data, value); + } + + /** + * Writes a date value. + * + * @param value the value + */ + public void writeLocalDate(LocalDate value) { + LOCAL_DATE_HANDLER.handle(data, value); + } + + /** + * Writes a list of date values. + * + * @param value the value + */ + public void writeLocalDateTime(LocalDateTime value) { + LOCAL_DATE_TIME_HANDLER.handle(data, value); + } + + /** + * Writes an inet adress value. + * + * @param value the value + */ + public void writeInet4Adress(Inet4Address value) { + INET_4_ADDRESS_HANDLER.handle(data, value); + } + + /** + * Writes a list of inet adress values. + * + * @param value the value + */ + public void writeInet6Adress(Inet6Address value) { + INET_6_ADDRESS_HANDLER.handle(data, value); + } + + /** + * Writes a map value. + * + * @param value the value + */ + public void writeHstore(Map<String, String> value) { + HSTORE_HANDLER.handle(data, value); + } + + /** + * Writes a jsonb array + * + * @param value the value + */ + public void writeJsonb(String value) { + JSONB_HANDLER.handle(data, value); + } + + /** + * Writes a geometry value. + * + * @param value the value + */ + public void writeGeometry(Geometry value) { + GEOMETRY_HANDLER.handle(data, value); + } + + /** + * Writes an envelope value. + * + * @param value the value + */ + public void writeEnvelope(Envelope value) { + ENVELOPE_HANDLER.handle(data, value); + } + + /** + * Writes the end of the row. + * + * @throws IOException + */ + @Override + public void close() throws IOException { + data.writeShort(-1); + data.flush(); + data.close(); + } } diff --git a/pom.xml b/pom.xml index 36a8691f4..106df3faa 100644 --- a/pom.xml +++ b/pom.xml @@ -667,6 +667,14 @@ limitations under the License. <licenseHeader> <file>${maven.multiModuleProjectDirectory}/LICENSE.header</file> </licenseHeader> + <excludes> + <include>**/CopyWriter.java</include> + <include>**/BufferedSpliterator.java</include> + <include>**/MemoryAlignedDataMap.java</include> + <include>**/MonotonicDataMap.java</include> + <include>**/MonotonicFixedSizeDataMap.java</include> + <include>**/StateReader.java</include> + </excludes> </java> </configuration> <executions>
![https://raw.githubusercontent.com/mapbox/martini/refs/heads/main/test/fixtures/fuji.png"](https://raw.githubusercontent.com/mapbox/martini/refs/heads/main/test/fixtures/fuji.png"){kind=link}