Skip to content

Update orc #3816

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
wants to merge 3 commits into from
Closed

Update orc #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ea8930
HIVE-25497: Moving to ORC to 1.7.1. LLAP EncodedTreeReaderFactory has…
pgaref Dec 8, 2021
9a290ac
HIVE-25497: Bump to 1.7.2
pgaref Dec 21, 2021
4de34f9
HIVE-25497: Upgrade ORC to 1.8.0.
Dec 5, 2022
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
10 changes: 5 additions & 5 deletions llap-server/src/java/org/apache/hadoop/hive/llap/io/decode/OrcEncodedDataConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
import org.apache.orc.impl.TreeReaderFactory.TreeReader;
import org.apache.orc.impl.WriterImpl;
import org.apache.orc.OrcProto;

import org.apache.orc.impl.reader.tree.TypeReader;

public class OrcEncodedDataConsumer
extends EncodedDataConsumer<OrcBatchKey, OrcEncodedColumnBatch> {
Expand Down Expand Up @@ -193,7 +193,7 @@ protected void decodeBatch(OrcEncodedColumnBatch batch,
*/
TreeReader reader = columnReaders[idx];
ColumnVector cv = prepareColumnVector(cvb, idx, batchSize);
reader.nextVector(cv, null, batchSize);
reader.nextVector(cv, null, batchSize, cvb.filterContext, TypeReader.ReadPhase.ALL);
}

// we are done reading a batch, send it to consumer for processing
Expand Down Expand Up @@ -234,7 +234,7 @@ private void createColumnReaders(OrcEncodedColumnBatch batch,
this.batchSchemas = includes.getBatchReaderTypes(fileSchema);
StructTreeReader treeReader = EncodedTreeReaderFactory.createRootTreeReader(
batchSchemas, stripeMetadata.getEncodings(), batch, codec, context, useDecimal64ColumnVectors);
this.columnReaders = treeReader.getChildReaders();
this.columnReaders = (TreeReader[]) treeReader.getChildReaders();

if (LlapIoImpl.LOG.isDebugEnabled()) {
for (int i = 0; i < columnReaders.length; ++i) {
Expand Down Expand Up @@ -306,7 +306,7 @@ private void positionInStreams(TreeReaderFactory.TreeReader[] columnReaders,
for (int i = 0; i < columnReaders.length; i++) {
if (columnReaders[i] == null) continue;
// TODO: we could/should trace seek destinations; pps needs a "peek" method
columnReaders[i].seek(pps);
columnReaders[i].seek(pps, TypeReader.ReadPhase.ALL);
}
}

Expand All @@ -331,7 +331,7 @@ private void repositionInStreams(TreeReaderFactory.TreeReader[] columnReaders,
((EncodedTreeReaderFactory.TimestampStreamReader) reader)
.updateTimezone(stripeMetadata.getWriterTimezone());
}
reader.seek(pps);
reader.seek(pps, TypeReader.ReadPhase.ALL);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<postgres.version>42.4.1</postgres.version>
<oracle.version>21.3.0.0</oracle.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.6.9</orc.version>
<orc.version>1.8.0</orc.version>
<mockito-core.version>3.4.4</mockito-core.version>
<powermock.version>2.0.2</powermock.version>
<mina.version>2.0.0-M5</mina.version>
Expand Down
Loading