ARROW-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits #409

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
55 changes: 34 additions & 21 deletions java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
public void basicTest() throws InterruptedException, IOException {
BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
.<Field>emptyList());
NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
Field field = new Field(
"testField", true,
new ArrowType.Int(8, true),
Collections.<Field>emptyList());
NullableTinyIntVector vector =
new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
Schema schema = new Schema(asList(field));

// Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
public void testFlatDictionary() throws IOException {
DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
allocator, null)) {
NullableIntVector writeVector =
new NullableIntVector(
"varchar",
new FieldType(true, MinorType.INT.getType(), writeEncoding),
allocator);
NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector(
"dict",
FieldType.nullable(VARCHAR.getType()),
allocator)) {
writeVector.allocateNewSafe();
NullableIntVector.Mutator mutator = writeVector.getMutator();
mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
public void testNestedDictionary() throws IOException {
DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
ListVector writeVector = new ListVector("list", allocator, null, null)) {

// data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.getMutator().setValueCount(2);

writeVector.addOrGetVector(MinorType.INT, writeEncoding);
writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
writeVector.allocateNew();
UnionListWriter listWriter = new UnionListWriter(writeVector);
listWriter.startList();
Expand Down
38 changes: 26 additions & 12 deletions java/vector/src/main/codegen/data/ArrowTypes.tdd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
types: [
{
name: "Null",
fields: []
fields: [],
complex: false
},
{
name: "Struct_",
fields: []
fields: [],
complex: true
},
{
name: "List",
fields: []
fields: [],
complex: true
},
{
name: "Union",
fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
complex: true
},
{
name: "Int",
fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
complex: false
},
{
name: "FloatingPoint",
fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
complex: false
},
{
name: "Utf8",
fields: []
fields: [],
complex: false
},
{
name: "Binary",
fields: []
fields: [],
complex: false
},
{
name: "Bool",
fields: []
fields: [],
complex: false
},
{
name: "Decimal",
fields: [{name: "precision", type: int}, {name: "scale", type: int}]
fields: [{name: "precision", type: int}, {name: "scale", type: int}],
complex: false
},
{
name: "Date",
fields: [{name: "unit", type: short, valueType: DateUnit}]
complex: false
},
{
name: "Time",
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
complex: false
},
{
name: "Timestamp",
fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
complex: false
},
{
name: "Interval",
fields: [{name: "unit", type: short, valueType: IntervalUnit}]
fields: [{name: "unit", type: short, valueType: IntervalUnit}],
complex: false
}
]
}
81 changes: 70 additions & 11 deletions java/vector/src/main/codegen/templates/ArrowType.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

public static abstract class PrimitiveType extends ArrowType {

private PrimitiveType() {
}

@Override
public boolean isComplex() {
return false;
}
}

public static abstract class ComplexType extends ArrowType {

private ComplexType() {
}

@Override
public boolean isComplex() {
return true;
}
}

public static enum ArrowTypeID {
<#list arrowTypes.types as type>
<#assign name = type.name>
${name?remove_ending("_")}(Type.${name}),
</#list>
NONE(Type.NONE);

private final byte flatbufType;

public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

@JsonIgnore
public abstract ArrowTypeID getTypeID();
@JsonIgnore
public abstract boolean isComplex();
public abstract int getType(FlatBufferBuilder builder);
public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
</#list>
}

/**
* to visit the Complex ArrowTypes and bundle Primitive ones in one case
*/
public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

public T visit(PrimitiveType type) {
throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
}

<#list arrowTypes.types as type>
<#if !type.complex>
public final T visit(${type.name?remove_ending("_")} type) {
return visit((PrimitiveType) type);
}
</#if>
</#list>
}

/**
* to visit the Primitive ArrowTypes and bundle Complex ones under one case
*/
public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

public T visit(ComplexType type) {
throw new UnsupportedOperationException("Unexpected Complex type: " + type);
}

