Skip to content

Commit 1e08ecf

Browse files
committed
scanner class updated
1 parent 32b4b70 commit 1e08ecf

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataexport/ExportManager.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.scalar.db.api.DistributedTransactionManager;
44
import com.scalar.db.api.Result;
5-
import com.scalar.db.api.Scanner;
65
import com.scalar.db.api.TableMetadata;
76
import com.scalar.db.api.TransactionManagerCrudOperable;
87
import com.scalar.db.dataloader.core.FileFormat;
@@ -13,6 +12,8 @@
1312
import com.scalar.db.dataloader.core.dataimport.dao.ScalarDbDao;
1413
import com.scalar.db.dataloader.core.dataimport.dao.ScalarDbDaoException;
1514
import com.scalar.db.dataloader.core.util.TableMetadataUtil;
15+
import com.scalar.db.exception.transaction.CrudException;
16+
import com.scalar.db.exception.transaction.UnknownTransactionStatusException;
1617
import com.scalar.db.io.DataType;
1718
import java.io.BufferedWriter;
1819
import java.io.IOException;
@@ -87,7 +88,8 @@ public ExportReport startExport(
8788
BufferedWriter bufferedWriter = new BufferedWriter(writer);
8889
boolean isJson = exportOptions.getOutputFileFormat() == FileFormat.JSON;
8990

90-
try (Scanner scanner = createScanner(exportOptions, dao, distributedTransactionManager)) {
91+
try (TransactionManagerCrudOperable.Scanner scanner =
92+
createScanner(exportOptions, dao, distributedTransactionManager)) {
9193

9294
Iterator<Result> iterator = scanner.iterator();
9395
AtomicBoolean isFirstBatch = new AtomicBoolean(true);
@@ -114,7 +116,10 @@ public ExportReport startExport(
114116
// TODO: handle this
115117
}
116118
processFooter(exportOptions, tableMetadata, bufferedWriter);
117-
} catch (InterruptedException | IOException e) {
119+
} catch (InterruptedException
120+
| IOException
121+
| UnknownTransactionStatusException
122+
| CrudException e) {
118123
logger.error("Error during export: {}", e.getMessage());
119124
} finally {
120125
bufferedWriter.flush();

0 commit comments

Comments
 (0)