jenkins-bot has submitted this change and it was merged.
Change subject: Better fix for empty change set
......................................................................
Better fix for empty change set
Change-Id: I3b6d7dabe10949538407714b6f50aec171f6b178
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 285069b..611dc55 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -379,12 +379,8 @@
for (Future<?> task : tasks) {
task.get();
}
- log.debug("Preparing update data took {} ms",
System.currentTimeMillis() - start);
- if (trueChanges.isEmpty()) {
- log.debug("Got no changes, we're done");
- } else {
- rdfRepository.syncFromChanges(trueChanges, verify);
- }
+ log.debug("Preparing update data took {} ms, have {} changes",
System.currentTimeMillis() - start, trueChanges.size());
+ rdfRepository.syncFromChanges(trueChanges, verify);
updateMeter.mark(trueChanges.size());
}
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index 27b652d..f7c0f34 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -361,6 +361,12 @@
valueList.addAll(change.getCleanupList());
}
+ if (entityIds.isEmpty()) {
+ // If we've got no IDs, this means all change retrieval failed
+ log.debug("Got no valid changes, we're done");
+ return 0;
+ }
+
b.bindUris("entityList", entityIds, uris.entity());
b.bindStatements("insertStatements", insertStatements);
b.bindValues("entityStatements", entityStatements);
--
To view, visit https://gerrit.wikimedia.org/r/313644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b6d7dabe10949538407714b6f50aec171f6b178
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
