Merge branch 'RYA-50-Add-Support-for-Sparql-Optional-Statements-in-Precomputed-Joins' of https://github.com/meiercaleb/incubator-rya into RYA-50
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/30ca57ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/30ca57ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/30ca57ed Branch: refs/heads/develop Commit: 30ca57ede51ad346636593fa48a355b3a9f06e9b Parents: 1d92d19 a24515b Author: pujav65 <[email protected]> Authored: Wed Apr 6 16:53:18 2016 -0400 Committer: pujav65 <[email protected]> Committed: Wed Apr 6 16:53:18 2016 -0400 ---------------------------------------------------------------------- .../accumulo/precompQuery/AccumuloPcjQuery.java | 40 +- .../indexing/external/PrecompJoinOptimizer.java | 20 + .../external/tupleSet/AccumuloIndexSet.java | 4 +- .../tupleSet/AccumuloPcjSerializer.java | 199 ++++++---- .../external/tupleSet/BindingSetConverter.java | 108 +++++ .../tupleSet/BindingSetStringConverter.java | 111 +++--- .../indexing/external/tupleSet/PcjTables.java | 26 +- .../indexing/external/PCJOptionalTestIT.java | 324 +++++++++++++++ .../external/PcjIntegrationTestingUtil.java | 9 +- .../external/PrecompJoinOptimizerTest.java | 2 + .../tupleSet/AccumuloPcjSerialzerTest.java | 154 +++++--- .../tupleSet/BindingSetStringConverterTest.java | 151 +++++-- .../tupleSet/PcjTablesIntegrationTests.java | 13 +- .../rya/indexing/pcj/fluo/api/CreatePcj.java | 15 +- .../indexing/pcj/fluo/app/BindingSetRow.java | 23 +- .../pcj/fluo/app/FilterResultUpdater.java | 10 +- .../pcj/fluo/app/FluoStringConverter.java | 152 ------- .../pcj/fluo/app/JoinResultUpdater.java | 395 +++++++++++++------ .../pcj/fluo/app/QueryResultUpdater.java | 10 +- .../fluo/app/observers/BindingSetUpdater.java | 7 +- .../pcj/fluo/app/observers/FilterObserver.java | 10 +- .../pcj/fluo/app/observers/JoinObserver.java | 10 +- .../fluo/app/observers/QueryResultObserver.java | 9 +- .../app/observers/StatementPatternObserver.java | 10 +- .../pcj/fluo/app/query/FluoQueryColumns.java | 2 + .../fluo/app/query/FluoQueryMetadataDAO.java | 7 + .../pcj/fluo/app/query/JoinMetadata.java | 35 ++ .../fluo/app/query/SparqlFluoQueryBuilder.java | 64 +-- .../pcj/fluo/app/FluoStringConverterTest.java | 74 ---- .../pcj/fluo/app/LeftOuterJoinTest.java | 174 ++++++++ .../indexing/pcj/fluo/app/NaturalJoinTest.java | 166 ++++++++ .../pcj/fluo/demo/FluoAndHistoricPcjsDemo.java | 7 +- .../apache/rya/indexing/pcj/fluo/ITBase.java | 9 +- .../fluo/app/query/FluoQueryMetadataDAOIT.java | 2 + .../indexing/pcj/fluo/integration/QueryIT.java | 44 +++ .../pcj/fluo/integration/RyaExportIT.java | 7 +- 36 files changed, 1730 insertions(+), 673 deletions(-) ----------------------------------------------------------------------
