Skip to content

fix: Add DateDayVector support #141

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

Merged
kodiakhq merged 5 commits into from
Nov 26, 2023
Merged

fix: Add DateDayVector support #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
598b45d
fix: add date types to ArrowHelper
spieden Nov 23, 2023
a6d7ef5
fix: undo imports reformat
spieden Nov 23, 2023
7cac302
fix: add tests for date as days since epoch, remove days as milliseco…
spieden Nov 25, 2023
0f8c23e
fix: unused import
spieden Nov 25, 2023
adcea5d
fix: formatting
spieden Nov 26, 2023
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
5 changes: 5 additions & 0 deletions lib/src/main/java/io/cloudquery/helper/ArrowHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.BitVector;
import org.apache.arrow.vector.DateDayVector;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.FixedSizeBinaryVector;
import org.apache.arrow.vector.Float4Vector;
Expand Down Expand Up @@ -139,6 +140,10 @@ private static void setVectorData(FieldVector vector, Object data) {
jsonVector.setSafe(0, (byte[]) data);
return;
}
if (vector instanceof DateDayVector dayDateVector) {
dayDateVector.set(0, (int) data);
return;
}

throw new IllegalArgumentException("Unsupported vector type: " + vector.getClass());
}
Expand Down
15 changes: 13 additions & 2 deletions lib/src/test/java/io/cloudquery/helper/ArrowHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
import io.cloudquery.schema.Resource;
import io.cloudquery.schema.Table;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import org.apache.arrow.vector.types.DateUnit;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.Schema;
Expand All @@ -41,7 +43,11 @@ public class ArrowHelperTest {
.primaryKey(true)
.build(),
Column.builder().name("string_column2").type(ArrowType.Utf8.INSTANCE).build(),
Column.builder().name("boolean_column").type(ArrowType.Bool.INSTANCE).build()))
Column.builder().name("boolean_column").type(ArrowType.Bool.INSTANCE).build(),
Column.builder()
.name("date_days_column")
.type(new ArrowType.Date(DateUnit.DAY))
.build()))
.build();

@Test
Expand Down Expand Up @@ -69,6 +75,9 @@ public void testToArrowSchema() {
CQ_EXTENSION_PRIMARY_KEY,
"false"));

assertEquals(arrowSchema.getFields().get(2).getName(), "boolean_column");
assertEquals(arrowSchema.getFields().get(3).getName(), "date_days_column");

assertEquals(
arrowSchema.getCustomMetadata(),
Map.of(
Expand All @@ -84,7 +93,8 @@ public void testFromArrowSchema() {
List<Field> fields =
List.of(
Field.nullable("string_column1", ArrowType.Utf8.INSTANCE),
Field.nullable("string_column2", ArrowType.Utf8.INSTANCE));
Field.nullable("string_column2", ArrowType.Utf8.INSTANCE),
Field.nullable("date_days_column", new ArrowType.Date(DateUnit.DAY)));

Schema schema = new Schema(fields, Map.of(CQ_TABLE_NAME, "table1"));

Expand Down Expand Up @@ -120,6 +130,7 @@ public void testRoundTripResourceEncoding() throws Exception {
Resource resource = Resource.builder().table(TEST_TABLE).build();
resource.set("string_column1", "test_data");
resource.set("string_column2", "test_data2");
resource.set("date_days_column", (int) LocalDate.parse("2023-11-24").toEpochDay());
resource.set("boolean_column", true);

Assertions.assertDoesNotThrow(
Expand Down