From 21a3c242df405a74f37e8d9e7b1c5cba23dd25e0 Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Fri, 6 Jun 2014 22:02:44 -0400
Subject: [PATCH] VIVO-719 Add some log statements so we can follow the
 progress.

---
 .../datatools/dumprestore/JsonToNquads.java         |  8 ++++++++
 .../datatools/dumprestore/RestoreModelsAction.java  | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/JsonToNquads.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/JsonToNquads.java
index 89d83e62d..acc0d7dd4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/JsonToNquads.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/JsonToNquads.java
@@ -30,9 +30,11 @@ public class JsonToNquads extends OutputStream {
 	private final ByteArrayOutputStream header = new ByteArrayOutputStream();
 
 	private boolean headerIsComplete;
+	private long recordCount;
 
 	public JsonToNquads(OutputStream out) throws IOException {
 		this.writer = new OutputStreamWriter(out, "UTF-8");
+		log.info("Dump beginning.");
 	}
 
 	@Override
@@ -43,6 +45,7 @@ public class JsonToNquads extends OutputStream {
 	@Override
 	public void close() throws IOException {
 		writer.close();
+		log.info("Dump is complete: " + recordCount + " records.");
 		log.debug("Left over in the buffer: '" + buffer + "'");
 	}
 
@@ -112,6 +115,11 @@ public class JsonToNquads extends OutputStream {
 				writer.write(String.format("%s %s %s %s .\n", s.toNquad(),
 						p.toNquad(), o.toNquad(), g.toNquad()));
 			}
+
+			recordCount++;
+			if (recordCount % 10000 == 0) {
+				log.info("dumped " + recordCount + " records.");
+			}
 		} catch (Exception e) {
 			log.error("Failed to parse record: '" + text + "'", e);
 			throw new RuntimeException(e);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
index 8dc5363c5..ffb31fb70 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
@@ -65,6 +65,8 @@ public class RestoreModelsAction extends AbstractDumpRestoreAction {
 	private final SelfLimitingTripleBuckets bnodeBuckets;
 	private final SelfLimitingTripleBuckets easyBuckets;
 
+	private long tripleCount;
+
 	RestoreModelsAction(HttpServletRequest req, HttpServletResponse resp)
 			throws BadRequestException {
 		super(req);
@@ -97,24 +99,32 @@ public class RestoreModelsAction extends AbstractDumpRestoreAction {
 			return;
 		}
 
+		log.info("Purging the " + which + " models.");
 		RDFService rdfService = getRdfService(which);
 		RDFServiceDataset dataset = new RDFServiceDataset(rdfService);
 		for (String graphUri : rdfService.getGraphURIs()) {
 			Model m = dataset.getNamedModel(graphUri);
+			log.info("Remove " + m.size() + " triples from " + graphUri);
 			m.removeAll();
 		}
+		log.info("Purge is complete.");
 	}
 
 	private long doTheRestore() throws IOException, RDFServiceException {
+		log.info("Restoring the " + which + " models.");
 		long lineCount = 0;
 		try (InputStream is = sourceFile.getInputStream();
 				DumpParser p = format.getParser(is)) {
 			for (DumpQuad line : p) {
 				bucketize(line);
 				lineCount++;
+				if (lineCount % 10000 == 0) {
+					log.info("read " + lineCount + " lines.");
+				}
 			}
 			emptyBuckets();
 		}
+		log.info("Restore is complete.");
 		return lineCount;
 	}
 
@@ -148,6 +158,9 @@ public class RestoreModelsAction extends AbstractDumpRestoreAction {
 				ModelSerializationFormat.NTRIPLE, graphUri);
 
 		rdfService.changeSetUpdate(change);
+		
+		tripleCount += triples.size();
+		log.info("processed " + tripleCount  +" triples.");
 	}
 
 	private InputStream serialize(Collection<DumpTriple> triples)