ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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 3 commits into from
Closed

ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2) #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b83d874
ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)
siddharthteotia Oct 16, 2017
5e310ae
add some javadocs
siddharthteotia Oct 23, 2017
823f75d
review comments and complete javadocs, code comments
siddharthteotia Oct 23, 2017
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
4 changes: 2 additions & 2 deletions java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
static void validateContent(int count, VectorSchemaRoot root) {
Assert.assertEquals(count, root.getRowCount());
for (int i = 0; i < count; i++) {
Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
Assert.assertEquals(i, root.getVector("int").getObject(i));
Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
}
}

Expand Down
84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
for (int i = 0; i < batches; i++) {
vector.allocateNew(16);
for (int j = 0; j < 8; j++) {
vector.getMutator().set(j, j + i);
vector.getMutator().set(j + 8, 0, (byte) (j + i));
vector.set(j, j + i);
vector.set(j + 8, 0, (byte) (j + i));
}
vector.getMutator().setValueCount(16);
vector.setValueCount(16);
root.setRowCount(16);
writer.writeBatch();
}
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
for (int i = 0; i < batches; i++) {
Assert.assertTrue(reader.loadNextBatch());
assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
assertEquals(16, readVector.getAccessor().getValueCount());
assertEquals(16, readVector.getValueCount());
for (int j = 0; j < 8; j++) {
assertEquals(j + i, readVector.getAccessor().get(j));
assertTrue(readVector.getAccessor().isNull(j + 8));
assertEquals(j + i, readVector.get(j));
assertTrue(readVector.isNull(j + 8));
}
}
Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
FieldType.nullable(VARCHAR.getType()),
allocator)) {
writeVector.allocateNewSafe();
NullableIntVector.Mutator mutator = writeVector.getMutator();
mutator.set(0, 0);
mutator.set(1, 1);
mutator.set(3, 2);
mutator.set(4, 1);
mutator.set(5, 2);
mutator.setValueCount(6);
writeVector.set(0, 0);
writeVector.set(1, 1);
writeVector.set(3, 2);
writeVector.set(4, 1);
writeVector.set(5, 2);
writeVector.setValueCount(6);

writeDictionaryVector.allocateNewSafe();
NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
dictionaryMutator.setValueCount(3);
writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.setValueCount(3);

List<Field> fields = ImmutableList.of(writeVector.getField());
List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
Assert.assertNotNull(readEncoding);
Assert.assertEquals(1L, readEncoding.getId());

FieldVector.Accessor accessor = readVector.getAccessor();
Assert.assertEquals(6, accessor.getValueCount());
Assert.assertEquals(0, accessor.getObject(0));
Assert.assertEquals(1, accessor.getObject(1));
Assert.assertEquals(null, accessor.getObject(2));
Assert.assertEquals(2, accessor.getObject(3));
Assert.assertEquals(1, accessor.getObject(4));
Assert.assertEquals(2, accessor.getObject(5));
Assert.assertEquals(6, readVector.getValueCount());
Assert.assertEquals(0, readVector.getObject(0));
Assert.assertEquals(1, readVector.getObject(1));
Assert.assertEquals(null, readVector.getObject(2));
Assert.assertEquals(2, readVector.getObject(3));
Assert.assertEquals(1, readVector.getObject(4));
Assert.assertEquals(2, readVector.getObject(5));

Dictionary dictionary = reader.lookup(1L);
Assert.assertNotNull(dictionary);
NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
.getVector()).getAccessor();
Assert.assertEquals(3, dictionaryAccessor.getValueCount());
Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
Assert.assertEquals(3, dictionaryVector.getValueCount());
Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
}
}
}
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
// [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

writeDictionaryVector.allocateNew();
writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.getMutator().setValueCount(2);
writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
writeDictionaryVector.setValueCount(2);

writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
Assert.assertEquals(2L, encoding.getId());
Assert.assertEquals(new Int(32, true), encoding.getIndexType());

ListVector.Accessor accessor = readVector.getAccessor();
Assert.assertEquals(3, accessor.getValueCount());
Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
Assert.assertEquals(3, readVector.getValueCount());
Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

Dictionary readDictionary = reader.lookup(2L);
Assert.assertNotNull(readDictionary);
NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
readDictionary.getVector()).getAccessor();
Assert.assertEquals(2, dictionaryAccessor.getValueCount());
Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
Assert.assertEquals(2, dictionaryVector.getValueCount());
Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
}
}
}
Expand Down
24 changes: 4 additions & 20 deletions java/vector/src/main/codegen/templates/ComplexReaders.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

<#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
minor.class == "TimeStampNano">
@Override
public ${minor.boxedType} read${minor.boxedType}(){
return vector.getAccessor().get(idx());
return vector.get(idx());
}
</#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
}

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