<#list arrowTypes.types as type>
<#if type.complex>
public final T visit(${type.name?remove_ending("_")} type) {
return visit((ComplexType) type);
}
</#if>
</#list>
}

<#list arrowTypes.types as type>
<#assign name = type.name?remove_ending("_")>
<#assign fields = type.fields>
public static class ${name} extends ArrowType {
public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
<#if type.fields?size == 0>
public static final ${name} INSTANCE = new ${name}();
</#if>
<#else>

<#list fields as field>
<#assign fieldType = field.valueType!field.type>
${fieldType} ${field.name};
</#list>

<#if type.fields?size != 0>
@JsonCreator
public ${type.name}(
<#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
this.${field.name} = ${field.name};
</#list>
}

<#list fields as field>
<#assign fieldType = field.valueType!field.type>
public ${fieldType} get${field.name?cap_first}() {
return ${field.name};
}
</#list>
</#if>

@Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
}

<#list fields as field>
<#assign fieldType = field.valueType!field.type>
public ${fieldType} get${field.name?cap_first}() {
return ${field.name};
}
</#list>

public String toString() {
return "${name}"
<#if fields?size != 0>
Expand Down
10 changes: 6 additions & 4 deletions java/vector/src/main/codegen/templates/MapWriters.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
list(child.getName());
break;
case UNION:
UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
fields.put(handleCase(child.getName()), writer);
break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
FieldWriter writer = fields.get(finalName);
if(writer == null){
int vectorCount=container.size();
NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
if(vectorCount != container.size()) {
writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
FieldWriter writer = fields.get(finalName);
int vectorCount = container.size();
if(writer == null) {
writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
if (container.size() > vectorCount) {
writer.allocate();
}
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
if(writer == null) {
ValueVector vector;
ValueVector currentVector = container.getChild(name);
${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
${vectName}Vector v = container.addOrGet(name,
FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
${vectName}Vector.class);
writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
vector = v;
if (currentVector == null || currentVector != vector) {
Expand Down
Loading
, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading

, '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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits#409

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-676: move from MinorType to FieldType in ValueVectors to carry all the relevant type bits
#409
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


55 changes: 34 additions & 21 deletions
java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,19 @@

package org.apache.arrow.tools;

import com.google.common.collect.ImmutableList;
import static java.util.Arrays.asList;
import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
Expand All@@ -39,24 +51,15 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Int;
import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.Text;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;

public class EchoServerTest {

Expand DownExpand Up@@ -133,9 +136,12 @@ private void testEchoServer(int serverPort,
 public void basicTest() throws InterruptedException, IOException {
 BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);

 Field field = new Field("testField", true, new ArrowType.Int(8, true), Collections
 .<Field>emptyList());
 NullableTinyIntVector vector = new NullableTinyIntVector("testField", alloc, null);
 Field field = new Field(
 "testField", true,
 new ArrowType.Int(8, true),
 Collections.<Field>emptyList());
 NullableTinyIntVector vector =
 new NullableTinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 Schema schema = new Schema(asList(field));

 // Try an empty stream, just the header.
Expand All@@ -152,9 +158,16 @@ public void basicTest() throws InterruptedException, IOException {
 public void testFlatDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableIntVector writeVector = new NullableIntVector("varchar", allocator, writeEncoding);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dict",
 allocator, null)) {
 NullableIntVector writeVector =
 new NullableIntVector(
 "varchar",
 new FieldType(true, MinorType.INT.getType(), writeEncoding),
 allocator);
 NullableVarCharVector writeDictionaryVector =
 new NullableVarCharVector(
 "dict",
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
Expand DownExpand Up@@ -222,8 +235,8 @@ public void testFlatDictionary() throws IOException {
 public void testNestedDictionary() throws IOException {
 DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
 try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
 NullableVarCharVector writeDictionaryVector = new NullableVarCharVector("dictionary",
allocator, null);
 NullableVarCharVector writeDictionaryVector =
new NullableVarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
 ListVector writeVector = new ListVector("list", allocator, null, null)) {

 // data being written:
Expand All@@ -234,7 +247,7 @@ public void testNestedDictionary() throws IOException {
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);

 writeVector.addOrGetVector(MinorType.INT, writeEncoding);
 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding));
 writeVector.allocateNew();
 UnionListWriter listWriter = new UnionListWriter(writeVector);
 listWriter.startList();
Expand Down

38 changes: 26 additions & 12 deletions
java/vector/src/main/codegen/data/ArrowTypes.tdd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,59 +14,73 @@
 types: [
 {
 name: "Null",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Struct_",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "List",
 fields: []
 fields: [],
 complex: true
 },
 {
 name: "Union",
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}]
 fields: [{name: "mode", type: short, valueType: UnionMode}, {name: "typeIds", type: "int[]"}],
 complex: true
 },
 {
 name: "Int",
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}]
 fields: [{name: "bitWidth", type: int}, {name: "isSigned", type: boolean}],
 complex: false
 },
 {
 name: "FloatingPoint",
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}]
 fields: [{name: precision, type: short, valueType: FloatingPointPrecision}],
 complex: false
 },
 {
 name: "Utf8",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Binary",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Bool",
 fields: []
 fields: [],
 complex: false
 },
 {
 name: "Decimal",
 fields: [{name: "precision", type: int}, {name: "scale", type: int}]
 fields: [{name: "precision", type: int}, {name: "scale", type: int}],
 complex: false
 },
 {
 name: "Date",
 fields: [{name: "unit", type: short, valueType: DateUnit}]
 complex: false
 },
 {
 name: "Time",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}]
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "bitWidth", type: int}],
 complex: false
 },
 {
 name: "Timestamp",
 fields: [{name: "unit", type: short, valueType: TimeUnit}, {name: "timezone", type: String}]
 complex: false
 },
 {
 name: "Interval",
 fields: [{name: "unit", type: short, valueType: IntervalUnit}]
 fields: [{name: "unit", type: short, valueType: IntervalUnit}],
 complex: false
 }
 ]
}

