ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

ARROW-674: [Java] Support additional Timestamp timezone metadata#408

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

Closed
julienledem wants to merge 1 commit into from
Closed

ARROW-674: [Java] Support additional Timestamp timezone metadata #408

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
},
{
name: "Interval",
Expand Down
16 changes: 8 additions & 8 deletions java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,10 +109,10 @@ public class Types {
private static final Field UINT8_FIELD = new Field("", true, new Int(64, false), null);
private static final Field DATE_FIELD = new Field("", true, Date.INSTANCE, null);
private static final Field TIME_FIELD = new Field("", true, new Time(TimeUnit.MILLISECOND, 32), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND), null);
private static final Field TIMESTAMPSEC_FIELD = new Field("", true, new Timestamp(TimeUnit.SECOND, "UTC"), null);
private static final Field TIMESTAMPMILLI_FIELD = new Field("", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null);
private static final Field TIMESTAMPMICRO_FIELD = new Field("", true, new Timestamp(TimeUnit.MICROSECOND, "UTC"), null);
private static final Field TIMESTAMPNANO_FIELD = new Field("", true, new Timestamp(TimeUnit.NANOSECOND, "UTC"), null);
private static final Field INTERVALDAY_FIELD = new Field("", true, new Interval(IntervalUnit.DAY_TIME), null);
private static final Field INTERVALYEAR_FIELD = new Field("", true, new Interval(IntervalUnit.YEAR_MONTH), null);
private static final Field FLOAT4_FIELD = new Field("", true, new FloatingPoint(FloatingPointPrecision.SINGLE), null);
Expand DownExpand Up@@ -252,7 +252,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in second from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND)) {
TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPSEC_FIELD;
Expand All@@ -269,7 +269,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in millis from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND)) {
TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMILLI_FIELD;
Expand All@@ -286,7 +286,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in microsecond from the Unix epoch, 00:00:00.000000 on 1 January 1970, UTC.
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND)) {
TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPMICRO_FIELD;
Expand All@@ -303,7 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
}
},
// time in nanosecond from the Unix epoch, 00:00:00.000000000 on 1 January 1970, UTC.
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND)) {
TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, "UTC")) {
@Override
public Field getField() {
return TIMESTAMPNANO_FIELD;
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ public void nestedSchema() {
new Field("child4.1", true, Utf8.INSTANCE, null)
)));
childrenBuilder.add(new Field("child5", true, new Union(UnionMode.Sparse, new int[] { MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal() } ), ImmutableList.<Field>of(
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND), null),
new Field("child5.1", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null),
new Field("child5.2", true, new FloatingPoint(DOUBLE), ImmutableList.<Field>of())
)));
Schema initialSchema = new Schema(childrenBuilder.build());
Expand Down
90 changes: 56 additions & 34 deletions java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,20 @@
import org.apache.arrow.vector.types.IntervalUnit;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.UnionMode;
import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
import org.apache.arrow.vector.types.pojo.ArrowType.Date;
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.ArrowType.FloatingPoint;
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
import org.apache.arrow.vector.types.pojo.ArrowType.List;
import org.apache.arrow.vector.types.pojo.ArrowType.Null;
import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
import org.apache.arrow.vector.types.pojo.ArrowType.Time;
import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
import org.apache.arrow.vector.types.pojo.ArrowType.Union;
import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
import org.junit.Test;

public class TestSchema {
Expand All@@ -42,46 +56,48 @@ private static Field field(String name, ArrowType type, Field... children) {
@Test
public void testComplex() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Int(8, true)),
field("b", new ArrowType.Struct(),
field("c", new ArrowType.Int(16, true)),
field("d", new ArrowType.Utf8())),
field("e", new ArrowType.List(), field(null, new ArrowType.Date())),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("h", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Int(8, true)),
field("b", new Struct(),
field("c", new Int(16, true)),
field("d", new Utf8())),
field("e", new List(), field(null, new Date())),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
field("i", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
assertEquals(
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND), h: Interval(DAY_TIME)>",
"Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date>, f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), i: Interval(DAY_TIME)>",
schema.toString());
}

@Test
public void testAll() throws IOException {
Schema schema = new Schema(asList(
field("a", false, new ArrowType.Null()),
field("b", new ArrowType.Struct(), field("ba", new ArrowType.Null())),
field("c", new ArrowType.List(), field("ca", new ArrowType.Null())),
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null())),
field("e", new ArrowType.Int(8, true)),
field("f", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new ArrowType.Utf8()),
field("h", new ArrowType.Binary()),
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", false, new Null()),
field("b", new Struct(), field("ba", new Null())),
field("c", new List(), field("ca", new Null())),
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
field("e", new Int(8, true)),
field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("g", new Utf8()),
field("h", new Binary()),
field("i", new Bool()),
field("j", new Decimal(5, 5)),
field("k", new Date()),
field("l", new Time(TimeUnit.MILLISECOND, 32)),
field("m", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("n", new Timestamp(TimeUnit.MICROSECOND, null)),
field("o", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
}

@Test
public void testUnion() throws IOException {
Schema schema = new Schema(asList(
field("d", new ArrowType.Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new ArrowType.Null()))
field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
));
roundTrip(schema);
contains(schema, "Sparse");
Expand All@@ -90,20 +106,26 @@ public void testUnion() throws IOException {
@Test
public void testTS() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Timestamp(TimeUnit.SECOND)),
field("b", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("c", new ArrowType.Timestamp(TimeUnit.MICROSECOND)),
field("d", new ArrowType.Timestamp(TimeUnit.NANOSECOND))
field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
field("e", new Timestamp(TimeUnit.SECOND, null)),
field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
field("h", new Timestamp(TimeUnit.NANOSECOND, null))
));
roundTrip(schema);
contains(schema, "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND");
assertEquals(
"Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
schema.toString());
}

@Test
public void testInterval() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.Interval(IntervalUnit.YEAR_MONTH)),
field("b", new ArrowType.Interval(IntervalUnit.DAY_TIME))
field("a", new Interval(IntervalUnit.YEAR_MONTH)),
field("b", new Interval(IntervalUnit.DAY_TIME))
));
roundTrip(schema);
contains(schema, "YEAR_MONTH", "DAY_TIME");
Expand All@@ -112,9 +134,9 @@ public void testInterval() throws IOException {
@Test
public void testFP() throws IOException {
Schema schema = new Schema(asList(
field("a", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
));
roundTrip(schema);
contains(schema, "HALF", "SINGLE", "DOUBLE");
Expand Down