<#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) {
<#if minor.class != "Int" && minor.class != "VarChar">
this.mutator = vector.getMutator();
</#if>
this.vector = vector;
}

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
<#else>

public void write(${minor.class}Holder h) {
<#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>
vector.setSafe(idx(), h);
vector.setValueCount(idx()+1);
}

public void write(Nullable${minor.class}Holder h) {
<#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>
vector.setSafe(idx(), h);
vector.setValueCount(idx()+1);
}

public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
<#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>
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 minor.class == "Decimal">

<#if minor.class == "Decimal">
public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
vector.setValueCount(idx()+1);
}
</#if>
<#if mode == "Nullable">

<#if mode == "Nullable">
public void writeNull() {
<#if minor.class != "Int" && minor.class != "VarChar">
mutator.setNull(idx());
vector.getMutator().setValueCount(idx()+1);
<#else>
vector.setNull(idx());
vector.setValueCount(idx()+1);
</#if>
vector.setNull(idx());
vector.setValueCount(idx()+1);
}
</#if>
</#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

 <#if mode == "Nullable">
 public void writeNull() {
 <#if minor.class != "Int" && minor.class != "VarChar">
 mutator.setNull(idx());
 vector.getMutator().setValueCount(idx()+1);
 <#else>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 </#if>
 vector.setNull(idx());
 vector.setValueCount(idx()+1);
 }
 </#if>
 </#if>
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-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)#1203

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
3
commits into

from

 Closed


ARROW-1474: [JAVA] Java ValueVector hierarchy Refactor (Implementation Phase 2)
#1203
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b83d874

ARROW-1474:[JAVA] ValueVector hierarchy (Implementation Phase 2)


siddharthteotia Oct 16, 2017
5e310ae

add some javadocs


siddharthteotia Oct 23, 2017
823f75d

review comments and complete javadocs, code comments


siddharthteotia Oct 23, 2017

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


4 changes: 2 additions & 2 deletions
java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,8 +78,8 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
 static void validateContent(int count, VectorSchemaRoot root) {
 Assert.assertEquals(count, root.getRowCount());
 for (int i = 0; i < count; i++) {
 Assert.assertEquals(i, root.getVector("int").getAccessor().getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getAccessor().getObject(i));
 Assert.assertEquals(i, root.getVector("int").getObject(i));
 Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
 }
 }

Expand Down

84 changes: 39 additions & 45 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@@ -104,10 +104,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 vector.allocateNew(16);
 for (int j = 0; j < 8; j++) {
 vector.getMutator().set(j, j + i);
 vector.getMutator().set(j + 8, 0, (byte) (j + i));
 vector.set(j, j + i);
 vector.set(j + 8, 0, (byte) (j + i));
 }
 vector.getMutator().setValueCount(16);
 vector.setValueCount(16);
 root.setRowCount(16);
 writer.writeBatch();
 }
Expand All@@ -120,10 +120,10 @@ private void testEchoServer(int serverPort,
 for (int i = 0; i < batches; i++) {
 Assert.assertTrue(reader.loadNextBatch());
 assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
 assertEquals(16, readVector.getAccessor().getValueCount());
 assertEquals(16, readVector.getValueCount());
 for (int j = 0; j < 8; j++) {
 assertEquals(j + i, readVector.getAccessor().get(j));
 assertTrue(readVector.getAccessor().isNull(j + 8));
 assertEquals(j + i, readVector.get(j));
 assertTrue(readVector.isNull(j + 8));
 }
 }
 Assert.assertFalse(reader.loadNextBatch());
Expand DownExpand Up@@ -169,20 +169,18 @@ public void testFlatDictionary() throws IOException {
 FieldType.nullable(VARCHAR.getType()),
 allocator)) {
 writeVector.allocateNewSafe();
 NullableIntVector.Mutator mutator = writeVector.getMutator();
 mutator.set(0, 0);
 mutator.set(1, 1);
 mutator.set(3, 2);
 mutator.set(4, 1);
 mutator.set(5, 2);
 mutator.setValueCount(6);
 writeVector.set(0, 0);
 writeVector.set(1, 1);
 writeVector.set(3, 2);
 writeVector.set(4, 1);
 writeVector.set(5, 2);
 writeVector.setValueCount(6);

 writeDictionaryVector.allocateNewSafe();
 NullableVarCharVector.Mutator dictionaryMutator = writeDictionaryVector.getMutator();
 dictionaryMutator.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 dictionaryMutator.setValueCount(3);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(3);

 List<Field> fields = ImmutableList.of(writeVector.getField());
 List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
Expand DownExpand Up@@ -210,23 +208,21 @@ public void testFlatDictionary() throws IOException {
 Assert.assertNotNull(readEncoding);
 Assert.assertEquals(1L, readEncoding.getId());

 FieldVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(6, accessor.getValueCount());
 Assert.assertEquals(0, accessor.getObject(0));
 Assert.assertEquals(1, accessor.getObject(1));
 Assert.assertEquals(null, accessor.getObject(2));
 Assert.assertEquals(2, accessor.getObject(3));
 Assert.assertEquals(1, accessor.getObject(4));
 Assert.assertEquals(2, accessor.getObject(5));
 Assert.assertEquals(6, readVector.getValueCount());
 Assert.assertEquals(0, readVector.getObject(0));
 Assert.assertEquals(1, readVector.getObject(1));
 Assert.assertEquals(null, readVector.getObject(2));
 Assert.assertEquals(2, readVector.getObject(3));
 Assert.assertEquals(1, readVector.getObject(4));
 Assert.assertEquals(2, readVector.getObject(5));

 Dictionary dictionary = reader.lookup(1L);
 Assert.assertNotNull(dictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector) dictionary
 .getVector()).getAccessor();
 Assert.assertEquals(3, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryAccessor.getObject(2));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) dictionary.getVector());
 Assert.assertEquals(3, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 }
 }
 }