81 changes: 70 additions & 11 deletions
java/vector/src/main/codegen/templates/ArrowType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,13 +50,35 @@
})
public abstract class ArrowType {

 public static abstract class PrimitiveType extends ArrowType {

 private PrimitiveType() {
 }

 @Override
 public boolean isComplex() {
 return false;
 }
 }

 public static abstract class ComplexType extends ArrowType {

 private ComplexType() {
 }

 @Override
 public boolean isComplex() {
 return true;
 }
 }

 public static enum ArrowTypeID {
 <#list arrowTypes.types as type>
 <#assign name = type.name>
 ${name?remove_ending("_")}(Type.${name}),
 </#list>
 NONE(Type.NONE);

 private final byte flatbufType;

 public byte getFlatbufID() {
Expand All@@ -70,6 +92,8 @@ private ArrowTypeID(byte flatbufType) {

 @JsonIgnore
 public abstract ArrowTypeID getTypeID();
 @JsonIgnore
 public abstract boolean isComplex();
 public abstract int getType(FlatBufferBuilder builder);
 public abstract <T> T accept(ArrowTypeVisitor<T> visitor);

Expand All@@ -87,21 +111,56 @@ public static interface ArrowTypeVisitor<T> {
 </#list>
 }

 /**
 * to visit the Complex ArrowTypes and bundle Primitive ones in one case
 */
 public static abstract class ComplexTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(PrimitiveType type) {
 throw new UnsupportedOperationException("Unexpected Primitive type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if !type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((PrimitiveType) type);
 }
 </#if>
 </#list>
 }

 /**
 * to visit the Primitive ArrowTypes and bundle Complex ones under one case
 */
 public static abstract class PrimitiveTypeVisitor<T> implements ArrowTypeVisitor<T> {

 public T visit(ComplexType type) {
 throw new UnsupportedOperationException("Unexpected Complex type: " + type);
 }

 <#list arrowTypes.types as type>
 <#if type.complex>
 public final T visit(${type.name?remove_ending("_")} type) {
 return visit((ComplexType) type);
 }
 </#if>
 </#list>
 }

 <#list arrowTypes.types as type>
 <#assign name = type.name?remove_ending("_")>
 <#assign fields = type.fields>
 public static class ${name} extends ArrowType {
 public static class ${name} extends <#if type.complex>ComplexType<#else>PrimitiveType</#if> {
 public static final ArrowTypeID TYPE_TYPE = ArrowTypeID.${name};
 <#if type.fields?size == 0>
 public static final ${name} INSTANCE = new ${name}();
 </#if>
 <#else>

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 ${fieldType} ${field.name};
 </#list>

 <#if type.fields?size != 0>
 @JsonCreator
 public ${type.name}(
 <#list type.fields as field>
Expand All@@ -113,6 +172,13 @@ public static class ${name} extends ArrowType {
 this.${field.name} = ${field.name};
 </#list>
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>
 </#if>

 @Override
Expand DownExpand Up@@ -143,13 +209,6 @@ public int getType(FlatBufferBuilder builder) {
 return org.apache.arrow.flatbuf.${type.name}.end${type.name}(builder);
 }

 <#list fields as field>
 <#assign fieldType = field.valueType!field.type>
 public ${fieldType} get${field.name?cap_first}() {
 return ${field.name};
 }
 </#list>

 public String toString() {
 return "${name}"
 <#if fields?size != 0>
Expand Down

10 changes: 6 additions & 4 deletions
java/vector/src/main/codegen/templates/MapWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public class ${mode}MapWriter extends AbstractFieldWriter {
 list(child.getName());
 break;
 case UNION:
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), MinorType.UNION, UnionVector.class, null), getNullableMapWriterFactory());
 UnionWriter writer = new UnionWriter(container.addOrGet(child.getName(), FieldType.nullable(MinorType.UNION.getType()), UnionVector.class), getNullableMapWriterFactory());
 fields.put(handleCase(child.getName()), writer);
 break;
<#list vv.types as type><#list type.minor as minor>
Expand DownExpand Up@@ -113,7 +113,7 @@ public MapWriter map(String name) {
 FieldWriter writer = fields.get(finalName);
 if(writer == null){
 int vectorCount=container.size();
 NullableMapVector vector = container.addOrGet(name, MinorType.MAP, NullableMapVector.class, null);
 NullableMapVector vector = container.addOrGet(name, FieldType.nullable(MinorType.MAP.getType()), NullableMapVector.class);
 writer = new PromotableWriter(vector, container, getNullableMapWriterFactory());
 if(vectorCount != container.size()) {
 writer.allocate();
Expand DownExpand Up@@ -157,7 +157,7 @@ public ListWriter list(String name) {
 FieldWriter writer = fields.get(finalName);
 int vectorCount = container.size();
 if(writer == null) {
 writer = new PromotableWriter(container.addOrGet(name, MinorType.LIST, ListVector.class, null), container, getNullableMapWriterFactory());
 writer = new PromotableWriter(container.addOrGet(name, FieldType.nullable(MinorType.LIST.getType()), ListVector.class), container, getNullableMapWriterFactory());
 if (container.size() > vectorCount) {
 writer.allocate();
 }
Expand DownExpand Up@@ -222,7 +222,9 @@ public void end() {
 if(writer == null) {
 ValueVector vector;
 ValueVector currentVector = container.getChild(name);
 ${vectName}Vector v = container.addOrGet(name, MinorType.${upperName}, ${vectName}Vector.class, null<#if minor.class == "Decimal"> , new int[] {precision, scale}</#if>);
 ${vectName}Vector v = container.addOrGet(name, 
 FieldType.nullable(<#if minor.class == "Decimal">new Decimal(precision, scale)<#else>MinorType.${upperName}.getType()</#if>),
 ${vectName}Vector.class);
 writer = new PromotableWriter(v, container, getNullableMapWriterFactory());
 vector = v;
 if (currentVector == null || currentVector != vector) {
Expand Down
Loading