jenkins-bot has submitted this change and it was merged.
Change subject: Relax subject check to only throw is no suitable data is ever
found
......................................................................
Relax subject check to only throw is no suitable data is ever found
Change-Id: Ibb586aae3c5c54a16815667b1ecb2d05334fe6b3
---
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
index ccd2143..e568b0b 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
@@ -15,6 +15,8 @@
import org.openrdf.model.Statement;
import org.openrdf.model.impl.StatementImpl;
import org.openrdf.model.impl.URIImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.wikidata.query.rdf.common.uri.Ontology;
import org.wikidata.query.rdf.common.uri.Provenance;
import org.wikidata.query.rdf.common.uri.RDF;
@@ -34,6 +36,8 @@
* tightly coupled with Wikibase's export format.
*/
public class Munger {
+ private static final Logger log = LoggerFactory.getLogger(Munger.class);
+
private final WikibaseUris uris;
/**
* Null if not in limit label languages mode and a set of allowed languages
@@ -510,7 +514,14 @@
*/
private void finishCommon() throws ContainedException {
if (!unknownSubjects.isEmpty()) {
- throw new BadSubjectException(unknownSubjects.keySet(), uris);
+ // If we have any valid statements, we ignore the garbage
+ // Otherwise, something wrong is going on and we reject the
update
+ if(statements.isEmpty() && restoredStatements.isEmpty()) {
+ throw new BadSubjectException(unknownSubjects.keySet(),
uris);
+ } else {
+ log.debug("Unrecognized subjects: {}. Expected only
sitelinks and subjects starting with {} and {}",
+ unknownSubjects.keySet(), uris.entityData(),
uris.entity());
+ }
}
if (revisionId == null) {
throw new ContainedException("Didn't get a revision id for " +
statements);
--
To view, visit https://gerrit.wikimedia.org/r/205258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb586aae3c5c54a16815667b1ecb2d05334fe6b3
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
