Skip to content
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

Jump to bottom

Re-implement ORCRecordReader #5267

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Re-implement ORCRecordReader #5267

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pinot-common/src/main/java/org/apache/pinot/common/utils/StringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.commons.lang.StringUtils;


// TODO: Use pinot-spi StringUtils instead
public class StringUtil {
private static final char NULL_CHARACTER = '\0';
private static final String charSet = "UTF-8";
Expand Down
6 changes: 2 additions & 4 deletions ...not-csv/src/test/java/org/apache/pinot/plugin/inputformat/csv/CSVRecordExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.spi.data.Schema;
import org.apache.pinot.spi.data.readers.AbstractRecordExtractorTest;
import org.apache.pinot.spi.data.readers.AbstractRecordReaderTest;
import org.apache.pinot.spi.data.readers.GenericRow;
import org.apache.pinot.spi.data.readers.RecordReader;
import org.testng.Assert;


/**
* Tests the {@link CSVRecordExtractor} using a schema containing groovy transform functions
*/
Expand Down Expand Up @@ -86,7 +84,7 @@ protected void checkValue(Map<String, Object> inputRecord, GenericRow genericRow
Object expectedValue = entry.getValue();
Object actualValue = genericRow.getValue(columnName);
if (expectedValue instanceof Collection) {
List expectedArray = (ArrayList) expectedValue;
List expectedArray = (List) expectedValue;
if (expectedArray.size() == 1) {
// in CSV, cannot differentiate between array with single element vs actual single element
Assert.assertEquals(actualValue, String.valueOf(expectedArray.get(0)));
Expand Down
28 changes: 6 additions & 22 deletions pinot-plugins/pinot-input-format/pinot-orc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,14 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-mapreduce</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
</exclusion>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</dependency>
</dependencies>
</project>
146 changes: 0 additions & 146 deletions ...t/pinot-orc/src/main/java/org/apache/pinot/plugin/inputformat/orc/ORCRecordExtractor.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ...t-orc/src/main/java/org/apache/pinot/plugin/inputformat/orc/ORCRecordExtractorConfig.java
View file
Open in desktop

This file was deleted.