embulk-parser-poi_excel 0.1.5 → 0.1.12

data/src/main/java/org/embulk/parser/poi_excel/bean/util/SearchMergedCell.java

@@ -0,0 +1,71 @@
+package org.embulk.parser.poi_excel.bean.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionFinder;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionList;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionMap;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionNothing;
+
+public enum SearchMergedCell {
+	NONE {
+		@Override
+		public MergedRegionFinder createMergedRegionFinder() {
+			return new MergedRegionNothing();
+		}
+	},
+	LINEAR_SEARCH {
+		@Override
+		public MergedRegionFinder createMergedRegionFinder() {
+			return new MergedRegionList();
+		}
+	},
+	TREE_SEARCH {
+		@Override
+		public MergedRegionFinder createMergedRegionFinder() {
+			return new MergedRegionMap() {
+
+				@Override
+				protected Map<Integer, Map<Integer, CellRangeAddress>> newRowMap() {
+					return new TreeMap<>();
+				}
+
+				@Override
+				protected Map<Integer, CellRangeAddress> newColumnMap() {
+					return new TreeMap<>();
+				}
+			};
+		}
+	},
+	HASH_SEARCH {
+		@Override
+		public MergedRegionFinder createMergedRegionFinder() {
+			return new MergedRegionMap() {
+
+				@Override
+				protected Map<Integer, Map<Integer, CellRangeAddress>> newRowMap() {
+					return new HashMap<>();
+				}
+
+				@Override
+				protected Map<Integer, CellRangeAddress> newColumnMap() {
+					return new HashMap<>();
+				}
+			};
+		}
+	};
+
+	private MergedRegionFinder mergedRegionFinder;
+
+	public MergedRegionFinder getMergedRegionFinder() {
+		if (mergedRegionFinder == null) {
+			this.mergedRegionFinder = createMergedRegionFinder();
+		}
+		return mergedRegionFinder;
+	}
+
+	protected abstract MergedRegionFinder createMergedRegionFinder();
+}

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellFontVisitor.java

@@ -100,12 +100,6 @@ public class PoiExcelCellFontVisitor extends AbstractPoiExcelCellAttributeVisito
 				return (long) font.getIndex();
 			}
 		});
