Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 c++/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ CHM_FILE =
HHC_LOCATION =

# The GENERATE_CHI flag controls if a separate .chi index file is generated (
# YES) or that it should be included in the master .chm file ( NO).
# YES) or that it should be included in the .chm file ( NO).
# The default value is: NO.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

Expand Down
12 changes: 6 additions & 6 deletions java/core/src/test/org/apache/orc/TestVectorOrcFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -4649,11 +4649,11 @@ public void testMultiStripeColumnEncryption(Version fileFormat) throws Exception
"bin:binary>");

InMemoryKeystore allKeys = new InMemoryKeystore();
byte[][] masterKeys = new byte[6][];
for(int k=0; k < masterKeys.length; ++k) {
masterKeys[k] = new byte[algorithm.keyLength()];
random.nextBytes(masterKeys[k]);
allKeys.addKey("key_" + k, algorithm, masterKeys[k]);
byte[][] keys = new byte[6][];
for(int k=0; k < keys.length; ++k) {
keys[k] = new byte[algorithm.keyLength()];
random.nextBytes(keys[k]);
allKeys.addKey("key_" + k, algorithm, keys[k]);
}

Writer writer = OrcFile.createWriter(testFilePath,
Expand Down Expand Up @@ -4707,7 +4707,7 @@ public void testMultiStripeColumnEncryption(Version fileFormat) throws Exception
// try enabling each key by itself
for(int c=0; c < 6; ++c) {
InMemoryKeystore single = new InMemoryKeystore();
single.addKey("key_" + c, algorithm, masterKeys[c]);
single.addKey("key_" + c, algorithm, keys[c]);
reader = OrcFile.createReader(testFilePath,
OrcFile.readerOptions(conf).setKeyProvider(single));
boolean[] hasData = new boolean[6];
Expand Down
2 changes: 1 addition & 1 deletion site/_docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker

The C++ library is supported on the following operating systems:

* CentOS 6 or 7
* CentOS 7 or 8
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a leftover which we missed.

* Debian 8 or 9
* MacOS 10.10 to 10.13
* Ubuntu 18.04 or 20.04
Expand Down
2 changes: 1 addition & 1 deletion site/_posts/2017-05-16-new-committer.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ author: omalley
categories: [team]
---

The ORC PMC is happy to add Deepak Majeti as an ORC committer for his
The ORC PMC is happy to add Deepak Majeti as an ORC committer for the
work on the C++ ORC reader including both contributions and reviews of
other's patches. Thank you for your work on ORC, Deepak!
2 changes: 1 addition & 1 deletion site/_posts/2019-01-10-add-dongjoon.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ author: omalley
categories: [team]
---

The ORC PMC is happy to add Dongjoon Hyun as an ORC committer for his
The ORC PMC is happy to add Dongjoon Hyun as an ORC committer for the
work on improving ORC's integration to Spark.

Thank you for your work on ORC, Dongjoon!
2 changes: 1 addition & 1 deletion site/_posts/2020-11-16-add-panagiotis.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ author: dongjoon
categories: [team]
---

The ORC PMC is happy to add Panagiotis Garefalakis as an ORC committer for his
The ORC PMC is happy to add Panagiotis Garefalakis as an ORC committer for the
work on improving ORC's integration to Apache Hive.

Thank you for your work on ORC, Panagiotis!
2 changes: 1 addition & 1 deletion site/_posts/2021-02-08-panagiotis-pmc.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ On behalf of the Apache ORC Project Management Committee (PMC), it gives
me great pleasure to announce that Panagiotis Garefalakis has joined the PMC. Panagiotis
has radically improved the integration between Hive and ORC.

Please join me in welcoming Dongjoon to the ORC PMC!
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a typo made by me.

Please join me in welcoming Panagiotis to the ORC PMC!

2 changes: 1 addition & 1 deletion site/_posts/2021-04-13-add-william.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ author: dongjoon
categories: [team]
---

The ORC PMC is happy to add William Hyun as an ORC committer for his
The ORC PMC is happy to add William Hyun as an ORC committer for the
work on improving ORC's code quality and integration to Apache Spark and Apache Iceberg.

Thank you for your work on ORC, William!