From 62a0010fe5ab7b247b345b456178659c3815a594 Mon Sep 17 00:00:00 2001 From: tbiScireum Date: Mon, 18 Feb 2019 11:34:14 +0100 Subject: [PATCH] Revert "Creates a row processor which can be used with the smartLineProcessor" --- .../sirius/biz/jobs/DatabaseProcessor.java | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 src/main/java/sirius/biz/jobs/DatabaseProcessor.java diff --git a/src/main/java/sirius/biz/jobs/DatabaseProcessor.java b/src/main/java/sirius/biz/jobs/DatabaseProcessor.java deleted file mode 100644 index b5af10a06..000000000 --- a/src/main/java/sirius/biz/jobs/DatabaseProcessor.java +++ /dev/null @@ -1,116 +0,0 @@ -package sirius.biz.jobs; - -import sirius.db.jdbc.Row; -import sirius.db.jdbc.SQLQuery; -import sirius.kernel.commons.Limit; -import sirius.kernel.commons.Tuple; -import sirius.kernel.commons.Values; -import sirius.web.data.LineBasedProcessor; -import sirius.web.data.RowProcessor; - -import java.sql.SQLException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * Implements a base database processor class. - *

- * Transforms the selected data so that all {@link RowProcessor processors} can handle them. - */ -public class DatabaseProcessor implements LineBasedProcessor { - /** - * The sql query selecting the data to import. - */ - private SQLQuery query; - - /** - * The number of items to be handled with one query iteration. - */ - private int limit; - - /** - * The current limit to be used during the iteration over the query. - */ - private Limit currentLimit; - - /** - * Sets a {@link SQLQuery} to iterate over. - * - * @param query the query to iterate over - * @param limit the number of items to be handled with one query iteration - * @return the processor itself for fluent method calls - */ - public DatabaseProcessor withQuery(SQLQuery query, int limit) { - this.query = query; - this.limit = limit; - return this; - } - - @Override - public void run(RowProcessor rowProcessor, Predicate errorHandler) throws Exception { - if (query == null) { - return; - } - - boolean hasMore = true; - - AtomicInteger lineNumber = new AtomicInteger(0); - - int itemsToSkip = 0; - while (hasMore) { - currentLimit = new Limit(itemsToSkip, limit); - try { - hasMore = runQuery(rowProcessor, lineNumber, errorHandler); - } catch (Exception e) { - if (!errorHandler.test(e)) { - throw e; - } - } - - itemsToSkip += limit; - } - } - - private Values getHeading(Row row) { - return Values.of(row.getFieldsList().stream().map(Tuple::getFirst).collect(Collectors.toList())); - } - - private Values getValues(Row row) { - return Values.of(row.getFieldsList().stream().map(Tuple::getSecond).collect(Collectors.toList())); - } - - /** - * Iterates over the query with the current limit. - * - * @param rowProcessor the row processor handling each row - * @param lineNumber the current line number - * @param errorHandler the error handler called in case of an exception - * @return true if there could be more rows to handle, if the limit would be modified, false otherwise - * @throws SQLException may be thrown if something goes wrong with the query execution - */ - private boolean runQuery(RowProcessor rowProcessor, AtomicInteger lineNumber, Predicate errorHandler) - throws SQLException { - AtomicBoolean hasMore = new AtomicBoolean(false); - - query.iterateAll(row -> { - try { - // has more if this iteration found at least one item and the limit is not unlimited - hasMore.set(currentLimit.getMaxItems() > 0); - - if (lineNumber.get() < 1) { - rowProcessor.handleRow(lineNumber.incrementAndGet(), getHeading(row)); - } - - rowProcessor.handleRow(lineNumber.incrementAndGet(), getValues(row)); - } catch (Exception e) { - if (!errorHandler.test(e)) { - throw e; - } - } - }, currentLimit); - - return hasMore.get(); - } -}