svn commit: r1636834 - /jena/site/trunk/content/tutorials/sparql.mdtext
Author: andy Date: Wed Nov 5 09:27:03 2014 New Revision: 1636834 URL: http://svn.apache.org/r1636834 Log: SPARQL reference card Modified: jena/site/trunk/content/tutorials/sparql.mdtext Modified: jena/site/trunk/content/tutorials/sparql.mdtext URL: http://svn.apache.org/viewvc/jena/site/trunk/content/tutorials/sparql.mdtext?rev=1636834r1=1636833r2=1636834view=diff == --- jena/site/trunk/content/tutorials/sparql.mdtext (original) +++ jena/site/trunk/content/tutorials/sparql.mdtext Wed Nov 5 09:27:03 2014 @@ -43,7 +43,7 @@ information, in the form of a set of bin - [Search RDF data with SPARQL](http://www.ibm.com/developerworks/xml/library/j-sparql/) (by Phil McCarthy) - article published on IBM developer works about SPARQL and Jena. -- [SPARQL reference card](http://www.ilrt.bris.ac.uk/people/cmdjb/2005/04-sparql/) -(by [Dave Beckett](http://www.ilrt.bristol.ac.uk/people/cmdjb/)) +- [SPARQL reference card](http://www.dajobe.org/2005/04-sparql/) +(by [Dave Beckett](http://www.dajobe.org/)) Detailed [ARQ documentation](/documentation/query/) \ No newline at end of file
svn commit: r928004 - in /websites/staging/jena/trunk/content: ./ tutorials/sparql.html
Author: buildbot Date: Wed Nov 5 09:27:29 2014 New Revision: 928004 Log: Staging update by buildbot for jena Modified: websites/staging/jena/trunk/content/ (props changed) websites/staging/jena/trunk/content/tutorials/sparql.html Propchange: websites/staging/jena/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Nov 5 09:27:29 2014 @@ -1 +1 @@ -1632276 +1636834 Modified: websites/staging/jena/trunk/content/tutorials/sparql.html == --- websites/staging/jena/trunk/content/tutorials/sparql.html (original) +++ websites/staging/jena/trunk/content/tutorials/sparql.html Wed Nov 5 09:27:29 2014 @@ -183,8 +183,8 @@ information, in the form of a set of bin lia href=http://www.ibm.com/developerworks/xml/library/j-sparql/;Search RDF data with SPARQL/a (by Phil McCarthy) - article published on IBM developer works about SPARQL and Jena./li -lia href=http://www.ilrt.bris.ac.uk/people/cmdjb/2005/04-sparql/;SPARQL reference card/a -(by a href=http://www.ilrt.bristol.ac.uk/people/cmdjb/;Dave Beckett/a)/li +lia href=http://www.dajobe.org/2005/04-sparql/;SPARQL reference card/a +(by a href=http://www.dajobe.org/;Dave Beckett/a)/li /ul pDetailed a href=/documentation/query/ARQ documentation/a/p /div
git commit: JENA-800 : Reorder function corresponding to that in 2.11.2.
Repository: jena
Updated Branches:
refs/heads/master ef40d6b7d - a9c7671cd
JENA-800 : Reorder function corresponding to that in 2.11.2.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a9c7671c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a9c7671c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a9c7671c
Branch: refs/heads/master
Commit: a9c7671cdd2b6d7c8c9c2031aac41b325cac91e1
Parents: ef40d6b
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 11:26:46 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 11:26:46 2014 +
--
.../optimizer/reorder/ReorderFixedAlt.java | 80
1 file changed, 80 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/a9c7671c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderFixedAlt.java
--
diff --git
a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderFixedAlt.java
b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderFixedAlt.java
new file mode 100644
index 000..e5014c9
--- /dev/null
+++
b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderFixedAlt.java
@@ -0,0 +1,80 @@
+/*
+ * 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 com.hp.hpl.jena.sparql.engine.optimizer.reorder;
+
+import static
com.hp.hpl.jena.sparql.engine.optimizer.reorder.PatternElements.TERM ;
+import static
com.hp.hpl.jena.sparql.engine.optimizer.reorder.PatternElements.VAR ;
+
+import com.hp.hpl.jena.sparql.engine.optimizer.Pattern ;
+import com.hp.hpl.jena.sparql.engine.optimizer.StatsMatcher ;
+import com.hp.hpl.jena.sparql.graph.NodeConst ;
+import com.hp.hpl.jena.sparql.sse.Item ;
+
+/**
+ * Alternative fixed reorder function. This corresponds to the algorithm prior
+ * to Jena 2.11.2. It is susceptable to picking bad orders when there are lots
+ * of non-characterstic (non-selective) rdf:type triples.
+ * p
+ * The default ReorderFixed is better in most cases because it avoids
+ * ? rdf:type T which can be very unselective. Being data independent, that
is
+ * a guess. Consider using the stats matcher for detailed control.
+ */
+public class ReorderFixedAlt extends ReorderTransformationSubstitution
+{
+public ReorderFixedAlt() {}
+
+// Fixed scheme for when we have no stats.
+// It chooses a triple pattern by order of preference.
+
+private static Item type = Item.createNode(NodeConst.nodeRDFType) ;
+
+/** The number of triples used for the base scale */
+public static int MultiTermSampleSize = 100 ;
+
+/** Maximum value for a match involving two terms. */
+public static int MultiTermMax = 9 ;
+
+public final static StatsMatcher matcher ;
+static {
+matcher = new StatsMatcher() ;
+
+//matcher.addPattern(new Pattern(1, TERM, TERM, TERM)) ; // SPO
- built-in - not needed a s a rule
+
+// Numbers choosen as an approximation ratios for a graph of 100
triples
+matcher.addPattern(new Pattern(2, TERM, TERM, VAR)) ; // SP?
+
+// Pointless - this rule is over ridden by lower weight ?PO
+ // matcher.addPattern(new Pattern(5, TERM, type, TERM)) ;
// ? type O -- worse than ?PO
+
+matcher.addPattern(new Pattern(3, VAR, TERM, TERM)) ;// ?PO
+matcher.addPattern(new Pattern(2, TERM, VAR, TERM)) ;// S?O
+
+matcher.addPattern(new Pattern(10, TERM, VAR, VAR)) ; // S??
+matcher.addPattern(new Pattern(20, VAR, VAR, TERM)) ;// ??O
+matcher.addPattern(new Pattern(30, VAR, TERM, VAR)) ; // ?P?
+
+matcher.addPattern(new Pattern(MultiTermSampleSize, VAR, VAR, VAR))
; // ???
+}
+
+@Override
+public double weight(PatternTriple pt)
+{
+return matcher.match(pt) ;
+}
+}
[2/4] git commit: Add StoreParams arguiments to many methods. Separate out StoreParamsConst.
Add StoreParams arguiments to many methods.
Separate out StoreParamsConst.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/463de5f0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/463de5f0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/463de5f0
Branch: refs/heads/tdb-store-params
Commit: 463de5f0451c397084bb1af2e9e4d3c17ac67c37
Parents: 140a088
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 13:43:35 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 15:06:44 2014 +
--
.../com/hp/hpl/jena/tdb/StoreConnection.java| 22 +++--
.../java/com/hp/hpl/jena/tdb/TDBFactory.java| 6 +-
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 12 ++-
.../hpl/jena/tdb/setup/StoreParamsBuilder.java | 59 +
.../hp/hpl/jena/tdb/setup/StoreParamsCodec.java | 2 +-
.../hp/hpl/jena/tdb/setup/StoreParamsConst.java | 87
6 files changed, 134 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/463de5f0/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
--
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
index 3683a29..91b333e 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
@@ -27,10 +27,11 @@ import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.tdb.base.file.ChannelManager ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.base.file.LocationLock;
+import com.hp.hpl.jena.tdb.base.file.LocationLock ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.tdb.transaction.* ;
/** A StoreConnection is the reference to the underlying storage.
@@ -166,10 +167,10 @@ public class StoreConnection
private static MapLocation, StoreConnection cache = new HashMap() ;
// statics managing the cache.
-/** Obtain a StoreConenction for a particular location */
+/** Obtain a StoreConnection for a particular location */
public static StoreConnection make(String location)
{
-return make(new Location(location)) ;
+return make(Location.create(location)) ;
}
/** Stop managing all locations. Use with great care. */
@@ -219,17 +220,22 @@ public class StoreConnection
* Return a StoreConnection for a particular connection. This is used to
* create transactions for the database at the location.
*/
-public static synchronized StoreConnection make(Location location)
+public static synchronized StoreConnection make(Location location,
StoreParams params)
{
StoreConnection sConn = cache.get(location) ;
if (sConn != null)
return sConn ;
-DatasetGraphTDB dsg = DatasetBuilderStd.create(location) ;
+DatasetGraphTDB dsg = DatasetBuilderStd.create(location, params) ;
sConn = _makeAndCache(dsg) ;
return sConn ;
}
-/**
+@Deprecated
+public static StoreConnection make(Location location) {
+return make(location, null) ;
+}
+
+/**
* Return the StoreConnection if one already exists for this location, else
* return null
*/
@@ -292,7 +298,7 @@ public class StoreConnection
*/
public static StoreConnection createMemUncached()
{
-DatasetGraphTDB dsg = DatasetBuilderStd.create(Location.mem()) ;
+DatasetGraphTDB dsg = DatasetBuilderStd.create(Location.mem(), null) ;
return new StoreConnection(dsg) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/463de5f0/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
--
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
index 5f2610e..9a01cae 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
@@ -45,7 +45,7 @@ public class TDBFactory
/** Create or connect to a TDB-backed dataset */
public static Dataset createDataset(String dir)
-{ return createDataset(new Location(dir)) ; }
+{ return createDataset(Location.create(dir)) ; }
/** Create or connect to a TDB-backed dataset */
[3/4] git commit: Fix mistaken recursion.
Fix mistaken recursion.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/aae3f238
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/aae3f238
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/aae3f238
Branch: refs/heads/tdb-store-params
Commit: aae3f2389716d8cace12a9672b022879f42fd585
Parents: 463de5f
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 13:48:12 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 15:06:44 2014 +
--
jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/aae3f238/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
--
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
index 0d18d51..26152b7 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
@@ -60,7 +60,7 @@ public class Location {
/** Return a location for a directory on disk */
static public Location create(String directoryName) {
-Location loc = Location.create(directoryName) ;
+Location loc = new Location(directoryName) ;
return loc ;
}
[4/4] git commit: Switch to Location.create from new Location for directory locations.
Switch to Location.create from new Location for directory locations.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/140a0889
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/140a0889
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/140a0889
Branch: refs/heads/tdb-store-params
Commit: 140a08890804a758cf37858a332a32f857920446
Parents: a9c7671
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 13:40:36 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 15:06:44 2014 +
--
.../jena/tdb/assembler/DatasetAssemblerTDB.java | 2 +-
.../jena/tdb/assembler/NodeTableAssembler.java | 4 +--
.../jena/tdb/assembler/TDBGraphAssembler.java | 2 +-
.../com/hp/hpl/jena/tdb/base/file/FileSet.java | 4 +--
.../com/hp/hpl/jena/tdb/base/file/Location.java | 10 --
.../tdb/store/bulkloader2/CmdIndexBuild.java| 2 +-
.../tdb/store/bulkloader2/CmdIndexCopy.java | 4 +--
.../store/bulkloader2/CmdNodeTableBuilder.java | 2 +-
.../java/com/hp/hpl/jena/tdb/sys/DebugTDB.java | 2 +-
.../java/com/hp/hpl/jena/tdb/sys/TDBMaker.java | 32 +---
jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +--
.../src/main/java/tdb/cmdline/ModLocation.java | 2 +-
.../main/java/tdb/cmdline/ModTDBDataset.java| 2 +-
.../src/main/java/tdb/tools/dumpnodetable.java | 2 +-
.../src/main/java/tdb/tools/tdbgenindex.java| 4 +--
.../jena/tdb/base/file/TestLocationLock.java| 12
.../tdb/base/objectfile/TestStringFileDisk.java | 2 +-
.../hpl/jena/tdb/extra/T_QuadsObjectIsNull.java | 2 +-
.../jena/tdb/extra/T_TDBWriteTransaction.java | 2 +-
.../hp/hpl/jena/tdb/extra/T_TransSystem.java| 6 ++--
.../tdb/extra/T_TransSystemMultiDatasets.java | 4 +--
.../jena/tdb/graph/TestPrefixMappingTDB.java| 6 ++--
.../jena/tdb/store/TestDatasetTDBPersist.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestGraphTDB.java | 2 +-
.../tdb/transaction/TestNodeTableTransDisk.java | 2 +-
.../transaction/TestObjectFileTransStorage.java | 4 +--
.../jena/tdb/transaction/TestTransRestart.java | 2 +-
.../tdb/transaction/TestTransactionTDB.java | 2 +-
28 files changed, 71 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/140a0889/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
--
diff --git
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
index 45634d5..b415c5c 100644
---
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
+++
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
@@ -54,7 +54,7 @@ public class DatasetAssemblerTDB extends DatasetAssembler
throw new AssemblerException(root, No location given) ;
String dir = getStringValue(root, pLocation) ;
-Location loc = new Location(dir) ;
+Location loc = Location.create(dir) ;
DatasetGraph dsg = TDBFactory.createDatasetGraph(loc) ;
if ( root.hasProperty(pUnionDefaultGraph) ) {
http://git-wip-us.apache.org/repos/asf/jena/blob/140a0889/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
--
diff --git
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
index da9b869..cc83a99 100644
---
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
+++
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
@@ -42,7 +42,7 @@ public class NodeTableAssembler extends AssemblerBase
//implements Assembler
//private Location location = null ;
-//public NodeTableAssembler() { this.location = new
Location(.) ; }
+//public NodeTableAssembler() { this.location =
Location.create(.) ; }
//public NodeTableAssembler(Location location){ this.location =
location ; }
public NodeTableAssembler() { }
@@ -52,7 +52,7 @@ public class NodeTableAssembler extends AssemblerBase
//implements Assembler
{
String location = getAsStringValue(root, pNodeIndex) ;
//if ( location != null )
-//return NodeTableFactory.create(IndexBuilder.get(), new
Location(location)) ;
+//return NodeTableFactory.create(IndexBuilder.get(),
Location.create(location)) ;
//
//String nodeIndex = getAsStringValue(root, pNodeIndex) ;
//String nodeData =
[1/4] git commit: StoreParams enabled in DatasetBuilderStd
Repository: jena
Updated Branches:
refs/heads/tdb-store-params [created] 74b75f380
StoreParams enabled in DatasetBuilderStd
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/74b75f38
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/74b75f38
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/74b75f38
Branch: refs/heads/tdb-store-params
Commit: 74b75f380f82f5e0078246711a8a41401413af8a
Parents: aae3f23
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 14:38:39 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 15:06:44 2014 +
--
.../java/com/hp/hpl/jena/tdb/setup/Build.java | 4 +--
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 16 +--
.../com/hp/hpl/jena/tdb/setup/StoreParams.java | 2 +-
.../hpl/jena/tdb/setup/StoreParamsBuilder.java | 30 +---
.../hpl/jena/tdb/setup/StoreParamsDynamic.java | 3 ++
.../hp/hpl/jena/tdb/setup/TestStoreParams.java | 18
6 files changed, 51 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/74b75f38/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
--
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
index 4bd2157..ddb98d2 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
@@ -48,7 +48,7 @@ public class Build
// XXX replace with:
// return DatasetBuilderStd.stdBuilder().makeTupleIndex(location,
indexName, primary, indexOrder) ;
// All this to BuilderDB.
-StoreParamsBuilder spb = new StoreParamsBuilder() ;
+StoreParamsBuilder spb = StoreParamsBuilder.create() ;
spb.blockReadCacheSize(readCacheSize) ;
spb.blockWriteCacheSize(writeCacheSize) ;
RecordFactory recordFactory = new RecordFactory(dftKeyLength,
dftValueLength) ;
@@ -77,7 +77,7 @@ public class Build
String indexNode2Id, int
node2NodeIdCacheSize,
String indexId2Node, int
nodeId2NodeCacheSize,
int sizeNodeMissCacheSize) {
-StoreParamsBuilder spb = new StoreParamsBuilder() ;
+StoreParamsBuilder spb = StoreParamsBuilder.create() ;
spb.indexNode2Id(indexNode2Id).node2NodeIdCacheSize(node2NodeIdCacheSize) ;
spb.indexId2Node(indexId2Node).nodeId2NodeCacheSize(nodeId2NodeCacheSize) ;
DatasetBuilderStd dbBuild = DatasetBuilderStd.stdBuilder() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/74b75f38/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
--
diff --git
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
index ae903ca..38173b5 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
@@ -73,9 +73,19 @@ public class DatasetBuilderStd implements DatasetBuilder {
}
public static DatasetGraphTDB create(Location location, StoreParams
$params) {
-if ( $params != null )
-log.warn(StoreParams != null (ignored)) ;
StoreParams params = paramsForLocation(location) ;
+// Experimental
+if ( ! location.isMem() $params != null ) {
+if ( FileOps.existsAnyFiles(location.getDirectoryPath()) )
+params = StoreParamsBuilder.modify(params, $params) ;
+else
+params = $params ;
+$params = null ;
+}
+
+//
+if ( $params != null )
+log.warn(StoreParams != null (experimental)) ;
DatasetBuilderStd x = new DatasetBuilderStd() ;
x.standardSetup() ;
return x.build(location, params) ;
@@ -331,7 +341,7 @@ public class DatasetBuilderStd implements DatasetBuilder {
}
protected NodeTable makeNodeTableNoCache(Location location, String
indexNode2Id, String indexId2Node, StoreParams params) {
-StoreParamsBuilder spb = new StoreParamsBuilder(params) ;
+StoreParamsBuilder spb = StoreParamsBuilder.create(params) ;
spb.node2NodeIdCacheSize(-1) ;
spb.nodeId2NodeCacheSize(-1) ;
spb.nodeMissCacheSize(-1) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/74b75f38/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java
git commit: Put in default StoreParams calls
Repository: jena
Updated Branches:
refs/heads/tdb-store-params 74b75f380 - 906be05b1
Put in default StoreParams calls
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/906be05b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/906be05b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/906be05b
Branch: refs/heads/tdb-store-params
Commit: 906be05b1f491c96eadba008c494b8faa72cdf81
Parents: 74b75f3
Author: Andy Seaborne a...@apache.org
Authored: Wed Nov 5 16:36:12 2014 +
Committer: Andy Seaborne a...@apache.org
Committed: Wed Nov 5 16:36:12 2014 +
--
.../com/hp/hpl/jena/tdb/StoreConnection.java| 4 +-
.../hpl/jena/tdb/setup/DatasetBuilderStd.java | 37 +-
.../com/hp/hpl/jena/tdb/setup/StoreParams.java | 41 +---
.../hp/hpl/jena/tdb/setup/StoreParamsConst.java | 27 +
.../store/bulkloader2/CmdNodeTableBuilder.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestLoader.java | 2 +-
6 files changed, 94 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/jena/blob/906be05b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
--
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
index 91b333e..5935a9a 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
@@ -230,12 +230,12 @@ public class StoreConnection
return sConn ;
}
-@Deprecated
+/** Make a StoreConnection based on any StoreParams at eh location or the
system defaults. */
public static StoreConnection make(Location location) {
return make(location, null) ;
}
-/**
+/**
* Return the StoreConnection if one already exists for this location, else
* return null
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/906be05b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
--
diff --git
a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
index 38173b5..3dd02e6 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
@@ -67,28 +67,47 @@ public class DatasetBuilderStd implements DatasetBuilder {
private TupleIndexBuilder tupleIndexBuilder ;
private Recorderrecorder = null ;
-@Deprecated
+/**
+ *
+ * @param location
+ * @return DatasetGraphTDB
+ */
public static DatasetGraphTDB create(Location location) {
return create(location, null) ;
}
-public static DatasetGraphTDB create(Location location, StoreParams
$params) {
-StoreParams params = paramsForLocation(location) ;
+/**
+ * Create a {@linkplain DatasetGraphTDB} with a set of {@linkplain
StoreParams}.
+ * The parameters for a store have 3 inputs: the parameters provided,
+ * any parameters
+ *
+ *
+ *
+ * @param location Where to create the database.
+ * @param params Store parameters to use (null means use default).
+ * @return DatasetGraphTDB
+ */
+public static DatasetGraphTDB create(Location location, StoreParams
params) {
+StoreParams $params = paramsForLocation(location) ;
// Experimental
-if ( ! location.isMem() $params != null ) {
+if ( ! location.isMem() params != null ) {
if ( FileOps.existsAnyFiles(location.getDirectoryPath()) )
-params = StoreParamsBuilder.modify(params, $params) ;
+$params = StoreParamsBuilder.modify($params, params) ;
else
-params = $params ;
-$params = null ;
+$params = params ;
+params = null ;
}
//
-if ( $params != null )
+if ( params != null )
log.warn(StoreParams != null (experimental)) ;
DatasetBuilderStd x = new DatasetBuilderStd() ;
x.standardSetup() ;
-return x.build(location, params) ;
+DatasetGraphTDB dsg = x.build(location, $params) ;
+// Write params.
+//if ( params != StoreParams.getDftStoreParams() )
+
+return dsg ;
}
public static DatasetGraphTDB create(StoreParams params) {
Build failed in Jenkins: Jena_Development_Test_Java8 #105
See https://builds.apache.org/job/Jena_Development_Test_Java8/105/ -- [...truncated 981 lines...] remote: Compressing objects: 11% (5080/45464) remote: Compressing objects: 11% (5084/45464) remote: Compressing objects: 11% (5108/45464) remote: Compressing objects: 11% (5119/45464) remote: Compressing objects: 11% (5120/45464) remote: Compressing objects: 11% (5122/45464) remote: Compressing objects: 11% (5133/45464) remote: Compressing objects: 11% (5150/45464) remote: Compressing objects: 12% (5456/45464) remote: Compressing objects: 13% (5911/45464) remote: Compressing objects: 14% (6365/45464) remote: Compressing objects: 14% (6457/45464) remote: Compressing objects: 14% (6511/45464) remote: Compressing objects: 14% (6717/45464) remote: Compressing objects: 15% (6820/45464) remote: Compressing objects: 15% (7168/45464) remote: Compressing objects: 16% (7275/45464) remote: Compressing objects: 17% (7729/45464) remote: Compressing objects: 18% (8184/45464) remote: Compressing objects: 19% (8639/45464) remote: Compressing objects: 20% (9093/45464) remote: Compressing objects: 21% (9548/45464) remote: Compressing objects: 21% (9921/45464) remote: Compressing objects: 21% (9938/45464) remote: Compressing objects: 22% (10003/45464) remote: Compressing objects: 22% (10094/45464) remote: Compressing objects: 22% (10122/45464) remote: Compressing objects: 22% (10124/45464) remote: Compressing objects: 22% (10150/45464) remote: Compressing objects: 22% (10152/45464) remote: Compressing objects: 22% (10154/45464) remote: Compressing objects: 22% (10190/45464) remote: Compressing objects: 22% (10193/45464) remote: Compressing objects: 22% (10197/45464) remote: Compressing objects: 22% (10200/45464) remote: Compressing objects: 22% (10205/45464) remote: Compressing objects: 23% (10457/45464) remote: Compressing objects: 24% (10912/45464) remote: Compressing objects: 25% (11366/45464) remote: Compressing objects: 26% (11821/45464) remote: Compressing objects: 27% (12276/45464) remote: Compressing objects: 28% (12730/45464) remote: Compressing objects: 28% (12889/45464) remote: Compressing objects: 28% (12915/45464) remote: Compressing objects: 28% (12920/45464) remote: Compressing objects: 28% (12931/45464) remote: Compressing objects: 28% (13096/45464) remote: Compressing objects: 28% (13103/45464) remote: Compressing objects: 28% (13110/45464) remote: Compressing objects: 28% (13122/45464) remote: Compressing objects: 28% (13129/45464) remote: Compressing objects: 29% (13185/45464) remote: Compressing objects: 29% (13577/45464) remote: Compressing objects: 29% (13625/45464) remote: Compressing objects: 30% (13640/45464) remote: Compressing objects: 30% (13658/45464) remote: Compressing objects: 30% (13662/45464) remote: Compressing objects: 30% (13669/45464) remote: Compressing objects: 30% (13719/45464) remote: Compressing objects: 30% (13720/45464) remote: Compressing objects: 30% (14079/45464) remote: Compressing objects: 30% (14091/45464) remote: Compressing objects: 31% (14094/45464) remote: Compressing objects: 31% (14095/45464) remote: Compressing objects: 31% (14118/45464) remote: Compressing objects: 31% (14160/45464) remote: Compressing objects: 31% (14200/45464) remote: Compressing objects: 31% (14422/45464) remote: Compressing objects: 32% (14549/45464) remote: Compressing objects: 33% (15004/45464) remote: Compressing objects: 33% (15093/45464) remote: Compressing objects: 33% (15126/45464) remote: Compressing objects: 33% (15129/45464) remote: Compressing objects: 33% (15307/45464) remote: Compressing objects: 33% (15400/45464) remote: Compressing objects: 34% (15458/45464) remote: Compressing objects: 34% (15471/45464) remote: Compressing objects: 34% (15499/45464) remote: Compressing objects: 34% (15501/45464) remote: Compressing objects: 34% (15506/45464) remote: Compressing objects: 34% (15521/45464) remote: Compressing objects: 34% (15522/45464) remote: Compressing objects: 34%
