Skip to content

Commit 3e88e76

Browse files
committed
GH-87: fixed comments
1 parent 4ab857c commit 3e88e76

File tree

8 files changed

+27
-29
lines changed

8 files changed

+27
-29
lines changed

vector/src/main/codegen/templates/AbstractFieldWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ public void endEntry() {
110110
public void write(ExtensionHolder var1) {
111111
this.fail("ExtensionType");
112112
}
113-
public void writeExtensionType(Object var1) {
113+
public void writeExtension(Object var1) {
114114
this.fail("ExtensionType");
115115
}
116-
public void addExtensionTypeFactory(ExtensionTypeWriterFactory var1) {
116+
public void addExtensionTypeWriterFactory(ExtensionTypeWriterFactory var1) {
117117
this.fail("ExtensionType");
118118
}
119119

vector/src/main/codegen/templates/BaseWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public interface ExtensionWriter extends BaseWriter {
111111
void writeNull();
112112

113113
/**
114-
* Writes vlaue from the given extension holder.
114+
* Writes value from the given extension holder.
115115
*
116116
* @param holder the extension holder to write
117117
*/
@@ -122,14 +122,14 @@ public interface ExtensionWriter extends BaseWriter {
122122
*
123123
* @param value the extension type value to write
124124
*/
125-
void writeExtensionType(Object value);
125+
void writeExtension(Object value);
126126

127127
/**
128128
* Adds the given extension type factory. This factory allows configuring writer implementations for specific ExtensionTypeVector.
129129
*
130130
* @param factory the extension type factory to add
131131
*/
132-
void addExtensionTypeFactory(ExtensionTypeWriterFactory factory);
132+
void addExtensionTypeWriterFactory(ExtensionTypeWriterFactory factory);
133133
}
134134

135135
public interface ScalarWriter extends

vector/src/main/codegen/templates/PromotableWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,13 @@ public void writeLargeVarChar(String value) {
541541
}
542542

543543
@Override
544-
public void writeExtensionType(Object value) {
545-
getWriter(MinorType.EXTENSIONTYPE).writeExtensionType(value);
544+
public void writeExtension(Object value) {
545+
getWriter(MinorType.EXTENSIONTYPE).writeExtension(value);
546546
}
547547

548548
@Override
549-
public void addExtensionTypeFactory(ExtensionTypeWriterFactory factory) {
550-
getWriter(MinorType.EXTENSIONTYPE).addExtensionTypeFactory(factory);
549+
public void addExtensionTypeWriterFactory(ExtensionTypeWriterFactory factory) {
550+
getWriter(MinorType.EXTENSIONTYPE).addExtensionTypeWriterFactory(factory);
551551
}
552552

553553
@Override

vector/src/main/codegen/templates/UnionListWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ public void writeNull() {
335335
}
336336
337337
@Override
338-
public void writeExtensionType(Object value) {
339-
writer.writeExtensionType(value);
338+
public void writeExtension(Object value) {
339+
writer.writeExtension(value);
340340
}
341341
@Override
342-
public void addExtensionTypeFactory(ExtensionTypeWriterFactory var1) {
343-
writer.addExtensionTypeFactory(var1);
342+
public void addExtensionTypeWriterFactory(ExtensionTypeWriterFactory var1) {
343+
writer.addExtensionTypeWriterFactory(var1);
344344
}
345345
public void write(ExtensionHolder var1) {
346346
writer.write(var1);

vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionExtensionWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public void close() throws Exception {
5555
}
5656

5757
@Override
58-
public void writeExtensionType(Object var1) {
59-
this.writer.writeExtensionType(var1);
58+
public void writeExtension(Object var1) {
59+
this.writer.writeExtension(var1);
6060
}
6161

6262
@Override
63-
public void addExtensionTypeFactory(ExtensionTypeWriterFactory factory) {
63+
public void addExtensionTypeWriterFactory(ExtensionTypeWriterFactory factory) {
6464
this.writer = factory.getWriterImpl(vector);
6565
this.writer.setPosition(idx());
6666
}

vector/src/test/java/org/apache/arrow/vector/UuidVector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public UuidVector(
3434
super(name, allocator, underlyingVector);
3535
this.field = new Field(name, FieldType.nullable(new UuidType()), null);
3636
}
37-
37+
3838
public UuidVector(String name, BufferAllocator allocator) {
3939
super(name, allocator, new FixedSizeBinaryVector(name, allocator, 16));
4040
this.field = new Field(name, FieldType.nullable(new UuidType()), null);

vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,12 +791,12 @@ public void testExtensionType() throws Exception {
791791
UUID u2 = UUID.randomUUID();
792792
container.allocateNew();
793793
container.setValueCount(1);
794-
writer.addExtensionTypeFactory(new UuidWriterFactory());
794+
writer.addExtensionTypeWriterFactory(new UuidWriterFactory());
795795

796796
writer.setPosition(0);
797-
writer.writeExtensionType(u1);
797+
writer.writeExtension(u1);
798798
writer.setPosition(1);
799-
writer.writeExtensionType(u2);
799+
writer.writeExtension(u2);
800800

801801
container.setValueCount(2);
802802

vector/src/test/java/org/apache/arrow/vector/complex/impl/UuidWriterImpl.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,26 @@
2222
import org.apache.arrow.vector.holder.UuidHolder;
2323
import org.apache.arrow.vector.holders.ExtensionHolder;
2424

25-
public class UuidWriterImpl extends AbstractExtensionTypeWriter {
25+
public class UuidWriterImpl extends AbstractExtensionTypeWriter<UuidVector> {
2626

2727
public UuidWriterImpl(UuidVector vector) {
2828
super(vector);
2929
}
3030

3131
@Override
32-
public void writeExtensionType(Object value) {
32+
public void writeExtension(Object value) {
3333
UUID uuid = (UUID) value;
3434
ByteBuffer bb = ByteBuffer.allocate(16);
3535
bb.putLong(uuid.getMostSignificantBits());
3636
bb.putLong(uuid.getLeastSignificantBits());
37-
((UuidVector) this.vector).setSafe(this.idx(), bb.array());
38-
this.vector.setValueCount(this.idx() + 1);
37+
vector.setSafe(idx(), bb.array());
38+
vector.setValueCount(this.idx() + 1);
3939
}
4040

4141
@Override
4242
public void write(ExtensionHolder holder) {
43-
if (holder instanceof UuidHolder) {
44-
UuidHolder uuidHolder = (UuidHolder) holder;
45-
((UuidVector) this.vector).setSafe(this.idx(), uuidHolder.value);
46-
this.vector.setValueCount(this.idx() + 1);
47-
}
43+
UuidHolder uuidHolder = (UuidHolder) holder;
44+
vector.setSafe(this.idx(), uuidHolder.value);
45+
vector.setValueCount(this.idx() + 1);
4846
}
4947
}

0 commit comments

Comments
 (0)