Expand All@@ -243,9 +239,9 @@ public void testNestedDictionary() throws IOException {
 // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]

 writeDictionaryVector.allocateNew();
 writeDictionaryVector.getMutator().set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.getMutator().setValueCount(2);
 writeDictionaryVector.set(0, "foo".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
 writeDictionaryVector.setValueCount(2);

 writeVector.addOrGetVector(new FieldType(true, MinorType.INT.getType(), writeEncoding, null));
 writeVector.allocateNew();
Expand DownExpand Up@@ -297,19 +293,17 @@ public void testNestedDictionary() throws IOException {
 Assert.assertEquals(2L, encoding.getId());
 Assert.assertEquals(new Int(32, true), encoding.getIndexType());

 ListVector.Accessor accessor = readVector.getAccessor();
 Assert.assertEquals(3, accessor.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), accessor.getObject(0));
 Assert.assertEquals(Arrays.asList(0), accessor.getObject(1));
 Assert.assertEquals(Arrays.asList(1), accessor.getObject(2));
 Assert.assertEquals(3, readVector.getValueCount());
 Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
 Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
 Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));

 Dictionary readDictionary = reader.lookup(2L);
 Assert.assertNotNull(readDictionary);
 NullableVarCharVector.Accessor dictionaryAccessor = ((NullableVarCharVector)
 readDictionary.getVector()).getAccessor();
 Assert.assertEquals(2, dictionaryAccessor.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryAccessor.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryAccessor.getObject(1));
 NullableVarCharVector dictionaryVector = ((NullableVarCharVector) readDictionary.getVector());
 Assert.assertEquals(2, dictionaryVector.getValueCount());
 Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
 Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
 }
 }
 }
Expand Down

24 changes: 4 additions & 20 deletions
java/vector/src/main/codegen/templates/ComplexReaders.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,11 +70,7 @@ public Field getField(){

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

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

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

 <#if minor.class == "TimeStampSec" ||
Expand All@@ -118,7 +106,7 @@ public void read(Nullable${minor.class?cap_first}Holder h){
 minor.class == "TimeStampNano">
 @Override
 public ${minor.boxedType} read${minor.boxedType}(){
 return vector.getAccessor().get(idx());
 return vector.get(idx());
 }
 </#if>

Expand All@@ -127,11 +115,7 @@ public void copyValue(FieldWriter w){
 }

 public Object readObject(){
 <#if minor.class == "Int" || minor.class == "VarChar">
 return (Object)vector.getObject(idx());
 <#else>
 return vector.getAccessor().getObject(idx());
 </#if>
 return (Object)vector.getObject(idx());
 }
}
</#if>
Expand Down

51 changes: 12 additions & 39 deletions
java/vector/src/main/codegen/templates/ComplexWriters.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,16 +39,9 @@
@SuppressWarnings("unused")
public class ${eName}WriterImpl extends AbstractFieldWriter {

 <#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) {
 <#if minor.class != "Int" && minor.class != "VarChar">
 this.mutator = vector.getMutator();
 </#if>
 this.vector = vector;
 }

Expand DownExpand Up@@ -108,51 +101,31 @@ public void setPosition(int idx) {
 <#else>

 public void write(${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write(Nullable${minor.class}Holder h) {
 <#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>
 vector.setSafe(idx(), h);
 vector.setValueCount(idx()+1);
 }

 public void write${minor.class}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
 <#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>
 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 minor.class == "Decimal">

 <#if minor.class == "Decimal">
 public void write${minor.class}(${friendlyType} value) {
mutator.setSafe(idx(), value);
 vector.getMutator().setValueCount(idx()+1);
vector.setSafe(idx(), value);
 vector.setValueCount(idx()+1);
 }
 </#if>
 <#if mode == "Nullable">

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