Merge branch 'develop' into ldp
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f1c65dbc Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f1c65dbc Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f1c65dbc Branch: refs/heads/develop Commit: f1c65dbcb2865dcd8df9436738894a013d58e982 Parents: 2039c6c f222bf4 Author: Sergio Fernández <[email protected]> Authored: Thu Sep 18 07:37:41 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Thu Sep 18 07:37:41 2014 +0200 ---------------------------------------------------------------------- .../kiwi/sparql/builder/DistinctFinder.java | 47 + .../kiwi/sparql/builder/ExtensionFinder.java | 57 + .../kiwi/sparql/builder/GroupFinder.java | 58 + .../kiwi/sparql/builder/LimitFinder.java | 44 + .../kiwi/sparql/builder/OPTypeFinder.java | 162 +++ .../marmotta/kiwi/sparql/builder/OPTypes.java | 27 + .../kiwi/sparql/builder/OrderFinder.java | 45 + .../kiwi/sparql/builder/PatternCollector.java | 95 ++ .../kiwi/sparql/builder/ProjectionType.java | 27 + .../sparql/builder/SQLAbstractSubquery.java | 45 + .../kiwi/sparql/builder/SQLBuilder.java | 1176 ++++++++++++++++++ .../marmotta/kiwi/sparql/builder/SQLClause.java | 80 ++ .../kiwi/sparql/builder/SQLFragment.java | 182 +++ .../kiwi/sparql/builder/SQLFunction.java | 85 ++ .../kiwi/sparql/builder/SQLPattern.java | 196 +++ .../sparql/builder/SQLProjectionFinder.java | 75 ++ .../kiwi/sparql/builder/SQLSubQuery.java | 80 ++ .../marmotta/kiwi/sparql/builder/SQLUnion.java | 158 +++ .../kiwi/sparql/builder/SQLVariable.java | 144 +++ .../kiwi/sparql/builder/ValueConverter.java | 33 + .../evaluation/KiWiEvaluationStrategyImpl.java | 182 ++- .../exception/UnsatisfiableQueryException.java | 33 + .../kiwi/sparql/function/FunctionUtil.java | 85 ++ .../kiwi/sparql/persistence/DistinctFinder.java | 47 - .../sparql/persistence/FilterCollector.java | 47 - .../persistence/KiWiSparqlConnection.java | 883 ++----------- .../kiwi/sparql/persistence/LimitFinder.java | 44 - .../kiwi/sparql/persistence/OPTypeFinder.java | 162 --- .../kiwi/sparql/persistence/OPTypes.java | 27 - .../sparql/persistence/PatternCollector.java | 46 - .../sparql/sail/KiWiSparqlSailConnection.java | 2 +- .../sparql/test/ComplexKiWiSparqlQueryTest.java | 15 +- .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 36 +- .../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 8 + .../marmotta/kiwi/sparql/test/query24.sparql | 24 + .../marmotta/kiwi/sparql/test/query25.sparql | 22 + .../marmotta/kiwi/sparql/test/query26.sparql | 26 + .../marmotta/kiwi/sparql/test/query27.sparql | 25 + .../marmotta/kiwi/sparql/test/query28.sparql | 26 + .../marmotta/kiwi/persistence/KiWiDialect.java | 9 + .../persistence/pgsql/PostgreSQLDialect.java | 132 ++ .../marmotta/kiwi/vocabulary/FN_MARMOTTA.java | 46 + .../persistence/pgsql/create_base_tables.sql | 2 + .../kiwi/test/junit/KiWiDatabaseRunner.java | 20 +- parent/pom.xml | 40 +- .../content/FileSystemContentReader.java | 4 +- .../content/FileSystemContentWriter.java | 2 +- 47 files changed, 3615 insertions(+), 1196 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f1c65dbc/parent/pom.xml ----------------------------------------------------------------------
