ARROW-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata #407

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@@ -58,7 +58,7 @@
},
{
name: "Time",
fields: []
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
},
{
name: "Timestamp",
Expand Down
39 changes: 2 additions & 37 deletions java/vector/src/main/codegen/templates/NullableValueVectors.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
values = new ${valuesName}(valuesField, allocator);
mutator = new Mutator();
accessor = new Accessor();
<#if minor.class == "TinyInt" ||
minor.class == "SmallInt" ||
minor.class == "Int" ||
minor.class == "BigInt">
field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
<#elseif minor.class == "UInt1" ||
minor.class == "UInt2" ||
minor.class == "UInt4" ||
minor.class == "UInt8">
field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
<#elseif minor.class == "Date">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
<#elseif minor.class == "Time">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
<#elseif minor.class == "Float4">
field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
<#elseif minor.class == "Float8">
field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
<#elseif minor.class == "TimeStampSec">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
<#elseif minor.class == "TimeStampMilli">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
<#elseif minor.class == "TimeStampMicro">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
<#elseif minor.class == "TimeStampNano">
field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
<#elseif minor.class == "IntervalDay">
field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
<#elseif minor.class == "IntervalYear">
field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
<#elseif minor.class == "VarChar">
field = new Field(name, true, new Utf8(), dictionary, null);
<#elseif minor.class == "VarBinary">
field = new Field(name, true, new Binary(), dictionary, null);
<#elseif minor.class == "Bit">
field = new Field(name, true, new Bool(), dictionary, null);
</#if>
ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
field = new Field(name, true, type, dictionary, null);
innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
bits,
<#if type.major = "VarLen">
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

@Override
public TypeLayout visit(Time type) {
return newFixedWidthTypeLayout(dataVector(64));
return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
}

@Override
Expand Down
7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
return new DateWriterImpl((NullableDateVector) vector);
}
},
TIME(Time.INSTANCE) {
TIME(new Time(TimeUnit.MILLISECOND, 32)) {
@Override
public Field getField() {
return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
}

@Override public MinorType visit(Time type) {
if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
}

@wesmwesmMar 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?

@julienledemjulienledemMar 20, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.

return MinorType.TIME;
}

Expand Down
2 changes: 1 addition & 1 deletion 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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
field("i", new ArrowType.Bool()),
field("j", new ArrowType.Decimal(5, 5)),
field("k", new ArrowType.Date()),
field("l", new ArrowType.Time()),
field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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 > 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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
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-673: [Java] Support additional Time metadata#407

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-673: [Java] Support additional Time metadata
#407
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@@ -58,7 +58,7 @@
 },
 {
 name: "Time",
 fields: []
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 },
 {
 name: "Timestamp",
Expand Down

39 changes: 2 additions & 37 deletions
java/vector/src/main/codegen/templates/NullableValueVectors.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,43 +84,8 @@ public final class ${className} extends BaseDataValueVector implements <#if type
 values = new ${valuesName}(valuesField, allocator);
 mutator = new Mutator();
 accessor = new Accessor();
 <#if minor.class == "TinyInt" ||
 minor.class == "SmallInt" ||
 minor.class == "Int" ||
 minor.class == "BigInt">
 field = new Field(name, true, new Int(${type.width} * 8, true), dictionary, null);
 <#elseif minor.class == "UInt1" ||
 minor.class == "UInt2" ||
 minor.class == "UInt4" ||
 minor.class == "UInt8">
 field = new Field(name, true, new Int(${type.width} * 8, false), dictionary, null);
 <#elseif minor.class == "Date">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Date(), dictionary, null);
 <#elseif minor.class == "Time">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Time(), dictionary, null);
 <#elseif minor.class == "Float4">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE), dictionary, null);
 <#elseif minor.class == "Float8">
 field = new Field(name, true, new FloatingPoint(org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE), dictionary, null);
 <#elseif minor.class == "TimeStampSec">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMilli">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND), dictionary, null);
 <#elseif minor.class == "TimeStampMicro">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND), dictionary, null);
 <#elseif minor.class == "TimeStampNano">
 field = new Field(name, true, new org.apache.arrow.vector.types.pojo.ArrowType.Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND), dictionary, null);
 <#elseif minor.class == "IntervalDay">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.DAY_TIME), dictionary, null);
 <#elseif minor.class == "IntervalYear">
 field = new Field(name, true, new Interval(org.apache.arrow.vector.types.IntervalUnit.YEAR_MONTH), dictionary, null);
 <#elseif minor.class == "VarChar">
 field = new Field(name, true, new Utf8(), dictionary, null);
 <#elseif minor.class == "VarBinary">
 field = new Field(name, true, new Binary(), dictionary, null);
 <#elseif minor.class == "Bit">
 field = new Field(name, true, new Bool(), dictionary, null);
 </#if>
 ArrowType type = Types.MinorType.${minor.class?upper_case}.getType();
 field = new Field(name, true, type, dictionary, null);
 innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(
 bits,
 <#if type.major = "VarLen">
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ public TypeLayout visit(Date type) {

 @Override
 public TypeLayout visit(Time type) {
 return newFixedWidthTypeLayout(dataVector(64));
 return newFixedWidthTypeLayout(dataVector(type.getBitWidth()));
 }

 @Override
Expand Down

7 changes: 5 additions & 2 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@@ -108,7 +108,7 @@ public class Types {
 private static final Field UINT4_FIELD = new Field("", true, new Int(32, false), null);
 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, Time.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);
Expand DownExpand Up@@ -235,7 +235,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
 return new DateWriterImpl((NullableDateVector) vector);
 }
 },
 TIME(Time.INSTANCE) {
 TIME(new Time(TimeUnit.MILLISECOND, 32)) {
 @Override
 public Field getField() {
 return TIME_FIELD;
Expand DownExpand Up@@ -639,6 +639,9 @@ public MinorType visit(FloatingPoint type) {
 }

 @Override public MinorType visit(Time type) {
 if (type.getUnit() != TimeUnit.MILLISECOND || type.getBitWidth() != 32) {
 throw new IllegalArgumentException("Only milliseconds on 32 bits supported for now: " + type);
 }
@wesmwesmMar 20, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you need to do something like what was done with timestamps for multiple unit support?
@julienledemjulienledemMar 20, 2017

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I was thinking of doing it as a follow up. I think we need to change a little bit the notion of MinorType to avoid generating too many vector classes.
 return MinorType.TIME;
 }

Expand Down

2 changes: 1 addition & 1 deletion
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@@ -71,7 +71,7 @@ public void testAll() throws IOException {
 field("i", new ArrowType.Bool()),
 field("j", new ArrowType.Decimal(5, 5)),
 field("k", new ArrowType.Date()),
 field("l", new ArrowType.Time()),
 field("l", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
 field("m", new ArrowType.Timestamp(TimeUnit.MILLISECOND)),
 field("n", new ArrowType.Interval(IntervalUnit.DAY_TIME))
 ));
Expand Down