You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by os...@apache.org on 2016/05/17 13:28:50 UTC
[1/5] jena git commit: Add support for ComplexPhraseQueryParser to
jena-text
Repository: jena
Updated Branches:
refs/heads/master 5f79d00e6 -> 933a32384
Add support for ComplexPhraseQueryParser to jena-text
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b89f0ea4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b89f0ea4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b89f0ea4
Branch: refs/heads/master
Commit: b89f0ea4fcfef4443ce813b8026bb9fda965e668
Parents: b327978
Author: Andrew Dolby <an...@gmail.com>
Authored: Sun May 15 09:59:38 2016 -0400
Committer: Andrew Dolby <an...@gmail.com>
Committed: Sun May 15 09:59:38 2016 -0400
----------------------------------------------------------------------
.../apache/jena/query/text/TextIndexLucene.java | 7 +-
.../org/apache/jena/query/text/TS_Text.java | 5 +-
...TestDatasetWithComplexPhraseQueryParser.java | 128 +++++++++++++++++++
3 files changed, 136 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b89f0ea4/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git 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
index f2e3786..f8d5937 100644
--- 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
@@ -35,6 +35,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer ;
import org.apache.lucene.document.* ;
import org.apache.lucene.index.* ;
import org.apache.lucene.queryparser.analyzing.AnalyzingQueryParser ;
+import org.apache.lucene.queryparser.complexPhrase.ComplexPhraseQueryParser ;
import org.apache.lucene.queryparser.classic.ParseException ;
import org.apache.lucene.queryparser.classic.QueryParser ;
import org.apache.lucene.queryparser.classic.QueryParserBase ;
@@ -291,13 +292,15 @@ public class TextIndexLucene implements TextIndex {
throw new TextIndexException(ex) ;
}
}
-
+
private QueryParser getQueryParser(Analyzer analyzer) {
switch(queryParserType) {
case "QueryParser":
return new QueryParser(VER, docDef.getPrimaryField(), analyzer) ;
case "AnalyzingQueryParser":
return new AnalyzingQueryParser(VER, docDef.getPrimaryField(), analyzer) ;
+ case "ComplexPhraseQueryParser":
+ return new ComplexPhraseQueryParser(VER, docDef.getPrimaryField(), analyzer);
default:
log.warn("Unknown query parser type '" + queryParserType + "'. Defaulting to standard QueryParser") ;
return new QueryParser(VER, docDef.getPrimaryField(), analyzer) ;
@@ -310,7 +313,7 @@ public class TextIndexLucene implements TextIndex {
Query query = queryParser.parse(queryString) ;
return query ;
}
-
+
protected Query preParseQuery(String queryString, Analyzer analyzer) throws ParseException {
return parseQuery(queryString, analyzer);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b89f0ea4/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java b/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
index 2ee1dd3..beff77b 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TS_Text.java
@@ -36,9 +36,9 @@ import org.junit.runners.Suite.SuiteClasses ;
, TestDatasetWithLuceneTextIndexDeletionSupport.class
, TestDatasetWithLuceneStoredLiterals.class
- // Embedded solr not supported
+ // Embedded solr not supported
//, TestDatasetWithEmbeddedSolrTextIndex.class
-
+
, TestEntityMapAssembler.class
, TestTextDatasetAssembler.class
, TestTextIndexLuceneAssembler.class
@@ -52,6 +52,7 @@ import org.junit.runners.Suite.SuiteClasses ;
, TestDatasetWithLocalizedAnalyzer.class
, TestDatasetWithConfigurableAnalyzer.class
, TestDatasetWithAnalyzingQueryParser.class
+ , TestDatasetWithComplexPhraseQueryParser.class
})
public class TS_Text
http://git-wip-us.apache.org/repos/asf/jena/blob/b89f0ea4/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
new file mode 100644
index 0000000..0d65869
--- /dev/null
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.text;
+
+import java.io.Reader ;
+import java.io.StringReader ;
+import java.util.Set ;
+
+import org.apache.jena.assembler.Assembler ;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.text.assembler.TextAssembler ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.ModelFactory ;
+import org.apache.jena.rdf.model.Resource ;
+import org.apache.jena.ext.com.google.common.collect.Sets ;
+import org.junit.Before ;
+import org.junit.Test ;
+
+/**
+ * This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index.
+ */
+public class TestDatasetWithComplexPhraseQueryParser extends AbstractTestDatasetWithTextIndexBase {
+
+ private static final String SPEC_BASE = "http://example.org/spec#";
+ private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
+ private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
+
+ private static String makeSpec(String analyzer, String parser) {
+ return StrUtils.strjoinNL(
+ "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
+ "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
+ "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
+ "prefix text: <http://jena.apache.org/text#>",
+ "prefix : <" + SPEC_BASE + ">",
+ "",
+ "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
+ "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
+ "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
+
+ ":" + SPEC_ROOT_LOCAL,
+ " a text:TextDataset ;",
+ " text:dataset :dataset ;",
+ " text:index :indexLucene ;",
+ " .",
+ "",
+ ":dataset",
+ " a ja:RDFDataset ;",
+ " ja:defaultGraph :graph ;",
+ ".",
+ ":graph",
+ " a ja:MemoryModel ;",
+ ".",
+ "",
+ ":indexLucene",
+ " a text:TextIndexLucene ;",
+ " text:directory \"mem\" ;",
+ " text:queryParser " + parser + ";",
+ " text:entityMap :entMap ;",
+ " .",
+ "",
+ ":entMap",
+ " a text:EntityMap ;",
+ " text:entityField \"uri\" ;",
+ " text:defaultField \"label\" ;",
+ " text:map (",
+ " [ text:field \"label\" ; ",
+ " text:predicate rdfs:label ;",
+ " text:analyzer [ a " + analyzer + " ]",
+ " ]",
+ " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
+ " ) ."
+ );
+ }
+
+ public void init(String analyzer, String parser) {
+ Reader reader = new StringReader(makeSpec(analyzer, parser));
+ Model specModel = ModelFactory.createDefaultModel();
+ specModel.read(reader, "", "TURTLE");
+ TextAssembler.init();
+ Resource root = specModel.getResource(SPEC_ROOT_URI);
+ dataset = (Dataset) Assembler.general.open(root);
+ }
+
+ @Before
+ public void before() {
+ init("text:StandardAnalyzer", "text:ComplexPhraseQueryParser");
+ }
+
+ @Test
+ public void testComplexPhraseQueryParserPerformsPhraseFuzzyQuery() {
+ final String testName = "testComplexPhraseQueryParserPerformsPhraseFuzzyQuery";
+ final String turtle = StrUtils.strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + testName + ">",
+ " rdfs:label 'secondary education'",
+ ".",
+ "<" + RESOURCE_BASE + "irrelevant>",
+ " rdfs:label 'tertiary elucidation'",
+ "."
+ );
+ String queryString = StrUtils.strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s text:query ( rdfs:label 'scondar~ edcation~' 10 ) .",
+ "}"
+ );
+ Set<String> expectedURIs = Sets.newHashSet(RESOURCE_BASE + testName);
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+}
[2/5] jena git commit: reorganize jena-text unit tests: separate
AbstractTestDatasetWithAnalyzer from TestDatasetWithKeywordAnalyzer
Posted by os...@apache.org.
reorganize jena-text unit tests: separate AbstractTestDatasetWithAnalyzer from TestDatasetWithKeywordAnalyzer
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9f260410
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9f260410
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9f260410
Branch: refs/heads/master
Commit: 9f260410cb2b49dde63d7ff5b358980473d8e1bc
Parents: fe0c4e2
Author: Osma Suominen <os...@apache.org>
Authored: Mon May 16 11:59:15 2016 +0300
Committer: Andrew Dolby <an...@gmail.com>
Committed: Mon May 16 21:33:41 2016 -0400
----------------------------------------------------------------------
.../text/AbstractTestDatasetWithAnalyzer.java | 111 +++++++++++++++++++
.../text/TestDatasetWithKeywordAnalyzer.java | 81 +-------------
2 files changed, 112 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9f260410/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java
new file mode 100644
index 0000000..458d8c0
--- /dev/null
+++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithAnalyzer.java
@@ -0,0 +1,111 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.text;
+
+import java.io.Reader ;
+import java.io.StringReader ;
+
+import org.apache.jena.assembler.Assembler ;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.text.assembler.TextAssembler ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.ModelFactory ;
+import org.apache.jena.rdf.model.Resource ;
+import org.junit.After ;
+import org.junit.Before ;
+
+/**
+ * This abstract class defines a setup configuration for a dataset that uses a specific analyzer with a Lucene index.
+ */
+public abstract class AbstractTestDatasetWithAnalyzer extends AbstractTestDatasetWithTextIndexBase {
+
+ private static final String SPEC_BASE = "http://example.org/spec#";
+ private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
+ private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
+
+ private static String makeSpec(String analyzer, String parser) {
+ return StrUtils.strjoinNL(
+ "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
+ "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
+ "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
+ "prefix text: <http://jena.apache.org/text#>",
+ "prefix : <" + SPEC_BASE + ">",
+ "",
+ "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
+ "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
+ "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
+
+ ":" + SPEC_ROOT_LOCAL,
+ " a text:TextDataset ;",
+ " text:dataset :dataset ;",
+ " text:index :indexLucene ;",
+ " .",
+ "",
+ ":dataset",
+ " a ja:RDFDataset ;",
+ " ja:defaultGraph :graph ;",
+ ".",
+ ":graph",
+ " a ja:MemoryModel ;",
+ ".",
+ "",
+ ":indexLucene",
+ " a text:TextIndexLucene ;",
+ " text:directory \"mem\" ;",
+ " text:queryParser " + parser + ";",
+ " text:entityMap :entMap ;",
+ " .",
+ "",
+ ":entMap",
+ " a text:EntityMap ;",
+ " text:entityField \"uri\" ;",
+ " text:defaultField \"label\" ;",
+ " text:map (",
+ " [ text:field \"label\" ; ",
+ " text:predicate rdfs:label ;",
+ " text:analyzer [ a " + analyzer + " ]",
+ " ]",
+ " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
+ " ) ."
+ );
+ }
+
+ public void init(String analyzer, String parser) {
+ Reader reader = new StringReader(makeSpec(analyzer, parser));
+ Model specModel = ModelFactory.createDefaultModel();
+ specModel.read(reader, "", "TURTLE");
+ TextAssembler.init();
+ Resource root = specModel.getResource(SPEC_ROOT_URI);
+ dataset = (Dataset) Assembler.general.open(root);
+ }
+
+ public void init(String analyzer) {
+ init(analyzer, "text:QueryParser");
+ }
+
+ @Before
+ abstract public void before();
+
+ @After
+ public void after() {
+ dataset.close();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/9f260410/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
index 375c7e0..3d90df2 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithKeywordAnalyzer.java
@@ -18,102 +18,23 @@
package org.apache.jena.query.text;
-import java.io.Reader ;
-import java.io.StringReader ;
import java.util.Arrays ;
import java.util.HashSet ;
import java.util.Set ;
-import org.apache.jena.assembler.Assembler ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.text.assembler.TextAssembler ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.rdf.model.Resource ;
-import org.junit.After ;
import org.junit.Before ;
import org.junit.Test ;
/**
* This class defines a setup configuration for a dataset that uses a keyword analyzer with a Lucene index.
*/
-public class TestDatasetWithKeywordAnalyzer extends AbstractTestDatasetWithTextIndexBase {
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
- private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
-
- private static String makeSpec(String analyzer, String parser) {
- return StrUtils.strjoinNL(
- "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
- "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
- "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "prefix text: <http://jena.apache.org/text#>",
- "prefix : <" + SPEC_BASE + ">",
- "",
- "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
- "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
- "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
-
- ":" + SPEC_ROOT_LOCAL,
- " a text:TextDataset ;",
- " text:dataset :dataset ;",
- " text:index :indexLucene ;",
- " .",
- "",
- ":dataset",
- " a ja:RDFDataset ;",
- " ja:defaultGraph :graph ;",
- ".",
- ":graph",
- " a ja:MemoryModel ;",
- ".",
- "",
- ":indexLucene",
- " a text:TextIndexLucene ;",
- " text:directory \"mem\" ;",
- " text:queryParser " + parser + ";",
- " text:entityMap :entMap ;",
- " .",
- "",
- ":entMap",
- " a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; ",
- " text:predicate rdfs:label ;",
- " text:analyzer [ a " + analyzer + " ]",
- " ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
- public void init(String analyzer, String parser) {
- Reader reader = new StringReader(makeSpec(analyzer, parser));
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- }
-
- public void init(String analyzer) {
- init(analyzer, "text:QueryParser");
- }
-
+public class TestDatasetWithKeywordAnalyzer extends AbstractTestDatasetWithAnalyzer {
@Before
public void before() {
init("text:KeywordAnalyzer");
}
- @After
- public void after() {
- dataset.close();
- }
-
@Test
public void testKeywordAnalyzerDoesNotSplitTokensAtSpace() {
final String testName = "testKeywordAnalyzerDoesNotSplitTokensAtSpace";
[4/5] jena git commit: Inherit from AbstractTestDatasetWithAnalyzer
to reduce code repetition
Posted by os...@apache.org.
Inherit from AbstractTestDatasetWithAnalyzer to reduce code repetition
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ffbd310d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ffbd310d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ffbd310d
Branch: refs/heads/master
Commit: ffbd310dfd23859380e56cdca325214ce1e4863c
Parents: 9f26041
Author: Andrew Dolby <an...@gmail.com>
Authored: Mon May 16 21:32:09 2016 -0400
Committer: Andrew Dolby <an...@gmail.com>
Committed: Mon May 16 21:33:41 2016 -0400
----------------------------------------------------------------------
...TestDatasetWithComplexPhraseQueryParser.java | 63 +-------------------
1 file changed, 1 insertion(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ffbd310d/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
index 0d65869..bfa6204 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithComplexPhraseQueryParser.java
@@ -36,68 +36,7 @@ import org.junit.Test ;
/**
* This class defines a setup configuration for a dataset that uses a standard analyzer with a Lucene index.
*/
-public class TestDatasetWithComplexPhraseQueryParser extends AbstractTestDatasetWithTextIndexBase {
-
- private static final String SPEC_BASE = "http://example.org/spec#";
- private static final String SPEC_ROOT_LOCAL = "lucene_text_dataset";
- private static final String SPEC_ROOT_URI = SPEC_BASE + SPEC_ROOT_LOCAL;
-
- private static String makeSpec(String analyzer, String parser) {
- return StrUtils.strjoinNL(
- "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> ",
- "prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> ",
- "prefix tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "prefix text: <http://jena.apache.org/text#>",
- "prefix : <" + SPEC_BASE + ">",
- "",
- "[] ja:loadClass \"org.apache.jena.query.text.TextQuery\" .",
- "text:TextDataset rdfs:subClassOf ja:RDFDataset .",
- "text:TextIndexLucene rdfs:subClassOf text:TextIndex .",
-
- ":" + SPEC_ROOT_LOCAL,
- " a text:TextDataset ;",
- " text:dataset :dataset ;",
- " text:index :indexLucene ;",
- " .",
- "",
- ":dataset",
- " a ja:RDFDataset ;",
- " ja:defaultGraph :graph ;",
- ".",
- ":graph",
- " a ja:MemoryModel ;",
- ".",
- "",
- ":indexLucene",
- " a text:TextIndexLucene ;",
- " text:directory \"mem\" ;",
- " text:queryParser " + parser + ";",
- " text:entityMap :entMap ;",
- " .",
- "",
- ":entMap",
- " a text:EntityMap ;",
- " text:entityField \"uri\" ;",
- " text:defaultField \"label\" ;",
- " text:map (",
- " [ text:field \"label\" ; ",
- " text:predicate rdfs:label ;",
- " text:analyzer [ a " + analyzer + " ]",
- " ]",
- " [ text:field \"comment\" ; text:predicate rdfs:comment ]",
- " ) ."
- );
- }
-
- public void init(String analyzer, String parser) {
- Reader reader = new StringReader(makeSpec(analyzer, parser));
- Model specModel = ModelFactory.createDefaultModel();
- specModel.read(reader, "", "TURTLE");
- TextAssembler.init();
- Resource root = specModel.getResource(SPEC_ROOT_URI);
- dataset = (Dataset) Assembler.general.open(root);
- }
-
+public class TestDatasetWithComplexPhraseQueryParser extends AbstractTestDatasetWithAnalyzer {
@Before
public void before() {
init("text:StandardAnalyzer", "text:ComplexPhraseQueryParser");
[3/5] jena git commit: JENA-1181: AssemblerUtils.registerModel
Posted by os...@apache.org.
JENA-1181: AssemblerUtils.registerModel
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fe0c4e2f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fe0c4e2f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fe0c4e2f
Branch: refs/heads/master
Commit: fe0c4e2f39996f651768bdd3462e6c62935682fc
Parents: b89f0ea
Author: Andy Seaborne <an...@apache.org>
Authored: Sun May 15 21:18:24 2016 +0100
Committer: Andrew Dolby <an...@gmail.com>
Committed: Mon May 16 21:33:41 2016 -0400
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/assembler/AssemblerUtils.java | 7 ++++++-
jena-cmds/pom.xml | 3 +--
.../src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java | 2 +-
jena-tdb/testing/Assembler/tdb-dataset-embed.ttl | 4 ----
jena-tdb/testing/Assembler/tdb-dataset.ttl | 2 --
jena-tdb/testing/Assembler/tdb-graph-embed.ttl | 4 ----
jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl | 2 --
jena-tdb/testing/Assembler/tdb-graph.ttl | 2 --
jena-tdb/testing/Assembler/tdb-named-graph-1.ttl | 2 --
jena-tdb/testing/Assembler/tdb-named-graph-2.ttl | 2 --
10 files changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
index 39c29ba..bb504ab 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
@@ -68,11 +68,16 @@ public class AssemblerUtils
register(ConstAssembler.general(), r, a, DatasetAssembler.getType()) ;
}
+ /** Register an assembler that creates a dataset */
+ static public void registerModel(Resource r, Assembler a) {
+ register(ConstAssembler.general(), r, a, JA.Model) ;
+ }
+
/** Register an addition assembler */
static public void register(AssemblerGroup g, Resource r, Assembler a, Resource superType) {
registerAssembler(g, r, a) ;
if ( superType != null && ! superType.equals(r) )
- modelExtras.add(r, RDFS.subClassOf, DatasetAssembler.getType()) ;
+ modelExtras.add(r, RDFS.subClassOf, superType) ;
}
/** register */
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 6b4a08e..f46ff2e 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -87,9 +87,8 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
- <!-- Testing -->
+ <!-- Testing -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java
index a9c9272..861d984 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java
@@ -71,6 +71,6 @@ public class VocabTDB
return;
initialized = true;
AssemblerUtils.registerDataset(tDatasetTDB, new DatasetAssemblerTDB());
- AssemblerUtils.register(ConstAssembler.general(), tGraphTDB, new TDBGraphAssembler(), JA.Model);
+ AssemblerUtils.registerModel(tGraphTDB, new TDBGraphAssembler());
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-dataset-embed.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-dataset-embed.ttl b/jena-tdb/testing/Assembler/tdb-dataset-embed.ttl
index d74e71c..81a9ff5 100644
--- a/jena-tdb/testing/Assembler/tdb-dataset-embed.ttl
+++ b/jena-tdb/testing/Assembler/tdb-dataset-embed.ttl
@@ -18,10 +18,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
-## tdb:GraphTDB rdfs:subClassOf ja:Model .
-
<#dataset> rdf:type tdb:DatasetTDB ;
tdb:location "--mem--" ;
.
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-dataset.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-dataset.ttl b/jena-tdb/testing/Assembler/tdb-dataset.ttl
index 027f040..173416b 100644
--- a/jena-tdb/testing/Assembler/tdb-dataset.ttl
+++ b/jena-tdb/testing/Assembler/tdb-dataset.ttl
@@ -17,8 +17,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-
<#dataset> rdf:type tdb:DatasetTDB ;
# Do at least one the long way.
tdb:location "target/tdb-testing/DB" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-graph-embed.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-graph-embed.ttl b/jena-tdb/testing/Assembler/tdb-graph-embed.ttl
index 50f3a59..96f3d2d 100644
--- a/jena-tdb/testing/Assembler/tdb-graph-embed.ttl
+++ b/jena-tdb/testing/Assembler/tdb-graph-embed.ttl
@@ -18,10 +18,6 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-## tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
-tdb:GraphTDB rdfs:subClassOf ja:Model .
-
<#dataset> rdf:type ja:RDFDataset ;
ja:defaultGraph <#graph> ;
.
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl b/jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl
index 4d9add9..1aac9d3 100644
--- a/jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl
+++ b/jena-tdb/testing/Assembler/tdb-graph-ref-dataset.ttl
@@ -17,8 +17,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-
<#dataset> rdf:type ja:RDFDataset ;
ja:defaultGraph <#graph> ;
.
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-graph.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-graph.ttl b/jena-tdb/testing/Assembler/tdb-graph.ttl
index 4282411..4797616 100644
--- a/jena-tdb/testing/Assembler/tdb-graph.ttl
+++ b/jena-tdb/testing/Assembler/tdb-graph.ttl
@@ -17,8 +17,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-
<#dataset> rdf:type ja:RDFDataset ;
ja:defaultGraph <#graph> ;
.
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-named-graph-1.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-named-graph-1.ttl b/jena-tdb/testing/Assembler/tdb-named-graph-1.ttl
index 4996794..39b0bd6 100644
--- a/jena-tdb/testing/Assembler/tdb-named-graph-1.ttl
+++ b/jena-tdb/testing/Assembler/tdb-named-graph-1.ttl
@@ -17,8 +17,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-
<#dataset> rdf:type ja:RDFDataset ;
ja:defaultGraph <#graph> ;
.
http://git-wip-us.apache.org/repos/asf/jena/blob/fe0c4e2f/jena-tdb/testing/Assembler/tdb-named-graph-2.ttl
----------------------------------------------------------------------
diff --git a/jena-tdb/testing/Assembler/tdb-named-graph-2.ttl b/jena-tdb/testing/Assembler/tdb-named-graph-2.ttl
index 4996794..39b0bd6 100644
--- a/jena-tdb/testing/Assembler/tdb-named-graph-2.ttl
+++ b/jena-tdb/testing/Assembler/tdb-named-graph-2.ttl
@@ -17,8 +17,6 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-
<#dataset> rdf:type ja:RDFDataset ;
ja:defaultGraph <#graph> ;
.
[5/5] jena git commit: Merge commit 'refs/pull/146/head' of
https://github.com/apache/jena
Posted by os...@apache.org.
Merge commit 'refs/pull/146/head' of https://github.com/apache/jena
This closes #146.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/933a3238
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/933a3238
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/933a3238
Branch: refs/heads/master
Commit: 933a323847c173d9a80f5f7c5b322525d53c3db6
Parents: 5f79d00 ffbd310
Author: Osma Suominen <os...@apache.org>
Authored: Tue May 17 16:27:33 2016 +0300
Committer: Osma Suominen <os...@apache.org>
Committed: Tue May 17 16:27:59 2016 +0300
----------------------------------------------------------------------
.../apache/jena/query/text/TextIndexLucene.java | 7 +-
.../org/apache/jena/query/text/TS_Text.java | 5 +-
...TestDatasetWithComplexPhraseQueryParser.java | 67 ++++++++++++++++++++
3 files changed, 75 insertions(+), 4 deletions(-)
----------------------------------------------------------------------