Strabon

changeset 127:4fc7c28159aa

merge
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Fri May 04 14:08:23 2012 +0300 (2012-05-04)
parents 8ebd01848161 719afbe293ba
children fe3dcddc2aba c84657ac1966
files pom.xml query.sh query2.sh strabon
line diff
     1.1 --- a/endpoint/pom.xml	Fri May 04 14:08:10 2012 +0300
     1.2 +++ b/endpoint/pom.xml	Fri May 04 14:08:23 2012 +0300
     1.3 @@ -215,7 +215,6 @@
     1.4  					<autoVersionSubmodules>true</autoVersionSubmodules>
     1.5  				</configuration>
     1.6  			</plugin>
     1.7 -			<!--
     1.8  			<plugin>
     1.9  				<groupId>org.apache.tomcat.maven</groupId>
    1.10  				<artifactId>tomcat7-maven-plugin</artifactId>
    1.11 @@ -232,7 +231,6 @@
    1.12  					</execution>
    1.13  				</executions>
    1.14  			</plugin>
    1.15 -			-->
    1.16  		</plugins>
    1.17  
    1.18  		<pluginManagement>
    1.19 @@ -270,6 +268,5 @@
    1.20  				</plugin>
    1.21  			</plugins>
    1.22  		</pluginManagement>
    1.23 -
    1.24  	</build>
    1.25  </project>
     2.1 --- a/pom.xml	Fri May 04 14:08:10 2012 +0300
     2.2 +++ b/pom.xml	Fri May 04 14:08:23 2012 +0300
     2.3 @@ -487,13 +487,11 @@
     2.4  				</plugin>
     2.5  				
     2.6  				<!-- The following plugin is for being able to run tomcat6/7:run -->
     2.7 -				<!--
     2.8  				<plugin>
     2.9  					<groupId>org.apache.tomcat.maven</groupId>
    2.10  					<artifactId>tomcat7-maven-plugin</artifactId>
    2.11  					<version>2.0-SNAPSHOT</version>
    2.12  				</plugin>
    2.13 -				-->
    2.14  			</plugins>
    2.15  		</pluginManagement>
    2.16  
    2.17 @@ -543,7 +541,6 @@
    2.18  	
    2.19  	<pluginRepositories>
    2.20  		<!-- The following repository is for being able to run tomcat7:run -->
    2.21 -		<!-- 
    2.22  		<pluginRepository>
    2.23  			<id>apache.snapshots</id>
    2.24  			<name>Apache Snapshots</name>
    2.25 @@ -555,7 +552,6 @@
    2.26  				<enabled>true</enabled>
    2.27  			</snapshots>
    2.28  		</pluginRepository>
    2.29 -		-->
    2.30  	</pluginRepositories>
    2.31  
    2.32  	<scm>
     3.1 --- a/query.sh	Fri May 04 14:08:10 2012 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,17 +0,0 @@
     3.4 -#!/bin/bash
     3.5 -#BASE=/home/strabon/experiments/data/naive/10mil
     3.6 -#10mil  0.01     11552771
     3.7 -#100mil 0.0034   99758140
     3.8 -#500mil 0.0015  512505143
     3.9 -#1bil   0.001  1153249211
    3.10 -
    3.11 -DB="noa-d4_1"
    3.12 -LOGPATH="/home/strabon/experiments/logs"
    3.13 -STEP="0.01"
    3.14 -TOTALTRIPLES="11552771"
    3.15 -
    3.16 -(cd jars/target &&
    3.17 -java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb 
    3.18 -"PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> PREFIX georss: <http://www.georss.org/georss/> PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> PREFIX lgdo: <http://linkedgeodata.org/ontology/> PREFIX gn: <http://www.geonames.org/ontology#> PREFIX iman: <http://teleios.di.uoa.gr/ontologies/imageAnnotationOntology.owl#> PREFIX eolo: <http://www.dlr.de/ontologies/EOLO.owl#> SELECT ?h ?hGeo ?hAcqTime ?hConfidence ?hProvider ?hConfirmation ?hSensor WHERE { ?h a noa:Hotspot ;    noa:hasGeometry ?hGeo ;    noa:hasAcquisitionTime ?hAcqTime ;    noa:hasConfidence ?hConfidence ;    noa:isProducedBy ?hProvider ;    noa:hasConfirmation ?hConfirmation ;    noa:isDerivedFromSensor ?hSensor ;    FILTER( \"2007-08-23T00:00:00\" <= str(?hAcqTime)    && str(?hAcqTime) <= \"2007-08-26T23:59:59\" ) .    FILTER( strdf:contains(\"POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))\"^^strdf:WKT, ?hGeo) ) .}" 
    3.19 -XML)
    3.20 -
     4.1 --- a/query2.sh	Fri May 04 14:08:10 2012 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,12 +0,0 @@
     4.4 -#!/bin/bash
     4.5 -#BASE=/home/strabon/experiments/data/naive/10mil
     4.6 -#10mil  0.01     11552771
     4.7 -#100mil 0.0034   99758140
     4.8 -#500mil 0.0015  512505143
     4.9 -#1bil   0.001  1153249211
    4.10 -
    4.11 -DB="test"
    4.12 -
    4.13 -(cd jars/target &&
    4.14 -java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb "SELECT * WHERE {?s ?p ?o} LIMIT 1" XML)
    4.15 -
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/scripts/query.sh	Fri May 04 14:08:23 2012 +0300
     5.3 @@ -0,0 +1,17 @@
     5.4 +#!/bin/bash
     5.5 +#BASE=/home/strabon/experiments/data/naive/10mil
     5.6 +#10mil  0.01     11552771
     5.7 +#100mil 0.0034   99758140
     5.8 +#500mil 0.0015  512505143
     5.9 +#1bil   0.001  1153249211
    5.10 +
    5.11 +DB="noa-d4_1"
    5.12 +LOGPATH="/home/strabon/experiments/logs"
    5.13 +STEP="0.01"
    5.14 +TOTALTRIPLES="11552771"
    5.15 +
    5.16 +(cd jars/target &&
    5.17 +java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb 
    5.18 +"PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#> PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> PREFIX georss: <http://www.georss.org/georss/> PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> PREFIX lgdo: <http://linkedgeodata.org/ontology/> PREFIX gn: <http://www.geonames.org/ontology#> PREFIX iman: <http://teleios.di.uoa.gr/ontologies/imageAnnotationOntology.owl#> PREFIX eolo: <http://www.dlr.de/ontologies/EOLO.owl#> SELECT ?h ?hGeo ?hAcqTime ?hConfidence ?hProvider ?hConfirmation ?hSensor WHERE { ?h a noa:Hotspot ;    noa:hasGeometry ?hGeo ;    noa:hasAcquisitionTime ?hAcqTime ;    noa:hasConfidence ?hConfidence ;    noa:isProducedBy ?hProvider ;    noa:hasConfirmation ?hConfirmation ;    noa:isDerivedFromSensor ?hSensor ;    FILTER( \"2007-08-23T00:00:00\" <= str(?hAcqTime)    && str(?hAcqTime) <= \"2007-08-26T23:59:59\" ) .    FILTER( strdf:contains(\"POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))\"^^strdf:WKT, ?hGeo) ) .}" 
    5.19 +XML)
    5.20 +
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/scripts/query2.sh	Fri May 04 14:08:23 2012 +0300
     6.3 @@ -0,0 +1,12 @@
     6.4 +#!/bin/bash
     6.5 +#BASE=/home/strabon/experiments/data/naive/10mil
     6.6 +#10mil  0.01     11552771
     6.7 +#100mil 0.0034   99758140
     6.8 +#500mil 0.0015  512505143
     6.9 +#1bil   0.001  1153249211
    6.10 +
    6.11 +DB="test"
    6.12 +
    6.13 +(cd jars/target &&
    6.14 +java -cp $(for file in `ls -1 *.jar`; do myVar=$myVar./$file":"; done; echo $myVar;) eu.earthobservatory.runtime.monetdb.QueryOp localhost 50000 $DB monetdb monetdb "SELECT * WHERE {?s ?p ?o} LIMIT 1" XML)
    6.15 +
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/scripts/strabon	Fri May 04 14:08:23 2012 +0300
     7.3 @@ -0,0 +1,28 @@
     7.4 +#! /bin/bash
     7.5 +
     7.6 +dbName=$1
     7.7 +dirs=$2
     7.8 +
     7.9 +# Evaluates a query using Strabon that is stored in $dir
    7.10 +#dir='/home/ggarbis/workspaces/Strabon-workspace/Strabon/jars/target'
    7.11 +dir='/home/kkyzir/teleios/nkua/Strabon/jars/target'
    7.12 +
    7.13 +# Arguments for QueryDir
    7.14 +HOST='localhost'
    7.15 +PORT='50000'
    7.16 +DATABASE=$dbName
    7.17 +USERNAME='monetdb'
    7.18 +PASSWORD='monetdb'
    7.19 +FORMAT=''
    7.20 +DIRS=$2
    7.21 +EXT=$3
    7.22 +
    7.23 +# Construct classpath with dependencies
    7.24 +cd $dir &&
    7.25 +for file in `ls -1 *.jar`;
    7.26 +do 
    7.27 +	myVar=$myVar./$file":";
    7.28 +done;
    7.29 +
    7.30 +# Evaluate a query
    7.31 +java -Xmx5000M -cp $myVar eu.earthobservatory.runtime.monetdb.QueryDir $HOST $PORT $DATABASE $USERNAME $PASSWORD "$DIRS" "$EXT" $FORMAT
     8.1 --- a/strabon	Fri May 04 14:08:10 2012 +0300
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,28 +0,0 @@
     8.4 -#! /bin/bash
     8.5 -
     8.6 -dbName=$1
     8.7 -dirs=$2
     8.8 -
     8.9 -# Evaluates a query using Strabon that is stored in $dir
    8.10 -#dir='/home/ggarbis/workspaces/Strabon-workspace/Strabon/jars/target'
    8.11 -dir='/home/kkyzir/teleios/nkua/Strabon/jars/target'
    8.12 -
    8.13 -# Arguments for QueryDir
    8.14 -HOST='localhost'
    8.15 -PORT='50000'
    8.16 -DATABASE=$dbName
    8.17 -USERNAME='monetdb'
    8.18 -PASSWORD='monetdb'
    8.19 -FORMAT=''
    8.20 -DIRS=$2
    8.21 -EXT=$3
    8.22 -
    8.23 -# Construct classpath with dependencies
    8.24 -cd $dir &&
    8.25 -for file in `ls -1 *.jar`;
    8.26 -do 
    8.27 -	myVar=$myVar./$file":";
    8.28 -done;
    8.29 -
    8.30 -# Evaluate a query
    8.31 -java -Xmx5000M -cp $myVar eu.earthobservatory.runtime.monetdb.QueryDir $HOST $PORT $DATABASE $USERNAME $PASSWORD "$DIRS" "$EXT" $FORMAT