sohami closed pull request #1377: DRILL-6596: Fix fillEmpties and set methods
for Nullable variable length
URL: https://github.com/apache/drill/pull/1377
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/exec/vector/src/main/codegen/templates/NullableValueVectors.java
b/exec/vector/src/main/codegen/templates/NullableValueVectors.java
index f30cfae78f6..ff066fbc969 100644
--- a/exec/vector/src/main/codegen/templates/NullableValueVectors.java
+++ b/exec/vector/src/main/codegen/templates/NullableValueVectors.java
@@ -579,9 +579,7 @@ public void set(int index, <#if type.major ==
"VarLen">byte[]<#elseif (type.widt
final ${valuesName}.Mutator valuesMutator = values.getMutator();
final UInt1Vector.Mutator bitsMutator = bits.getMutator();
<#if type.major == "VarLen">
- for (int i = lastSet + 1; i < index; i++) {
- valuesMutator.set(i, emptyByteArray);
- }
+ valuesMutator.fillEmpties(lastSet, index);
</#if>
bitsMutator.set(index, 1);
valuesMutator.set(index, value);
@@ -591,9 +589,7 @@ public void set(int index, <#if type.major ==
"VarLen">byte[]<#elseif (type.widt
<#if type.major == "VarLen">
private void fillEmpties(int index) {
final ${valuesName}.Mutator valuesMutator = values.getMutator();
- for (int i = lastSet; i < index; i++) {
- valuesMutator.setSafe(i + 1, emptyByteArray);
- }
+ valuesMutator.fillEmpties(lastSet, index+1);
while(index > bits.getValueCapacity()) {
bits.reAlloc();
}
@@ -644,9 +640,7 @@ public void setSkipNull(int index,
Nullable${minor.class}Holder holder) {
public void set(int index, Nullable${minor.class}Holder holder) {
final ${valuesName}.Mutator valuesMutator = values.getMutator();
<#if type.major == "VarLen">
- for (int i = lastSet + 1; i < index; i++) {
- valuesMutator.set(i, emptyByteArray);
- }
+ valuesMutator.fillEmpties(lastSet, index);
</#if>
bits.getMutator().set(index, holder.isSet);
valuesMutator.set(index, holder);
@@ -656,9 +650,7 @@ public void set(int index, Nullable${minor.class}Holder
holder) {
public void set(int index, ${minor.class}Holder holder) {
final ${valuesName}.Mutator valuesMutator = values.getMutator();
<#if type.major == "VarLen">
- for (int i = lastSet + 1; i < index; i++) {
- valuesMutator.set(i, emptyByteArray);
- }
+ valuesMutator.fillEmpties(lastSet, index);
</#if>
bits.getMutator().set(index, 1);
valuesMutator.set(index, holder);
@@ -673,9 +665,7 @@ public boolean isSafe(int outIndex) {
public void set(int index, int isSet<#list fields as field><#if
field.include!true >, ${field.type} ${field.name}Field</#if></#list> ) {
final ${valuesName}.Mutator valuesMutator = values.getMutator();
<#if type.major == "VarLen">
- for (int i = lastSet + 1; i < index; i++) {
- valuesMutator.set(i, emptyByteArray);
- }
+ valuesMutator.fillEmpties(lastSet, index);
</#if>
bits.getMutator().set(index, isSet);
valuesMutator.set(index<#list fields as field><#if field.include!true >,
${field.name}Field</#if></#list>);
@@ -887,4 +877,4 @@ public void fromNotNullable(${minor.class}Vector srce) {
}
}
</#list>
-</#list>
\ No newline at end of file
+</#list>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
