Skip to content

ARROW-1868: [Java] Cleanup usage of Types.MinorType to MinorType #1831

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

ARROW-1868: [Java] Cleanup usage of Types.MinorType to MinorType #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void write(${name}Holder holder) {

<#if minor.class == "Decimal">
public void writeBigEndianBytesToDecimal(byte[] value) {
getWriter(Types.MinorType.DECIMAL).writeBigEndianBytesToDecimal(value);
getWriter(MinorType.DECIMAL).writeBigEndianBytesToDecimal(value);
}
</#if>

Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.BigIntHolder;
import org.apache.arrow.vector.holders.NullableBigIntHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;

Expand All @@ -44,8 +44,7 @@ public class BigIntVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public BigIntVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.BIGINT.getType()),
allocator);
this(name, FieldType.nullable(MinorType.BIGINT.getType()), allocator);
}

/**
Expand Down Expand Up @@ -75,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.BIGINT;
public MinorType getMinorType() {
return MinorType.BIGINT;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.BitHolder;
import org.apache.arrow.vector.holders.NullableBitHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.OversizedAllocationException;
import org.apache.arrow.vector.util.TransferPair;
Expand All @@ -45,8 +45,7 @@ public class BitVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public BitVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.BIT.getType()),
allocator);
this(name, FieldType.nullable(MinorType.BIT.getType()), allocator);
}

/**
Expand Down Expand Up @@ -79,8 +78,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.BIT;
public MinorType getMinorType() {
return MinorType.BIT;
}

/**
Expand Down
10 changes: 4 additions & 6 deletions java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.DateDayHolder;
import org.apache.arrow.vector.holders.NullableDateDayHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.slf4j.Logger;

/**
* DateDayVector implements a fixed width (4 bytes) vector of
Expand All @@ -45,8 +44,7 @@ public class DateDayVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public DateDayVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.DATEDAY.getType()),
allocator);
this(name, FieldType.nullable(MinorType.DATEDAY.getType()), allocator);
}

/**
Expand Down Expand Up @@ -76,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.DATEDAY;
public MinorType getMinorType() {
return MinorType.DATEDAY;
}


Expand Down
11 changes: 4 additions & 7 deletions java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.DateMilliHolder;
import org.apache.arrow.vector.holders.NullableDateMilliHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.joda.time.LocalDateTime;
import org.joda.time.LocalDateTimes;
import org.slf4j.Logger;

/**
* DateMilliVector implements a fixed width vector (8 bytes) of
Expand All @@ -47,8 +45,7 @@ public class DateMilliVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public DateMilliVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.DATEMILLI.getType()),
allocator);
this(name, FieldType.nullable(MinorType.DATEMILLI.getType()), allocator);
}

/**
Expand Down Expand Up @@ -78,8 +75,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.DATEMILLI;
public MinorType getMinorType() {
return MinorType.DATEMILLI;
}


Expand Down
6 changes: 3 additions & 3 deletions java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.DecimalHolder;
import org.apache.arrow.vector.holders.NullableDecimalHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.DecimalUtility;
import org.apache.arrow.vector.util.TransferPair;
Expand Down Expand Up @@ -85,8 +85,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.DECIMAL;
public MinorType getMinorType() {
return MinorType.DECIMAL;
}


Expand Down
6 changes: 3 additions & 3 deletions java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.FixedSizeBinaryHolder;
import org.apache.arrow.vector.holders.NullableFixedSizeBinaryHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.ArrowType.FixedSizeBinary;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
Expand Down Expand Up @@ -82,8 +82,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.FIXEDSIZEBINARY;
public MinorType getMinorType() {
return MinorType.FIXEDSIZEBINARY;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.Float4Holder;
import org.apache.arrow.vector.holders.NullableFloat4Holder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;

Expand All @@ -44,8 +44,7 @@ public class Float4Vector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public Float4Vector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.FLOAT4.getType()),
allocator);
this(name, FieldType.nullable(MinorType.FLOAT4.getType()), allocator);
}

/**
Expand Down Expand Up @@ -75,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.FLOAT4;
public MinorType getMinorType() {
return MinorType.FLOAT4;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.Float8Holder;
import org.apache.arrow.vector.holders.NullableFloat8Holder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;

Expand All @@ -44,8 +44,7 @@ public class Float8Vector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public Float8Vector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.FLOAT8.getType()),
allocator);
this(name, FieldType.nullable(MinorType.FLOAT8.getType()), allocator);
}

/**
Expand Down Expand Up @@ -75,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.FLOAT8;
public MinorType getMinorType() {
return MinorType.FLOAT8;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.IntHolder;
import org.apache.arrow.vector.holders.NullableIntHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;

Expand All @@ -45,8 +45,7 @@ public class IntVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public IntVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(org.apache.arrow.vector.types.Types.MinorType.INT.getType()),
allocator);
this(name, FieldType.nullable(MinorType.INT.getType()), allocator);
}

/**
Expand Down Expand Up @@ -79,8 +78,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.INT;
public MinorType getMinorType() {
return MinorType.INT;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.IntervalDayHolder;
import org.apache.arrow.vector.holders.NullableIntervalDayHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.joda.time.Period;
Expand All @@ -47,8 +47,7 @@ public class IntervalDayVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public IntervalDayVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.INTERVALDAY.getType()),
allocator);
this(name, FieldType.nullable(MinorType.INTERVALDAY.getType()), allocator);
}

/**
Expand Down Expand Up @@ -78,8 +77,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.INTERVALDAY;
public MinorType getMinorType() {
return MinorType.INTERVALDAY;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.IntervalYearHolder;
import org.apache.arrow.vector.holders.NullableIntervalYearHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.joda.time.Period;
Expand All @@ -44,8 +44,7 @@ public class IntervalYearVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public IntervalYearVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.INTERVALYEAR.getType()),
allocator);
this(name, FieldType.nullable(MinorType.INTERVALYEAR.getType()), allocator);
}

/**
Expand Down Expand Up @@ -75,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.INTERVALYEAR;
public MinorType getMinorType() {
return MinorType.INTERVALYEAR;
}


Expand Down
9 changes: 4 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.SmallIntHolder;
import org.apache.arrow.vector.holders.NullableSmallIntHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;

Expand All @@ -44,8 +44,7 @@ public class SmallIntVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public SmallIntVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.SMALLINT.getType()),
allocator);
this(name, FieldType.nullable(MinorType.SMALLINT.getType()), allocator);
}

/**
Expand Down Expand Up @@ -75,8 +74,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.SMALLINT;
public MinorType getMinorType() {
return MinorType.SMALLINT;
}


Expand Down
10 changes: 4 additions & 6 deletions java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.TimeMicroHolder;
import org.apache.arrow.vector.holders.NullableTimeMicroHolder;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.TransferPair;
import org.slf4j.Logger;

/**
* TimeMicroVector implements a fixed width vector (8 bytes) of
Expand All @@ -46,8 +45,7 @@ public class TimeMicroVector extends BaseFixedWidthVector {
* @param allocator allocator for memory management.
*/
public TimeMicroVector(String name, BufferAllocator allocator) {
this(name, FieldType.nullable(Types.MinorType.TIMEMICRO.getType()),
allocator);
this(name, FieldType.nullable(MinorType.TIMEMICRO.getType()), allocator);
}

/**
Expand Down Expand Up @@ -77,8 +75,8 @@ public FieldReader getReader() {
* @return {@link org.apache.arrow.vector.types.Types.MinorType}
*/
@Override
public Types.MinorType getMinorType() {
return Types.MinorType.TIMEMICRO;
public MinorType getMinorType() {
return MinorType.TIMEMICRO;
}


Expand Down
Loading