You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/06/02 14:56:24 UTC
[02/13] jena git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3f0c5173
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3f0c5173
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3f0c5173
Branch: refs/heads/master
Commit: 3f0c5173eb59b37011d985e491a73cdd2dc93b31
Parents: 4c99ec5 66a1eda
Author: Osma Suominen <os...@aalto.fi>
Authored: Mon May 25 15:57:38 2015 +0300
Committer: Osma Suominen <os...@aalto.fi>
Committed: Mon May 25 15:57:38 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/jena/query/ARQ.java | 4 +-
.../main/java/org/apache/jena/query/Query.java | 17 +
.../apache/jena/riot/out/NodeFormatterBase.java | 2 +-
.../org/apache/jena/riot/system/RiotChars.java | 44 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 8 +
.../org/apache/jena/sparql/ARQConstants.java | 13 +-
.../apache/jena/sparql/core/VarExprList.java | 12 +-
.../jena/sparql/modify/GraphStoreBasic.java | 1 +
.../jena/sparql/modify/GraphStoreNull.java | 3 +
.../modify/GraphStoreNullTransactional.java | 2 +
.../jena/sparql/modify/GraphStoreWrapper.java | 1 +
.../pfunction/PropertyFunctionRegistry.java | 9 +-
.../sparql/serializer/FormatterElement.java | 4 +-
.../jena/sparql/syntax/ElementDataset.java | 13 +-
.../jena/sparql/syntax/ElementWalker.java | 4 +-
.../sparql/syntax/RecursiveElementVisitor.java | 2 +-
.../apache/jena/sparql/util/MappedLoader.java | 29 +-
.../jena/sparql/vocabulary/ListPFunction.java | 65 +-
.../java/org/apache/jena/update/GraphStore.java | 14 +-
.../src/main/java/riotcmd/CmdLangParse.java | 2 +-
.../apache/jena/riot/thrift/TS_RDFThrift.java | 1 -
.../apache/jena/riot/thrift/TestThriftTerm.java | 48 +-
.../sparql/api/TestQueryExecutionTimeout1.java | 2 +-
.../sparql/api/TestQueryExecutionTimeout2.java | 2 +-
.../org/apache/jena/sparql/path/TestPathPF.java | 10 +-
jena-arq/testing/ARQ/EngineMain/filter-1.rq | 2 +-
jena-arq/testing/ARQ/Function/concat-1.arq | 2 +-
jena-arq/testing/ARQ/Function/concat-2.arq | 2 +-
jena-arq/testing/ARQ/Function/func-03.rq | 2 +-
jena-arq/testing/ARQ/Function/func-04.rq | 2 +-
jena-arq/testing/ARQ/Function/func-sha1sum-1.rq | 2 +-
jena-arq/testing/ARQ/Function/func-sha1sum-2.rq | 2 +-
jena-arq/testing/ARQ/Function/localname-1.rq | 2 +-
jena-arq/testing/ARQ/Function/namespace-1.rq | 2 +-
jena-arq/testing/ARQ/Function/q-lang-1.rq | 2 +-
jena-arq/testing/ARQ/Function/q-lang-2.rq | 2 +-
jena-arq/testing/ARQ/Function/strjoin-1.arq | 2 +-
jena-arq/testing/ARQ/Function/strjoin-2.arq | 2 +-
jena-arq/testing/ARQ/Function/strlen-1.rq | 2 +-
jena-arq/testing/ARQ/Function/strlen-2.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-1.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-2.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-3.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-1.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-2.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-3.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-4.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-5.rq | 2 +-
.../testing/ARQ/PropertyFunctions/assign-6.rq | 2 +-
.../testing/ARQ/PropertyFunctions/concat-1.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-1.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-2.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-3.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-4.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-5.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-6.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-7.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-8.rq | 2 +-
.../testing/ARQ/PropertyFunctions/list-9.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-1.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-2.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-3.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-4.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-5.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-6.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-7.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-8.rq | 2 +-
.../ARQ/PropertyFunctions/list-index-9.rq | 2 +-
.../ARQ/PropertyFunctions/list-length-1.rq | 2 +-
.../ARQ/PropertyFunctions/list-length-2.rq | 2 +-
.../ARQ/PropertyFunctions/list-length-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-1.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-2.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-3.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-4.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-5.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-6.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-7.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-8.rq | 2 +-
.../testing/ARQ/PropertyFunctions/splitIRI-9.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/str-1.rq | 2 +-
jena-arq/testing/ARQ/Sort/order-3.rq | 2 +-
.../testing/ARQ/SubQuery/graph-subquery-1.rq | 2 +-
.../java/org/apache/jena/atlas/lib/Bytes.java | 22 +
.../java/org/apache/jena/atlas/logging/Log.java | 11 +
.../org/apache/jena/atlas/lib/TestBytes.java | 22 +
jena-core/pom.xml | 474 ++---
.../apache/jena/assembler/AssemblerHelp.java | 9 +-
.../java/org/apache/jena/util/SplitIRI.java | 313 ++++
.../jena/assembler/test/TestAssemblerGroup.java | 18 +-
.../apache/jena/graph/GraphContractTest.java | 1729 ++++++++++++++++++
.../graph/GraphEventManagerContractTest.java | 500 +++++
.../jena/graph/GraphMakerContractTest.java | 295 +++
.../graph/GraphWithPerformContractTest.java | 86 +
.../jena/graph/RecordingGraphListener.java | 92 +
.../graph/TransactionHandlerContractTest.java | 136 ++
.../apache/jena/graph/compose/DeltaTest.java | 110 ++
.../jena/graph/compose/DifferenceTest.java | 97 +
.../jena/graph/compose/IntersectionTest.java | 109 ++
.../apache/jena/graph/compose/UnionTest.java | 185 ++
.../jena/graph/impl/CollectionGraph_CS.java | 67 +
.../jena/graph/impl/SimpleEventManager_CS.java | 54 +
.../jena/graph/impl/SimpleGraphMaker_CS.java | 54 +
.../graph/impl/SimpleTransactionHandler_CS.java | 54 +
.../jena/graph/impl/TestCollectionGraph.java | 39 -
.../graph/impl/TripleStoreContractTest.java | 160 ++
.../apache/jena/graph/impl/WrappedGraph_CS.java | 63 +
.../java/org/apache/jena/mem/ArrayBunch_CS.java | 52 +
.../apache/jena/mem/BunchMapContractTest.java | 163 ++
.../java/org/apache/jena/mem/GraphMem_CS.java | 115 ++
.../apache/jena/mem/GraphTripleStoreMem_CS.java | 51 +
.../apache/jena/mem/GraphTripleStore_CS.java | 51 +
.../org/apache/jena/mem/HashedBunchMap_CS.java | 52 +
.../apache/jena/mem/HashedTripleBunch_CS.java | 50 +
.../java/org/apache/jena/mem/SetBunch_CS.java | 50 +
.../jena/mem/TripleBunchContractTest.java | 205 +++
.../org/apache/jena/mem/WrappedHashMap_CS.java | 52 +
.../AbstractGraphProducer.java | 105 ++
.../AbstractInfModelProducer.java | 91 +
.../AbstractModelProducer.java | 89 +
.../AbstractRecordingListener.java | 190 ++
.../GraphEventManagerProducerInterface.java | 35 +
.../jena/testing_framework/GraphHelper.java | 508 +++++
.../testing_framework/IContainerProducer.java | 37 +
.../testing_framework/IIteratorProducer.java | 60 +
.../jena/testing_framework/INodeProducer.java | 39 +
.../testing_framework/IResourceProducer.java | 28 +
.../testing_framework/IStatementProducer.java | 45 +
.../testing_framework/ITripleStoreProducer.java | 35 +
.../jena/testing_framework/ModelHelper.java | 401 ++++
.../jena/testing_framework/NodeCreateUtils.java | 177 ++
.../NodeProducerInterface.java | 32 +
.../jena/testing_framework/TestFileData.java | 398 ++++
.../jena/testing_framework/TestUtils.java | 320 ++++
.../testing_framework/manifest/Manifest.java | 228 +++
.../manifest/ManifestException.java | 48 +
.../manifest/ManifestFile.java | 38 +
.../manifest/ManifestItem.java | 71 +
.../manifest/ManifestItemHandler.java | 32 +
.../manifest/ManifestSuite.java | 143 ++
.../manifest/ManifestTest.java | 31 +
.../manifest/ManifestTestRunner.java | 93 +
.../jena/testing_framework/package-info.java | 109 ++
.../testing_framework/tuples/TupleItem.java | 84 +
.../jena/testing_framework/tuples/TupleSet.java | 274 +++
.../java/org/apache/jena/util/TestPackage.java | 7 +-
.../org/apache/jena/util/TestSplitIRI_TTL.java | 160 ++
.../org/apache/jena/util/TestSplitIRI_XML.java | 138 ++
.../java/org/apache/jena/util/TestUtil.java | 138 --
.../hadoop/rdf/io/input/QuadsInputFormat.java | 5 +-
.../hadoop/rdf/io/input/TriplesInputFormat.java | 5 +-
.../rdf/io/input/TriplesOrQuadsInputFormat.java | 5 +-
.../io/input/jsonld/JsonLDQuadInputFormat.java | 5 +-
.../input/jsonld/JsonLDTripleInputFormat.java | 5 +-
.../input/nquads/BlockedNQuadsInputFormat.java | 5 +-
.../rdf/io/input/nquads/NQuadsInputFormat.java | 5 +-
.../nquads/WholeFileNQuadsInputFormat.java | 5 +-
.../ntriples/BlockedNTriplesInputFormat.java | 5 +-
.../io/input/ntriples/NTriplesInputFormat.java | 5 +-
.../ntriples/WholeFileNTriplesInputFormat.java | 5 +-
.../io/input/rdfjson/RdfJsonInputFormat.java | 5 +-
.../rdf/io/input/rdfxml/RdfXmlInputFormat.java | 5 +-
.../AbstractBlockBasedNodeTupleReader.java | 10 +-
.../AbstractLineBasedNodeTupleReader.java | 12 +-
.../AbstractWholeFileNodeTupleReader.java | 10 +-
.../io/input/thrift/ThriftQuadInputFormat.java | 5 +-
.../input/thrift/ThriftTripleInputFormat.java | 5 +-
.../rdf/io/input/trig/TriGInputFormat.java | 5 +-
.../rdf/io/input/trix/TriXInputFormat.java | 5 +-
.../rdf/io/input/turtle/TurtleInputFormat.java | 5 +-
.../rdf/io/output/AbstractNodeOutputFormat.java | 4 +-
.../output/AbstractNodeTupleOutputFormat.java | 4 +-
.../writers/AbstractBatchedNodeTupleWriter.java | 4 +-
.../AbstractLineBasedNodeTupleWriter.java | 5 +-
.../io/output/writers/AbstractNodeWriter.java | 5 +-
.../AbstractStreamRdfNodeTupleWriter.java | 6 +-
.../AbstractWholeFileNodeTupleWriter.java | 4 +-
.../registry/readers/JsonLDReaderFactory.java | 6 +-
.../registry/readers/NQuadsReaderFactory.java | 4 +-
.../registry/readers/NTriplesReaderFactory.java | 3 +-
.../registry/readers/RdfJsonReaderFactory.java | 4 +-
.../registry/readers/RdfXmlReaderFactory.java | 4 +-
.../registry/readers/ThriftReaderFactory.java | 6 +-
.../io/registry/readers/TriGReaderFactory.java | 4 +-
.../io/registry/readers/TriXReaderFactory.java | 4 +-
.../registry/readers/TurtleReaderFactory.java | 4 +-
.../registry/writers/JsonLDWriterFactory.java | 7 +-
.../registry/writers/NQuadsWriterFactory.java | 4 +-
.../registry/writers/NTriplesWriterFactory.java | 4 +-
.../registry/writers/RdfJsonWriterFactory.java | 4 +-
.../registry/writers/RdfXmlWriterFactory.java | 4 +-
.../registry/writers/ThriftWriterFactory.java | 7 +-
.../io/registry/writers/TriGWriterFactory.java | 4 +-
.../io/registry/writers/TriXWriterFactory.java | 4 +-
.../registry/writers/TurtleWriterFactory.java | 4 +-
.../AbstractNodeTupleInputFormatTests.java | 25 +-
.../AbstractWholeFileQuadInputFormatTests.java | 2 +-
.../io/input/bnodes/AbstractBlankNodeTests.java | 2 -
...CompressedWholeFileQuadInputFormatTests.java | 2 +-
.../apache/jena/hadoop/rdf/stats/RdfStats.java | 17 +-
jena-elephas/pom.xml | 2 +-
.../querybuilder/handlers/DatasetHandler.java | 49 +-
.../jena/arq/querybuilder/handlers/Handler.java | 16 -
.../querybuilder/handlers/SelectHandler.java | 31 +-
.../handlers/SolutionModifierHandler.java | 21 +-
.../arq/querybuilder/handlers/WhereHandler.java | 33 +-
.../querybuilder/rewriters/ElementRewriter.java | 4 +-
.../querybuilder/clauses/WhereClauseTest.java | 2 +-
.../handlers/SelectHandlerTest.java | 9 +-
.../querybuilder/handlers/WhereHandlerTest.java | 4 +-
.../apache/jena/fuseki/mgt/ActionBackup.java | 35 +-
.../apache/jena/fuseki/server/FusekiConfig.java | 8 +-
.../jena/fuseki/servlets/SPARQL_REST.java | 4 +-
.../fuseki/servlets/SimpleVelocityServlet.java | 2 +-
.../org/apache/jena/fuseki/build/Builder.java | 6 +-
.../jena/fuseki/build/DataServiceDesc.java | 106 --
.../apache/jena/fuseki/build/FusekiConfig.java | 5 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 3 +-
.../apache/jena/fuseki/server/DataService.java | 15 +-
.../apache/jena/fuseki/server/SystemState.java | 6 +-
.../apache/jena/fuseki/servlets/ActionBase.java | 4 +-
.../apache/jena/fuseki/servlets/ActionREST.java | 4 +-
.../jena/fuseki/servlets/FusekiFilter.java | 2 +-
.../jena/fuseki/servlets/SPARQL_Upload.java | 104 +-
.../org/apache/jena/fuseki/TestDatasetOps.java | 14 +-
.../AbstractJenaConnectionTests.java | 4 +-
jena-parent/pom.xml | 12 +-
.../java/org/apache/jena/sdb/SDBFactory.java | 67 +-
.../jena/sdb/layout1/TupleLoaderSimple.java | 6 +-
.../sdb/layout2/hash/TupleLoaderOneHash.java | 2 +-
.../jena/sdb/script/CmdDescAssembler.java | 2 +-
.../org/apache/jena/sdb/sql/DataSourceSDB.java | 14 +-
.../apache/jena/sdb/store/DatasetGraphSDB.java | 3 +-
.../org/apache/jena/sdb/store/FeatureSet.java | 3 +-
.../apache/jena/sdb/test/junit/StoreList.java | 2 +-
jena-sdb/testing/slist.rq | 2 +-
.../jena/query/spatial/EntityDefinition.java | 2 -
.../assembler/EntityDefinitionAssembler.java | 2 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 3 +-
.../transaction/DatasetGraphTransaction.java | 3 +-
.../apache/jena/tdb/extra/T_TransSystem.java | 2 +-
.../org/apache/jena/tdb/junit/QueryTestTDB.java | 2 +-
.../main/java/examples/JenaTextExample1.java | 6 +-
.../java/org/apache/jena/query/text/Entity.java | 9 +-
.../jena/query/text/EntityDefinition.java | 56 +-
.../jena/query/text/TextDatasetFactory.java | 50 +-
.../apache/jena/query/text/TextIndexConfig.java | 61 +
.../apache/jena/query/text/TextIndexLucene.java | 68 +-
.../query/text/TextIndexLuceneMultilingual.java | 75 +
.../apache/jena/query/text/TextQueryFuncs.java | 9 +-
.../org/apache/jena/query/text/TextQueryPF.java | 39 +-
.../apache/jena/query/text/analyzer/Util.java | 96 +
.../assembler/EntityDefinitionAssembler.java | 10 +-
.../assembler/LocalizedAnalyzerAssembler.java | 60 +
.../query/text/assembler/TextAssembler.java | 1 +
.../assembler/TextIndexLuceneAssembler.java | 40 +-
.../jena/query/text/assembler/TextVocab.java | 5 +
...ractTestDatasetWithLuceneGraphTextIndex.java | 6 +-
.../org/apache/jena/query/text/TS_Text.java | 3 +
.../jena/query/text/TestBuildTextDataset.java | 5 +-
.../text/TestDatasetWithLocalizedAnalyzer.java | 147 ++
...tDatasetWithLuceneMultilingualTextIndex.java | 238 +++
...DatasetWithLuceneTextIndexWithLangField.java | 126 ++
.../text/TestLuceneWithMultipleThreads.java | 10 +-
.../org/apache/jena/query/text/TestTextTDB.java | 5 +-
jena-text/testing/TextQuery/data.skos | 36 +
267 files changed, 10981 insertions(+), 1237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3f0c5173/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --cc jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index 98a0f63,cd9ea2f..983e3a2
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@@ -303,9 -321,9 +321,9 @@@ public class TextIndexLucene implement
}
}
- private List<Node> query$(IndexReader indexReader, String qs, int limit) throws ParseException, IOException {
+ private List<TextHit> query$(IndexReader indexReader, String qs, int limit) throws ParseException, IOException {
IndexSearcher indexSearcher = new IndexSearcher(indexReader) ;
- Query query = parseQuery(qs, docDef.getPrimaryField(), queryAnalyzer) ;
+ Query query = preParseQuery(qs, docDef.getPrimaryField(), queryAnalyzer) ;
if ( limit <= 0 )
limit = MAX_N ;
ScoreDoc[] sDocs = indexSearcher.search(query, limit).scoreDocs ;
http://git-wip-us.apache.org/repos/asf/jena/blob/3f0c5173/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --cc jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 6520516,81dc412..4b37d95
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@@ -70,10 -67,14 +72,14 @@@ public class TextQueryPF extends Proper
DatasetGraph dsg = execCxt.getDataset() ;
server = chooseTextIndex(dsg) ;
- if (!argSubject.isNode())
- throw new QueryBuildException("Subject is not a single node: " + argSubject) ;
+ if (argSubject.isList() && argSubject.getArgListSize() != 2)
+ throw new QueryBuildException("Subject has "+argSubject.getArgList().size()+" elements, not 2: "+argSubject);
if (argObject.isList()) {
+ //extract of extra lang arg if present and if is usable.
+ //arg is removed from the list to avoid conflict with order and args length
+ langArg = extractArg("lang", argObject);
+
List<Node> list = argObject.getArgList() ;
if (list.size() == 0)
throw new QueryBuildException("Zero-length argument list") ;