Skip to content

ARROW-1463: [JAVA - WIP] refactoring #1164

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
siddharthteotia wants to merge 1 commit into from
Closed

ARROW-1463: [JAVA - WIP] refactoring #1164

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
24 changes: 20 additions & 4 deletions java/vector/src/main/codegen/templates/ComplexReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ public Field getField(){

public boolean isSet(){
<#if nullMode == "Nullable">
return !vector.getAccessor().isNull(idx());
<#if minor.class != "Int" && minor.class != "VarChar">
return !vector.getAccessor().isNull(idx());
<#else>
return !vector.isNull(idx());
</#if>
<#else>
return true;
</#if>
Expand All @@ -93,11 +97,19 @@ public void read(${minor.class?cap_first}Holder h){
</#if>

public void read(Nullable${minor.class?cap_first}Holder h){
vector.getAccessor().get(idx(), h);
<#if minor.class != "Int" && minor.class != "VarChar">
vector.getAccessor().get(idx(), h);
<#else>
vector.get(idx(), h);
</#if>
}

public ${friendlyType} read${safeType}(){
return vector.getAccessor().getObject(idx());
<#if minor.class == "Int" || minor.class == "VarChar">
return vector.getObject(idx());
<#else>
return vector.getAccessor().getObject(idx());
</#if>
}

<#if minor.class == "TimeStampSec" ||
Expand All @@ -115,7 +127,11 @@ public void copyValue(FieldWriter w){
}

public Object readObject(){
return vector.getAccessor().getObject(idx());
<#if minor.class == "Int" || minor.class == "VarChar">
return (Object)vector.getObject(idx());
<#else>
return vector.getAccessor().getObject(idx());
</#if>
}
}
</#if>
Expand Down
45 changes: 35 additions & 10 deletions java/vector/src/main/codegen/templates/ComplexWriters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,16 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

private final Nullable${name}Vector.Mutator mutator;
<#if minor.class != "Int" && minor.class != "VarChar">
private final Nullable${name}Vector.Mutator mutator;
</#if>

final Nullable${name}Vector vector;

public ${eName}WriterImpl(Nullable${name}Vector vector) {
this.mutator = vector.getMutator();
<#if minor.class != "Int" && minor.class != "VarChar">
this.mutator = vector.getMutator();
</#if>
this.vector = vector;
}

Expand Down Expand Up @@ -103,18 +108,33 @@ public void setPosition(int idx) {
<#else>

public void write(${minor.class}Holder h) {
mutator.setSafe(idx(), h);
vector.getMutator().setValueCount(idx()+1);
<#if minor.class != "Int" && minor.class != "VarChar">
mutator.setSafe(idx(), h);
vector.getMutator().setValueCount(idx()+1);
<#else>
vector.setSafe(idx(), h);
vector.setValueCount(idx()+1);
</#if>
}

public void write(Nullable${minor.class}Holder h) {
mutator.setSafe(idx(), h);
vector.getMutator().setValueCount(idx()+1);
<#if minor.class != "Int" && minor.class != "VarChar">
mutator.setSafe(idx(), h);
vector.getMutator().setValueCount(idx()+1);
<#else>
vector.setSafe(idx(), h);
vector.setValueCount(idx()+1);
</#if>
}

public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
mutator.setSafe(idx()<#if mode == "Nullable">, 1</#if><#list fields as field><#if field.include!true >, ${field.name}</#if></#list>);
vector.getMutator().setValueCount(idx()+1);
<#if minor.class != "Int" && minor.class != "VarChar">
mutator.setSafe(idx()<#if mode == "Nullable">, 1</#if><#list fields as field><#if field.include!true >, ${field.name}</#if></#list>);
vector.getMutator().setValueCount(idx()+1);
<#else>
vector.setSafe(idx()<#if mode == "Nullable">, 1</#if><#list fields as field><#if field.include!true >, ${field.name}</#if></#list>);
vector.setValueCount(idx()+1);
</#if>
}
<#if minor.class == "Decimal">

Expand All @@ -126,8 +146,13 @@ public void write(Nullable${minor.class}Holder h) {
<#if mode == "Nullable">

public void writeNull() {
mutator.setNull(idx());
vector.getMutator().setValueCount(idx()+1);
<#if minor.class != "Int" && minor.class != "VarChar">
mutator.setNull(idx());
vector.getMutator().setValueCount(idx()+1);
<#else>
vector.setNull(idx());
vector.setValueCount(idx()+1);
</#if>
}
</#if>
</#if>
Expand Down
Loading