Skip to content

Commit

Permalink
DRILL-2731: Repeat realloc until enough space
Browse files Browse the repository at this point in the history 
Repeat realloc for variable length vectors as well
  • Loading branch information
@StevenMPhillips
StevenMPhillips committed Apr 11, 2015
1 parent 6edf6eb commit 4993bd2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions exec/java-exec/src/main/codegen/templates/FixedValueVectors.java
View file
Expand Up @@ -230,7 +230,7 @@ public void copyFrom(int fromIndex, int thisIndex, ${minor.class}Vector from){
}

public void copyFromSafe(int fromIndex, int thisIndex, ${minor.class}Vector from){
if(thisIndex >= getValueCapacity()) {
while(thisIndex >= getValueCapacity()) {
reAlloc();
}
copyFrom(fromIndex, thisIndex, from);
Expand Down Expand Up @@ -544,7 +544,7 @@ public void set(int index, <#if (type.width > 4)>${minor.javaType!type.javaType}
}

public void setSafe(int index, <#if (type.width > 4)>${minor.javaType!type.javaType}<#else>int</#if> value) {
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
data.setBytes(index * ${type.width}, value, 0, ${type.width});
Expand All @@ -567,7 +567,7 @@ protected void set(int index, Nullable${minor.class}Holder holder){
}

public void setSafe(int index, int months, int days, int milliseconds){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, months, days, milliseconds);
Expand Down Expand Up @@ -596,7 +596,7 @@ protected void set(int index, Nullable${minor.class}Holder holder){
}

public void setSafe(int index, int days, int milliseconds){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, days, milliseconds);
Expand Down Expand Up @@ -628,7 +628,7 @@ public void setSafe(int index, ${minor.class}Holder holder){
}

public void setSafe(int index, int start, DrillBuf buffer){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, start, buffer);
Expand Down Expand Up @@ -660,7 +660,7 @@ public void setSafe(int index, Nullable${minor.class}Holder holder){
}

public void setSafe(int index, int start, DrillBuf buffer){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, holder);
Expand Down Expand Up @@ -692,7 +692,7 @@ public void set(int index, <#if (type.width >= 4)>${minor.javaType!type.javaType
}

public void setSafe(int index, <#if (type.width >= 4)>${minor.javaType!type.javaType}<#else>int</#if> value) {
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, value);
Expand All @@ -703,7 +703,7 @@ protected void set(int index, ${minor.class}Holder holder){
}

public void setSafe(int index, ${minor.class}Holder holder){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, holder);
Expand All @@ -714,7 +714,7 @@ protected void set(int index, Nullable${minor.class}Holder holder){
}

public void setSafe(int index, Nullable${minor.class}Holder holder){
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, holder);
Expand Down Expand Up @@ -774,4 +774,4 @@ public void setValueCount(int valueCount) {

</#if> <#-- type.major -->
</#list>
</#list>
</#list>
14 changes: 7 additions & 7 deletions exec/java-exec/src/main/codegen/templates/VariableLengthVectors.java
View file
Expand Up @@ -210,7 +210,7 @@ public boolean copyFromSafe(int fromIndex, int thisIndex, ${minor.class}Vector f

int outputStart = offsetVector.data.get${(minor.javaType!type.javaType)?cap_first}(thisIndex * ${type.width});

if(data.capacity() < outputStart + len) {
while(data.capacity() < outputStart + len) {
reAlloc();
}

Expand Down Expand Up @@ -423,7 +423,7 @@ public void setSafe(int index, byte[] bytes) {
assert index >= 0;
int currentOffset = offsetVector.getAccessor().get(index);
if (data.capacity() < currentOffset + bytes.length) {
while (data.capacity() < currentOffset + bytes.length) {
reAlloc();
}
offsetVector.getMutator().setSafe(index + 1, currentOffset + bytes.length);
Expand Down Expand Up @@ -451,7 +451,7 @@ public void setSafe(int index, byte[] bytes, int start, int length) {
int currentOffset = offsetVector.getAccessor().get(index);
if (data.capacity() < currentOffset + length) {
while (data.capacity() < currentOffset + length) {
reAlloc();
}
offsetVector.getMutator().setSafe(index + 1, currentOffset + length);
Expand All @@ -460,7 +460,7 @@ public void setSafe(int index, byte[] bytes, int start, int length) {
public void setValueLengthSafe(int index, int length) {
int offset = offsetVector.getAccessor().get(index);
if(data.capacity() < offset + length ) {
while(data.capacity() < offset + length ) {
reAlloc();
}
offsetVector.getMutator().setSafe(index + 1, offsetVector.getAccessor().get(index) + length);
Expand All @@ -472,7 +472,7 @@ public void setSafe(int index, int start, int end, DrillBuf buffer){
int outputStart = offsetVector.data.get${(minor.javaType!type.javaType)?cap_first}(index * ${type.width});
if(data.capacity() < outputStart + len) {
while(data.capacity() < outputStart + len) {
reAlloc();
}
Expand All @@ -490,7 +490,7 @@ public void setSafe(int index, Nullable${minor.class}Holder holder){
int outputStart = offsetVector.data.get${(minor.javaType!type.javaType)?cap_first}(index * ${type.width});
if(data.capacity() < outputStart + len) {
while(data.capacity() < outputStart + len) {
reAlloc();
}
Expand All @@ -506,7 +506,7 @@ public void setSafe(int index, ${minor.class}Holder holder){
int outputStart = offsetVector.data.get${(minor.javaType!type.javaType)?cap_first}(index * ${type.width});
if(data.capacity() < outputStart + len) {
while(data.capacity() < outputStart + len) {
reAlloc();
}
Expand Down
6 changes: 3 additions & 3 deletions exec/java-exec/src/main/java/org/apache/drill/exec/vector/BitVector.java
View file
Expand Up @@ -351,21 +351,21 @@ final void set(int index, NullableBitHolder holder) {
}

public void setSafe(int index, int value) {
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, value);
}

public void setSafe(int index, BitHolder holder) {
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, holder.value);
}

public void setSafe(int index, NullableBitHolder holder) {
if(index >= getValueCapacity()) {
while(index >= getValueCapacity()) {
reAlloc();
}
set(index, holder.value);
Expand Down

0 comments on commit 4993bd2

Please sign in to comment.