From 438ca49b4d626cb601b3c1543617c58d959e605f Mon Sep 17 00:00:00 2001 From: Micah Kornfield Date: Thu, 22 Oct 2020 04:47:56 +0000 Subject: [PATCH] Adress java comments --- .../main/codegen/templates/AbstractPromotableFieldWriter.java | 4 ++-- java/vector/src/main/codegen/templates/ArrowType.java | 2 +- java/vector/src/main/codegen/templates/UnionListWriter.java | 2 +- testing | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java b/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java index be6ad7fff5e7c..6b14dbf2a5714 100644 --- a/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java +++ b/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java @@ -75,7 +75,7 @@ public void endList() { <#list vv.types as type><#list type.minor as minor><#assign name = minor.class?cap_first /> <#assign fields = minor.fields!type.fields /> - <#if minor.class != "Decimal" && minor.class != "BigDecimal"> + <#if minor.class != "Decimal" && minor.class != "Decimal256"> @Override public void write(${name}Holder holder) { getWriter(MinorType.${name?upper_case}).write(holder); @@ -108,7 +108,7 @@ public void writeBigEndianBytesToDecimal(byte[] value) { } <#elseif minor.class == "Decimal256"> @Override - public void write(BigDecimalHolder holder) { + public void write(Decimal256Holder holder) { getWriter(MinorType.DECIMAL256).write(holder); } diff --git a/java/vector/src/main/codegen/templates/ArrowType.java b/java/vector/src/main/codegen/templates/ArrowType.java index 09b273a0c9af4..f8f0e20c940da 100644 --- a/java/vector/src/main/codegen/templates/ArrowType.java +++ b/java/vector/src/main/codegen/templates/ArrowType.java @@ -169,7 +169,7 @@ public static class ${name} extends <#if type.complex>ComplexType<#else>Primitiv <#if type.name == "Decimal"> // Needed to support golden file integration tests. @JsonCreator - public static Decimal createDecimal128( + public static Decimal createDecimal( @JsonProperty("precision") int precision, @JsonProperty("scale") int scale, @JsonProperty("bitWidth") Integer bitWidth) { diff --git a/java/vector/src/main/codegen/templates/UnionListWriter.java b/java/vector/src/main/codegen/templates/UnionListWriter.java index 8d6aa755cf387..155895d8932de 100644 --- a/java/vector/src/main/codegen/templates/UnionListWriter.java +++ b/java/vector/src/main/codegen/templates/UnionListWriter.java @@ -249,7 +249,7 @@ public void writeBigEndianBytesToDecimal(byte[] value, ArrowType arrowType){ writer.setPosition(writer.idx() + 1); } - public void writeDecimal256(int start, ArrowBuf buffer, ArrowType arrowType) { + public void writeDecimal256(long start, ArrowBuf buffer, ArrowType arrowType) { writer.writeDecimal256(start, buffer, arrowType); writer.setPosition(writer.idx()+1); } diff --git a/testing b/testing index 90e15c6bd4fc5..860376d4e586a 160000 --- a/testing +++ b/testing @@ -1 +1 @@ -Subproject commit 90e15c6bd4fc50eb8cac6ee35cc3ab43807cfabe +Subproject commit 860376d4e586a3ac34ec93089889da624ead6c2a