Merge branch 'master' into develop; added new kiwi-sparql optimizations
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a8d1abea Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a8d1abea Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a8d1abea Branch: refs/heads/develop Commit: a8d1abea1068ce903f65c4353cac65a1050cc80a Parents: f851639 0301584 Author: Sebastian Schaffert <[email protected]> Authored: Thu Apr 25 16:13:44 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Apr 25 16:13:44 2013 +0200 ---------------------------------------------------------------------- client/marmotta-client-java/pom.xml | 1 + libraries/kiwi/kiwi-sparql/pom.xml | 160 + .../evaluation/KiWiEvaluationStatistics.java | 52 + .../evaluation/KiWiEvaluationStrategyImpl.java | 96 + .../kiwi/sparql/evaluation/KiWiTripleSource.java | 106 + .../sparql/persistence/KiWiSparqlConnection.java | 316 ++ .../marmotta/kiwi/sparql/sail/KiWiSparqlSail.java | 87 + .../kiwi/sparql/sail/KiWiSparqlSailConnection.java | 90 + .../marmotta/kiwi/sparql/sqlmapper/JoinTable.java | 73 - .../sqlmapper/LMFNativeEvaluationStrategy.java | 479 --- .../kiwi/sparql/sqlmapper/SparqlToSQLMapper.java | 2427 --------------- .../kiwi/sparql/sqlmapper/UnionOptimizer.java | 239 -- .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 312 ++ .../marmotta/kiwi/sparql/test/demo-data.foaf | 70 + .../apache/marmotta/kiwi/sparql/test/query1.sparql | 6 + .../apache/marmotta/kiwi/sparql/test/query2.sparql | 8 + .../marmotta/kiwi/persistence/KiWiConnection.java | 4 +- .../marmotta/kiwi/sail/KiWiSailConnection.java | 6 - libraries/kiwi/pom.xml | 1 + parent/pom.xml | 5 + 20 files changed, 1313 insertions(+), 3225 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a8d1abea/parent/pom.xml ----------------------------------------------------------------------
