[MediaWiki-commits] [Gerrit] Override date functions to process WikibaseDate - change (wikidata...rdf)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232892

Change subject: Override date functions to process WikibaseDate
......................................................................

Override date functions to process WikibaseDate

Bug: T109803
Change-Id: I9435af7160b5af02cc8959789ab629d7a002329b
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
M pom.xml
M tools/pom.xml
3 files changed, 31 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/92/232892/1

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
index 61a3eb9..07c5ae3 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
@@ -2,9 +2,14 @@
 
 import javax.servlet.ServletContextEvent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import 
org.wikidata.query.rdf.blazegraph.constraints.WikibaseDateBOp.WikibaseDateFactory;
 import org.wikidata.query.rdf.blazegraph.label.LabelService;
 
+import com.bigdata.rdf.internal.constraints.DateBOp.DateOp;
 import com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener;
+import com.bigdata.rdf.sparql.ast.FunctionRegistry;
 import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
@@ -15,6 +20,9 @@
  * Context listener to enact configurations we need on initialization.
  */
 public class WikibaseContextListener extends BigdataRDFServletContextListener {
+
+    private static final transient Logger log = 
LoggerFactory.getLogger(WikibaseContextListener.class);
+
     /**
      * Replaces the default Blazegraph services with ones that do not allow
      * remote services and a label resolution service.
@@ -22,6 +30,27 @@
     public static void initializeServices() {
         ServiceRegistry.getInstance().setDefaultServiceFactory(new 
DisableRemotesServiceFactory());
         LabelService.register();
+
+        // Override date functions so that we can handle them
+        // via WikibaseDate
+        FunctionRegistry.remove(FunctionRegistry.YEAR);
+        FunctionRegistry.add(FunctionRegistry.YEAR,
+                new WikibaseDateFactory(DateOp.YEAR));
+        FunctionRegistry.remove(FunctionRegistry.MONTH);
+        FunctionRegistry.add(FunctionRegistry.MONTH,
+                new WikibaseDateFactory(DateOp.MONTH));
+        FunctionRegistry.remove(FunctionRegistry.DAY);
+        FunctionRegistry.add(FunctionRegistry.DAY,
+                new WikibaseDateFactory(DateOp.DAY));
+        FunctionRegistry.remove(FunctionRegistry.HOURS);
+        FunctionRegistry.add(FunctionRegistry.HOURS,
+                new WikibaseDateFactory(DateOp.HOURS));
+        FunctionRegistry.remove(FunctionRegistry.MINUTES);
+        FunctionRegistry.add(FunctionRegistry.MINUTES,
+                new WikibaseDateFactory(DateOp.MINUTES));
+        FunctionRegistry.remove(FunctionRegistry.SECONDS);
+        FunctionRegistry.add(FunctionRegistry.SECONDS,
+                new WikibaseDateFactory(DateOp.SECONDS));
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 50f4e67..c5820b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <blazegraph.version>1.5.2</blazegraph.version>
+    <blazegraph.version>1.5.3-wmf-1</blazegraph.version>
     <!-- This Blazegraph version has backports onto the 1.5.1 branch and is 
hosted at WMF. Documentation on how to do that
       is in the backport_blazegraph.txt file. -->
     <sesame.version>2.8.1</sesame.version>
diff --git a/tools/pom.xml b/tools/pom.xml
index 414eb84..4bd3904 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -215,7 +215,7 @@
           <contextHandlers>
             <contextHandler 
implementation="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
               <!-- TODO a war with the blazegraph extensions -->
-              <war>${project.build.directory}/blazegraph</war>
+              
<war>${project.basedir}/../war/target/blazegraph-service-${project.version}-dist.war</war>
               <contextPath>/bigdata</contextPath>
             </contextHandler>
           </contextHandlers>

-- 
To view, visit https://gerrit.wikimedia.org/r/232892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9435af7160b5af02cc8959789ab629d7a002329b
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits