This is an automated email from the ASF dual-hosted git repository. agozhiy pushed a commit to branch MERGE-200221-00 in repository https://gitbox.apache.org/repos/asf/drill.git
commit 8a8e58bf8382060305162b2ca261949b91179e46 Author: Charles Givre <[email protected]> AuthorDate: Thu Feb 20 13:21:06 2020 -0500 DRILL-7514: Update Apache POI to Latest Version closes #1991 --- contrib/format-excel/pom.xml | 2 +- .../org/apache/drill/exec/store/excel/ExcelBatchReader.java | 12 ++++-------- contrib/udfs/pom.xml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/contrib/format-excel/pom.xml b/contrib/format-excel/pom.xml index c66a912..ca6b6ab 100644 --- a/contrib/format-excel/pom.xml +++ b/contrib/format-excel/pom.xml @@ -31,7 +31,7 @@ <name>contrib/format-excel</name> <properties> - <poi.version>4.1.1</poi.version> + <poi.version>4.1.2</poi.version> </properties> <dependencies> <dependency> diff --git a/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelBatchReader.java b/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelBatchReader.java index 848fa75..32c062d 100644 --- a/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelBatchReader.java +++ b/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelBatchReader.java @@ -38,6 +38,7 @@ import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.drill.exec.physical.impl.scan.file.FileScanFramework.FileSchemaNegotiator; @@ -270,15 +271,10 @@ public class ExcelBatchReader implements ManagedReader<FileSchemaNegotiator> { * @return The number of actual columns */ private int getColumnCount() { - int columnCount; + int rowNumber = readerConfig.headerRow > 0 ? sheet.getFirstRowNum() : 0; + XSSFRow sheetRow = sheet.getRow(rowNumber); - if (readerConfig.headerRow >= 0) { - columnCount = sheet.getRow(sheet.getFirstRowNum()).getPhysicalNumberOfCells(); - } else { - // Case for when the user defines the headerRow as -1 IE: When there isn't a headerRow. - columnCount = sheet.getRow(0).getPhysicalNumberOfCells(); - } - return columnCount; + return sheetRow != null ? sheetRow.getPhysicalNumberOfCells() : 0; } @Override diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml index ed2bac2..be24c96 100644 --- a/contrib/udfs/pom.xml +++ b/contrib/udfs/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>nl.basjes.parse.useragent</groupId> <artifactId>yauaa</artifactId> - <version>5.11</version> + <version>5.13</version> </dependency> <!-- Test dependencies -->
