Skip to content

HIVE-26809: Upgrade ORC to 1.8.1. #3833

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

HIVE-26809: Upgrade ORC to 1.8.1. #3833

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
5 changes: 5 additions & 0 deletions beeline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...eberg-handler/src/test/results/positive/query_iceberg_metadata_of_partitioned_table.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ POSTHOOK: query: select summary from default.ice_meta_3.snapshots
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_3
POSTHOOK: Output: hdfs://### HDFS PATH ###
{"added-data-files":"7","added-records":"15","added-files-size":"1329","changed-partition-count":"7","total-records":"15","total-files-size":"1329","total-data-files":"7","total-delete-files":"0","total-position-deletes":"0","total-equality-deletes":"0"}
{"added-data-files":"7","added-records":"15","added-files-size":"1378","changed-partition-count":"7","total-records":"15","total-files-size":"1378","total-data-files":"7","total-delete-files":"0","total-position-deletes":"0","total-equality-deletes":"0"}
PREHOOK: query: select summary['changed-partition-count'] from default.ice_meta_2.snapshots
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_meta_2
Expand Down Expand Up @@ -424,7 +424,7 @@ POSTHOOK: query: select summary from default.ice_meta_3.snapshots
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_meta_3
POSTHOOK: Output: hdfs://### HDFS PATH ###
{"added-data-files":"7","added-records":"15","added-files-size":"1329","changed-partition-count":"7","total-records":"15","total-files-size":"1329","total-data-files":"7","total-delete-files":"0","total-position-deletes":"0","total-equality-deletes":"0"}
{"added-data-files":"7","added-records":"15","added-files-size":"1378","changed-partition-count":"7","total-records":"15","total-files-size":"1378","total-data-files":"7","total-delete-files":"0","total-position-deletes":"0","total-equality-deletes":"0"}
PREHOOK: query: select summary['changed-partition-count'] from default.ice_meta_2.snapshots
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_meta_2
Expand Down
12 changes: 6 additions & 6 deletions itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1373", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "1395", parameters.get("totalSize"));

parameters = partitions
.stream()
Expand All @@ -400,7 +400,7 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1442", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "1453", parameters.get("totalSize"));

//Do a major compaction
CompactionRequest rqst = new CompactionRequest(dbName, tblName, CompactionType.MAJOR);
Expand All @@ -425,7 +425,7 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "801", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "808", parameters.get("totalSize"));

parameters = partitions
.stream()
Expand All @@ -435,7 +435,7 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1442", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "1453", parameters.get("totalSize"));
}

/**
Expand Down Expand Up @@ -478,7 +478,7 @@ public void testStatsAfterCompactionTbl() throws Exception {
Map<String, String> parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1434", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "1446", parameters.get("totalSize"));

//Do a major compaction
CompactionRequest rqst = new CompactionRequest(dbName, tblName, CompactionType.MAJOR);
Expand All @@ -496,7 +496,7 @@ public void testStatsAfterCompactionTbl() throws Exception {
parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "776", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "783", parameters.get("totalSize"));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...ve-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ public void testStatsAfterQueryCompactionOnTez() throws Exception {
Map<String, String> parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1434", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "1446", parameters.get("totalSize"));

//Do a major compaction
CompactorTestUtil.runCompaction(conf, dbName, tblName, CompactionType.MAJOR, true);
Expand All @@ -723,7 +723,7 @@ public void testStatsAfterQueryCompactionOnTez() throws Exception {
parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "727", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "735", parameters.get("totalSize"));
}

@Test
Expand Down
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 @@ -55,14 +55,14 @@
import org.apache.hadoop.hive.ql.io.orc.encoded.Reader.OrcEncodedColumnBatch;
import org.apache.hadoop.hive.ql.io.orc.RecordReaderImpl;
import org.apache.orc.TypeDescription;
import org.apache.orc.impl.reader.tree.TypeReader;
import org.apache.orc.impl.SchemaEvolution;
import org.apache.orc.impl.TreeReaderFactory;
import org.apache.orc.impl.TreeReaderFactory.StructTreeReader;
import org.apache.orc.impl.TreeReaderFactory.TreeReader;
import org.apache.orc.impl.WriterImpl;
import org.apache.orc.OrcProto;


public class OrcEncodedDataConsumer
extends EncodedDataConsumer<OrcBatchKey, OrcEncodedColumnBatch> {
private TreeReaderFactory.TreeReader[] columnReaders;
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 @@ -180,7 +180,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.1</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