Updated Branches: refs/heads/develop 01be878af -> be516c94e
improve the use of indexes in the database, many multi-column indexes were redundant - this should both improve importing performance and reduce hard disk usage considerably Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/be516c94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/be516c94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/be516c94 Branch: refs/heads/develop Commit: be516c94e73a3b24f5ec4724aef7ebe8e8dbef56 Parents: 01be878 Author: Sebastian Schaffert <[email protected]> Authored: Sun May 26 14:39:30 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Sun May 26 14:39:30 2013 +0200 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 43 +-------------- .../kiwi/persistence/h2/create_base_tables.sql | 8 ++-- .../kiwi/persistence/mysql/create_base_tables.sql | 8 ++-- .../kiwi/persistence/pgsql/create_base_tables.sql | 8 ++-- 4 files changed, 13 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be516c94/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml index bde7cb0..d39ab45 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml @@ -84,18 +84,6 @@ </plugin> <plugin> <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <version>2.0</version> - <configuration> - <path>${marmotta.context}</path> - <port>${marmotta.port}</port> - <systemProperties> - <marmotta.home>${marmotta.home}</marmotta.home> - </systemProperties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <version>2.0</version> <configuration> @@ -108,27 +96,6 @@ <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> --> </configuration> </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.10</version> - <configuration> - <contextPath>${marmotta.context}</contextPath> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${marmotta.port}</port> - </connector> - </connectors> - <systemProperties> - <systemProperty> - <name>marmotta.home</name> - <value>${marmotta.home}</value> - </systemProperty> - </systemProperties> - <stopKey>marmotta</stopKey> - <stopPort>9999</stopPort> - </configuration> - </plugin> </plugins> </pluginManagement> <resources> @@ -148,17 +115,9 @@ </plugin> <plugin> <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - </plugin> - <plugin> <artifactId>maven-dependency-plugin</artifactId> </plugin> </plugins> @@ -238,7 +197,7 @@ </dependency> <dependency> <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> + <artifactId>javax.el-api</artifactId> <version>${javaxElVersion}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be516c94/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql index 66c2ad1..89bb625 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql @@ -66,13 +66,13 @@ CREATE TABLE metadata ( CREATE INDEX idx_node_content ON nodes(svalue); CREATE INDEX idx_literal_lang ON nodes(lang); -CREATE INDEX idx_triples_s ON triples(subject); +-- CREATE INDEX idx_triples_s ON triples(subject); CREATE INDEX idx_triples_o ON triples(object); -CREATE INDEX idx_triples_sp ON triples(subject,predicate); +-- CREATE INDEX idx_triples_sp ON triples(subject,predicate); CREATE INDEX idx_triples_po ON triples(predicate,object); CREATE INDEX idx_triples_spo ON triples(subject,predicate,object); -CREATE INDEX idx_triples_cs ON triples(context,subject); -CREATE INDEX idx_triples_csp ON triples(context,subject,predicate); +-- CREATE INDEX idx_triples_cs ON triples(context,subject); +-- CREATE INDEX idx_triples_csp ON triples(context,subject,predicate); CREATE INDEX idx_triples_cspo ON triples(context,subject,predicate,object); CREATE INDEX idx_namespaces_uri ON namespaces(uri); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be516c94/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql index 083e5b6..1910e48 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql @@ -75,13 +75,13 @@ CREATE TABLE metadata ( CREATE INDEX idx_node_content ON nodes(svalue(256)); CREATE INDEX idx_literal_lang ON nodes(lang); -CREATE INDEX idx_triples_s ON triples(subject); +-- CREATE INDEX idx_triples_s ON triples(subject); CREATE INDEX idx_triples_o ON triples(object); -CREATE INDEX idx_triples_sp ON triples(subject,predicate); +-- CREATE INDEX idx_triples_sp ON triples(subject,predicate); CREATE INDEX idx_triples_po ON triples(predicate,object); CREATE INDEX idx_triples_spo ON triples(subject,predicate,object); -CREATE INDEX idx_triples_cs ON triples(context,subject); -CREATE INDEX idx_triples_csp ON triples(context,subject,predicate); +-- CREATE INDEX idx_triples_cs ON triples(context,subject); +-- CREATE INDEX idx_triples_csp ON triples(context,subject,predicate); CREATE INDEX idx_triples_cspo ON triples(context,subject,predicate,object); CREATE INDEX idx_namespaces_uri ON namespaces(uri); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be516c94/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_base_tables.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_base_tables.sql index 42a143c..f51510b 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_base_tables.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_base_tables.sql @@ -67,13 +67,13 @@ CREATE TABLE metadata ( CREATE INDEX idx_node_content ON nodes USING hash(svalue); CREATE INDEX idx_literal_lang ON nodes(lang) WHERE ntype = 'string'; -CREATE INDEX idx_triples_s ON triples(subject) WHERE deleted = false; +--CREATE INDEX idx_triples_s ON triples(subject) WHERE deleted = false; CREATE INDEX idx_triples_o ON triples(object) WHERE deleted = false; -CREATE INDEX idx_triples_sp ON triples(subject,predicate) WHERE deleted = false; +--CREATE INDEX idx_triples_sp ON triples(subject,predicate) WHERE deleted = false; CREATE INDEX idx_triples_po ON triples(predicate,object) WHERE deleted = false; CREATE INDEX idx_triples_spo ON triples(subject,predicate,object) WHERE deleted = false; -CREATE INDEX idx_triples_cs ON triples(context,subject) WHERE deleted = false; -CREATE INDEX idx_triples_csp ON triples(context,subject,predicate) WHERE deleted = false; +--CREATE INDEX idx_triples_cs ON triples(context,subject) WHERE deleted = false; +--CREATE INDEX idx_triples_csp ON triples(context,subject,predicate) WHERE deleted = false; CREATE INDEX idx_triples_cspo ON triples(context,subject,predicate,object) WHERE deleted = false; CREATE INDEX idx_namespaces_uri ON namespaces(uri);