-		map.put("boldweight", new AttributeSupplier<Font>() {
-			@Override
-			public Object get(Column column, Cell cell, Font font) {
-				return (long) font.getBoldweight();
-			}
-		});
 		map.put("bold", new AttributeSupplier<Font>() {
 			@Override
 			public Object get(Column column, Cell cell, Font font) {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellStyleVisitor.java

@@ -41,16 +41,16 @@ public class PoiExcelCellStyleVisitor extends AbstractPoiExcelCellAttributeVisit
 		map.put("alignment", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getAlignment();
+				return (long) style.getAlignmentEnum().getCode();
 			}
 		});
 		map.put("border", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				int n0 = style.getBorderTop();
-				int n1 = style.getBorderBottom();
-				int n2 = style.getBorderLeft();
-				int n3 = style.getBorderRight();
+				int n0 = style.getBorderTopEnum().getCode();
+				int n1 = style.getBorderBottomEnum().getCode();
+				int n2 = style.getBorderLeftEnum().getCode();
+				int n3 = style.getBorderRightEnum().getCode();
 				if (column.getType() instanceof StringType) {
 					return String.format("%02x%02x%02x%02x", n0, n1, n2, n3);
 				}
@@ -60,25 +60,25 @@ public class PoiExcelCellStyleVisitor extends AbstractPoiExcelCellAttributeVisit
 		map.put("border_bottom", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getBorderBottom();
+				return (long) style.getBorderBottomEnum().getCode();
 			}
 		});
 		map.put("border_left", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getBorderLeft();
+				return (long) style.getBorderLeftEnum().getCode();
 			}
 		});
 		map.put("border_right", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getBorderRight();
+				return (long) style.getBorderRightEnum().getCode();
 			}
 		});
 		map.put("border_top", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getBorderTop();
+				return (long) style.getBorderTopEnum().getCode();
 			}
 		});
 		map.put("border_bottom_color", new AttributeSupplier<CellStyle>() {
@@ -154,7 +154,7 @@ public class PoiExcelCellStyleVisitor extends AbstractPoiExcelCellAttributeVisit
 		map.put("fill_pattern", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getFillPattern();
+				return (long) style.getFillPatternEnum().getCode();
 			}
 		});
 		map.put("font_index", new AttributeSupplier<CellStyle>() {
@@ -190,7 +190,7 @@ public class PoiExcelCellStyleVisitor extends AbstractPoiExcelCellAttributeVisit
 		map.put("vertical_alignment", new AttributeSupplier<CellStyle>() {
 			@Override
 			public Object get(Column column, Cell cell, CellStyle style) {
-				return (long) style.getVerticalAlignment();
+				return (long) style.getVerticalAlignmentEnum().getCode();
 			}
 		});
 		map.put("wrap_text", new AttributeSupplier<CellStyle>() {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellTypeVisitor.java

@@ -0,0 +1,52 @@
+package org.embulk.parser.poi_excel.visitor;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
+import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
+import org.embulk.spi.Column;
+import org.embulk.spi.PageBuilder;
+import org.embulk.spi.type.StringType;
+
+public class PoiExcelCellTypeVisitor {
+	protected final PoiExcelVisitorValue visitorValue;
+	protected final PageBuilder pageBuilder;
+
+	public PoiExcelCellTypeVisitor(PoiExcelVisitorValue visitorValue) {
+		this.visitorValue = visitorValue;
+		this.pageBuilder = visitorValue.getPageBuilder();
+	}
+
+	public void visit(PoiExcelColumnBean bean, Cell cell, CellType cellType, CellVisitor visitor) {
+		assert cell != null;
+
+		Column column = bean.getColumn();
+		if (column.getType() instanceof StringType) {
+			String type = cellType.name();
+			visitor.visitCellValueString(column, cell, type);
+			return;
+		}
+
+		int code = getCode(cellType);
+		visitor.visitCellValueNumeric(column, cell, code);
+	}
+
+	private static int getCode(CellType cellType) {
+		switch (cellType) {
+		case NUMERIC:
+			return 0;
+		case STRING:
+			return 1;
+		case FORMULA:
+			return 2;
+		case BLANK:
+			return 3;
+		case BOOLEAN:
+			return 4;
+		case ERROR:
+			return 5;
+		default:
+			return -1;
+		}
+	}
+}

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellValueVisitor.java

@@ -4,6 +4,7 @@ import java.text.MessageFormat;
 import java.util.List;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.CellValue;
 import org.apache.poi.ss.usermodel.CreationHelper;
 import org.apache.poi.ss.usermodel.FormulaError;
@@ -12,11 +13,14 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellReference;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.FormulaReplaceTask;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.ErrorStrategy;
+import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean.FormulaHandling;
 import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
+import org.embulk.parser.poi_excel.visitor.util.MergedRegionFinder;
 import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
@@ -38,15 +42,15 @@ public class PoiExcelCellValueVisitor {
 
 		Column column = bean.getColumn();
 
-		int cellType = cell.getCellType();
+		CellType cellType = cell.getCellTypeEnum();
 		switch (cellType) {
-		case Cell.CELL_TYPE_NUMERIC:
+		case NUMERIC:
 			visitor.visitCellValueNumeric(column, cell, cell.getNumericCellValue());
 			return;
-		case Cell.CELL_TYPE_STRING:
+		case STRING:
 			visitor.visitCellValueString(column, cell, cell.getStringCellValue());
 			return;
-		case Cell.CELL_TYPE_FORMULA:
+		case FORMULA:
 			PoiExcelColumnValueType valueType = bean.getValueType();
 			if (valueType == PoiExcelColumnValueType.CELL_FORMULA) {
 				visitor.visitCellFormula(column, cell);
@@ -54,13 +58,13 @@ public class PoiExcelCellValueVisitor {
 				visitCellValueFormula(bean, cell, visitor);
 			}
 			return;
-		case Cell.CELL_TYPE_BLANK:
+		case BLANK:
 			visitCellValueBlank(bean, cell, visitor);
 			return;
-		case Cell.CELL_TYPE_BOOLEAN:
+		case BOOLEAN:
 			visitor.visitCellValueBoolean(column, cell, cell.getBooleanCellValue());
 			return;
-		case Cell.CELL_TYPE_ERROR:
+		case ERROR:
 			visitCellValueError(bean, cell, cell.getErrorCellValue(), visitor);
 			return;
 		default:
@@ -69,35 +73,24 @@ public class PoiExcelCellValueVisitor {
 	}
 
 	protected void visitCellValueBlank(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
-		assert cell.getCellType() == Cell.CELL_TYPE_BLANK;
+		assert cell.getCellTypeEnum() == CellType.BLANK;
 
 		Column column = bean.getColumn();
 
-		boolean search = bean.getSearchMergedCell();
-		if (!search) {
-			visitor.visitCellValueBlank(column, cell);
-			return;
-		}
-
-		int r = cell.getRowIndex();
-		int c = cell.getColumnIndex();
-
-		Sheet sheet = cell.getSheet();
-		int size = sheet.getNumMergedRegions();
-		for (int i = 0; i < size; i++) {
-			CellRangeAddress range = visitorValue.getSheet().getMergedRegion(i);
-			if (range.isInRange(r, c)) {
-				Row firstRow = sheet.getRow(range.getFirstRow());
-				if (firstRow == null) {
-					visitCellNull(column);
-					return;
-				}
-				Cell firstCell = firstRow.getCell(range.getFirstColumn());
-				if (firstCell == null) {
-					visitCellNull(column);
-					return;
-				}
+		CellRangeAddress region = findRegion(bean, cell);
+		if (region != null) {
+			Row firstRow = cell.getSheet().getRow(region.getFirstRow());
+			if (firstRow == null) {
+				visitCellNull(column);
+				return;
+			}
+			Cell firstCell = firstRow.getCell(region.getFirstColumn());
+			if (firstCell == null) {
+				visitCellNull(column);
+				return;
+			}
 
+			if (firstCell.getRowIndex() != cell.getRowIndex() || firstCell.getColumnIndex() != cell.getColumnIndex()) {
 				visitCellValue(bean, firstCell, visitor);
 				return;
 			}
@@ -106,9 +99,56 @@ public class PoiExcelCellValueVisitor {
 		visitor.visitCellValueBlank(column, cell);
 	}
 
+	protected CellRangeAddress findRegion(PoiExcelColumnBean bean, Cell cell) {
+		Sheet sheet = cell.getSheet();
+		int r = cell.getRowIndex();
+		int c = cell.getColumnIndex();
+
+		MergedRegionFinder finder = bean.getMergedRegionFinder();
+		return finder.get(sheet, r, c);
+	}
+
 	protected void visitCellValueFormula(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
-		assert cell.getCellType() == Cell.CELL_TYPE_FORMULA;
+		assert cell.getCellTypeEnum() == CellType.FORMULA;
 
+		FormulaHandling handling = bean.getFormulaHandling();
+		switch (handling) {
+		case CASHED_VALUE:
+			visitCellValueFormulaCashedValue(bean, cell, visitor);
+			break;
+		default:
+			visitCellValueFormulaEvaluate(bean, cell, visitor);
+			break;
+		}
+	}
+
+	protected void visitCellValueFormulaCashedValue(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
+		Column column = bean.getColumn();
+
+		CellType cellType = cell.getCachedFormulaResultTypeEnum();
+		switch (cellType) {
+		case NUMERIC:
+			visitor.visitCellValueNumeric(column, cell, cell.getNumericCellValue());
+			return;
+		case STRING:
+			visitor.visitCellValueString(column, cell, cell.getStringCellValue());
+			return;
+		case BLANK:
+			visitCellValueBlank(bean, cell, visitor);
+			return;
+		case BOOLEAN:
+			visitor.visitCellValueBoolean(column, cell, cell.getBooleanCellValue());
+			return;
+		case ERROR:
+			visitCellValueError(bean, cell, cell.getErrorCellValue(), visitor);
+			return;
+		case FORMULA:
+		default:
+			throw new IllegalStateException(MessageFormat.format("unsupported POI cellType={0}", cellType));
+		}
+	}
+
+	protected void visitCellValueFormulaEvaluate(PoiExcelColumnBean bean, Cell cell, CellVisitor visitor) {
 		Column column = bean.getColumn();
 
 		List<FormulaReplaceTask> list = bean.getFormulaReplace();
@@ -120,7 +160,13 @@ public class PoiExcelCellValueVisitor {
 				String regex = replace.getRegex();
 				String replacement = replace.getTo();
 
-				replacement = replacement.replace("${row}", Integer.toString(cell.getRowIndex() + 1));
+				if (replacement.contains("${row}")) {
+					replacement = replacement.replace("${row}", Integer.toString(cell.getRowIndex() + 1));
+				}
+				if (replacement.contains("${column}")) {
+					replacement = replacement.replace("${column}",
+							CellReference.convertNumToColString(cell.getColumnIndex() + 1));
+				}
 
 				formula = formula.replaceAll(regex, replacement);
 			}
@@ -159,24 +205,24 @@ public class PoiExcelCellValueVisitor {
 			throw new RuntimeException(MessageFormat.format("evaluate error. formula={0}", cell.getCellFormula()), e);
 		}
 
-		int cellType = cellValue.getCellType();
+		CellType cellType = cellValue.getCellTypeEnum();
 		switch (cellType) {
-		case Cell.CELL_TYPE_NUMERIC:
+		case NUMERIC:
 			visitor.visitCellValueNumeric(column, cellValue, cellValue.getNumberValue());
 			return;
-		case Cell.CELL_TYPE_STRING:
+		case STRING:
 			visitor.visitCellValueString(column, cellValue, cellValue.getStringValue());
 			return;
-		case Cell.CELL_TYPE_BLANK:
+		case BLANK:
 			visitor.visitCellValueBlank(column, cellValue);
 			return;
-		case Cell.CELL_TYPE_BOOLEAN:
+		case BOOLEAN:
 			visitor.visitCellValueBoolean(column, cellValue, cellValue.getBooleanValue());
 			return;
-		case Cell.CELL_TYPE_ERROR:
+		case ERROR:
 			visitCellValueError(bean, cellValue, cellValue.getErrorValue(), visitor);
 			return;
-		case Cell.CELL_TYPE_FORMULA:
+		case FORMULA:
 		default:
 			throw new IllegalStateException(MessageFormat.format("unsupported POI cellType={0}", cellType));
 		}

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelClientAnchorVisitor.java

@@ -40,7 +40,7 @@ public class PoiExcelClientAnchorVisitor extends AbstractPoiExcelCellAttributeVi
 		map.put("anchor_type", new AttributeSupplier<ClientAnchor>() {
 			@Override
 			public Object get(Column column, Cell cell, ClientAnchor anchor) {
-				return (long) anchor.getAnchorType();
+				return (long) anchor.getAnchorType().value;
 			}
 		});
 		map.put("col1", new AttributeSupplier<ClientAnchor>() {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColumnVisitor.java

@@ -3,22 +3,27 @@ package org.embulk.parser.poi_excel.visitor;
 import java.text.MessageFormat;
 
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
+import org.embulk.parser.poi_excel.bean.record.PoiExcelRecord;
+import org.embulk.parser.poi_excel.bean.util.PoiExcelCellAddress;
 import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
 import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
+import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
+import org.slf4j.Logger;
 
 public class PoiExcelColumnVisitor implements ColumnVisitor {
+	private final Logger log = Exec.getLogger(getClass());
 
 	protected final PoiExcelVisitorValue visitorValue;
 	protected final PageBuilder pageBuilder;
 	protected final PoiExcelVisitorFactory factory;
 
-	protected Row currentRow;
+	protected PoiExcelRecord record;
 
 	public PoiExcelColumnVisitor(PoiExcelVisitorValue visitorValue) {
 		this.visitorValue = visitorValue;
@@ -26,8 +31,8 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		this.factory = visitorValue.getVisitorFactory();
 	}
 
-	public void setRow(Row row) {
-		this.currentRow = row;
+	public void setRecord(PoiExcelRecord record) {
+		this.record = record;
 	}
 
 	@Override
@@ -56,30 +61,53 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 	}
 
 	protected final void visitCell0(Column column, CellVisitor visitor) {
+		if (log.isTraceEnabled()) {
+			log.trace("{} start", column);
+		}
 		try {
 			visitCell(column, visitor);
 		} catch (Exception e) {
 			String sheetName = visitorValue.getSheet().getSheetName();
-			String ref = new CellReference(currentRow.getRowNum(), visitorValue.getColumnBean(column).getColumnIndex())
-					.formatAsString();
+			String ref = record.getCellReference(visitorValue.getColumnBean(column)).formatAsString();
 			throw new RuntimeException(MessageFormat.format("error at {0} cell={1}!{2}. {3}", column, sheetName, ref,
 					e.getMessage()), e);
 		}
+		if (log.isTraceEnabled()) {
+			log.trace("{} end", column);
+		}
 	}
 
 	protected void visitCell(Column column, CellVisitor visitor) {
 		PoiExcelColumnBean bean = visitorValue.getColumnBean(column);
 		PoiExcelColumnValueType valueType = bean.getValueType();
+		PoiExcelCellAddress cellAddress = bean.getCellAddress();
 
 		switch (valueType) {
 		case SHEET_NAME:
-			visitor.visitSheetName(column);
+			if (cellAddress != null) {
+				Sheet sheet = cellAddress.getSheet(record);
+				visitor.visitSheetName(column, sheet);
+			} else {
+				visitor.visitSheetName(column);
+			}
 			return;
 		case ROW_NUMBER:
-			visitor.visitRowNumber(column, currentRow.getRowNum() + 1);
+			int rowIndex;
+			if (cellAddress != null) {
+				rowIndex = cellAddress.getRowIndex();
+			} else {
+				rowIndex = record.getRowIndex(bean);
+			}
+			visitor.visitRowNumber(column, rowIndex + 1);
 			return;
 		case COLUMN_NUMBER:
-			visitor.visitColumnNumber(column, bean.getColumnIndex() + 1);
+			int columnIndex;
+			if (cellAddress != null) {
+				columnIndex = cellAddress.getColumnIndex();
+			} else {
+				columnIndex = record.getColumnIndex(bean);
+			}
+			visitor.visitColumnNumber(column, columnIndex + 1);
 			return;
 		case CONSTANT:
 			visitCellConstant(column, bean.getValueTypeSuffix(), visitor);
@@ -88,8 +116,13 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 			break;
 		}
 
-		assert valueType.useCell();
-		Cell cell = currentRow.getCell(bean.getColumnIndex());
+		// assert valueType.useCell();
+		Cell cell;
+		if (cellAddress != null) {
+			cell = cellAddress.getCell(record);
+		} else {
+			cell = record.getCell(bean);
+		}
 		if (cell == null) {
 			visitCellNull(column);
 			return;
@@ -108,6 +141,16 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		case CELL_COMMENT:
 			visitCellComment(bean, cell, visitor);
 			return;
+		case CELL_TYPE:
+			visitCellType(bean, cell, cell.getCellTypeEnum(), visitor);
+			return;
+		case CELL_CACHED_TYPE:
+			if (cell.getCellTypeEnum() == CellType.FORMULA) {
+				visitCellType(bean, cell, cell.getCachedFormulaResultTypeEnum(), visitor);
+			} else {
+				visitCellType(bean, cell, cell.getCellTypeEnum(), visitor);
+			}
+			return;
 		default:
 			throw new UnsupportedOperationException(MessageFormat.format("unsupported value_type={0}", valueType));
 		}
@@ -144,4 +187,9 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		PoiExcelCellCommentVisitor delegator = factory.getPoiExcelCellCommentVisitor();
 		delegator.visit(bean, cell, visitor);
 	}
+
+	private void visitCellType(PoiExcelColumnBean bean, Cell cell, CellType cellType, CellVisitor visitor) {
+		PoiExcelCellTypeVisitor delegator = factory.getPoiExcelCellTypeVisitor();
+		delegator.visit(bean, cell, cellType, visitor);
+	}
 }