Menu
▾
▴
bigdata-commit — Commit traffic.
This list is closed, nobody may subscribe to it.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(139) |
Aug
(94) |
Sep
(232) |
Oct
(143) |
Nov
(138) |
Dec
(55) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(127) |
Feb
(90) |
Mar
(101) |
Apr
(74) |
May
(148) |
Jun
(241) |
Jul
(169) |
Aug
(121) |
Sep
(157) |
Oct
(199) |
Nov
(281) |
Dec
(75) |
| 2012 |
Jan
(107) |
Feb
(122) |
Mar
(184) |
Apr
(73) |
May
(14) |
Jun
(49) |
Jul
(26) |
Aug
(103) |
Sep
(133) |
Oct
(61) |
Nov
(51) |
Dec
(55) |
| 2013 |
Jan
(59) |
Feb
(72) |
Mar
(99) |
Apr
(62) |
May
(92) |
Jun
(19) |
Jul
(31) |
Aug
(138) |
Sep
(47) |
Oct
(83) |
Nov
(95) |
Dec
(111) |
| 2014 |
Jan
(125) |
Feb
(60) |
Mar
(119) |
Apr
(136) |
May
(270) |
Jun
(83) |
Jul
(88) |
Aug
(30) |
Sep
(47) |
Oct
(27) |
Nov
(23) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
(1) |
3
(7) |
4
(1) |
5
|
6
(1) |
7
(1) |
8
|
|
9
(2) |
10
(3) |
11
|
12
(2) |
13
|
14
(3) |
15
|
|
16
|
17
(9) |
18
(3) |
19
(7) |
20
(2) |
21
(7) |
22
(6) |
|
23
|
24
|
25
|
26
|
27
|
28
|
29
|
|
30
|
31
|
|
|
|
|
|
|
From: <mar...@us...> - 2012-12-22 22:30:20
|
Revision: 6802
http://bigdata.svn.sourceforge.net/bigdata/?rev=6802&view=rev
Author: martyncutcher
Date: 2012-12-22 22:30:06 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
relax assertion in clearAddrMap
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-22 21:57:29 UTC (rev 6801)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-22 22:30:06 UTC (rev 6802)
@@ -2213,7 +2213,9 @@
if (removed == null) {
// Must be present.
- throw new AssertionError();
+ // throw new AssertionError();
+
+ return false;
}
removed.deleted = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-22 21:57:40
|
Revision: 6801
http://bigdata.svn.sourceforge.net/bigdata/?rev=6801&view=rev
Author: thompsonbry
Date: 2012-12-22 21:57:29 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Disabling the solution set cache in CI. It was leaking memory and causing journals to not shutdown. It was accidentally enabled with the commit to create a bigdata-client JAR.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java 2012-12-22 18:14:42 UTC (rev 6800)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java 2012-12-22 21:57:29 UTC (rev 6801)
@@ -398,7 +398,7 @@
*/
String SOLUTION_SET_CACHE = "solutionSetCache";
- boolean DEFAULT_SOLUTION_SET_CACHE = true;
+ boolean DEFAULT_SOLUTION_SET_CACHE = false;
/**
* When <code>true</code> a DESCRIBE cache will be maintained. This can
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-22 18:14:54
|
Revision: 6800
http://bigdata.svn.sourceforge.net/bigdata/?rev=6800&view=rev
Author: thompsonbry
Date: 2012-12-22 18:14:42 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Added link in build.xml to the ticket for this issue [1].
[1] https://sourceforge.net/apps/trac/bigdata/ticket/628
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/build.xml
Modified: branches/BIGDATA_RELEASE_1_2_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/build.xml 2012-12-22 18:14:00 UTC (rev 6799)
+++ branches/BIGDATA_RELEASE_1_2_0/build.xml 2012-12-22 18:14:42 UTC (rev 6800)
@@ -475,16 +475,8 @@
</java>
</target>
- <!-- -Y ${build.dir}/lib/${version}.jar
- -Y ${bigdata.dir}/bigdata/lib/*.jar
- -Y ${bigdata.dir}/bigdata/lib/unimi/*.jar
- -Y ${bigdata.dir}/bigdata/lib/icu/*.jar
- -Y ${bigdata.dir}/bigdata/lib/jetty/*.jar
- -Y ${bigdata.dir}/bigdata/lib/lucene/*.jar
- -Y ${bigdata.dir}/bigdata-rdf/lib/*.jar
- -Y ${bigdata.dir}/bigdata-sails/lib/httpcomponents/*.jar
- -c ${build.dir}/lib/${version}.jar
-clean, prepare, jar
+ <!-- @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/628" >
+ Create a bigdata-client jar for the NSS REST API </a>
-->
<target name="bigdata-client" depends="clean, prepare, jar"
description="Prepare the bigdata web access client library.">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-22 18:14:13
|
Revision: 6799
http://bigdata.svn.sourceforge.net/bigdata/?rev=6799&view=rev
Author: thompsonbry
Date: 2012-12-22 18:14:00 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/properties/PropertiesFormat.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java
branches/BIGDATA_RELEASE_1_2_0/build.xml
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IMimeTypes.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/MiniMime.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/client/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/client/TestAll.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java
Removed Paths:
-------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AST2SPARQLUtil.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/EncodeDecodeValue.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MiniMime.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestEncodeDecodeValue.java
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -75,7 +75,7 @@
import com.bigdata.rdf.rio.PresortRioLoader;
import com.bigdata.rdf.rio.RDFParserOptions;
import com.bigdata.rdf.rio.StatementBuffer;
-import com.bigdata.rdf.sail.webapp.MiniMime;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
import com.bigdata.rdf.sparql.ast.LoadGraph;
import com.bigdata.rdf.store.AbstractTripleStore;
import com.bigdata.rdf.store.DataLoader;
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -37,7 +37,6 @@
import org.openrdf.rio.RDFWriterRegistry;
import com.bigdata.rdf.model.StatementEnum;
-import com.bigdata.rdf.rio.nquads.NQuadsParser;
import com.bigdata.rdf.rio.ntriples.BigdataNTriplesParserFactory;
import com.bigdata.rdf.rio.rdfxml.BigdataRDFXMLParserFactory;
import com.bigdata.rdf.rio.rdfxml.BigdataRDFXMLWriterFactory;
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/properties/PropertiesFormat.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/properties/PropertiesFormat.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/properties/PropertiesFormat.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -65,10 +65,9 @@
import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArraySet;
-import org.openrdf.rio.RDFFormat;
-
/**
* Formats for a properties file.
+ *
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
*/
public class PropertiesFormat extends FileFormat implements Iterable<PropertiesFormat> {
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AST2SPARQLUtil.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AST2SPARQLUtil.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AST2SPARQLUtil.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -1,174 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2012. All rights reserved.
-
-Contact:
- SYSTAP, LLC
- 4501 Tower Road
- Greensboro, NC 27410
- lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-/*
- * Created on Mar 5, 2012
- */
-
-package com.bigdata.rdf.sparql.ast;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-
-/**
- * Utility class for externalizing {@link TermNode}s.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public class AST2SPARQLUtil {
-
- /**
- * The prefix declarations used within the SERVICE clause (from the original
- * query).
- */
- private final Map<String, String> prefixDecls;
-
- /** Reverse map for {@link #prefixDecls}. */
- private final Map<String, String> namespaces;
-
- public AST2SPARQLUtil(final Map<String, String> prefixDecls) {
-
- this.prefixDecls = prefixDecls;
-
- if (prefixDecls != null) {
-
- /*
- * Build up a reverse map from namespace to prefix.
- */
-
- namespaces = new HashMap<String, String>();
-
- for (Map.Entry<String, String> e : prefixDecls.entrySet()) {
-
- namespaces.put(e.getValue(), e.getKey());
-
- }
-
- } else {
-
- namespaces = null;
-
- }
-
- }
-
- /**
- * Return an external form for the {@link Value} suitable for direct
- * embedding into a SPARQL query.
- *
- * @param val
- * The value.
- *
- * @return The external form.
- */
- public String toExternal(final Value val) {
-
- if (val instanceof URI) {
-
- return toExternal((URI) val);
-
- } else if (val instanceof Literal) {
-
- return toExternal((Literal)val);
-
- } else if (val instanceof BNode) {
-
- return toExternal((BNode)val);
-
- } else {
-
- throw new AssertionError();
-
- }
-
- }
-
- public String toExternal(final BNode bnd) {
-
- final String id = bnd.stringValue();
-
-// final boolean isLetter = Character.isLetter(id.charAt(0));
-
-// return "_:" + (isLetter ? "" : "B") + id;
- return "_:B" + id;
-
- }
-
- public String toExternal(final URI uri) {
-
- if (prefixDecls != null) {
-
- final String prefix = namespaces.get(uri.getNamespace());
-
- if (prefix != null) {
-
- return prefix + ":" + uri.getLocalName();
-
- }
-
- }
-
- return "<" + uri.stringValue() + ">";
-
- }
-
- public String toExternal(final Literal lit) {
-
- final String label = lit.getLabel();
-
- final String languageCode = lit.getLanguage();
-
- final URI datatypeURI = lit.getDatatype();
-
- final String datatypeStr = datatypeURI == null ? null
- : toExternal(datatypeURI);
-
- final StringBuilder sb = new StringBuilder((label.length() + 2)
- + (languageCode != null ? (languageCode.length() + 1) : 0)
- + (datatypeURI != null ? datatypeStr.length() + 2 : 0));
-
- sb.append('"');
- sb.append(label);
- sb.append('"');
-
- if (languageCode != null) {
- sb.append('@');
- sb.append(languageCode);
- }
-
- if (datatypeURI != null) {
- sb.append("^^");
- sb.append(datatypeStr);
- }
-
- return sb.toString();
-
- }
-
-}
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -398,15 +398,15 @@
*/
String SOLUTION_SET_CACHE = "solutionSetCache";
- boolean DEFAULT_SOLUTION_SET_CACHE = false;
+ boolean DEFAULT_SOLUTION_SET_CACHE = true;
/**
* When <code>true</code> a DESCRIBE cache will be maintained. This can
- * DESCRIBE queries, linked data queries (which are mapped to a DESCRIBE
- * query by the NSS), and potentially accelerate star-joins (if the query
- * plan is rewritten to hit the DESCRIBE cache and obtain the materialized
- * joins from it, but this is best done with a fully materialized and
- * synchronously maintained DESCRIBE cache).
+ * accelerate DESCRIBE queries, linked data queries (which are mapped to a
+ * DESCRIBE query by the NSS), and potentially accelerate star-joins (if the
+ * query plan is rewritten to hit the DESCRIBE cache and obtain the
+ * materialized joins from it, but this is best done with a fully
+ * materialized and synchronously maintained DESCRIBE cache).
*
* @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/584">
* DESCRIBE CACHE </a>
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -96,7 +96,7 @@
import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
import com.bigdata.rdf.sail.SPARQLUpdateEvent;
import com.bigdata.rdf.sail.Sesame2BigdataIterator;
-import com.bigdata.rdf.sail.webapp.MiniMime;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
import com.bigdata.rdf.sparql.ast.ASTContainer;
import com.bigdata.rdf.sparql.ast.AbstractGraphDataUpdate;
import com.bigdata.rdf.sparql.ast.AddGraph;
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -40,7 +40,7 @@
import org.openrdf.query.impl.EmptyBindingSet;
import com.bigdata.bop.IVariable;
-import com.bigdata.rdf.sparql.ast.AST2SPARQLUtil;
+import com.bigdata.rdf.sail.webapp.client.AST2SPARQLUtil;
/**
* Utility class constructs a valid SPARQL query for a remote
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -39,7 +39,7 @@
import org.openrdf.query.BindingSet;
import com.bigdata.bop.IVariable;
-import com.bigdata.rdf.sparql.ast.AST2SPARQLUtil;
+import com.bigdata.rdf.sail.webapp.client.AST2SPARQLUtil;
/**
* Utility class constructs a valid SPARQL query for a remote
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -58,6 +58,7 @@
import com.bigdata.rdf.properties.PropertiesWriterRegistry;
import com.bigdata.rdf.rules.ConstraintViolationException;
import com.bigdata.rdf.sail.webapp.XMLBuilder.Node;
+import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue;
import com.bigdata.util.InnerCause;
/**
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -42,12 +42,13 @@
import com.bigdata.journal.IIndexManager;
import com.bigdata.journal.Journal;
import com.bigdata.quorum.Quorum;
+import com.bigdata.rdf.sail.webapp.client.IMimeTypes;
/**
* Useful glue for implementing service actions, but does not directly implement
* any service action/
*/
-abstract public class BigdataServlet extends HttpServlet {
+abstract public class BigdataServlet extends HttpServlet implements IMimeTypes {
/**
*
@@ -93,25 +94,6 @@
HTTP_INTERNALERROR = HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
HTTP_NOTIMPLEMENTED = HttpServletResponse.SC_NOT_IMPLEMENTED;
- /**
- * Common MIME types for dynamic content.
- */
- public static final transient String
- MIME_TEXT_PLAIN = "text/plain",
- MIME_TEXT_HTML = "text/html",
-// MIME_TEXT_XML = "text/xml",
- /**
- * General purpose binary <code>application/octet-stream</code>.
- */
- MIME_DEFAULT_BINARY = "application/octet-stream",
- MIME_APPLICATION_XML = "application/xml",
- MIME_TEXT_JAVASCRIPT = "text/javascript",
- /**
- * The traditional encoding of URL query parameters within a POST
- * message body.
- */
- MIME_APPLICATION_URL_ENCODED = "application/x-www-form-urlencoded";
-
protected <T> T getRequiredServletContextAttribute(final String name) {
@SuppressWarnings("unchecked")
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -39,6 +39,7 @@
import org.openrdf.rio.RDFFormat;
import com.bigdata.rdf.properties.PropertiesFormat;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
/**
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -49,6 +49,8 @@
import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
import com.bigdata.rdf.sail.webapp.BigdataRDFContext.AbstractQueryTask;
+import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
/**
* Handler for DELETE by query (DELETE verb) and DELETE by data (POST).
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/EncodeDecodeValue.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/EncodeDecodeValue.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/EncodeDecodeValue.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -1,445 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2011. All rights reserved.
-
-Contact:
- SYSTAP, LLC
- 4501 Tower Road
- Greensboro, NC 27410
- lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-/*
- * Created on Oct 13, 2011
- */
-
-package com.bigdata.rdf.sail.webapp;
-
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-
-/**
- * Utility class to encode/decode RDF {@link Value}s for interchange with the
- * REST API.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public class EncodeDecodeValue {
-
-// /*
-// * Note: The decode logic was derived from the JavaCharStream file generated
-// * by JavaCC.
-// */
-//
-// private static final int hexval(char c) {
-// switch (c) {
-// case '0':
-// return 0;
-// case '1':
-// return 1;
-// case '2':
-// return 2;
-// case '3':
-// return 3;
-// case '4':
-// return 4;
-// case '5':
-// return 5;
-// case '6':
-// return 6;
-// case '7':
-// return 7;
-// case '8':
-// return 8;
-// case '9':
-// return 9;
-//
-// case 'a':
-// case 'A':
-// return 10;
-// case 'b':
-// case 'B':
-// return 11;
-// case 'c':
-// case 'C':
-// return 12;
-// case 'd':
-// case 'D':
-// return 13;
-// case 'e':
-// case 'E':
-// return 14;
-// case 'f':
-// case 'F':
-// return 15;
-// }
-//
-// throw new AssertionError();
-// }
-//
-// private static class DecodeString {
-// private final StringBuilder sb = new StringBuilder();
-// private final String src;
-// private int srcpos = 0;
-// DecodeString(final String s) {
-// this.src = s;
-// }
-//
-// private char ReadByte() {
-// return src.charAt(srcpos++);
-// }
-//
-// private void backup(final int n) {
-//
-// sb.setLength(sb.length() - n);
-//
-// }
-//
-// /**
-// * Read a character.
-// *
-// * TODO Does not handle the 8 character escape code sequences (but
-// * neither does the SPARQL parser!)
-// */
-// private char readChar() throws java.io.IOException {
-// char c;
-//
-// sb.append(c = ReadByte());
-//
-// if (c == '\\') {
-//
-// int backSlashCnt = 1;
-//
-// for (;;) // Read all the backslashes
-// {
-//
-// try {
-// sb.append(c=ReadByte());
-// if (c != '\\') {
-// // found a non-backslash char.
-// if ((c == 'u') && ((backSlashCnt & 1) == 1)) {
-// if (--bufpos < 0)
-// bufpos = bufsize - 1;
-//
-// break;
-// }
-//
-// backup(backSlashCnt);
-// return '\\';
-// }
-// } catch (java.io.IOException e) {
-// // We are returning one backslash so we should only
-// // backup (count-1)
-// if (backSlashCnt > 1)
-// backup(backSlashCnt - 1);
-//
-// return '\\';
-// }
-//
-// backSlashCnt++;
-// }
-//
-// // Here, we have seen an odd number of backslash's followed by a
-// // 'u'
-// try {
-// while ((c = ReadByte()) == 'u') {}
-//
-// // Decode the code sequence.
-// c = (char) (hexval(c) << 12 | hexval(ReadByte()) << 8
-// | hexval(ReadByte()) << 4 | hexval(ReadByte()));
-//
-// sb.append(c);
-//
-// } catch (java.io.IOException e) {
-//
-// throw new Error("Invalid escape character");
-//
-// }
-//
-// if (backSlashCnt == 1)
-// return c;
-// else {
-// backup(backSlashCnt - 1);
-// return '\\';
-// }
-// } else {
-// return c;
-// }
-// }
-//
-// }
-//
-// /**
-// * Apply code point escape sequences for anything that we need to escape.
-// * For our purposes, this is just <code>"</code> and <code>></code>.
-// * @param s
-// * @return
-// *
-// * @see http://www.w3.org/TR/sparql11-query/#codepointEscape
-// */
-// static String encodeEscapeSequences(final String s) {
-//
-// return s;
-//
-// }
-//
-// /**
-// * Decode all code point escape sequences. Note that we need to decode more
-// * than we encode since we are not responsible for the encoding when it
-// * comes to the REST API, just the decoding.
-// *
-// * @param s
-// * The string, which may have escape sequences encoded.
-// *
-// * @return The string with escape sequences decoded.
-// *
-// * @throws IllegalArgumentException
-// * if the argument is <code>null</code>.
-// * @throws IllegalArgumentException
-// * if the argument is contains an ill-formed escape code
-// * sequence.
-// *
-// * @see http://www.w3.org/TR/sparql11-query/#codepointEscape
-// *
-// * FIXME Implement encode/decode.
-// */
-// static String decodeEscapeSequences(final String s) {
-//
-//// // Remove any escape sequences.
-//// final StringBuilder sb = new StringBuilder();
-//// for (int i = 0; i < slen; i++) {
-//// char ch = s.charAt(i);
-//// if (ch == '\\') {
-//// if (i + 1 == slen)
-//// throw new IllegalArgumentException(s);
-//// ch = s.charAt(i);
-//// }
-//// sb.append(ch);
-//// }
-//// final String t = sb.toString();
-//
-// return s;
-//
-// }
-
- /**
- * Decode a URI or Literal.
- *
- * @param s
- * The value to be decoded.
- *
- * @return The URI or literal -or- <code>null</code> if the argument was
- * <code>null</code>.
- *
- * @throws IllegalArgumentException
- * if the request parameter could not be decoded as an RDF
- * {@link Value}.
- */
- public static Value decodeValue(final String s) {
-
- if(s == null)
- return null;
-
-// final String s = decodeEscapeSequences(ss);
-
- final int slen = s.length();
-
- if (slen == 0)
- throw new IllegalArgumentException("<Empty String>");
-
- final char ch = s.charAt(0);
-
- if(ch == '\"' || ch == '\'') {
-
- /*
- * Literal.
- */
-
- final int closeQuotePos = s.lastIndexOf(ch);
-
- if (closeQuotePos == 0)
- throw new IllegalArgumentException(s);
-
- final String label = s.substring(1, closeQuotePos);
-
- if (slen == closeQuotePos + 1) {
-
- /*
- * Plain literal.
- */
-
- return new LiteralImpl(label);
-
- }
-
- final char ch2 = s.charAt(closeQuotePos + 1);
-
- if (ch2 == '@') {
-
- /*
- * Language code literal.
- */
-
- final String languageCode = s.substring(closeQuotePos + 2);
-
- return new LiteralImpl(label, languageCode);
-
- } else if (ch2 == '^') {
-
- /*
- * Datatype literal.
- */
-
- if (slen <= closeQuotePos + 2)
- throw new IllegalArgumentException(s);
-
- if (s.charAt(closeQuotePos + 2) != '^')
- throw new IllegalArgumentException(s);
-
- final String datatypeStr = s.substring(closeQuotePos + 3);
-
- final URI datatypeURI = decodeURI(datatypeStr);
-
- return new LiteralImpl(label,datatypeURI);
-
- } else {
-
- throw new IllegalArgumentException(s);
-
- }
-
- } else if (ch == '<') {
-
- /*
- * URI
- */
-
- if (s.charAt(slen - 1) != '>')
- throw new IllegalArgumentException(s);
-
- final String uriStr = s.substring(1, slen - 1);
-
- return new URIImpl(uriStr);
-
- } else {
-
- throw new IllegalArgumentException(s);
-
- }
-
- }
-
- /**
- * Type safe variant for a {@link Resource}.
- */
- public static Resource decodeResource(final String param) {
-
- final Value v = decodeValue(param);
-
- if (v == null || v instanceof Resource)
- return (Resource) v;
-
- throw new IllegalArgumentException("Not a Resource: '" + param + "'");
-
- }
-
- /**
- * Type safe variant for a {@link URI}.
- */
- public static URI decodeURI(final String param) {
-
- final Value v = decodeValue(param);
-
- if (v == null || v instanceof URI)
- return (URI) v;
-
- throw new IllegalArgumentException("Not an URI: '" + param + "'");
-
- }
-
- /**
- * Encode an RDF {@link Value} as it should appear if used in a SPARQL
- * query. E.g., a literal will look like <code>"abc"</code>,
- * <code>"abc"@en</code> or
- * <code>"3"^^xsd:int. A URI will look like <code><http://www.bigdata.com/></code>
- * .
- *
- * @param v
- * The value (optional).
- *
- * @return The encoded value -or- <code>null</code> if the argument is
- * <code>null</code>.
- *
- * @throws IllegalArgumentException
- * if the argument is a {@link BNode}.
- */
- public static String encodeValue(final Value v) {
- if(v == null)
- return null;
- if (v instanceof BNode)
- throw new IllegalArgumentException();
- if (v instanceof URI) {
- return "<" + v.stringValue() + ">";
- }
- if (v instanceof Literal) {
- final Literal lit = (Literal) v;
- final StringBuilder sb = new StringBuilder();
- sb.append("\"");
- sb.append(lit.getLabel());
- sb.append("\"");
- if (lit.getLanguage() != null) {
- sb.append("@");
- sb.append(lit.getLanguage());
- }
- if (lit.getDatatype() != null) {
- sb.append("^^");
- sb.append(encodeValue(lit.getDatatype()));
- }
- return sb.toString();
- }
- throw new AssertionError();
- }
-
- public static Resource[] decodeResources(final String[] strings) {
- if (strings == null || strings.length == 0)
- return null;
-
- final Resource[] resources = new Resource[strings.length];
- for (int i = 0; i < strings.length; i++) {
- resources[i] = decodeResource(strings[i]);
- }
-
- return resources;
- }
-
- public static String[] encodeValues(final Value[] values) {
- if (values == null || values.length == 0)
- return null;
-
- final String[] strings = new String[values.length];
- for (int i = 0; i < values.length; i++) {
- strings[i] = encodeValue(values[i]);
- }
-
- return strings;
- }
-
-}
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -46,6 +46,8 @@
import org.openrdf.sail.SailException;
import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
+import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
/**
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MiniMime.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MiniMime.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MiniMime.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -1,76 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2012. All rights reserved.
-
-Contact:
- SYSTAP, LLC
- 4501 Tower Road
- Greensboro, NC 27410
- lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-/*
- * Created on Mar 7, 2012
- */
-
-package com.bigdata.rdf.sail.webapp;
-
-import org.apache.log4j.Logger;
-
-/**
- * Extract and return the quality score for the mime type (defaults to
- * <code>1.0</code>).
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- *
- * TODO Lift out patterns.
- */
-public class MiniMime {
-
- static private final Logger log = Logger.getLogger(MiniMime.class);
-
- public final float q;
-
- private final String mimeType;
-
- public final String[][] params;
-
- public MiniMime(final String s) {
- final String[] b = s.split(";");
- mimeType = b[0];
- float q = 1f;
- params = new String[b.length][];
- for (int i = 1; i < b.length; i++) {
- final String c = b[i];
- final String[] d = c.split("=");
- if (d.length < 2)
- continue;
- params[i] = d;
- // params[i][0] = d[0];
- // params[i][1] = d[1];
- if (!d[0].equals("q"))
- continue;
- q = Float.valueOf(d[1]);
- }
- if (log.isDebugEnabled())
- log.debug("Considering: " + s + " :: q=" + q);
- this.q = q;
- }
-
- public String getMimeType() {
- return mimeType;
- }
-}
\ No newline at end of file
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -68,6 +68,7 @@
import com.bigdata.rdf.sail.webapp.BigdataRDFContext.AbstractQueryTask;
import com.bigdata.rdf.sail.webapp.BigdataRDFContext.RunningQuery;
import com.bigdata.rdf.sail.webapp.BigdataRDFContext.UpdateTask;
+import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue;
import com.bigdata.rdf.sparql.ast.ASTContainer;
import com.bigdata.rdf.sparql.ast.QueryRoot;
import com.bigdata.rdf.store.AbstractTripleStore;
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -50,6 +50,8 @@
import com.bigdata.rdf.sail.webapp.BigdataRDFContext.AbstractQueryTask;
import com.bigdata.rdf.sail.webapp.DeleteServlet.RemoveStatementHandler;
import com.bigdata.rdf.sail.webapp.InsertServlet.AddStatementHandler;
+import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue;
+import com.bigdata.rdf.sail.webapp.client.MiniMime;
/**
* Handler for NanoSparqlServer REST API UPDATE operations (PUT, not SPARQL
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java (from rev 6786, branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AST2SPARQLUtil.java)
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java (rev 0)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -0,0 +1,174 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2012. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+/*
+ * Created on Mar 5, 2012
+ */
+
+package com.bigdata.rdf.sail.webapp.client;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.openrdf.model.BNode;
+import org.openrdf.model.Literal;
+import org.openrdf.model.URI;
+import org.openrdf.model.Value;
+
+/**
+ * Utility class for externalizing SPARQL prefix declaration management.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public class AST2SPARQLUtil {
+
+ /**
+ * The prefix declarations used within the SERVICE clause (from the original
+ * query).
+ */
+ private final Map<String, String> prefixDecls;
+
+ /** Reverse map for {@link #prefixDecls}. */
+ private final Map<String, String> namespaces;
+
+ public AST2SPARQLUtil(final Map<String, String> prefixDecls) {
+
+ this.prefixDecls = prefixDecls;
+
+ if (prefixDecls != null) {
+
+ /*
+ * Build up a reverse map from namespace to prefix.
+ */
+
+ namespaces = new HashMap<String, String>();
+
+ for (Map.Entry<String, String> e : prefixDecls.entrySet()) {
+
+ namespaces.put(e.getValue(), e.getKey());
+
+ }
+
+ } else {
+
+ namespaces = null;
+
+ }
+
+ }
+
+ /**
+ * Return an external form for the {@link Value} suitable for direct
+ * embedding into a SPARQL query.
+ *
+ * @param val
+ * The value.
+ *
+ * @return The external form.
+ */
+ public String toExternal(final Value val) {
+
+ if (val instanceof URI) {
+
+ return toExternal((URI) val);
+
+ } else if (val instanceof Literal) {
+
+ return toExternal((Literal)val);
+
+ } else if (val instanceof BNode) {
+
+ return toExternal((BNode)val);
+
+ } else {
+
+ throw new AssertionError();
+
+ }
+
+ }
+
+ public String toExternal(final BNode bnd) {
+
+ final String id = bnd.stringValue();
+
+// final boolean isLetter = Character.isLetter(id.charAt(0));
+
+// return "_:" + (isLetter ? "" : "B") + id;
+ return "_:B" + id;
+
+ }
+
+ public String toExternal(final URI uri) {
+
+ if (prefixDecls != null) {
+
+ final String prefix = namespaces.get(uri.getNamespace());
+
+ if (prefix != null) {
+
+ return prefix + ":" + uri.getLocalName();
+
+ }
+
+ }
+
+ return "<" + uri.stringValue() + ">";
+
+ }
+
+ public String toExternal(final Literal lit) {
+
+ final String label = lit.getLabel();
+
+ final String languageCode = lit.getLanguage();
+
+ final URI datatypeURI = lit.getDatatype();
+
+ final String datatypeStr = datatypeURI == null ? null
+ : toExternal(datatypeURI);
+
+ final StringBuilder sb = new StringBuilder((label.length() + 2)
+ + (languageCode != null ? (languageCode.length() + 1) : 0)
+ + (datatypeURI != null ? datatypeStr.length() + 2 : 0));
+
+ sb.append('"');
+ sb.append(label);
+ sb.append('"');
+
+ if (languageCode != null) {
+ sb.append('@');
+ sb.append(languageCode);
+ }
+
+ if (datatypeURI != null) {
+ sb.append("^^");
+ sb.append(datatypeStr);
+ }
+
+ return sb.toString();
+
+ }
+
+}
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java 2012-12-22 16:45:25 UTC (rev 6798)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -30,7 +30,6 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -44,7 +43,7 @@
import org.openrdf.query.resultio.TupleQueryResultFormat;
import org.openrdf.rio.RDFFormat;
-import com.bigdata.rdf.ServiceProviderHook;
+//import com.bigdata.rdf.ServiceProviderHook;
/**
* Options for the HTTP connection.
@@ -89,7 +88,18 @@
static {
- ServiceProviderHook.forceLoad();
+ /**
+ * Note: This has been commented out. If it is included, then a lot of
+ * the total code base gets dragged into the bigdata-client JAR. If this
+ * creates a problem for clients, then we will need to examine the
+ * bigdata RDF model and bigdata RDF parser packages carefully and
+ * relayer them in order to decouple them from the rest of the code
+ * base.
+ *
+ * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/628" >
+ * Create a bigdata-client jar for the NSS REST API </a>
+ */
+// ServiceProviderHook.forceLoad();
/*
* FIXME We really need to know whether we are talking to a triple or
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java (from rev 6786, branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/EncodeDecodeValue.java)
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java (rev 0)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -0,0 +1,445 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+/*
+ * Created on Oct 13, 2011
+ */
+
+package com.bigdata.rdf.sail.webapp.client;
+
+import org.openrdf.model.BNode;
+import org.openrdf.model.Literal;
+import org.openrdf.model.Resource;
+import org.openrdf.model.URI;
+import org.openrdf.model.Value;
+import org.openrdf.model.impl.LiteralImpl;
+import org.openrdf.model.impl.URIImpl;
+
+/**
+ * Utility class to encode/decode RDF {@link Value}s for interchange with the
+ * REST API.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public class EncodeDecodeValue {
+
+// /*
+// * Note: The decode logic was derived from the JavaCharStream file generated
+// * by JavaCC.
+// */
+//
+// private static final int hexval(char c) {
+// switch (c) {
+// case '0':
+// return 0;
+// case '1':
+// return 1;
+// case '2':
+// return 2;
+// case '3':
+// return 3;
+// case '4':
+// return 4;
+// case '5':
+// return 5;
+// case '6':
+// return 6;
+// case '7':
+// return 7;
+// case '8':
+// return 8;
+// case '9':
+// return 9;
+//
+// case 'a':
+// case 'A':
+// return 10;
+// case 'b':
+// case 'B':
+// return 11;
+// case 'c':
+// case 'C':
+// return 12;
+// case 'd':
+// case 'D':
+// return 13;
+// case 'e':
+// case 'E':
+// return 14;
+// case 'f':
+// case 'F':
+// return 15;
+// }
+//
+// throw new AssertionError();
+// }
+//
+// private static class DecodeString {
+// private final StringBuilder sb = new StringBuilder();
+// private final String src;
+// private int srcpos = 0;
+// DecodeString(final String s) {
+// this.src = s;
+// }
+//
+// private char ReadByte() {
+// return src.charAt(srcpos++);
+// }
+//
+// private void backup(final int n) {
+//
+// sb.setLength(sb.length() - n);
+//
+// }
+//
+// /**
+// * Read a character.
+// *
+// * TODO Does not handle the 8 character escape code sequences (but
+// * neither does the SPARQL parser!)
+// */
+// private char readChar() throws java.io.IOException {
+// char c;
+//
+// sb.append(c = ReadByte());
+//
+// if (c == '\\') {
+//
+// int backSlashCnt = 1;
+//
+// for (;;) // Read all the backslashes
+// {
+//
+// try {
+// sb.append(c=ReadByte());
+// if (c != '\\') {
+// // found a non-backslash char.
+// if ((c == 'u') && ((backSlashCnt & 1) == 1)) {
+// if (--bufpos < 0)
+// bufpos = bufsize - 1;
+//
+// break;
+// }
+//
+// backup(backSlashCnt);
+// return '\\';
+// }
+// } catch (java.io.IOException e) {
+// // We are returning one backslash so we should only
+// // backup (count-1)
+// if (backSlashCnt > 1)
+// backup(backSlashCnt - 1);
+//
+// return '\\';
+// }
+//
+// backSlashCnt++;
+// }
+//
+// // Here, we have seen an odd number of backslash's followed by a
+// // 'u'
+// try {
+// while ((c = ReadByte()) == 'u') {}
+//
+// // Decode the code sequence.
+// c = (char) (hexval(c) << 12 | hexval(ReadByte()) << 8
+// | hexval(ReadByte()) << 4 | hexval(ReadByte()));
+//
+// sb.append(c);
+//
+// } catch (java.io.IOException e) {
+//
+// throw new Error("Invalid escape character");
+//
+// }
+//
+// if (backSlashCnt == 1)
+// return c;
+// else {
+// backup(backSlashCnt - 1);
+// return '\\';
+// }
+// } else {
+// return c;
+// }
+// }
+//
+// }
+//
+// /**
+// * Apply code point escape sequences for anything that we need to escape.
+// * For our purposes, this is just <code>"</code> and <code>></code>.
+// * @param s
+// * @return
+// *
+// * @see http://www.w3.org/TR/sparql11-query/#codepointEscape
+// */
+// static String encodeEscapeSequences(final String s) {
+//
+// return s;
+//
+// }
+//
+// /**
+// * Decode all code point escape sequences. Note that we need to decode more
+// * than we encode since we are not responsible for the encoding when it
+// * comes to the REST API, just the decoding.
+// *
+// * @param s
+// * The string, which may have escape sequences encoded.
+// *
+// * @return The string with escape sequences decoded.
+// *
+// * @throws IllegalArgumentException
+// * if the argument is <code>null</code>.
+// * @throws IllegalArgumentException
+// * if the argument is contains an ill-formed escape code
+// * sequence.
+// *
+// * @see http://www.w3.org/TR/sparql11-query/#codepointEscape
+// *
+// * FIXME Implement encode/decode.
+// */
+// static String decodeEscapeSequences(final String s) {
+//
+//// // Remove any escape sequences.
+//// final StringBuilder sb = new StringBuilder();
+//// for (int i = 0; i < slen; i++) {
+//// char ch = s.charAt(i);
+//// if (ch == '\\') {
+//// if (i + 1 == slen)
+//// throw new IllegalArgumentException(s);
+//// ch = s.charAt(i);
+//// }
+//// sb.append(ch);
+//// }
+//// final String t = sb.toString();
+//
+// return s;
+//
+// }
+
+ /**
+ * Decode a URI or Literal.
+ *
+ * @param s
+ * The value to be decoded.
+ *
+ * @return The URI or literal -or- <code>null</code> if the argument was
+ * <code>null</code>.
+ *
+ * @throws IllegalArgumentException
+ * if the request parameter could not be decoded as an RDF
+ * {@link Value}.
+ */
+ public static Value decodeValue(final String s) {
+
+ if(s == null)
+ return null;
+
+// final String s = decodeEscapeSequences(ss);
+
+ final int slen = s.length();
+
+ if (slen == 0)
+ throw new IllegalArgumentException("<Empty String>");
+
+ final char ch = s.charAt(0);
+
+ if(ch == '\"' || ch == '\'') {
+
+ /*
+ * Literal.
+ */
+
+ final int closeQuotePos = s.lastIndexOf(ch);
+
+ if (closeQuotePos == 0)
+ throw new IllegalArgumentException(s);
+
+ final String label = s.substring(1, closeQuotePos);
+
+ if (slen == closeQuotePos + 1) {
+
+ /*
+ * Plain literal.
+ */
+
+ return new LiteralImpl(label);
+
+ }
+
+ final char ch2 = s.charAt(closeQuotePos + 1);
+
+ if (ch2 == '@') {
+
+ /*
+ * Language code literal.
+ */
+
+ final String languageCode = s.substring(closeQuotePos + 2);
+
+ return new LiteralImpl(label, languageCode);
+
+ } else if (ch2 == '^') {
+
+ /*
+ * Datatype literal.
+ */
+
+ if (slen <= closeQuotePos + 2)
+ throw new IllegalArgumentException(s);
+
+ if (s.charAt(closeQuotePos + 2) != '^')
+ throw new IllegalArgumentException(s);
+
+ final String datatypeStr = s.substring(closeQuotePos + 3);
+
+ final URI datatypeURI = decodeURI(datatypeStr);
+
+ return new LiteralImpl(label,datatypeURI);
+
+ } else {
+
+ throw new IllegalArgumentException(s);
+
+ }
+
+ } else if (ch == '<') {
+
+ /*
+ * URI
+ */
+
+ if (s.charAt(slen - 1) != '>')
+ throw new IllegalArgumentException(s);
+
+ final String uriStr = s.substring(1, slen - 1);
+
+ return new URIImpl(uriStr);
+
+ } else {
+
+ throw new IllegalArgumentException(s);
+
+ }
+
+ }
+
+ /**
+ * Type safe variant for a {@link Resource}.
+ */
+ public static Resource decodeResource(final String param) {
+
+ final Value v = decodeValue(param);
+
+ if (v == null || v instanceof Resource)
+ return (Resource) v;
+
+ throw new IllegalArgumentException("Not a Resource: '" + param + "'");
+
+ }
+
+ /**
+ * Type safe variant for a {@link URI}.
+ */
+ public static URI decodeURI(final String param) {
+
+ final Value v = decodeValue(param);
+
+ if (v == null || v instanceof URI)
+ return (URI) v;
+
+ throw new IllegalArgumentException("Not an URI: '" + param + "'");
+
+ }
+
+ /**
+ * Encode an RDF {@link Value} as it should appear if used in a SPARQL
+ * query. E.g., a literal will look like <code>"abc"</code>,
+ * <code>"abc"@en</code> or
+ * <code>"3"^^xsd:int. A URI will look like <code><http://www.bigdata.com/></code>
+ * .
+ *
+ * @param v
+ * The value (optional).
+ *
+ * @return The encoded value -or- <code>null</code> if the argument is
+ * <code>null</code>.
+ *
+ * @throws IllegalArgumentException
+ * if the argument is a {@link BNode}.
+ */
+ public static String encodeValue(final Value v) {
+ if(v == null)
+ return null;
+ if (v instanceof BNode)
+ throw new IllegalArgumentException();
+ if (v instanceof URI) {
+ return "<" + v.stringValue() + ">";
+ }
+ if (v instanceof Literal) {
+ final Literal lit = (Literal) v;
+ final StringBuilder sb = new StringBuilder();
+ sb.append("\"");
+ sb.append(lit.getLabel());
+ sb.append("\"");
+ if (lit.getLanguage() != null) {
+ sb.append("@");
+ sb.append(lit.getLanguage());
+ }
+ if (lit.getDatatype() != null) {
+ sb.append("^^");
+ sb.append(encodeValue(lit.getDatatype()));
+ }
+ return sb.toString();
+ }
+ throw new AssertionError();
+ }
+
+ public static Resource[] decodeResources(final String[] strings) {
+ if (strings == null || strings.length == 0)
+ return null;
+
+ final Resource[] resources = new Resource[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ resources[i] = decodeResource(strings[i]);
+ }
+
+ return resources;
+ }
+
+ public static String[] encodeValues(final Value[] values) {
+ if (values == null || values.length == 0)
+ return null;
+
+ final String[] strings = new String[values.length];
+ for (int i = 0; i < values.length; i++) {
+ strings[i] = encodeValue(values[i]);
+ }
+
+ return strings;
+ }
+
+}
Added: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IMimeTypes.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IMimeTypes.java (rev 0)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IMimeTypes.java 2012-12-22 18:14:00 UTC (rev 6799)
@@ -0,0 +1,46 @@
+/**
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+package com.bigdata.rdf.sail.webapp.client;
+
+/**
+ * Common MIME types for dynamic content.
+ */
+public interface IMimeTypes {
+
+ public String
+ MIME_TEXT_PLAIN = "text/plain",
+ MIME_TEXT_HTML = "text/html",
+// MIME_TEXT_XML = "text/xml",
+ /**
+ * General purpose binary <code>application/octet-stream</code>.
+ */
+ MIME_DEFAULT_BINARY = "application/octet-stream",
+ MIME_APPLICATION_XML = "application/xml",
+ MIME_TEXT_JAVASCRIPT = "text/javascript",
+ /**
+ * The traditional encoding of URL query parameters within a POST
+ * message body.
+ */
+ MIME_APPLICATION_URL_ENCODED = "application/x-www-form-urlencoded";
+
+}
Modified: b...
[truncated message content] |
|
From: <tho...@us...> - 2012-12-22 16:45:37
|
Revision: 6798
http://bigdata.svn.sourceforge.net/bigdata/?rev=6798&view=rev
Author: thompsonbry
Date: 2012-12-22 16:45:25 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
update to the web.xml template to document the ability to override the location of the bigdata property file using an environment variable.
@see https://sourceforge.net/apps/trac/bigdata/ticket/627
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-war/src/resources/WEB-INF/web.xml
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-war/src/resources/WEB-INF/web.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-war/src/resources/WEB-INF/web.xml 2012-12-22 14:48:06 UTC (rev 6797)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-war/src/resources/WEB-INF/web.xml 2012-12-22 16:45:25 UTC (rev 6798)
@@ -16,7 +16,12 @@
which you start the servlet container so you may have to edit it for your
installation, e.g., by specifying an absolution path. Also, it is a good
idea to review the RWStore.properties file as well and specify the location
- of the database file on which it will persist your data.</description>
+ of the database file on which it will persist your data.
+
+ Note: You MAY override this parameter using
+ "-Dcom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile=FILE"
+ when starting the servlet container.
+ </description>
</context-param>
<context-param>
<param-name>namespace</param-name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-22 14:48:19
|
Revision: 6797
http://bigdata.svn.sourceforge.net/bigdata/?rev=6797&view=rev
Author: thompsonbry
Date: 2012-12-22 14:48:06 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Modified the webapp to allow specification of the bigdata journal property file through an OS environment variable override:
-Dcom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile=FILE
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-21 17:05:47 UTC (rev 6796)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-22 14:48:06 UTC (rev 6797)
@@ -150,13 +150,29 @@
} else {
- /*
+ /**
* The index manager will be open based on the specified property
* file or config file.
+ *
+ * Note: You may override the location of the property file using
+ * <pre>
+ * -Dcom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile=FILE
+ * </pre>
*/
- final String propertyFile = context
+ // The fully qualified name of the environment variable.
+ final String FQN_PROPERTY_FILE = ConfigParams.class.getName() + "."
+ + ConfigParams.PROPERTY_FILE;
+
+ // The default value is taken from the web.xml file.
+ final String defaultValue = context
.getInitParameter(ConfigParams.PROPERTY_FILE);
+
+ // The effective location of the property file.
+ final String propertyFile = System.getProperty(//
+ FQN_PROPERTY_FILE,//
+ defaultValue//
+ );
if (propertyFile == null)
throw new RuntimeException("Required config-param: "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 17:05:55
|
Revision: 6796
http://bigdata.svn.sourceforge.net/bigdata/?rev=6796&view=rev
Author: thompsonbry
Date: 2012-12-21 17:05:47 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Bug fix for stack trace reported if log @ INFO on NSS startup. (fix already applied in READ_CACHE branch).
{{{
[java] WARN : BigdataRDFContext.java:2149: commitTime: -1
[java] java.lang.IllegalArgumentException: commitTime: -1
[java] at com.bigdata.journal.TimestampUtility.asHistoricalRead(TimestampUtility.java:162)
[java] at com.bigdata.sparse.GlobalRowStoreHelper.get(GlobalRowStoreHelper.java:182)
[java] at com.bigdata.journal.Journal.getGlobalRowStore(Journal.java:2061)
[java] at com.bigdata.rdf.sail.webapp.BigdataRDFContext.getKBInfo(BigdataRDFContext.java:2031)
[java] at com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener.contextInitialized(BigdataRDFServletContextListener.java:294)
[java] at org.eclipse.jetty.server.handler.ContextHandler.startContext(ContextHandler.java:641)
[java] at org.eclipse.jetty.servlet.ServletContextHandler.startContext(ServletContextHandler.java:228)
[java] at org.eclipse.jetty.server.handler.ContextHandler.doStart(ContextHandler.java:584)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at org.eclipse.jetty.server.handler.HandlerCollection.doStart(HandlerCollection.java:226)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at org.eclipse.jetty.server.handler.HandlerWrapper.doStart(HandlerWrapper.java:93)
[java] at org.eclipse.jetty.server.Server.doStart(Server.java:243)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at com.bigdata.rdf.sail.webapp.NanoSparqlServer.main(NanoSparqlServer.java:284)
[java] INFO : BigdataRDFServletContextListener.java:294:
}}}
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-21 17:04:32 UTC (rev 6795)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-21 17:05:47 UTC (rev 6796)
@@ -291,8 +291,11 @@
/*
* Log some information about the default kb (#of statements, etc).
*/
+ final long effectiveTimestamp = config.timestamp == ITx.READ_COMMITTED ? indexManager
+ .getLastCommitTime() : config.timestamp;
log.info("\n"
- + rdfContext.getKBInfo(config.namespace, config.timestamp));
+ + rdfContext
+ .getKBInfo(config.namespace, effectiveTimestamp));
}
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 17:04:42
|
Revision: 6795
http://bigdata.svn.sourceforge.net/bigdata/?rev=6795&view=rev
Author: thompsonbry
Date: 2012-12-21 17:04:32 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Bug fix for stack trace reported if log @ INFO on NSS startup. I will port this fix to the dev branch as well.
{{{
[java] WARN : BigdataRDFContext.java:2149: commitTime: -1
[java] java.lang.IllegalArgumentException: commitTime: -1
[java] at com.bigdata.journal.TimestampUtility.asHistoricalRead(TimestampUtility.java:162)
[java] at com.bigdata.sparse.GlobalRowStoreHelper.get(GlobalRowStoreHelper.java:182)
[java] at com.bigdata.journal.Journal.getGlobalRowStore(Journal.java:2061)
[java] at com.bigdata.rdf.sail.webapp.BigdataRDFContext.getKBInfo(BigdataRDFContext.java:2031)
[java] at com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener.contextInitialized(BigdataRDFServletContextListener.java:294)
[java] at org.eclipse.jetty.server.handler.ContextHandler.startContext(ContextHandler.java:641)
[java] at org.eclipse.jetty.servlet.ServletContextHandler.startContext(ServletContextHandler.java:228)
[java] at org.eclipse.jetty.server.handler.ContextHandler.doStart(ContextHandler.java:584)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at org.eclipse.jetty.server.handler.HandlerCollection.doStart(HandlerCollection.java:226)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at org.eclipse.jetty.server.handler.HandlerWrapper.doStart(HandlerWrapper.java:93)
[java] at org.eclipse.jetty.server.Server.doStart(Server.java:243)
[java] at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:55)
[java] at com.bigdata.rdf.sail.webapp.NanoSparqlServer.main(NanoSparqlServer.java:284)
[java] INFO : BigdataRDFServletContextListener.java:294:
}}}
Modified Paths:
--------------
branches/READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
Modified: branches/READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
===================================================================
--- branches/READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-21 16:41:42 UTC (rev 6794)
+++ branches/READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2012-12-21 17:04:32 UTC (rev 6795)
@@ -291,8 +291,11 @@
/*
* Log some information about the default kb (#of statements, etc).
*/
+ final long effectiveTimestamp = config.timestamp == ITx.READ_COMMITTED ? indexManager
+ .getLastCommitTime() : config.timestamp;
log.info("\n"
- + rdfContext.getKBInfo(config.namespace, config.timestamp));
+ + rdfContext
+ .getKBInfo(config.namespace, effectiveTimestamp));
}
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 16:41:52
|
Revision: 6794
http://bigdata.svn.sourceforge.net/bigdata/?rev=6794&view=rev
Author: thompsonbry
Date: 2012-12-21 16:41:42 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
javadoc
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 16:26:53 UTC (rev 6793)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 16:41:42 UTC (rev 6794)
@@ -60,6 +60,7 @@
import com.bigdata.io.FileChannelUtility;
import com.bigdata.io.IBufferAccess;
import com.bigdata.io.IReopenChannel;
+import com.bigdata.io.writecache.WriteCacheService.AsynchronousCloseException;
import com.bigdata.journal.AbstractBufferStrategy;
import com.bigdata.journal.IRootBlockView;
import com.bigdata.journal.StoreTypeEnum;
@@ -2950,32 +2951,65 @@
// release();
// }
// }
-
- public ByteBuffer allocate(final int nbytes) throws IllegalStateException,
- InterruptedException {
- final ByteBuffer tmp = acquire(); // tmp=null possible on current
- // close() of WriteCache.
- try {
- // if(tmp==null&&isClosed()) throw new AsyncClosedException; // if
- // we have one for the WCS.
- synchronized (tmp) {
- if (remaining() > nbytes) {
- final int pos = tmp.position();
- tmp.position(pos + nbytes);
- final ByteBuffer ret = tmp.duplicate();
- ret.position(pos);
- ret.limit(pos+nbytes);
-
- return ret;
- } else {
- return null;
- }
- }
- } finally {
- release();
- }
- }
+ /**
+ * Allocate space for a record of the given length on this
+ * {@link WriteCache}.
+ *
+ * @param nbytes
+ * The size of the record.
+ *
+ * @return A view of the allocation on the {@link WriteCache} -or-
+ * <code>null</code> if there is not enough room in this
+ * {@link WriteCache} for the allocation.
+ *
+ * @throws IllegalStateException
+ * if the {@link WriteCache} has been {@link #close() closed}.
+ * @throws InterruptedException
+ * if the lock could not be acquired.
+ */
+ public ByteBuffer allocate(final int nbytes) throws IllegalStateException,
+ InterruptedException {
+
+ final ByteBuffer tmp = acquire();
+
+ try {
+
+ synchronized (tmp) {
+
+ if (remaining() > nbytes) {
+
+ // [pos] the position of the new allocation.
+ final int pos = tmp.position();
+
+ // Advance position() beyond the new allocation.
+ tmp.position(pos + nbytes);
+
+ // Dup the buffer for independent pos and limit.
+ final ByteBuffer ret = tmp.duplicate();
+
+ // Setup view onto new allocation.
+ ret.position(pos);
+ ret.limit(pos + nbytes);
+
+ // Return view.
+ return ret;
+
+ } else {
+
+ return null;
+
+ }
+
+ }
+
+ } finally {
+
+ release();
+
+ }
+
+ }
void commitToMap(final long offset, final int position, final int nbytes) {
final RecordMetadata md = new RecordMetadata(offset, position,
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 16:26:53 UTC (rev 6793)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 16:41:42 UTC (rev 6794)
@@ -3547,8 +3547,16 @@
assert willInstall == false;
return _readFromLocalDiskIntoNewHeapByteBuffer(offset, nbytes);
}
-
+
+ /*
+ * [bb] is a view onto an allocation on [theCache] into which we can
+ * install the read.
+ */
+
+ // The offset into [bb] of the allocation.
final int pos = bb.position();
+
+ // Read the record from the disk into NIO buffer.
final ByteBuffer ret = reader.readRaw(offset, bb);
// update record maps
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 16:27:03
|
Revision: 6793
http://bigdata.svn.sourceforge.net/bigdata/?rev=6793&view=rev
Author: thompsonbry
Date: 2012-12-21 16:26:53 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Working on read cache counters.
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java 2012-12-21 16:20:48 UTC (rev 6792)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java 2012-12-21 16:26:53 UTC (rev 6793)
@@ -25,6 +25,7 @@
import com.bigdata.io.writecache.WriteCache.ReadCache;
import com.bigdata.io.writecache.WriteCacheService.WriteTask;
+import com.bigdata.util.concurrent.Memoizer;
/**
* Interface declaring the counters exposed by the {@link WriteCacheService} .
@@ -128,6 +129,7 @@
/*
* ReadCache counters.
*/
+
/**
* The #of read requests that were a miss in the cache and resulted in a
* read through to the disk where the record was NOT installed into the read
@@ -136,5 +138,11 @@
* {@link ReadCache} block to install the read).
*/
String NREAD_NOT_INSTALLED = "nreadNotInstalled";
-
+
+ /**
+ * The current size of the {@link Memoizer}'s internal cache that is used to
+ * serialize reads against a given byte offset on the backing file.
+ */
+ String MEMO_CACHE_SIZE = "memoCacheSize";
+
} // interface IWriteCacheCounters
\ No newline at end of file
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 16:20:48 UTC (rev 6792)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 16:26:53 UTC (rev 6793)
@@ -3334,15 +3334,15 @@
}
-// /**
-// * The approximate size of the cache (used solely for debugging to
-// * detect cache leaks).
-// */
-// int size() {
-//
-// return cache.size();
-//
-// }
+ /**
+ * The approximate size of the cache (used solely for debugging to
+ * detect cache leaks).
+ */
+ int size() {
+
+ return cache.size();
+
+ }
/**
* Called by the thread which atomically installs the record into the
@@ -3392,6 +3392,8 @@
try {
+ counters.get().memoCacheSize.set(memo.size());
+
return memo.compute(new LoadRecordRequest(this, offset, nbytes));
} catch (InterruptedException e) {
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java 2012-12-21 16:20:48 UTC (rev 6792)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java 2012-12-21 16:26:53 UTC (rev 6793)
@@ -138,6 +138,8 @@
*/
public final CAT nreadNotInstalled = new CAT();
+ public final CAT memoCacheSize = new CAT();
+
public WriteCacheServiceCounters(final int nbuffers,
final int dirtyListThreshold, final int compactingThreshold) {
@@ -231,12 +233,22 @@
}
});
+ /*
+ * Read Cache.
+ */
+
root.addCounter(NREAD_NOT_INSTALLED, new Instrument<Long>() {
public void sample() {
setValue(nreadNotInstalled.get());
}
});
+ root.addCounter(MEMO_CACHE_SIZE, new Instrument<Long>() {
+ public void sample() {
+ setValue(memoCacheSize.get());
+ }
+ });
+
return root;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 16:21:00
|
Revision: 6792
http://bigdata.svn.sourceforge.net/bigdata/?rev=6792&view=rev
Author: thompsonbry
Date: 2012-12-21 16:20:48 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Some cleanup of counters.
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java 2012-12-21 14:51:09 UTC (rev 6791)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IWriteCacheServiceCounters.java 2012-12-21 16:20:48 UTC (rev 6792)
@@ -23,6 +23,7 @@
*/
package com.bigdata.io.writecache;
+import com.bigdata.io.writecache.WriteCache.ReadCache;
import com.bigdata.io.writecache.WriteCacheService.WriteTask;
/**
@@ -124,4 +125,16 @@
*/
String MB_PER_SEC = "mbPerSec";
+ /*
+ * ReadCache counters.
+ */
+ /**
+ * The #of read requests that were a miss in the cache and resulted in a
+ * read through to the disk where the record was NOT installed into the read
+ * cache (either because there is no read cache, because the record is too
+ * large for the read cache, or because the thread could not obtain a
+ * {@link ReadCache} block to install the read).
+ */
+ String NREAD_NOT_INSTALLED = "nreadNotInstalled";
+
} // interface IWriteCacheCounters
\ No newline at end of file
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 14:51:09 UTC (rev 6791)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 16:20:48 UTC (rev 6792)
@@ -41,7 +41,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 14:51:09 UTC (rev 6791)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 16:20:48 UTC (rev 6792)
@@ -2146,7 +2146,7 @@
final WriteCache nxt = cleanList.take();
counters.get().nclean--;
- // FIXME: should already be pristine
+ // Note: should already be pristine
nxt.resetWith(serviceMap);//, fileExtent.get());
current.set(nxt);
if (haLog.isInfoEnabled())
@@ -2992,14 +2992,12 @@
if (tmp != null) {
- counters.get().nclean--; // FIXME [nclean] is for the write cache,
- // not the read cache.
-
try {
/*
* Attempt to reset the record.
*
- * FIXME: add hot readCache data to hotCache
+ * FIXME: add hot readCache data to hotCache and track metadata
+ * about #of hot records retained in WCS counters.
*/
tmp.resetWith(serviceMap);
} catch (InterruptedException ex) {
@@ -3032,8 +3030,6 @@
* the service is already closed NOR if there is an asynchronous close of
* the service. Instead it just returns <code>null</code> to indicate a
* cache miss.
- *
- * FIXME Change method signature to readRaw()?
*/
public ByteBuffer read(final long offset, final int nbytes)
throws InterruptedException, ChecksumError {
@@ -3051,35 +3047,41 @@
// Cache miss.
counters.get().nmiss.increment();
- // If we have a reader to enable callbacks then schedule concurrent read
if (reader != null) {
- // Read through to the disk and install the record into cache.
- return loadRecord(offset, nbytes);
+
+ /*
+ * Read through to the disk and install the record into cache.
+ */
+ return loadRecord(offset, nbytes);
+
} else {
- return null;
+
+ /*
+ * No reader. Return null. Caller is responsible for reading through
+ * to the disk.
+ */
+
+ return null;
+
}
}
- /** Attempt to read record from cache (either write cache or read cache depending on the service map state). */
+
+ /**
+ * Attempt to read record from cache (either write cache or read cache
+ * depending on the service map state).
+ */
private ByteBuffer _readFromCache(final long offset, final int nbytes)
throws ChecksumError, InterruptedException {
-
+
if (nbytes > capacity) {
/*
* Note: Writes larger than a single write cache buffer are NOT
* cached.
- *
- * FIXME Martyn: Verify condition for edge cases (checksum is in the
- * record count and prefixWrites are only used with the RWS and the
- * RWS does not do large record writes so I think that this
- * condition is correct - BT). [Consider extracting
- * isLargeRecord(nbytes) and using here and in write() and in
- * _getRecord() which also needs to avoid installing a large record
- * into the read cache.]
*/
return null;
}
-
+
final Long off = Long.valueOf(offset);
while (true) {
@@ -3112,12 +3114,17 @@
final ByteBuffer ret = cache.read(off.longValue(), nbytes);
- if (ret == null && serviceMap.get(off) == cache) {
- throw new IllegalStateException("Inconsistent cache for offset: " + off);
- }
+ if (ret == null && serviceMap.get(off) == cache) {
- if (ret == null && log.isDebugEnabled()) {
+ throw new IllegalStateException(
+ "Inconsistent cache for offset: " + off);
+
+ }
+
+ if (ret == null && log.isDebugEnabled()) {
+
log.debug("WriteCache out of sync with WriteCacheService");
+
}
if (ret != null) {
@@ -3223,13 +3230,11 @@
* Note: This class must implement equals() and hashCode() since it is used
* within the {@link Memoizer} pattern.
*/
- static class LoadRecordRequest {
+ private static class LoadRecordRequest {
final WriteCacheService service;
final long offset;
final int nbytes;
-
- boolean evalOnce = true;
public LoadRecordRequest(final WriteCacheService service,
final long offset, final int nbytes) {
@@ -3275,10 +3280,11 @@
*/
final private static Computable<LoadRecordRequest, ByteBuffer> loadChild = new Computable<LoadRecordRequest, ByteBuffer>() {
- /**
+ /**
* Loads a record from the specified address.
*
- * @return A heap {@link ByteBuffer} containing the data for that record.
+ * @return A heap {@link ByteBuffer} containing the data for that
+ * record.
*
* @throws IllegalArgumentException
* if addr is {@link IRawStore#NULL}.
@@ -3287,10 +3293,6 @@
throws InterruptedException {
try {
- if (!req.evalOnce) {
- throw new AssertionError("Some guarantee that proved!");
- }
- req.evalOnce = false;
return req.service._getRecord(req.offset, req.nbytes);
@@ -3381,7 +3383,7 @@
* same record will wait on the {@link Future} for the thread doing
* the work.
*/
- final ReadMemoizer memo;
+ private final ReadMemoizer memo;
/**
* Enter the memoizer pattern.
@@ -3540,7 +3542,6 @@
* No free buffer to install the read. Read directly into a heap
* ByteBuffer and return that to the caller.
*/
- // TODO counter.
assert willInstall == false;
return _readFromLocalDiskIntoNewHeapByteBuffer(offset, nbytes);
}
@@ -3587,7 +3588,6 @@
private final ByteBuffer _readFromLocalDiskIntoNewHeapByteBuffer(
final long offset, final int nbytes) {
- // TODO Put counter on #of reads w/ installs.
if (log.isDebugEnabled())
log.debug("Allocating direct, nbytes: " + nbytes);
@@ -3604,6 +3604,9 @@
+ ",expected=" + tstchk + ",actual=" + chk);
ret.limit(nbytes - 4);
+
+ // This read was not installed into the read cache.
+ counters.get().nreadNotInstalled.increment();
return ret;
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java 2012-12-21 14:51:09 UTC (rev 6791)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheServiceCounters.java 2012-12-21 16:20:48 UTC (rev 6792)
@@ -25,9 +25,11 @@
import java.util.concurrent.TimeUnit;
+import com.bigdata.counters.CAT;
import com.bigdata.counters.CounterSet;
import com.bigdata.counters.Instrument;
import com.bigdata.counters.OneShotInstrument;
+import com.bigdata.io.writecache.WriteCache.ReadCache;
import com.bigdata.io.writecache.WriteCacheService.WriteTask;
import com.bigdata.rawstore.Bytes;
@@ -127,6 +129,15 @@
*/
public volatile long nclearAddrCleared;
+ /**
+ * The #of read requests that were a miss in the cache and resulted in a
+ * read through to the disk where the record was NOT installed into the read
+ * cache (either because there is no read cache, because the record is too
+ * large for the read cache, or because the thread could not obtain a
+ * {@link ReadCache} block to install the read).
+ */
+ public final CAT nreadNotInstalled = new CAT();
+
public WriteCacheServiceCounters(final int nbuffers,
final int dirtyListThreshold, final int compactingThreshold) {
@@ -220,6 +231,12 @@
}
});
+ root.addCounter(NREAD_NOT_INSTALLED, new Instrument<Long>() {
+ public void sample() {
+ setValue(nreadNotInstalled.get());
+ }
+ });
+
return root;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-21 14:51:18
|
Revision: 6791
http://bigdata.svn.sourceforge.net/bigdata/?rev=6791&view=rev
Author: thompsonbry
Date: 2012-12-21 14:51:09 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Commit back to Martyn - working on critical section in _getRecord().
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IBackingReader.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IBackingReader.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IBackingReader.java 2012-12-21 10:01:05 UTC (rev 6790)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/IBackingReader.java 2012-12-21 14:51:09 UTC (rev 6791)
@@ -36,6 +36,21 @@
*/
public interface IBackingReader {
+ /**
+ * Read on the backing file, installing the record into the caller's buffer.
+ * {@link ByteBuffer#remaining()} bytes will be read into the caller's
+ * buffer, starting at the specified offset in the backing file.
+ *
+ * @param offset
+ * The offset of the first byte (relative to the start of the
+ * data region).
+ * @param dst
+ * Where to put the data. Bytes will be written at position until
+ * limit.
+ *
+ * @return The caller's buffer, prepared for reading back the installed
+ * record.
+ */
public ByteBuffer readRaw(long offset, ByteBuffer dst);
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 10:01:05 UTC (rev 6790)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-21 14:51:09 UTC (rev 6791)
@@ -2098,6 +2098,7 @@
/**
* Overide clearAddrMap for read cache to always remove from the record map.
*/
+ @Override
/* public */boolean clearAddrMap(final long addr, final int latchedAddr)
throws IllegalStateException, InterruptedException {
@@ -2111,12 +2112,29 @@
/**
* ReadCache is always closedForWrites
*/
+ @Override
public boolean isClosedForWrites() {
return true;
}
+
+ @Override
+ public void closeForWrites() {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ boolean write(final long offset, final ByteBuffer data, final int chk,
+ boolean writeChecksum, final int latchedAddr)
+ throws InterruptedException {
+
+ throw new UnsupportedOperationException();
+
+ }
+
}
/**
@@ -2987,6 +3005,7 @@
* @return current reference count
*/
public int incrementReferenceCount() {
+ // Note: Used from critical sections. Nothing interruptable here!
return m_referenceCount.incrementAndGet();
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 10:01:05 UTC (rev 6790)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 14:51:09 UTC (rev 6791)
@@ -78,6 +78,7 @@
import com.bigdata.rawstore.IRawStore;
import com.bigdata.rwstore.RWStore;
import com.bigdata.util.ChecksumError;
+import com.bigdata.util.ChecksumUtility;
import com.bigdata.util.InnerCause;
import com.bigdata.util.concurrent.Computable;
import com.bigdata.util.concurrent.DaemonThreadFactory;
@@ -2980,18 +2981,45 @@
}
+ /**
+ * Non-blocking take of a {@link ReadCache}. If successful, the returned
+ * {@link ReadCache} will be clean.
+ */
private ReadCache getDirectReadCache() throws InterruptedException {
+
+ // Non-blocking take.
final ReadCache tmp = readList.poll();
if (tmp != null) {
- counters.get().nclean--;
-
- // FIXME: add hot readCache data to hotCache
- tmp.resetWith(serviceMap);
- }
-
-
+ counters.get().nclean--; // FIXME [nclean] is for the write cache,
+ // not the read cache.
+
+ try {
+ /*
+ * Attempt to reset the record.
+ *
+ * FIXME: add hot readCache data to hotCache
+ */
+ tmp.resetWith(serviceMap);
+ } catch (InterruptedException ex) {
+ /*
+ * If interrupted, then return the ReadCache to the list and
+ * propagate the interrupt to the caller. This makes the
+ * operation safe with respect to an interrupt. Either the
+ * operation succeeds fully, or we return [null] to the caller
+ * and propagate restore the interrupt status on the current
+ * Thread.
+ */
+ readList.put(tmp);
+ // Propagate the interrupt status.
+ Thread.currentThread().interrupt();
+ // ReadCache is not available.
+ return null;
+ }
+
+ }
+
return tmp;
}
@@ -3032,7 +3060,7 @@
}
}
-
+ /** Attempt to read record from cache (either write cache or read cache depending on the service map state). */
private ByteBuffer _readFromCache(final long offset, final int nbytes)
throws ChecksumError, InterruptedException {
@@ -3384,18 +3412,13 @@
*
* @param offset
* @param nbytes
- * @return
+ * @return A heap byte buffer containing the read record.
* @throws IllegalStateException
* @throws InterruptedException
*/
private ByteBuffer _getRecord(final long offset, final int nbytes)
throws IllegalStateException, InterruptedException {
- // Large records are not cached but DO use the memoizer load
- // assert nbytes <= capacity;
-
- // FIXME: are there still synchronization holes here and Interrupt problems?
-
/*
* On entry, this thread will either install the read into the cache or
* the record will already be in the cache. We are protected by the
@@ -3407,6 +3430,7 @@
if (tmp != null) {
+ // Already in the read cache.
return tmp;
}
@@ -3414,114 +3438,177 @@
final boolean largeRecord = nbytes > capacity;
final boolean directRead = largeRecord || this.readListSize == 0;
- /*
- * The reader threads co-operatively manage the readCache on behalf of the
- * WCS. The allocation attempt for a cache buffer is serialized and when
- * an allocation fails a new readCache is initialized and the previous cache
- * reference is decremented (no longer referenced as the current read cache).
- *
- * When a cache is selected to buffer a read, the reference is incremented while
- * the read is active.
- *
- * When the reference is finally decremented to zero (either at the end of a read
- * or after a failed allocation) the cache can be returned to the clean list.
- */
+ if (directRead) {
+
+ // No free buffer to install the read (OR largeRecord)
+ return _readFromLocalDiskIntoNewHeapByteBuffer(offset, nbytes);
- // WriteCache.referenceCount := 0 ; // on reset() and init().
+ }
+
+ /*
+ * The reader threads co-operatively manage the readCache on behalf of
+ * the WCS. The allocation attempt for a cache buffer is serialized and
+ * when an allocation fails a new readCache is initialized and the
+ * previous cache reference is decremented (no longer referenced as the
+ * current read cache).
+ *
+ * When a cache is selected to buffer a read, the reference is
+ * incremented while the read is active.
+ *
+ * When the reference is finally decremented to zero (either at the end
+ * of a read or after a failed allocation) the cache can be returned to
+ * the clean list.
+ */
+
+ // The cache block into which we will install the record.
ReadCache theCache = null;
+ // The buffer slice into which we will install the record.
ByteBuffer bb = null;
- if (!directRead) {
- synchronized (readCache) {
-
- theCache = readCache.get();
- // if(theCache==null&&isClosed()) throw new
- // AsyncClosedException();
- // // iff one defined.
- assert theCache != null;
- assert theCache.isClosedForWrites(); // always for the cleanList
- // and
- // readCache.
- assert theCache.getReferenceCount() > 0;
+ /*
+ * Set true iff we will install a record and have incremented the
+ * reference count for the cache. if true, then this Thread MUST
+ * decrement the reference count by any code path that leaves this
+ * method. (If a obtain an allocation but do not set this flag, then we
+ * will not actually perform the installation and the cache block will
+ * not be pinned.)
+ */
+ boolean willInstall = false;
+ try {
+ synchronized (readCache) {
+ theCache = readCache.get();
+ if (theCache != null) {
+ /*
+ * Attempt to allocate record on current read cache.
+ */
+ assert theCache.getReferenceCount() > 0;
+ bb = theCache.allocate(nbytes); // intr iff can't lock().
+ if (bb != null) {
+ // increment while readCache synchronized
+ theCache.incrementReferenceCount();
+ willInstall = true;
+ } else {
+ /*
+ * At this point, the current [readCache] does not have
+ * enough room to install the record. We will clear the
+ * [readCache] reference and transfer it to the
+ * [readList].
+ *
+ * *** CRITICAL SECTION ***
+ *
+ * We MUST transfer cache once reference is cleared or
+ * the buffer will be lost!
+ *
+ * Note: Anything on the readList MUST have
+ * referenceCount==0 since we do not transfer to the
+ * readList until that condition is met.
+ */
+ readCache.set(null);
+ if (theCache.decrementReferenceCount() == 0) {
+ readList.add(theCache);
+ }
+ }
+ }
+ if (bb == null) {
+ /*
+ * Either no [readCache] on entry or no room in current
+ * [readCache] and [readCache] was set to [null].
+ */
+ assert readCache.get() == null; // pre-condition.
+ final ReadCache newCache = getDirectReadCache(); // non-blocking take
+ if (newCache != null) {
+ assert newCache.getReferenceCount() == 0;
+ { // CRITICAL SECTION
+ // Pre-increment the new [readCache].
+ newCache.incrementReferenceCount();
+ // Set read cache reference.
+ readCache.set(newCache/* newValue */);
+ }
+ // guaranteed to succeed unless interrupted
+ bb = newCache.allocate(nbytes);
+ theCache = newCache;
+ { // CRITICAL SECTION.
+ // increment while readCache synchronized
+ theCache.incrementReferenceCount();
+ willInstall = true;
+ }
+ }
+ }
+ } // synchronized(readCache)
+
+ if (bb == null) {
+ /*
+ * No free buffer to install the read. Read directly into a heap
+ * ByteBuffer and return that to the caller.
+ */
+ // TODO counter.
+ assert willInstall == false;
+ return _readFromLocalDiskIntoNewHeapByteBuffer(offset, nbytes);
+ }
+
+ final int pos = bb.position();
+ final ByteBuffer ret = reader.readRaw(offset, bb);
+
+ // update record maps
+ theCache.commitToMap(offset, pos, nbytes);
+ serviceMap.put(offset, theCache);
+
+ // must copy to heap buffer from cache, allowing for checksum
+ final byte[] b = new byte[nbytes - 4];
+ ret.get(b);
+
+ return ByteBuffer.wrap(b);
- {
- bb = theCache.allocate(nbytes);
- if (bb == null) {
- // current readCache is no good for us - no room in
- // buffer
- readCache.set(null);
-
- if (theCache.decrementReferenceCount() == 0) {
- // handle case where no concurrent install.
- readList.add(theCache);
- }
+ } finally {
+ /*
+ * CRITICAL SECTION. If [willInstall] then we are responsible for
+ * this ReadCache and MUST decrement the counter.
+ */
+ if (willInstall && theCache.decrementReferenceCount() == 0) {
+ readList.add(theCache);
+ // END CRITICAL SECTION.
+ if (theCache == readCache.get())
+ throw new AssertionError();
+ }
+ }
+
+ }
- final ReadCache newCache = getDirectReadCache(); // non-blocking
- // take
- if (newCache != null) {
- // FIXME: resetWith should be a NOP
- newCache.resetWith(serviceMap); // read for writes
+ /**
+ * Read through to the backing file.
+ *
+ * @param offset
+ * The byte offset of the record on the backing file.
+ * @param nbytes
+ * The #of bytes to be read.
+ *
+ * @return The installed record in a newly allocated heap {@link ByteBuffer}
+ * .
+ */
+ private final ByteBuffer _readFromLocalDiskIntoNewHeapByteBuffer(
+ final long offset, final int nbytes) {
- newCache.closeForWrites(); // flag as read cache
+ // TODO Put counter on #of reads w/ installs.
+ if (log.isDebugEnabled())
+ log.debug("Allocating direct, nbytes: " + nbytes);
- // Add reference for readCache
- if (newCache.incrementReferenceCount() != 1)
- throw new AssertionError();
+ final ByteBuffer ret = reader.readRaw(offset,
+ ByteBuffer.allocate(nbytes));
- if (!readCache.compareAndSet(null/* expect */,
- newCache/* newValue */))
- throw new AssertionError();
+ final int chk = ChecksumUtility.getCHK().checksum(ret.array(),
+ 0/* offset */, nbytes - 4/* len */); // read checksum
- bb = newCache.allocate(nbytes);
- theCache = newCache;
- }
-
- }
-
- if (bb != null) { // must be incremented while readCache
- // synchronized
- theCache.incrementReferenceCount();
- }
-
- }
- }
- }
-
- if (bb == null) {
- // No free buffer to install the read (OR largeRecord)
- // TODO Put counter on #of reads w/ installs.
- if (log.isDebugEnabled())
- log.debug("Allocating direct, nbytes: " + nbytes);
-
- // TODO: checksum check
- bb = ByteBuffer.allocate(nbytes);
-
- final ByteBuffer ret = reader.readRaw(offset, bb);
- ret.limit(nbytes-4);
-
- return ret;
- }
-
- final int pos = bb.position();
- final ByteBuffer ret = reader.readRaw(offset, bb);
-
- // update record maps
- theCache.commitToMap(offset, pos, nbytes);
- serviceMap.put(offset, theCache);
-
- // must copy to heap buffer from cache, allowing for checksum
- final byte[] b = new byte[nbytes-4];
- ret.get(b);
+ final int tstchk = ret.getInt(nbytes - 4);
- if (theCache.decrementReferenceCount() == 0) {
- if (theCache == readCache.get())
- throw new AssertionError();
-
- readList.add(theCache);
- }
-
- return ByteBuffer.wrap(b);
- }
+ if (chk != tstchk)
+ throw new ChecksumError("offset=" + offset + ",nbytes=" + nbytes
+ + ",expected=" + tstchk + ",actual=" + chk);
+
+ ret.limit(nbytes - 4);
+
+ return ret;
+ }
+
/**
* Read the data from the backing file.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2012-12-21 10:01:15
|
Revision: 6790
http://bigdata.svn.sourceforge.net/bigdata/?rev=6790&view=rev
Author: martyncutcher
Date: 2012-12-21 10:01:05 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
added intallReads and invoke from writeRaw for HA
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-20 18:48:37 UTC (rev 6789)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-21 10:01:05 UTC (rev 6790)
@@ -2913,33 +2913,7 @@
if (this.readListSize > 0) { // if there is a readCache
- synchronized (readCache) {
- final ReadCache rcache = readCache.get();
- if (!WriteCache.transferTo(cache, rcache, serviceMap, 0)) {
- // full readCache
- readCache.set(null);
- if (rcache.decrementReferenceCount()==0) {
- readList.add(rcache);
- }
-
- final ReadCache ncache = getDirectReadCache();
- if (ncache == null) {
- throw new AssertionError();
- }
-
- // remaining must be >= to announced capacity after getDirectReadCache
- if (ncache.remaining() < ncache.capacity())
- throw new AssertionError("New Cache, remaining() < capacity(): " + ncache.remaining() + " < " + ncache.capacity());
-
- // Now transfer remaining to new readCache
- if (!WriteCache.transferTo(cache, ncache, serviceMap, 0)) {
- throw new AssertionError("Unable to complete transfer to new cache with remaining: " + ncache.remaining());
- }
-
- ncache.incrementReferenceCount();
- readCache.set(ncache);
- }
- }
+ installReads(cache);
} else {
cache.resetWith(serviceMap);
}
@@ -2959,7 +2933,42 @@
cleanListLock.unlock();
}
}
+
+ public boolean installReads(final WriteCache cache) throws InterruptedException {
+ if (readListSize == 0)
+ return false;
+
+ synchronized (readCache) {
+ final ReadCache rcache = readCache.get();
+ if (!WriteCache.transferTo(cache, rcache, serviceMap, 0)) {
+ // full readCache
+ readCache.set(null);
+ if (rcache.decrementReferenceCount()==0) {
+ readList.add(rcache);
+ }
+
+ final ReadCache ncache = getDirectReadCache();
+ if (ncache == null) {
+ throw new AssertionError();
+ }
+
+ // remaining must be >= to announced capacity after getDirectReadCache
+ if (ncache.remaining() < ncache.capacity())
+ throw new AssertionError("New Cache, remaining() < capacity(): " + ncache.remaining() + " < " + ncache.capacity());
+
+ // Now transfer remaining to new readCache
+ if (!WriteCache.transferTo(cache, ncache, serviceMap, 0)) {
+ throw new AssertionError("Unable to complete transfer to new cache with remaining: " + ncache.remaining());
+ }
+
+ ncache.incrementReferenceCount();
+ readCache.set(ncache);
+ }
+ }
+ return true;
+ }
+
private WriteCache getDirectCleanCache() throws InterruptedException {
final WriteCache tmp = cleanList.poll();
@@ -3385,7 +3394,8 @@
// Large records are not cached but DO use the memoizer load
// assert nbytes <= capacity;
-
+ // FIXME: are there still synchronization holes here and Interrupt problems?
+
/*
* On entry, this thread will either install the read into the cache or
* the record will already be in the cache. We are protected by the
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java 2012-12-20 18:48:37 UTC (rev 6789)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java 2012-12-21 10:01:05 UTC (rev 6790)
@@ -325,7 +325,7 @@
// assert block.releaseSession(m_store.m_writeCache) == 0;
// clear out writes - FIXME is releaseSession okay
- block.releaseCommitWrites(m_store.m_writeCache);
+ block.releaseCommitWrites(m_store.m_writeCacheService);
block.m_transients = block.m_live.clone();
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-20 18:48:37 UTC (rev 6789)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-21 10:01:05 UTC (rev 6790)
@@ -468,7 +468,7 @@
* during {@link #reset(long)} in order to propagate the then current quorum
* token to the {@link WriteCacheService}.
*/
- RWWriteCacheService m_writeCache;
+ RWWriteCacheService m_writeCacheService;
/**
* The actual allocation sizes as read from the store.
@@ -629,7 +629,7 @@
// Added to enable debug of rare problem
// FIXME: disable by removal once solved
protected void registerWriteStatus(long offset, int length, char action) {
- m_writeCache.debugAddrs(offset, length, action);
+ m_writeCacheService.debugAddrs(offset, length, action);
}
@Override
@@ -809,7 +809,7 @@
// setup write cache AFTER init to ensure filesize is correct!
- m_writeCache = newWriteCache();
+ m_writeCacheService = newWriteCache();
final int maxBlockLessChk = m_maxFixedAlloc-4;
@@ -1036,7 +1036,7 @@
m_bufferedWrite.release();
m_bufferedWrite = null;
}
- m_writeCache.close();
+ m_writeCacheService.close();
m_reopener.raf.close();
} catch (Throwable t) {
throw new RuntimeException(t);
@@ -1638,13 +1638,13 @@
*/
final ByteBuffer bbuf;
try {
- bbuf = m_writeCache != null ? m_writeCache.read(paddr, length) : null;
+ bbuf = m_writeCacheService != null ? m_writeCacheService.read(paddr, length) : null;
} catch (Throwable t) {
throw new IllegalStateException(
"Error reading from WriteCache addr: " + paddr
+ " length: " + (length - 4)
+ ", writeCacheDebug: "
- + m_writeCache.addrDebugInfo(paddr), t);
+ + m_writeCacheService.addrDebugInfo(paddr), t);
}
if (bbuf != null) {
if (bbuf.limit() != length-4) {
@@ -1653,7 +1653,7 @@
"Incompatible buffer size for addr: " + paddr
+ ", " + bbuf.limit() + " != "
+ (length - 4) + " writeCacheDebug: "
- + m_writeCache.addrDebugInfo(paddr));
+ + m_writeCacheService.addrDebugInfo(paddr));
}
final byte[] in = bbuf.array(); // reads in with checksum - no need to check if in cache
for (int i = 0; i < length-4; i++) {
@@ -1716,8 +1716,8 @@
if (chk != tstchk) {
assertAllocators();
- if (m_writeCache != null) {
- final String cacheDebugInfo = m_writeCache.addrDebugInfo(paddr);
+ if (m_writeCacheService != null) {
+ final String cacheDebugInfo = m_writeCacheService.addrDebugInfo(paddr);
log.warn("Invalid data checksum for addr: " + paddr
+ ", chk: " + chk + ", tstchk: " + tstchk + ", length: " + length
+ ", first bytes: " + toHexString(buf, 32) + ", successful reads: " + m_diskReads
@@ -1951,7 +1951,7 @@
if (log.isDebugEnabled())
log.debug("RELEASE SESSIONS");
for (FixedAllocator fa : m_allocs) {
- fa.releaseSession(m_writeCache);
+ fa.releaseSession(m_writeCacheService);
}
}
}
@@ -2067,7 +2067,7 @@
if (overrideSession || !this.isSessionProtected()) {
// Only overwrite if NOT committed
if (!alloc.isCommitted(addrOffset)) {
- m_writeCache.clearWrite(pa,addr);
+ m_writeCacheService.clearWrite(pa,addr);
// m_writeCache.overwrite(pa, sze);
/*
* Pass the size of the allocator, NOT the size of the
@@ -2334,7 +2334,7 @@
final long pa = physicalAddress(newAddr);
try {
- m_writeCache.write(pa, ByteBuffer.wrap(buf, 0, size), chk, true/*writeChecksum*/, newAddr/*latchedAddr*/);
+ m_writeCacheService.write(pa, ByteBuffer.wrap(buf, 0, size), chk, true/*writeChecksum*/, newAddr/*latchedAddr*/);
} catch (InterruptedException e) {
throw new RuntimeException("Closed Store?", e);
}
@@ -2447,7 +2447,7 @@
* we must remember so that we avoid clearing down the store.
*/
for (FixedAllocator fa : m_allocs) {
- isolatedWrites = isolatedWrites || fa.reset(m_writeCache, m_committedNextAllocation);
+ isolatedWrites = isolatedWrites || fa.reset(m_writeCacheService, m_committedNextAllocation);
}
if (!isolatedWrites) {
@@ -2498,8 +2498,8 @@
* href="https://sourceforge.net/apps/trac/bigdata/ticket/530">
* HA Journal </a>
*/
- m_writeCache.close();
- m_writeCache = newWriteCache();
+ m_writeCacheService.close();
+ m_writeCacheService = newWriteCache();
}
/*
* Discard any writes on the delete blocks. Those deletes MUST NOT
@@ -2583,7 +2583,7 @@
assert addr > 0;
try {
- m_writeCache.write(addr, ByteBuffer.wrap(buf), 0/*chk*/, false/*useChecksum*/, m_metaBitsAddr/*latchedAddr*/);
+ m_writeCacheService.write(addr, ByteBuffer.wrap(buf), 0/*chk*/, false/*useChecksum*/, m_metaBitsAddr/*latchedAddr*/);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -2669,7 +2669,7 @@
try {
// do not use checksum
- m_writeCache.write(metaBit2Addr(naddr), ByteBuffer
+ m_writeCacheService.write(metaBit2Addr(naddr), ByteBuffer
.wrap(allocator.write()), 0/*chk*/, false/*useChecksum*/,0/*latchedAddr*/);
} catch (InterruptedException e) {
@@ -2683,8 +2683,8 @@
writeMetaBits();
try {
- m_writeCache.flush(true);
- lastBlockSequence = m_writeCache.resetSequence();
+ m_writeCacheService.flush(true);
+ lastBlockSequence = m_writeCacheService.resetSequence();
} catch (InterruptedException e) {
log.error(e, e);
throw new RuntimeException(e);
@@ -3084,7 +3084,7 @@
clrBit(m_metaTransientBits, bit);
}
- m_writeCache.clearWrite(metaBit2Addr(bit),0/*latchedAddr*/);
+ m_writeCacheService.clearWrite(metaBit2Addr(bit),0/*latchedAddr*/);
}
/**
@@ -3301,7 +3301,7 @@
storeCounters.get().ntruncate++;
// must ensure writeCache is in sync for HA
- m_writeCache.setExtent(toAddr);
+ m_writeCacheService.setExtent(toAddr);
if (log.isInfoEnabled()) log.info("Extend file done");
} catch (Throwable t) {
@@ -3692,7 +3692,7 @@
try {
- m_writeCache.flush(metadata);
+ m_writeCacheService.flush(metadata);
// sync the disk.
m_reopener.reopenChannel().force(metadata);
@@ -4366,7 +4366,7 @@
: m_parent.m_context;
for (FixedAllocator f : m_allFixed) {
- f.abortAllocationContext(pcontext, m_store.m_writeCache);
+ f.abortAllocationContext(pcontext, m_store.m_writeCacheService);
f.setFreeList(freeFixed[m_store.fixedAllocatorIndex(f.m_size)]);
}
@@ -5119,11 +5119,11 @@
// attach the most recently updated values from the striped counters.
root.attach(storeCounters.get().getCounters());
- if (m_writeCache != null) {
+ if (m_writeCacheService != null) {
final CounterSet tmp = root.makePath("writeCache");
- tmp.attach(m_writeCache.getCounters());
+ tmp.attach(m_writeCacheService.getCounters());
}
@@ -5140,7 +5140,7 @@
* including a ZERO (0) data length if any offset winds up being deleted
* (released).
*/
- final WriteCache writeCache = m_writeCache.newWriteCache(b,
+ final WriteCache writeCache = m_writeCacheService.newWriteCache(b,
true/* useChecksums */, true/* bufferHasData */, m_reopener,
msg.getFileExtent());
@@ -5166,8 +5166,8 @@
// Flush writes.
writeCache.flush(false/* force */);
- // TODO transferTo readCache
-
+ // install reads into readCache (if any)
+ m_writeCacheService.installReads(writeCache);
} finally {
m_allocationLock.unlock();
}
@@ -5374,11 +5374,11 @@
}
public void showWriteCacheDebug(long paddr) {
- log.warn("WriteCacheDebug: " + paddr + " - " + m_writeCache.addrDebugInfo(paddr));
+ log.warn("WriteCacheDebug: " + paddr + " - " + m_writeCacheService.addrDebugInfo(paddr));
}
public CounterSet getWriteCacheCounters() {
- return m_writeCache.getCounters();
+ return m_writeCacheService.getCounters();
}
// /**
@@ -5435,7 +5435,7 @@
public boolean inWriteCache(final int rwaddr) {
- return m_writeCache.isPresent(physicalAddress(rwaddr, true));
+ return m_writeCacheService.isPresent(physicalAddress(rwaddr, true));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2012-12-20 18:48:44
|
Revision: 6789
http://bigdata.svn.sourceforge.net/bigdata/?rev=6789&view=rev
Author: martyncutcher
Date: 2012-12-20 18:48:37 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Set readCacheBuffers directly from Journal Properties rather than FilemetaData.
Define compactingReserve WriteCache
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/VerifyCommitRecordIndex.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -173,11 +173,11 @@
*
* ReadCache lists
* Without a hotList the readCache is managed naively by clearing any new
- * readCache. This potentialy results in frequently accessed records being
+ * readCache. This potentially results in frequently accessed records being
* lost to the cache.
*
* HotCache
- * With the HotCache evicted readCaches get transferred to hotList and 'old'
+ * With the HotCache evicted readCaches hot records get transferred to hotList and 'old'
* hotCaches get added to end of readCache. Pattern is needed to pluck reserve
* hotCache from readList so that it is always possible to transfer hot records
* from the readList.
@@ -308,6 +308,11 @@
private WriteCache compactingCache = null;
/**
+ * Maintained to guarantee that compaction is possible
+ */
+ private WriteCache compactingReserve = null;
+
+ /**
* Disable {@link WriteCache} compaction when <code>false</code>.
* <p>
* Note: This is set to <code>false</code> when
@@ -1041,15 +1046,15 @@
*/
assert !cache.isClosedForWrites();
- final WriteCache reserve = getDirectCleanCache();
-
- if (reserve == null) {
-
- // Not guaranteed that we can compact.
- return false;
+ if (compactingReserve == null) {
+ compactingReserve = getDirectCleanCache();
+
+ if (compactingReserve == null)
+ return false; // cannot guarantee compaction
+
+ compactingReserve.resetWith(serviceMap); // should be NOP!
+ }
- }
-
/*
* We can be certain to be able to compact.
*/
@@ -1076,14 +1081,6 @@
curCompactingCache/* dst */, serviceMap, 0/*threshold*/);
if (done) {
sendAddressMetadata(cache);
- /*
- * Return reserve to the cleanList.
- *
- * Note: by adding to the front of the deque, we are
- * helping to preserve the FIFO aging policy for the
- * cleanList.
- */
- addClean(reserve, true/* addFirst */);
if (log.isDebugEnabled())
log.debug("RETURNING RESERVE: curCompactingCache.bytesWritten="
@@ -1121,8 +1118,11 @@
if (log.isTraceEnabled())
log.trace("Setting curCompactingCache to reserve");
- reserve.resetWith(serviceMap);//, fileExtent.get());
- curCompactingCache = reserve;
+ curCompactingCache = compactingReserve;
+ compactingReserve = getDirectCleanCache();
+ if (compactingReserve != null)
+ compactingReserve.resetWith(serviceMap); // should be NOP!
+
if (log.isTraceEnabled())
log.trace("Transferring to curCompactingCache");
done = WriteCache.transferTo(cache/* src */,
@@ -3457,7 +3457,7 @@
if (newCache.incrementReferenceCount() != 1)
throw new AssertionError();
- if (!readCache.compareAndSet(theCache/* expect */,
+ if (!readCache.compareAndSet(null/* expect */,
newCache/* newValue */))
throw new AssertionError();
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -167,11 +167,6 @@
public final int writeCacheBufferCount;
/**
- * The #of read cache buffers to be used if the write cache is enabled.
- */
- public final int readCacheBufferCount;
-
- /**
* <code>true</code> iff record level checksums are enabled. These are used
* beginning with {@link RootBlockView#VERSION2} and for the
* {@link RWStrategy} from {@link RootBlockView#VERSION1}.
@@ -342,7 +337,7 @@
final boolean isEmptyFile, boolean deleteOnExit,
final boolean readOnly, final ForceEnum forceWrites,
final int offsetBits, final boolean writeCacheEnabled,
- final int writeCacheBufferCount, final int readCacheBufferCount, final boolean validateChecksum,
+ final int writeCacheBufferCount, final boolean validateChecksum,
final long createTime, final long quorumToken,
final boolean alternateRootBlock,
final Properties properties) throws RuntimeException {
@@ -394,8 +389,6 @@
this.writeCacheBufferCount = writeCacheBufferCount;
- this.readCacheBufferCount = readCacheBufferCount;
-
this.fileMode = (readOnly ? "r" : forceWrites.asFileMode());
this.readOnly = readOnly;
@@ -893,7 +886,6 @@
FileMetadata(final File file, final boolean useDirectBuffers,
final boolean readOnly, final ForceEnum forceWrites,
final boolean writeCacheEnabled, final int writeCacheBufferCount,
- final int readCacheBufferCount,
final boolean validateChecksum, final boolean alternateRootBlock,
final boolean ignoreBadRootBlock, final Properties properties)
throws RuntimeException {
@@ -917,8 +909,6 @@
this.writeCacheBufferCount = writeCacheBufferCount;
- this.readCacheBufferCount = readCacheBufferCount;
-
this.fileMode = (readOnly ? "r" : forceWrites.asFileMode());
this.readOnly = readOnly;
@@ -1436,10 +1426,6 @@
properties, Options.WRITE_CACHE_BUFFER_COUNT,
Options.DEFAULT_WRITE_CACHE_BUFFER_COUNT));
- final int readCacheBufferCount = Integer.parseInt(getProperty(
- properties, Options.READ_CACHE_BUFFER_COUNT,
- Options.DEFAULT_READ_CACHE_BUFFER_COUNT));
-
final boolean validateChecksum = Boolean.parseBoolean(getProperty(
properties, Options.VALIDATE_CHECKSUM,
Options.DEFAULT_VALIDATE_CHECKSUM));
@@ -1462,11 +1448,11 @@
/*
* Code path when the file exists and is non-empty.
*/
-
+
return new FileMetadata(file, useDirectBuffers, readOnly,
forceWrites, writeCacheEnabled, writeCacheBufferCount,
- readCacheBufferCount, validateChecksum, alternateRootBlock,
- ignoreBadRootBlock, properties);
+ validateChecksum, alternateRootBlock, ignoreBadRootBlock,
+ properties);
} else {
@@ -1488,10 +1474,10 @@
new LongRangeValidator(initialExtent, Long.MAX_VALUE));
/*
- * Note: The caller SHOULD specify an explicit [createTime] when its
- * value is critical. The default assigned here does NOT attempt to
- * use a clock that is consistent with the commit protocol or even a
- * clock that assigns unique timestamps.
+ * Note: The caller SHOULD specify an explicit [createTime] when
+ * its value is critical. The default assigned here does NOT
+ * attempt to use a clock that is consistent with the commit
+ * protocol or even a clock that assigns unique timestamps.
*/
final long createTime = Long.parseLong(getProperty(properties,
Options.CREATE_TIME, "" + System.currentTimeMillis()));
@@ -1509,10 +1495,9 @@
return new FileMetadata(file, bufferMode, useDirectBuffers,
initialExtent, maximumExtent, create, isEmptyFile,
deleteOnExit, readOnly, forceWrites, offsetBits,
- writeCacheEnabled, writeCacheBufferCount,
- readCacheBufferCount, validateChecksum, createTime,
- quorumToken, alternateRootBlock, properties);
-
+ writeCacheEnabled, writeCacheBufferCount, validateChecksum,
+ createTime, quorumToken, alternateRootBlock, properties);
+
}
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -619,7 +619,7 @@
/**
* The default for {@link #READ_CACHE_CAPACITY}.
*/
- String DEFAULT_READ_CACHE_CAPACITY = "0";
+ String DEFAULT_READ_CACHE_CAPACITY = "10";
// String DEFAULT_READ_CACHE_CAPACITY = "10000";
/**
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -295,7 +295,6 @@
offsetBits,//
true, // writeCacheEnabled
3, // writeCacheBufferCount
- 0, // readCacheBufferCount
false, // validateChecksum (desperation option for restart).
createTime,//
Quorum.NO_QUORUM,// Temporary stores are not HA.
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/VerifyCommitRecordIndex.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/VerifyCommitRecordIndex.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/VerifyCommitRecordIndex.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -94,8 +94,6 @@
final int removed = jrnl.removeCommitRecordEntries(zeroKey, releaseKey);
- System.out.println("Commit Record Index verified with " + removed + " records removed");
-
jrnl.commit();
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -221,6 +221,13 @@
private final int writeCacheBufferCount;
/**
+ * The #of read cache buffers to use.
+ *
+ * @see com.bigdata.journal.Options#READ_CACHE_BUFFER_COUNT
+ */
+ private final int readCacheBufferCount;
+
+ /**
* <code>true</code> if the backing store will be used in an HA
* {@link Quorum} (this is passed through to the {@link WriteCache} objects
* which use this flag to conditionally track the checksum of the entire
@@ -905,6 +912,10 @@
this.writeCacheBufferCount = fileMetadata.writeCacheBufferCount;
+ this.readCacheBufferCount = Integer.valueOf(fileMetadata.getProperty(
+ com.bigdata.journal.Options.READ_CACHE_BUFFER_COUNT,
+ com.bigdata.journal.Options.DEFAULT_READ_CACHE_CAPACITY));
+
isHighlyAvailable = quorum != null && quorum.isHighlyAvailable();
final boolean useWriteCacheService = fileMetadata.writeCacheEnabled
@@ -946,7 +957,7 @@
final IReopenChannel<? extends Channel> opener,
final Quorum quorum) throws InterruptedException {
- super(writeCacheBufferCount, 0/* maxDirtyListSize */, 0/*readBuffers*/,
+ super(writeCacheBufferCount, 0/* maxDirtyListSize */, readCacheBufferCount,
false/* prefixWrites */, 100/* compactionThreshold */,
useChecksums, extent, opener, quorum, WORMStrategy.this /*reader*/);
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-20 14:44:38 UTC (rev 6788)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-20 18:48:37 UTC (rev 6789)
@@ -728,8 +728,9 @@
m_writeCacheBufferCount = fileMetadata.writeCacheBufferCount;
- // FIXME: DEBUG
- m_readCacheBufferCount = 6; // fileMetadata.readCacheBufferCount;
+ m_readCacheBufferCount = Integer.valueOf(fileMetadata.getProperty(
+ com.bigdata.journal.Options.READ_CACHE_BUFFER_COUNT,
+ com.bigdata.journal.Options.DEFAULT_READ_CACHE_CAPACITY));
if (log.isInfoEnabled())
log.info(com.bigdata.journal.Options.WRITE_CACHE_BUFFER_COUNT
@@ -5164,6 +5165,9 @@
try {
// Flush writes.
writeCache.flush(false/* force */);
+
+ // TODO transferTo readCache
+
} finally {
m_allocationLock.unlock();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2012-12-20 14:44:47
|
Revision: 6788
http://bigdata.svn.sourceforge.net/bigdata/?rev=6788&view=rev
Author: martyncutcher
Date: 2012-12-20 14:44:38 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
With readCache enabled TestRWJournal is green with fixes to ReadCache initialization, referenceCount maintenance and transferTo
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
branches/READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-19 18:50:52 UTC (rev 6787)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-20 14:44:38 UTC (rev 6788)
@@ -2084,8 +2084,8 @@
public static class ReadCache extends WriteCache {
public ReadCache(IBufferAccess buf) throws InterruptedException {
- super(buf, true/* scatterredWrtes */, false/* useChecksum */,
- false/* isHighlyAvailable */, true/* bufferHasData */, 0/* fileExtent */);
+ super(buf, false/* prefixWrites */, true/* useChecksum */,
+ false/* isHighlyAvailable */, false/* bufferHasData */, 0/* fileExtent */);
}
@Override
@@ -2107,6 +2107,16 @@
// might be null if concurrent transfer has taken place
return removed != null;
}
+
+ /**
+ * ReadCache is always closedForWrites
+ */
+ public boolean isClosedForWrites() {
+
+ return true;
+
+ }
+
}
/**
@@ -2275,9 +2285,10 @@
// debug to see recycling
log.info("clean WriteCache: hashCode=" + hashCode());
}
- if (m_written) {
- log.warn("Written WriteCache but with no records");
- }
+ // cache is written but also transfererd to readCache
+// if (m_written) {
+// log.warn("Written WriteCache but with no records");
+// }
}
reset(); // must ensure reset state even if cache already empty
@@ -2558,11 +2569,15 @@
*/
final ByteBuffer bb = src.acquire().duplicate();
ByteBuffer dd = null;
+ final int srcSize = src.recordMap.size();
+ int notTransferred = 0;
+ int transferred = 0;
try {
// Setup destination
dd = dst.acquire();
// Note: md.recordLength includes the checksum (suffix)
- final int prefixlen = src.prefixWrites ? SIZEOF_PREFIX_WRITE_METADATA : 0;
+ // check *destination* for prefixWrites - which will be zero for ReadCache
+ final int prefixlen = dst.prefixWrites ? SIZEOF_PREFIX_WRITE_METADATA : 0;
final Set<Entry<Long, RecordMetadata>> es = src.recordMap.entrySet();
final Iterator<Entry<Long, RecordMetadata>> entries = es.iterator();
@@ -2573,19 +2588,24 @@
final RecordMetadata md = entry.getValue();
if (serviceRecordMap != null) {
final WriteCache tmp = serviceRecordMap.get(fileOffset);
- if (tmp == null)
- throw new AssertionError("Not owned: offset="
- + fileOffset + ", md=" + md);
- else if (tmp != src)
- throw new AssertionError(
- "Record not owned by this cache: src="
- + src + ", owner=" + tmp
- + ", offset=" + fileOffset + ", md="
- + md);
+ if (tmp != src) {
+ assert !(tmp instanceof ReadCache);
+
+ entries.remove();
+
+ continue;
+// throw new AssertionError(
+// "Record not owned by this cache: src="
+// + src + ", owner=" + tmp
+// + ", offset=" + fileOffset + ", md="
+// + md);
+ }
}
assert !md.deleted; // not deleted (deleted entries should not be in the recordMap).
// only copy records >= to threshold
if (md.hitCount < threshold) {
+ notTransferred++;
+
serviceRecordMap.remove(fileOffset);
} else {
final int len = prefixlen + md.recordLength;
@@ -2594,6 +2614,7 @@
// Not enough room in destination for this record.
if (dstremaining >= 512) {
// Destination still has room, keep looking.
+ notTransferred++;
continue;
}
// Destination is full (or full enough).
@@ -2615,6 +2636,9 @@
synchronized (dd) {
dstoff = dd.position() + prefixlen;
dd.put(bb);
+
+ transferred++;
+
assert dst.remaining() == (dstremaining - len) : "dst.remaining(): "
+ dst.remaining()
+ " expected: "
@@ -2655,6 +2679,7 @@
// Clear entry from src recordMap.
entries.remove();
+
}
// true iff all records were transfered out.
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-19 18:50:52 UTC (rev 6787)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-20 14:44:38 UTC (rev 6788)
@@ -170,6 +170,26 @@
* record compression. Note that the B+Tree leaf and node records may
* require an uncompressed header to allow fixup of the priorAddr and
* nextAddr fields.
+ *
+ * ReadCache lists
+ * Without a hotList the readCache is managed naively by clearing any new
+ * readCache. This potentialy results in frequently accessed records being
+ * lost to the cache.
+ *
+ * HotCache
+ * With the HotCache evicted readCaches get transferred to hotList and 'old'
+ * hotCaches get added to end of readCache. Pattern is needed to pluck reserve
+ * hotCache from readList so that it is always possible to transfer hot records
+ * from the readList.
+ *
+ * Start with hotCache AND hotReserve.
+ * If new reserve needed, because existing one is now used, try and compress
+ * new readCache into current hotCache - if won't fit, then call resetWith and
+ * lose those writes, cycle again, moving front hotCache to readList and compress
+ * that one.
+ * LIMIT: If we begin with full caches with above threshold hitCounts then
+ * the whole list will cycle around until we hit original cache which will contain
+ * records with zero hitCounts - for practical purposes ignoring any concurrent reads.
*/
abstract public class WriteCacheService implements IWriteCache {
@@ -558,7 +578,7 @@
// pre-allocate all ReadCache
for (int i = 0; i < readBuffers.length; i++) {
- readBuffers[i] = new ReadCache(DirectBufferPool.INSTANCE.acquire());
+ readBuffers[i] = new ReadCache(null);
}
/*
@@ -581,6 +601,12 @@
// set initial read cache
hotCache = hotList.poll();
readCache.set(readList.poll());
+ {
+ final ReadCache curReadCache = readCache.get();
+ if (curReadCache != null) {
+ curReadCache.incrementReferenceCount();
+ }
+ }
if (log.isInfoEnabled())
log.info("nbuffers=" + nwriteBuffers + ", dirtyListThreshold="
@@ -2892,17 +2918,25 @@
if (!WriteCache.transferTo(cache, rcache, serviceMap, 0)) {
// full readCache
readCache.set(null);
- readList.add(rcache);
+ if (rcache.decrementReferenceCount()==0) {
+ readList.add(rcache);
+ }
+
final ReadCache ncache = getDirectReadCache();
if (ncache == null) {
throw new AssertionError();
}
+ // remaining must be >= to announced capacity after getDirectReadCache
+ if (ncache.remaining() < ncache.capacity())
+ throw new AssertionError("New Cache, remaining() < capacity(): " + ncache.remaining() + " < " + ncache.capacity());
+
// Now transfer remaining to new readCache
if (!WriteCache.transferTo(cache, ncache, serviceMap, 0)) {
- throw new AssertionError();
+ throw new AssertionError("Unable to complete transfer to new cache with remaining: " + ncache.remaining());
}
+ ncache.incrementReferenceCount();
readCache.set(ncache);
}
}
@@ -3388,7 +3422,7 @@
ByteBuffer bb = null;
if (!directRead) {
synchronized (readCache) {
-
+
theCache = readCache.get();
// if(theCache==null&&isClosed()) throw new
// AsyncClosedException();
@@ -3404,9 +3438,11 @@
if (bb == null) {
// current readCache is no good for us - no room in
// buffer
+ readCache.set(null);
+
if (theCache.decrementReferenceCount() == 0) {
// handle case where no concurrent install.
- addClean(theCache, false/* addFirst */);
+ readList.add(theCache);
}
final ReadCache newCache = getDirectReadCache(); // non-blocking
@@ -3467,9 +3503,12 @@
ret.get(b);
if (theCache.decrementReferenceCount() == 0) {
- addClean(theCache, false/* addFirst */);
+ if (theCache == readCache.get())
+ throw new AssertionError();
+
+ readList.add(theCache);
}
-
+
return ByteBuffer.wrap(b);
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-19 18:50:52 UTC (rev 6787)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-20 14:44:38 UTC (rev 6788)
@@ -729,7 +729,7 @@
m_writeCacheBufferCount = fileMetadata.writeCacheBufferCount;
// FIXME: DEBUG
- m_readCacheBufferCount = 0; // fileMetadata.readCacheBufferCount;
+ m_readCacheBufferCount = 6; // fileMetadata.readCacheBufferCount;
if (log.isInfoEnabled())
log.info(com.bigdata.journal.Options.WRITE_CACHE_BUFFER_COUNT
Modified: branches/READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java
===================================================================
--- branches/READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java 2012-12-19 18:50:52 UTC (rev 6787)
+++ branches/READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java 2012-12-20 14:44:38 UTC (rev 6788)
@@ -686,7 +686,7 @@
* Reallocates the same object several times, then commits and tests
* read back.
*
- *
+ * Has been amended to exercise different cache read paths.
*/
public void test_reallocate() {
final Journal store = (Journal) getStore();
@@ -709,16 +709,38 @@
long faddr2 = bs.write(bb);
bb.position(0);
+ // test read from writeCache
+ ByteBuffer inbb1 = bs.read(faddr1);
+ ByteBuffer inbb2 = bs.read(faddr2);
+
+ assertEquals(bb, inbb1);
+ assertEquals(bb, inbb2);
+
store.commit();
+ // test direct read from readCache / postCommit
+ inbb1 = bs.read(faddr1);
+ inbb2 = bs.read(faddr2);
+
+ assertEquals(bb, inbb1);
+ assertEquals(bb, inbb2);
+
rw.reset();
- ByteBuffer inbb1 = bs.read(faddr1);
- ByteBuffer inbb2 = bs.read(faddr2);
+ // test read from store (via readcache)
+ inbb1 = bs.read(faddr1);
+ inbb2 = bs.read(faddr2);
assertEquals(bb, inbb1);
assertEquals(bb, inbb2);
+ // test read direct from readCache
+ inbb1 = bs.read(faddr1);
+ inbb2 = bs.read(faddr2);
+
+ assertEquals(bb, inbb1);
+ assertEquals(bb, inbb2);
+
} finally {
store.destroy();
}
@@ -984,7 +1006,7 @@
store.close();
// added to try and foce bug
- if(log.isInfoEnabled())log.info("Re-open Journal");
+ if (log.isInfoEnabled())log.info("Re-open Journal");
store = (Journal) getStore();
reallocBatchWithRead(store, 1, 800, 1500, tcount, true, true);
reallocBatchWithRead(store, 1, 50, 250, tcount, true, true);
@@ -992,33 +1014,33 @@
store.close();
// .. end add to force bug
- if(log.isInfoEnabled())log.info("Re-open Journal");
+ if (log.isInfoEnabled()) log.info("Re-open Journal");
store = (Journal) getStore();
reallocBatchWithRead(store, 1, 2000, 10000, tcount, true, true);
reallocBatchWithRead(store, 1, 200, 500, tcount, true, true);
store.close();
- if(log.isInfoEnabled())log.info("Re-open Journal");
+ if (log.isInfoEnabled()) log.info("Re-open Journal");
store = (Journal) getStore();
reallocBatchWithRead(store, 1, 800, 1256, tcount, true, true);
reallocBatchWithRead(store, 1, 50, 250, tcount, true, true);
reallocBatchWithRead(store, 1, 50, 250, tcount, true, true);
showStore(store);
store.close();
- if(log.isInfoEnabled())log.info("Re-open Journal");
+ if (log.isInfoEnabled()) log.info("Re-open Journal");
store = (Journal) getStore();
showStore(store);
reallocBatchWithRead(store, 1, 400, 1000, tcount, true, true);
reallocBatchWithRead(store, 1, 1000, 2000, tcount, true, true);
reallocBatchWithRead(store, 1, 400, 1000, tcount, true, true);
store.close();
- if(log.isInfoEnabled())log.info("Re-open Journal");
+ if (log.isInfoEnabled()) log.info("Re-open Journal");
store = (Journal) getStore();
bufferStrategy = (RWStrategy) store.getBufferStrategy();
rw = bufferStrategy.getStore();
- if(log.isInfoEnabled())log.info("Final allocations: " + (rw.getTotalAllocations() - numAllocs)
+ if (log.isInfoEnabled()) log.info("Final allocations: " + (rw.getTotalAllocations() - numAllocs)
+ ", allocated bytes: " + (rw.getTotalAllocationsSize() - startAllocations) + ", file length: "
+ rw.getStoreFile().length());
} finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-19 18:50:58
|
Revision: 6787
http://bigdata.svn.sourceforge.net/bigdata/?rev=6787&view=rev
Author: thompsonbry
Date: 2012-12-19 18:50:52 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Bumped sesame version in build.properties.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/build.properties
Modified: branches/BIGDATA_RELEASE_1_2_0/build.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/build.properties 2012-12-19 18:43:27 UTC (rev 6786)
+++ branches/BIGDATA_RELEASE_1_2_0/build.properties 2012-12-19 18:50:52 UTC (rev 6787)
@@ -47,7 +47,7 @@
#
icu.version=4.8
zookeeper.version=3.3.3
-sesame.version=2.6.3
+sesame.version=2.6.10
slf4j.version=1.6.1
jetty.version=7.2.2.v20101205
lucene.version=3.0.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-19 18:43:42
|
Revision: 6786
http://bigdata.svn.sourceforge.net/bigdata/?rev=6786&view=rev
Author: thompsonbry
Date: 2012-12-19 18:43:27 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Merging in change set for ticket to update dependencies to Sesame 2.6.10. There are some new test failures. Most of these are negative syntax tests for the SPARQL parser. There are a few new test failures for new tests.
@see https://sourceforge.net/apps/trac/bigdata/ticket/593 (Upgrade to Sesame 2.6.10)
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_2_0/.classpath
branches/BIGDATA_RELEASE_1_2_0/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParserFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Att.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Atts.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParserFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriter.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriterFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/SAXFilter.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/HavingNode.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/nquads/TestNQuadsParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/nquads/TestNQuadsParserFactory.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BatchRDFValueResolver.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTOperationContainer.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTQueryContainer.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTSelect.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTSelectQuery.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTUpdateContainer.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTUpdateSequence.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderConstants.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jj
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jjt
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll_AST.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataArbitraryLengthPathTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQL11SyntaxTest.java
Removed Paths:
-------------
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/openrdf-sesame-2.6.3-onejar.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/sesame-rio-testsuite-2.6.3.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/lib/sesame-sparql-testsuite-2.6.3.jar
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/lib/sesame-store-testsuite-2.6.3.jar
Property Changed:
----------------
branches/BIGDATA_RELEASE_1_2_0/
branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/htree/raba/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/jsr166/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/joinGraph/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/util/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/jsr166/
branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/util/httpd/
branches/BIGDATA_RELEASE_1_2_0/bigdata-compatibility/
branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/attr/
branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/disco/
branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/util/config/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc/src/resources/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/lubm/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot/
branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot/src/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/error/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/samples/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/LEGAL/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/lib/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/java/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/java/it/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/java/it/unimi/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/test/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/test/it/unimi/
branches/BIGDATA_RELEASE_1_2_0/dsi-utils/src/test/it/unimi/dsi/
branches/BIGDATA_RELEASE_1_2_0/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/BIGDATA_RELEASE_1_2_0/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/BIGDATA_RELEASE_1_2_0/osgi/
branches/BIGDATA_RELEASE_1_2_0/src/resources/bin/config/
Property changes on: branches/BIGDATA_RELEASE_1_2_0
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
Modified: branches/BIGDATA_RELEASE_1_2_0/.classpath
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/.classpath 2012-12-19 18:19:21 UTC (rev 6785)
+++ branches/BIGDATA_RELEASE_1_2_0/.classpath 2012-12-19 18:43:27 UTC (rev 6786)
@@ -66,15 +66,11 @@
<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/fastutil-5.1.5.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-analyzers-3.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-core-3.0.0.jar"/>
- <classpathentry kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.3.jar" sourcepath="/org.openrdf.sesame-2.6.3"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-ext-1.1-b3-dev.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-api-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-log4j12-1.6.1.jar"/>
- <classpathentry kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.3-onejar.jar" sourcepath="/Users/bryan/Documents/workspace/org.openrdf.sesame-2.6.3"/>
- <classpathentry kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.3.jar" sourcepath="/org.openrdf.sesame-2.6.3"/>
- <classpathentry kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.3.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpclient-4.1.3.jar"/>
@@ -84,5 +80,9 @@
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.2.2.jar"/>
<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/>
+ <classpathentry kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar"/>
+ <classpathentry kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar"/>
+ <classpathentry kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar"/>
+ <classpathentry kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph:6769-6785
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util:6769-6785
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/htree/raba
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/htree/raba:6769-6785
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/jsr166:6769-6785
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/joinGraph:6769-6785
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/util:6769-6785
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/jsr166:6769-6785
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/util/httpd
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/util/httpd:6769-6785
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-compatibility
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-compatibility:6769-6785
/branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java 2012-12-19 18:19:21 UTC (rev 6785)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java 2012-12-19 18:43:27 UTC (rev 6786)
@@ -77,7 +77,7 @@
final String resource = "foaf-tbl-plus-6-degrees-small.nq";
- load(getClass().getResource(resource), NQuadsParser.nquads);
+ load(getClass().getResource(resource), RDFFormat.NQUADS);
new Example1(om).call();
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/attr:6769-6785
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/disco:6769-6785
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/util/config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/util/config:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/util/config:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/util/config:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/util/config:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/util/config:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/util/config:6769-6785
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/util/config:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/util/config:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/util/config:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/util/config:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/util/config:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-perf:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-perf:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-perf:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-perf:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-perf:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf:4814-4836
/branches/bugfix-btm/bigdata-perf:2594-3237
/branches/dev-btm/bigdata-perf:2574-2730
/branches/fko/bigdata-perf:3150-3194
/trunk/bigdata-perf:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf:6769-6785
/branches/BTREE_BUFFER_BRANCH/bigdata-perf:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-perf:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-perf:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-perf:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-perf:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf:4814-4836
/branches/bugfix-btm/bigdata-perf:2594-3237
/branches/dev-btm/bigdata-perf:2574-2730
/branches/fko/bigdata-perf:3150-3194
/trunk/bigdata-perf:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/btc:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc:4814-4836
/trunk/bigdata-perf/btc:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc:6769-6785
/branches/INT64_BRANCH/bigdata-perf/btc:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc:4814-4836
/trunk/bigdata-perf/btc:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/btc/src/resources:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc/src/resources:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc/src/resources:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/src/resources:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc/src/resources:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc/src/resources:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc/src/resources:6769-6785
/branches/INT64_BRANCH/bigdata-perf/btc/src/resources:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc/src/resources:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc/src/resources:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/src/resources:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc/src/resources:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc/src/resources:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/lubm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/lubm:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/lubm:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/lubm:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/lubm:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/lubm:6769-6785
/branches/INT64_BRANCH/bigdata-perf/lubm:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/lubm:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/lubm:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/lubm:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/uniprot:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot:4814-4836
/trunk/bigdata-perf/uniprot:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot:6769-6785
/branches/INT64_BRANCH/bigdata-perf/uniprot:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot:4814-4836
/trunk/bigdata-perf/uniprot:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/uniprot/src:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot/src:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot/src:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/src:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot/src:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot/src:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot/src:6769-6785
/branches/INT64_BRANCH/bigdata-perf/uniprot/src:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot/src:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot/src:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/src:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot/src:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot/src:4814-4836
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar (from rev 6785, branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar)
===================================================================
(Binary files differ)
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/openrdf-sesame-2.6.3-onejar.jar
===================================================================
(Binary files differ)
Copied: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar (from rev 6785, branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar)
===================================================================
(Binary files differ)
Deleted: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/lib/sesame-rio-testsuite-2.6.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:6769-6785
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4814-4836
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java 2012-12-19 18:19:21 UTC (rev 6785)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java 2012-12-19 18:43:27 UTC (rev 6786)
@@ -111,8 +111,8 @@
r.add(new BigdataRDFXMLParserFactory());
- // Note: This ensures that the RDFFormat for NQuads is loaded.
- r.get(NQuadsParser.nquads);
+// // Note: This ensures that the RDFFormat for NQuads is loaded.
+// r.get(RDFFormat.NQUADS);
r.add(new BigdataNTriplesParserFactory());
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/changesets
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/changesets:6769-6785
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/error
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/error:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/error:6769-6785
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/error:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4814-4836
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/internal:6769-6785
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4814-4836
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java 2012-12-19 18:19:21 UTC (rev 6785)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java 2012-12-19 18:43:27 UTC (rev 6786)
@@ -48,7 +48,6 @@
import com.bigdata.rdf.ServiceProviderHook;
import com.bigdata.rdf.inf.ClosureStats;
import com.bigdata.rdf.rio.RDFParserOptions;
-import com.bigdata.rdf.rio.nquads.NQuadsParser;
import com.bigdata.rdf.rules.InferenceEngine;
import com.bigdata.rdf.store.AbstractTripleStore;
import com.bigdata.rdf.store.AbstractTripleStore.Options;
@@ -258,9 +257,8 @@
* When the {@link RDFFormat} of a resource is not evident, assume that
* it is the format specified by this value (default
* {@value #DEFAULT_RDF_FORMAT}). The value is one of the {@link String}
- * values of the known {@link RDFFormat}s, including
- * {@link NQuadsParser#nquads}. It may be null, in which case there is
- * no default.
+ * values of the known {@link RDFFormat}s. It may be null, in which case
+ * there is no default.
*/
String RDF_FORMAT = "rdfFormat";
Property changes on: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/relation
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4814-4836
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/relation:6769-6785
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4814-4836
Modified: branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java
===================================================================
--- branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java 2012-12-19 18:19:21 UTC (rev 6785)
+++ branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java 2012-12-19 18:43:27 UTC (rev 6786)
@@ -31,8 +31,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.charset.Charset;
-import java.util.Arrays;
import org.apache.log4j.Logger;
import org.openrdf.model.Literal;
@@ -68,60 +66,60 @@
final protected transient static Logger log = Logger
.getLogger(NQuadsParser.class);
- /**
- * The nquads RDF format.
- * <p>
- * The file extension <code>.nq</code> is recommended for N-Quads documents.
- * The media type is <code>text/x-nquads</code> and the encoding is 7-bit
- * US-ASCII. The URI that identifies the N-Quads syntax is
- * <code>http://sw.deri.org/2008/07/n-quads/#n-quads</code>.
- * </p>
- *
- * @see http://sw.deri.org/2008/07/n-quads/
- */
- static public final RDFFormat nquads;
+// /**
+// * The nquads RDF format.
+// * <p>
+// * The file extension <code>.nq</code> is recommended for N-Quads documents.
+// * The media type is <code>text/x-nquads</code> and the encoding is 7-bit
+// * US-ASCII. The URI that identifies the N-Quads syntax is
+// * <code>http://sw.deri.org/2008/07/n-quads/#n-quads</code>.
+// * </p>
+// *
+// * @see http://sw.deri.org/2008/07/n-quads/
+// */
+// static public final RDFFormat nquads;
- /**
- * Register an {@link RDFFormat} for the {@link NxParser} to handle nquads.
- *
- * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/439">
- * Class loader problems </a>
- * @see <a href="http://www.openrdf.org/issues/browse/SES-802"> Please add
- * support for NQuads format </a>
- * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/559"> Use
- * RDFFormat.NQUADS as the format identifier for the NQuads parser </a>
- */
- static {
-
- nquads = new RDFFormat(
- // format name.
- "N-Quads",
- // registered mime types.
- Arrays.asList(new String[] {"text/x-nquads"}), //
- Charset.forName("US-ASCII"), // charset
- // file extensions
- Arrays.asList(new String[]{"nq"}),
- false, // supportsNamespaces,
- true // supportsContexts
- );
-
- // register the nquads format.
- RDFFormat.register(nquads);
-
-// // register the parser factory for nquads.
-// RDFParserRegistry.getInstance().add(new RDFParserFactory() {
+// /**
+// * Register an {@link RDFFormat} for the {@link NxParser} to handle nquads.
+// *
+// * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/439">
+// * Class loader problems </a>
+// * @see <a href="http://www.openrdf.org/issues/browse/SES-802"> Please add
+// * support for NQuads format </a>
+// * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/559"> Use
+// * RDFFormat.NQUADS as the format identifier for the NQuads parser </a>
+// */
+// static {
//
-// public RDFParser getParser() {
-// return new NQuadsParser();
-// }
+//// nquads = new RDFFormat(
+//// // format name.
+//// "N-Quads",
+//// // registered mime types.
+//// Arrays.asList(new String[] {"text/x-nquads"}), //
+//// Charset.forName("US-ASCII"), // charset
+//// // file extensions
+//// Arrays.asList(new String[]{"nq"}),
+//// false, // supportsNamespaces,
+//// true // supportsContexts
+//// );
+////
+//// // register the nquads format.
+//// RDFFormat.register(nquads);
//
-// public RDFFormat getRDFFormat() {
-// return nquads;
-// }
-//
-// });
-
- }
+//// // register the parser factory for nquads.
+//// RDFParserRegistry.getInstance().add(new RDFParserFactory() {
+////
+//// public RDFParser getParser() {
+//// return new NQuadsParser();
+//// }
+////
+//// public RDFFormat getRDFFormat() {
+//// return nquads;
+//// }
+////
+//// });
+//
+// }
private ValueFactory valueFactory = new ValueFactoryImpl();
@@ -140,7 +138,7 @@
public RDFFormat getRDFFormat() {
- return nquads;
+ ...
[truncated message content] |
|
From: <tho...@us...> - 2012-12-19 18:19:32
|
Revision: 6785
http://bigdata.svn.sourceforge.net/bigdata/?rev=6785&view=rev
Author: thompsonbry
Date: 2012-12-19 18:19:21 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Merged in empty delta from dev branch into the BIGDATA_OPENRDF_2_6_9_UPDATE branch prior to merging the update branch back into the dev branch. Only commits appear to be SVN metadata on directories (no files added, removed, or modified).
Property Changed:
----------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/htree/raba/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/jsr166/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/joinGraph/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/util/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/jsr166/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/util/httpd/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-compatibility/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/attr/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/disco/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/util/config/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc/src/resources/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/lubm/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot/src/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/error/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/samples/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/LEGAL/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/lib/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/java/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/java/it/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/java/it/unimi/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/test/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/test/it/unimi/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src/test/it/unimi/dsi/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/osgi/
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/src/resources/bin/config/
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0:6768-6783
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6768-6783
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6768-6783
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph:6768-6783
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util:6768-6783
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/htree/raba
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/htree/raba:6768-6783
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/jsr166:6768-6783
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/joinGraph:6768-6783
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/util:6768-6783
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/jsr166:6768-6783
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/util/httpd
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/util/httpd:6768-6783
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-compatibility
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-compatibility:6768-6783
/branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/attr:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/disco:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/util/config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/util/config:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/util/config:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/util/config:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/util/config:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/util/config:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/util/config:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/util/config:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/util/config:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/util/config:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/util/config:4814-4836
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/util/config:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/util/config:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/util/config:2981-3282,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-perf:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-perf:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-perf:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-perf:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-perf:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf:4814-4836
/branches/bugfix-btm/bigdata-perf:2594-3237
/branches/dev-btm/bigdata-perf:2574-2730
/branches/fko/bigdata-perf:3150-3194
/trunk/bigdata-perf:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-perf:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-perf:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-perf:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-perf:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-perf:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf:4814-4836
/branches/bugfix-btm/bigdata-perf:2594-3237
/branches/dev-btm/bigdata-perf:2574-2730
/branches/fko/bigdata-perf:3150-3194
/trunk/bigdata-perf:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/btc:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc:4814-4836
/trunk/bigdata-perf/btc:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc:6768-6783
/branches/INT64_BRANCH/bigdata-perf/btc:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc:4814-4836
/trunk/bigdata-perf/btc:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/btc/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/btc/src/resources:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc/src/resources:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc/src/resources:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/src/resources:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc/src/resources:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc/src/resources:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/btc/src/resources:6768-6783
/branches/INT64_BRANCH/bigdata-perf/btc/src/resources:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/btc/src/resources:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/btc/src/resources:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/btc/src/resources:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/btc/src/resources:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/btc/src/resources:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/lubm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/lubm:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/lubm:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/lubm:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/lubm:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/lubm:6768-6783
/branches/INT64_BRANCH/bigdata-perf/lubm:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/lubm:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/lubm:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/lubm:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/uniprot:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot:4814-4836
/trunk/bigdata-perf/uniprot:2981-3043,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot:6768-6783
/branches/INT64_BRANCH/bigdata-perf/uniprot:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot:4814-4836
/trunk/bigdata-perf/uniprot:2981-3043,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-perf/uniprot/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-perf/uniprot/src:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot/src:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot/src:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/src:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot/src:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot/src:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-perf/uniprot/src:6768-6783
/branches/INT64_BRANCH/bigdata-perf/uniprot/src:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-perf/uniprot/src:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-perf/uniprot/src:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-perf/uniprot/src:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-perf/uniprot/src:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-perf/uniprot/src:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/changesets
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/changesets:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/error
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/error:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/error:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/error:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/error:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/internal:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/internal:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/relation
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/relation:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/relation:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-rdf/src/java/com/bigdata/rdf/util:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/util:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4814-4836
/branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:2594-3237
/branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:2574-2730
/branches/fko/bigdata-rdf/src/java/com/bigdata/rdf/util:3150-3194
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:2981-3110,3368-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/java/com/bigdata/rdf/util:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-rdf/src/java/com/bigdata/rdf/util:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/java/com/bigdata/rdf/util:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/java/com/bigdata/rdf/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/util:4814-4836
/branches/bugfix-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:2594-3237
/branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:2574-2730
/branches/fko/bigdata-rdf/src/java/com/bigdata/rdf/util:3150-3194
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:2981-3110,3368-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/samples
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/samples:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/samples:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/samples:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/samples:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/samples:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/samples:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/samples:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/samples:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/samples:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/samples:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/rdf/internal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/test/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/internal:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/test/com/bigdata/rdf/internal:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4525-4531,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/rdf/internal:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/internal:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/test/com/bigdata/rdf/relation
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/test/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-rdf/src/test/com/bigdata/rdf/relation:6768-6783
/branches/INT64_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-rdf/src/test/com/bigdata/rdf/relation:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-rdf/src/test/com/bigdata/rdf/relation:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/relation:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4814-4836
/branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2594-3237
/branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2574-2730
/branches/fko/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3150-3194
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3369-3437,3656-4061
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:6768-6783
/branches/BTREE_BUFFER_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:4814-4836
/branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2594-3237
/branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:2574-2730
/branches/fko/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3150-3194
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3369-3437,3656-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:6768-6783
/branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:6768-6783
/branches/INT64_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:6768-6783
/branches/INT64_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:6768-6783
/branches/INT64_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/dsi-utils:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils:4814-4836
+ /branches/BIGDATA_RELEASE_1_2_0/dsi-utils:6768-6783
/branches/INT64_BRANCH/dsi-utils:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils:4814-4836
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/dsi-utils/LEGAL:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils/LEGAL:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils/LEGAL:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils/LEGAL:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils/LEGAL:4814-4836
/trunk/dsi-utils/LEGAL:3369-3423,3659-4061
+ /branches/BIGDATA_RELEASE_1_2_0/dsi-utils/LEGAL:6768-6783
/branches/INT64_BRANCH/dsi-utils/LEGAL:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils/LEGAL:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils/LEGAL:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils/LEGAL:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils/LEGAL:4814-4836
/trunk/dsi-utils/LEGAL:3369-3423,3659-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/dsi-utils/lib:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils/lib:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils/lib:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils/lib:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils/lib:4814-4836
/trunk/dsi-utils/lib:3369-3423,3659-4061
+ /branches/BIGDATA_RELEASE_1_2_0/dsi-utils/lib:6768-6783
/branches/INT64_BRANCH/dsi-utils/lib:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils/lib:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-utils/lib:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/RWSTORE_1_1_0_DEBUG/dsi-utils/lib:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/dsi-utils/lib:4814-4836
/trunk/dsi-utils/lib:3369-3423,3659-4061
Property changes on: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/INT64_BRANCH/dsi-utils/src:4486-4522
/branches/LARGE_LITERALS_REFACTOR/dsi-utils/src:4175-4387
/branches/QUADS_QUERY_BRANCH/dsi-util...
[truncated message content] |
|
From: <tho...@us...> - 2012-12-19 18:11:49
|
Revision: 6784
http://bigdata.svn.sourceforge.net/bigdata/?rev=6784&view=rev
Author: thompsonbry
Date: 2012-12-19 18:11:42 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Marking the version that will be merged back into the dev branch.
Added Paths:
-----------
tags/OPENRDF_2_6_9_UPDATE_BEFORE_MERGE_BACK_TO_DEV_BRANCH/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-19 17:55:53
|
Revision: 6783
http://bigdata.svn.sourceforge.net/bigdata/?rev=6783&view=rev
Author: thompsonbry
Date: 2012-12-19 17:55:43 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Modified DatasetDeclProcessor to allow op==null for negative syntax tests.
Modified FunctionRegistry to provide declaration of AggregateFactory for operators that are aggregates in partial support of negative syntax tests.
Modified StaticAnalysis to use FunctionRegistry.isAggregate(URI) in partial support of negative syntax tests.
Modified EarlReport to provide metadata about the system under test (bigdata).
@see https://sourceforge.net/apps/trac/bigdata/ticket/593 (Upgrade to Sesame 2.6.10)
Modified Paths:
--------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderConstants.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jj
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jjt
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java
Added Paths:
-----------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQL11SyntaxTest.java
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java 2012-12-19 17:42:45 UTC (rev 6782)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java 2012-12-19 17:55:43 UTC (rev 6783)
@@ -231,7 +231,7 @@
public static final URI XSD_STR = XMLSchema.STRING;
static {
- add(AVERAGE, new Factory() {
+ add(AVERAGE, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -245,7 +245,7 @@
}
});
- add(COUNT, new Factory() {
+ add(COUNT, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -261,7 +261,7 @@
add(GROUP_CONCAT, new GroupConcatFactory());
- add(MAX, new Factory() {
+ add(MAX, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -275,7 +275,7 @@
}
});
- add(MIN, new Factory() {
+ add(MIN, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -290,7 +290,7 @@
}
});
- add(SAMPLE, new Factory() {
+ add(SAMPLE, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -304,7 +304,7 @@
}
});
- add(SUM, new Factory() {
+ add(SUM, new AggregateFactory() {
public IValueExpression<? extends IV> create(final GlobalAnnotations globals,
Map<String, Object> scalarValues, final ValueExpressionNode... args) {
@@ -939,6 +939,14 @@
}
+ public static boolean isAggregate(final URI functionUri) {
+
+ final Factory f = factories.get(functionUri);
+
+ return f != null && f instanceof AggregateFactory;
+
+ }
+
/**
* Verify type constraints.
*
@@ -1104,6 +1112,15 @@
final ValueExpressionNode... args);
}
+
+ /**
+ * Marker interface for aggregate functions.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ */
+ public static interface AggregateFactory extends Factory {
+
+ }
public static class CompareFactory implements Factory {
@@ -1315,7 +1332,7 @@
}
- public static class GroupConcatFactory implements Factory {
+ public static class GroupConcatFactory implements AggregateFactory {
public interface Annotations extends GROUP_CONCAT.Annotations{
}
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java 2012-12-19 17:42:45 UTC (rev 6782)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java 2012-12-19 17:55:43 UTC (rev 6783)
@@ -2300,6 +2300,34 @@
final IValueExpression<?> expr = exprNode.getValueExpression();
+ if (expr == null) {
+
+ /*
+ * The value expression is not cached....
+ */
+
+ if (exprNode instanceof FunctionNode) {
+
+ /*
+ * Hack used when the BigdataExprBuilder needs to decide
+ * on the validity of aggregate expressions before we
+ * get around to caching the value expressions during
+ * evaluation (i.e., to pass the compliance tests for
+ * the parser).
+ */
+ final FunctionNode functionNode = (FunctionNode) exprNode;
+
+ if (FunctionRegistry.isAggregate(functionNode
+ .getFunctionURI()))
+
+ return true;
+
+ }
+
+ return false;
+
+ }
+
if (isObviousAggregate(expr)) {
return true;
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java 2012-12-19 17:42:45 UTC (rev 6782)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java 2012-12-19 17:55:43 UTC (rev 6783)
@@ -34,17 +34,22 @@
package com.bigdata.rdf.sail.sparql;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.apache.log4j.Logger;
import com.bigdata.bop.BOp;
import com.bigdata.bop.IBindingSet;
+import com.bigdata.bop.IConstraint;
+import com.bigdata.bop.IValueExpression;
import com.bigdata.bop.IVariable;
import com.bigdata.bop.bindingSet.ListBindingSet;
+import com.bigdata.bop.solutions.GroupByState;
import com.bigdata.rdf.internal.IV;
import com.bigdata.rdf.model.BigdataValue;
import com.bigdata.rdf.sail.sparql.ast.ASTAskQuery;
@@ -98,6 +103,7 @@
import com.bigdata.rdf.sparql.ast.QueryType;
import com.bigdata.rdf.sparql.ast.SliceNode;
import com.bigdata.rdf.sparql.ast.StatementPatternNode;
+import com.bigdata.rdf.sparql.ast.StaticAnalysis;
import com.bigdata.rdf.sparql.ast.SubqueryRoot;
import com.bigdata.rdf.sparql.ast.TermNode;
import com.bigdata.rdf.sparql.ast.ValueExpressionNode;
@@ -180,6 +186,8 @@
handleBindings(astQuery, queryRoot);
+ verifyAggregate(queryRoot);
+
return queryRoot;
}
@@ -258,6 +266,8 @@
handleBindings(node, queryRoot);
+ verifyAggregate(queryRoot);
+
return queryRoot;
}
@@ -284,6 +294,7 @@
final QueryBase queryRoot = (QueryBase) data;
final ProjectionNode projection = new ProjectionNode();
+
queryRoot.setProjection(projection);
if (node.isWildcard()) {
@@ -407,6 +418,8 @@
handleBindings(node, queryRoot);
+ verifyAggregate(queryRoot);
+
return queryRoot;
}
@@ -635,10 +648,14 @@
projection.setReduced(true);
if (select.isWildcard()) {
+
projection.addProjectionVar(new VarNode("*"));
} else {
-
+
+ // Used to detect duplicate variables in a projection.
+ final Set<String> vars = new HashSet<String>();
+
final Iterator<ASTProjectionElem> itr = select
.getProjectionElemList().iterator();
@@ -654,13 +671,17 @@
final ASTProjectionElem e = itr.next();
+ final String varname;
+
if (!e.hasAlias()) {
// Var
final ASTVar aVar = (ASTVar) e.jjtGetChild(0/* index */);
- projection.addProjectionVar(new VarNode(aVar.getName()));
-
+ varname = aVar.getName();
+
+ projection.addProjectionVar(new VarNode(varname));
+
} else {
// Expression AS Var
@@ -669,13 +690,17 @@
final IValueExpressionNode ve = (IValueExpressionNode) expr
.jjtAccept(this, null/* data */);
- final String varname = e.getAlias();
+ varname = e.getAlias();
projection.addProjectionExpression(new AssignmentNode(
new VarNode(varname), ve));
}
-
+
+ if (!vars.add(varname))
+ throw new VisitorException(
+ "duplicate variable in projection: " + varname);
+
}
}
@@ -730,16 +755,15 @@
throws VisitorException {
final ASTGroupClause groupNode = astQuery.getGroupClause();
-
- if (groupNode != null) {
- final GroupByNode groupBy = (GroupByNode) groupNode.jjtAccept(
- this, null);
+ if (groupNode == null)
+ return;
- queryRoot.setGroupBy(groupBy);
+ final GroupByNode groupBy = (GroupByNode) groupNode.jjtAccept(this,
+ null);
- }
-
+ queryRoot.setGroupBy(groupBy);
+
}
/**
@@ -993,5 +1017,153 @@
return null;
}
}
+
+ /**
+ * Verify the various conditions that must be met when a query uses GROUP BY
+ * or when a query uses aggregates in a PROJECTION.
+ *
+ * @param queryBase
+ * The query.
+ *
+ * @throws VisitorException
+ */
+ private void verifyAggregate(final QueryBase queryBase)
+ throws VisitorException {
+ if(true)
+ return;
+
+ /*
+ * FIXME The following code has some dependencies on whether or not the
+ * value expressions have been cached. That is not done until we get
+ * into AST2BOpUtility. I have worked some hacks to support this in
+ * FunctionRegistry.isAggregate() and StaticAnalysis.isAggregate().
+ * However, the code is still hitting some edge cases.
+ *
+ * There is some commented out code from openrdf that depends on setting
+ * a flag for the expression if an AggregationCollector reports at least
+ * one aggregation in a projection element. We could do this same thing
+ * here but we still need to have the logic to figure out what is an
+ * invalid aggregate.
+ */
+
+ final ProjectionNode projection = queryBase.getProjection() == null ? null
+ : queryBase.getProjection().isEmpty() ? null : queryBase
+ .getProjection();
+
+ final GroupByNode groupBy = queryBase.getGroupBy() == null ? null
+ : queryBase.getGroupBy().isEmpty() ? null : queryBase
+ .getGroupBy();
+
+ final HavingNode having = queryBase.getHaving() == null ? null
+ : queryBase.getHaving().isEmpty() ? null : queryBase
+ .getHaving();
+
+ // true if this is an aggregation query.
+ final boolean isAggregate = StaticAnalysis.isAggregate(projection,
+ groupBy, having);
+
+ if (isAggregate) {
+
+ if (projection.isWildcard())
+ throw new VisitorException(
+ "Wildcard not allowed with aggregate.");
+
+ final IValueExpression<?>[] projectExprs = projection
+ .getValueExpressions();
+
+ final IValueExpression<?>[] groupByExprs = groupBy == null ? null
+ : groupBy.getValueExpressions();
+
+ final IConstraint[] havingExprs = having == null ? null
+ : having.getConstraints();
+
+ try {
+
+ /*
+ * Delegate logic to validate the aggregate query.
+ */
+
+ new GroupByState(projectExprs, groupByExprs, havingExprs);
+
+ } catch (IllegalArgumentException ex) {
+
+ throw new VisitorException("Bad aggregate", ex);
+
+ }
+
+ }
+
+// /*
+// * Note: The following code is modeled after the openrdf code that
+// * checks the constraints on legal aggregations.
+// */
+//
+// final ProjectionNode projection = queryBase.getProjection() == null ? null
+// : queryBase.getProjection().isEmpty() ? null : queryBase
+// .getProjection();
+//
+// final GroupByNode groupBy = queryBase.getGroupBy() == null ? null
+// : queryBase.getGroupBy().isEmpty() ? null : queryBase
+// .getGroupBy();
+//
+// final HavingNode having = queryBase.getHaving() == null ? null
+// : queryBase.getHaving().isEmpty() ? null : queryBase
+// .getHaving();
+//
+// if (groupBy != null) {
+//
+// if (projection.isWildcard())
+// throw new VisitorException(
+// "Wildcard not permitted with GROUP BY");
+//
+// /*
+// * TODO Recursive search of a ValueExpression for anything that
+// * would be mapped onto an IAggregate.
+// */
+//// AggregateCollector collector = new AggregateCollector();
+//// valueExpr.visit(collector);
+////
+//// if (collector.getOperators().size() > 0) {
+//// elem.setAggregateOperatorInExpression(true);
+//
+// for (AssignmentNode elem : projection) {
+//
+//// if (!elem.hasAggregateOperatorInExpression()) {
+////
+//// final Set<String> groupNames = group.getBindingNames();
+////
+//// ExtensionElem extElem = elem.getSourceExpression();
+//// if (extElem != null) {
+//// ValueExpr expr = extElem.getExpr();
+////
+//// VarCollector collector = new VarCollector();
+//// expr.visit(collector);
+////
+//// for (Var var : collector.getCollectedVars()) {
+//// if (!groupNames.contains(var.getName())) {
+//// throw new VisitorException("variable '" + var.getName()
+//// + "' in projection not present in GROUP BY.");
+////
+//// }
+//// }
+//// }
+//// else {
+//// if (!groupNames.contains(elem.getTargetName())) {
+//// throw new VisitorException("variable '" + elem.getTargetName()
+//// + "' in projection not present in GROUP BY.");
+//// }
+//// else if (!groupNames.contains(elem.getSourceName())) {
+//// throw new VisitorException("variable '" + elem.getSourceName()
+//// + "' in projection not present in GROUP BY.");
+////
+//// }
+//// }
+//// }
+// }
+//
+// }
+
+ }
+
}
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java 2012-12-19 17:42:45 UTC (rev 6782)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java 2012-12-19 17:55:43 UTC (rev 6783)
@@ -102,6 +102,13 @@
final ASTOperation op = qc.getOperation();
+ if(op == null) {
+
+ // Allowed for some negative syntax tests.
+ return null;
+
+ }
+
final List<ASTDatasetClause> datasetClauses = op.getDatasetClauseList();
// Lazily resolved.
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java 2012-12-19 17:42:45 UTC (rev 6782)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java 2012-12-19 17:55:43 UTC (rev 6783)
@@ -12,56 +12,58 @@
public class SyntaxTreeBuilder/*@bgen(jjtree)*/implements SyntaxTreeBuilderTreeConstants, SyntaxTreeBuilderConstants {/*@bgen(jjtree)*/
protected JJTSyntaxTreeBuilderState jjtree = new JJTSyntaxTreeBuilderState();
- /**
- * Parses the supplied SPARQL query and builds a syntax tree from it.
- *
- * @param query A SPARQL query string.
- * @return The root of the syntax tree.
- * @throws TokenMgrError If the query was syntactically incorrect.
- * @throws ParseException If the query was syntactically incorrect.
- */
- public static ASTQueryContainer parseQuery(final String query)
- throws TokenMgrError, ParseException
- {
- final SyntaxTreeBuilder stb = new SyntaxTreeBuilder( new StringReader(query) );
+ /**
+ * Parses the supplied SPARQL query and builds a syntax tree from it.
+ *
+ * @param query A SPARQL query string.
+ * @return The root of the syntax tree.
+ * @throws TokenMgrError If the query was syntactically incorrect.
+ * @throws ParseException If the query was syntactically incorrect.
+ */
+ public static ASTQueryContainer parseQuery(final String query)
+ throws TokenMgrError, ParseException
+ {
+ final SyntaxTreeBuilder stb = new SyntaxTreeBuilder( new StringReader(query) );
- // Set size of tab to 1 to force tokenmanager to report correct column
- // index for substring splitting of service graph pattern.
- stb.jj_input_stream.setTabSize(1);
+ // Set size of tab to 1 to force tokenmanager to report correct column
+ // index for substring splitting of service graph pattern.
+ stb.jj_input_stream.setTabSize(1);
- final ASTQueryContainer container = stb.QueryContainer();
- container.setSourceString(query);
- return container;
- }
+ final ASTQueryContainer container = stb.QueryContainer();
+ container.setSourceString(query);
+ return container;
+ }
- /**
- * Parses the supplied SPARQL update sequence and builds a syntax tree from it.
- *
- * @param sequence A SPARQL update sequence string.
- * @return The root of the syntax tree.
- * @throws TokenMgrError If the update sequence was syntactically incorrect.
- * @throws ParseException If the update sequence was syntactically incorrect.
- */
- public static ASTUpdateSequence parseUpdateSequence(final String sequence)
- throws TokenMgrError, ParseException
- {
- final SyntaxTreeBuilder stb = new SyntaxTreeBuilder( new StringReader(sequence) );
- return stb.UpdateSequence();
- }
+ /**
+ * Parses the supplied SPARQL update sequence and builds a syntax tree from it.
+ *
+ * @param sequence A SPARQL update sequence string.
+ * @return The root of the syntax tree.
+ * @throws TokenMgrError If the update sequence was syntactically incorrect.
+ * @throws ParseException If the update sequence was syntactically incorrect.
+ */
+ public static ASTUpdateSequence parseUpdateSequence(final String sequence)
+ throws TokenMgrError, ParseException
+ {
+ final SyntaxTreeBuilder stb = new SyntaxTreeBuilder( new StringReader(sequence) );
+ final ASTUpdateSequence seq = stb.UpdateSequence();
+ seq.setSourceString(sequence);
+ return seq;
+ }
- /**
- * Trims <tt>n</tt> character from the start and end of the supplied string.
- */
- private static String _trimString(String s, int n) {
- if (s.length() >= 2 * n) {
- s = s.substring(n, s.length() - n);
- }
- return s;
+ /**
+ * Trims <tt>n</tt> character from the start and end of the supplied string.
+ */
+ private static String _trimString(String s, int n) {
+ if (s.length() >= 2 * n) {
+ s = s.substring(n, s.length() - n);
}
+ return s;
+ }
-//
-// grammar
-//
+//
+// grammar
+//
final public ASTUpdateSequence UpdateSequence() throws ParseException {
/*@bgen(jjtree) UpdateSequence */
ASTUpdateSequence jjtn000 = new ASTUpdateSequence(JJTUPDATESEQUENCE);
@@ -69,36 +71,14 @@
jjtree.openNodeScope(jjtn000);
try {
UpdateContainer();
- label_1:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- ;
- break;
- default:
- jj_la1[0] = jj_gen;
- break label_1;
- }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case SEMICOLON:
jj_consume_token(SEMICOLON);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BASE:
- case PREFIX:
- case LOAD:
- case CLEAR:
- case DROP:
- case ADD:
- case MOVE:
- case COPY:
- case CREATE:
- case INSERT:
- case DELETE:
- case WITH:
- UpdateContainer();
- break;
- default:
- jj_la1[1] = jj_gen;
- ;
- }
+ UpdateSequence();
+ break;
+ default:
+ jj_la1[0] = jj_gen;
+ ;
}
jj_consume_token(0);
jjtree.closeNodeScope(jjtn000, true);
@@ -133,7 +113,23 @@
jjtree.openNodeScope(jjtn000);
try {
Prolog();
- Update();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LOAD:
+ case CLEAR:
+ case DROP:
+ case ADD:
+ case MOVE:
+ case COPY:
+ case CREATE:
+ case INSERT:
+ case DELETE:
+ case WITH:
+ Update();
+ break;
+ default:
+ jj_la1[1] = jj_gen;
+ ;
+ }
jjtree.closeNodeScope(jjtn000, true);
jjtc000 = false;
{if (true) return jjtn000;}
@@ -168,33 +164,33 @@
Prolog();
Query();
jj_consume_token(0);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- {if (true) return jjtn000;}
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ {if (true) return jjtn000;}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
throw new Error("Missing return statement in function");
}
final public void Prolog() throws ParseException {
- label_2:
+ label_1:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BASE:
@@ -203,7 +199,7 @@
break;
default:
jj_la1[2] = jj_gen;
- break label_2;
+ break label_1;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PREFIX:
@@ -228,13 +224,13 @@
try {
jj_consume_token(BASE);
t = jj_consume_token(Q_IRI_REF);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- jjtn000.setIRI(_trimString(t.image, 1));
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ jjtn000.setIRI(_trimString(t.image, 1));
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -247,31 +243,31 @@
jj_consume_token(PREFIX);
prefix = jj_consume_token(PNAME_NS);
IRI();
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- // Remove trailing colon from prefix
- String prefixStr = prefix.image;
- prefixStr = prefixStr.substring(0, prefixStr.length() - 1);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ // Remove trailing colon from prefix
+ String prefixStr = prefix.image;
+ prefixStr = prefixStr.substring(0, prefixStr.length() - 1);
- jjtn000.setPrefix(prefixStr);
+ jjtn000.setPrefix(prefixStr);
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -303,7 +299,7 @@
jjtree.openNodeScope(jjtn000);
try {
Select();
- label_3:
+ label_2:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FROM:
@@ -311,11 +307,11 @@
break;
default:
jj_la1[5] = jj_gen;
- break label_3;
+ break label_2;
}
DatasetClause();
}
- label_4:
+ label_3:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
@@ -323,7 +319,7 @@
break;
default:
jj_la1[6] = jj_gen;
- break label_4;
+ break label_3;
}
NamedSubquery();
}
@@ -338,26 +334,64 @@
;
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
+ final public void SubSelect() throws ParseException {
+ /*@bgen(jjtree) SelectQuery */
+ ASTSelectQuery jjtn000 = new ASTSelectQuery(JJTSELECTQUERY);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ Select();
+ WhereClause();
+ SolutionModifier();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BINDINGS:
+ BindingsClause();
+ break;
+ default:
+ jj_la1[8] = jj_gen;
+ ;
+ }
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
final public void Select() throws ParseException {
/*@bgen(jjtree) Select */
ASTSelect jjtn000 = new ASTSelect(JJTSELECT);
@@ -371,33 +405,33 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DISTINCT:
jj_consume_token(DISTINCT);
- jjtn000.setDistinct(true);
+ jjtn000.setDistinct(true);
break;
case REDUCED:
jj_consume_token(REDUCED);
- jjtn000.setReduced(true);
+ jjtn000.setReduced(true);
break;
default:
- jj_la1[8] = jj_gen;
+ jj_la1[9] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[9] = jj_gen;
+ jj_la1[10] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STAR:
jj_consume_token(STAR);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- jjtn000.setWildcard(true);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ jjtn000.setWildcard(true);
break;
case LPAREN:
case VAR1:
case VAR2:
- label_5:
+ label_4:
while (true) {
ProjectionElem();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -407,34 +441,34 @@
;
break;
default:
- jj_la1[10] = jj_gen;
- break label_5;
+ jj_la1[11] = jj_gen;
+ break label_4;
}
}
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[12] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -457,7 +491,7 @@
jj_consume_token(RPAREN);
break;
default:
- jj_la1[12] = jj_gen;
+ jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -489,27 +523,27 @@
jjtree.openNodeScope(jjtn000);
try {
Construct();
- label_6:
+ label_5:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FROM:
;
break;
default:
- jj_la1[13] = jj_gen;
- break label_6;
+ jj_la1[14] = jj_gen;
+ break label_5;
}
DatasetClause();
}
- label_7:
+ label_6:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
;
break;
default:
- jj_la1[14] = jj_gen;
- break label_7;
+ jj_la1[15] = jj_gen;
+ break label_6;
}
NamedSubquery();
}
@@ -520,27 +554,27 @@
BindingsClause();
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[16] = jj_gen;
;
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -557,23 +591,23 @@
;
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -609,7 +643,7 @@
TriplesBlock();
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[17] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -622,27 +656,27 @@
jjtree.openNodeScope(jjtn000);
try {
Describe();
- label_8:
+ label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FROM:
;
break;
default:
- jj_la1[17] = jj_gen;
- break label_8;
+ jj_la1[18] = jj_gen;
+ break label_7;
}
DatasetClause();
}
- label_9:
+ label_8:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
;
break;
default:
- jj_la1[18] = jj_gen;
- break label_9;
+ jj_la1[19] = jj_gen;
+ break label_8;
}
NamedSubquery();
}
@@ -652,7 +686,7 @@
WhereClause();
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[20] = jj_gen;
;
}
SolutionModifier();
@@ -661,27 +695,27 @@
BindingsClause();
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[21] = jj_gen;
;
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -695,16 +729,16 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STAR:
jj_consume_token(STAR);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- jjtn000.setWildcard(true);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ jjtn000.setWildcard(true);
break;
case Q_IRI_REF:
case PNAME_NS:
case PNAME_LN:
case VAR1:
case VAR2:
- label_10:
+ label_9:
while (true) {
VarOrIRIref();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -716,34 +750,34 @@
;
break;
default:
- jj_la1[21] = jj_gen;
- break label_10;
+ jj_la1[22] = jj_gen;
+ break label_9;
}
}
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[23] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -754,27 +788,27 @@
jjtree.openNodeScope(jjtn000);
try {
jj_consume_token(ASK);
- label_11:
+ label_10:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FROM:
;
break;
default:
- jj_la1[23] = jj_gen;
- break label_11;
+ jj_la1[24] = jj_gen;
+ break label_10;
}
DatasetClause();
}
- label_12:
+ label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
;
break;
default:
- jj_la1[24] = jj_gen;
- break label_12;
+ jj_la1[25] = jj_gen;
+ break label_11;
}
NamedSubquery();
}
@@ -784,27 +818,27 @@
BindingsClause();
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[26] = jj_gen;
;
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -820,27 +854,27 @@
jj_consume_token(RBRACE);
jj_consume_token(AS);
t = jj_consume_token(VAR3);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- jjtn000.setName(t.image);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ jjtn000.setName(t.image);
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -854,40 +888,40 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NAMED:
jj_consume_token(NAMED);
- jjtn000.setNamed(true);
+ jjtn000.setNamed(true);
break;
default:
- jj_la1[26] = jj_gen;
+ jj_la1[27] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VIRTUAL_GRAPH:
jj_consume_token(VIRTUAL_GRAPH);
- jjtn000.setVirtual(true);
+ jjtn000.setVirtual(true);
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[28] = jj_gen;
;
}
IRIref();
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -902,33 +936,33 @@
jj_consume_token(WHERE);
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[29] = jj_gen;
;
}
GroupGraphPattern();
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
-// Note: Modified to group the binding variables and binding sets for more
-// efficient processing.
+// Note: Modified to group the binding variables and binding sets for more
+// efficient processing.
final public void BindingsClause() throws ParseException {
/*@bgen(jjtree) BindingsClause */
ASTBindingsClause jjtn000 = new ASTBindingsClause(JJTBINDINGSCLAUSE);
@@ -965,7 +999,7 @@
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
try {
- label_13:
+ label_12:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR1:
@@ -973,29 +1007,29 @@
;
break;
default:
- jj_la1[29] = jj_gen;
- break label_13;
+ jj_la1[30] = jj_gen;
+ break label_12;
}
Var();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -1006,7 +1040,7 @@
jjtree.openNodeScope(jjtn000);
try {
jj_consume_token(LBRACE);
- label_14:
+ label_13:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
@@ -1014,30 +1048,30 @@
;
break;
default:
- jj_la1[30] = jj_gen;
- break label_14;
+ jj_la1[31] = jj_gen;
+ break label_13;
}
BindingSet();
}
jj_consume_token(RBRACE);
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -1050,7 +1084,7 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
jj_consume_token(LPAREN);
- label_15:
+ label_14:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TRUE:
@@ -1075,8 +1109,8 @@
;
break;
default:
- jj_la1[31] = jj_gen;
- break label_15;
+ jj_la1[32] = jj_gen;
+ break label_14;
}
BindingValue();
}
@@ -1086,7 +1120,7 @@
jj_consume_token(NIL);
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[33] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1148,28 +1182,28 @@
jj_consume_token(UNDEF);
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -1179,7 +1213,7 @@
GroupClause();
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[35] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1187,7 +1221,7 @@
HavingClause();
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[36] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1195,7 +1229,7 @@
OrderClause();
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[37] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1204,7 +1238,7 @@
LimitOffsetClauses();
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[38] = jj_gen;
;
}
}
@@ -1217,7 +1251,7 @@
try {
jj_consume_token(GROUP);
jj_consume_token(BY);
- label_16:
+ label_15:
while (true) {
GroupCondition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1281,8 +1315,8 @@
;
break;
default:
- jj_la1[38] = jj_gen;
- break label_16;
+ jj_la1[39] = jj_gen;
+ break label_15;
}
}
} catch (Throwable jjte000) {
@@ -1314,7 +1348,7 @@
try {
jj_consume_token(ORDER);
jj_consume_token(BY);
- label_17:
+ label_16:
while (true) {
OrderCondition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1380,28 +1414,28 @@
;
break;
default:
- jj_la1[39] = jj_gen;
- break label_17;
+ jj_la1[40] = jj_gen;
+ break label_16;
}
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -1479,7 +1513,7 @@
Var();
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[41] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1489,28 +1523,28 @@
Var();
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
}
@@ -1562,16 +1596,16 @@
break;
case DESC:
jj_consume_token(DESC);
- jjtn000.setAscending(false);
+ jjtn000.setAscending(false);
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[43] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[44] = jj_gen;
;
}
BrackettedExpression();
@@ -1639,28 +1673,28 @@
Var();
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[45] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
} catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseEx...
[truncated message content] |
|
From: <tho...@us...> - 2012-12-19 17:42:56
|
Revision: 6782
http://bigdata.svn.sourceforge.net/bigdata/?rev=6782&view=rev
Author: thompsonbry
Date: 2012-12-19 17:42:45 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
javadoc
Modified Paths:
--------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/HavingNode.java
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/HavingNode.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/HavingNode.java 2012-12-19 17:06:01 UTC (rev 6781)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/HavingNode.java 2012-12-19 17:42:45 UTC (rev 6782)
@@ -78,7 +78,7 @@
}
/**
- * Return the {@link IConstraint}s for this {@link ProjectionNode}.
+ * Return the {@link IConstraint}s for this {@link HavingNode}.
*/
public IConstraint[] getConstraints() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2012-12-19 17:06:11
|
Revision: 6781
http://bigdata.svn.sourceforge.net/bigdata/?rev=6781&view=rev
Author: martyncutcher
Date: 2012-12-19 17:06:01 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Work in progress...
ReadCache initialization - but disabled with RWStore readBufferCount set to zero.
TestRWJournal fails several tests with incorrect assumptions since data is now cleared from the cache on commit - it will later be copied to the read cache.
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java
branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWriteCacheServiceLifetime.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -346,7 +346,7 @@
* record. The values describe the position in buffer where that record is
* found and the length of the record.
*/
- final private ConcurrentMap<Long/* fileOffset */, RecordMetadata> recordMap;
+ final protected ConcurrentMap<Long/* fileOffset */, RecordMetadata> recordMap;
/**
* An ordered list of the {@link RecordMetadata} in the order in which those
@@ -2081,6 +2081,34 @@
} // class FileChannelScatteredWriteCache
+ public static class ReadCache extends WriteCache {
+
+ public ReadCache(IBufferAccess buf) throws InterruptedException {
+ super(buf, true/* scatterredWrtes */, false/* useChecksum */,
+ false/* isHighlyAvailable */, true/* bufferHasData */, 0/* fileExtent */);
+ }
+
+ @Override
+ protected boolean writeOnChannel(ByteBuffer buf, long firstOffset,
+ Map<Long, RecordMetadata> recordMap, long nanos)
+ throws InterruptedException, TimeoutException, IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Overide clearAddrMap for read cache to always remove from the record map.
+ */
+ /* public */boolean clearAddrMap(final long addr, final int latchedAddr)
+ throws IllegalStateException, InterruptedException {
+
+ // Remove record from this cache.
+ final RecordMetadata removed = recordMap.remove(addr);
+
+ // might be null if concurrent transfer has taken place
+ return removed != null;
+ }
+ }
+
/**
* To support deletion we will remove any entries for the provided address.
* This is just to yank something out of the cache which was created and
@@ -2463,6 +2491,8 @@
* .
* @param serviceRecordMap
* The {@link WriteCacheService}'s record map.
+ * @param threshold
+ * The hitCount aty which the record is transferred
*
* @return Returns true if the transfer is complete, or false if the
* destination runs out of room.
@@ -2471,7 +2501,7 @@
*/
// package private
static boolean transferTo(final WriteCache src, final WriteCache dst,
- final ConcurrentMap<Long, WriteCache> serviceRecordMap)
+ final ConcurrentMap<Long, WriteCache> serviceRecordMap, final int threshold)
throws InterruptedException {
if (src == null)
@@ -2480,14 +2510,16 @@
throw new IllegalArgumentException();
if (src == dst)
throw new IllegalArgumentException();
- if (src.m_closedForWrites) {
- // the source buffer must not be closed for writes.
- throw new IllegalStateException();
- }
- if (dst.m_closedForWrites) {
- // the dst buffer must not be closed for writes.
- throw new IllegalStateException();
- }
+
+ // FIXME: check assumptions for transferTo, closedForWrites vs ReadCache etc
+// if (src.m_closedForWrites) {
+// // the source buffer must not be closed for writes.
+// throw new IllegalStateException();
+// }
+// if (dst.m_closedForWrites) {
+// // the dst buffer must not be closed for writes.
+// throw new IllegalStateException();
+// }
/*
* Note: This method is only invoked during critical code in
* WriteTask.call(). No other thread can write on [src] (because it is
@@ -2552,67 +2584,75 @@
+ md);
}
assert !md.deleted; // not deleted (deleted entries should not be in the recordMap).
- final int len = prefixlen + md.recordLength;
- final int dstremaining = dst.remaining();
- if (len > dstremaining) {
- // Not enough room in destination for this record.
- if (dstremaining >= 512) {
- // Destination still has room, keep looking.
- continue;
- }
- // Destination is full (or full enough).
- return false;
- }
-
-// final ByteBuffer dup = bb;//bb.duplicate(); (dup'd above).
- final int pos = md.bufferOffset - prefixlen;// include prefix
- final int limit = pos + len; // and any postfix
- final int dstoff; // offset in the destination buffer.
- synchronized (bb) {
- bb.limit(limit);
- bb.position(pos);
- // dst.writeRaw(fileOffset, dup, md.latchedAddr);
+ // only copy records >= to threshold
+ if (md.hitCount < threshold) {
+ serviceRecordMap.remove(fileOffset);
+ } else {
+ final int len = prefixlen + md.recordLength;
+ final int dstremaining = dst.remaining();
+ if (len > dstremaining) {
+ // Not enough room in destination for this record.
+ if (dstremaining >= 512) {
+ // Destination still has room, keep looking.
+ continue;
+ }
+ // Destination is full (or full enough).
+ return false;
+ }
- // Copy to destination.
- synchronized (dd) {
- dstoff = dd.position() + prefixlen;
- dd.put(bb);
- assert dst.remaining() == (dstremaining - len) : "dst.remaining(): "
- + dst.remaining()
- + " expected: "
- + dstremaining;
- }
- }
- /*
- * Insert record into destination.
- *
- * Note: The [orderedList] on the target buffer is not
- * updated because we handle the propagation of the address
- * allocation/clear notices separately and synchronously
- * using prepareAddressMetadataForHA().
- */
- {
- final RecordMetadata old = dst.recordMap.put(Long
- .valueOf(fileOffset), new RecordMetadata(
- fileOffset, dstoff/* bufferOffset */,
- md.recordLength, md.latchedAddr));
+ // final ByteBuffer dup = bb;//bb.duplicate(); (dup'd
+ // above).
+ final int pos = md.bufferOffset - prefixlen;// include
+ // prefix
+ final int limit = pos + len; // and any postfix
+ final int dstoff; // offset in the destination buffer.
+ synchronized (bb) {
+ bb.limit(limit);
+ bb.position(pos);
+ // dst.writeRaw(fileOffset, dup, md.latchedAddr);
- assert old == null : "Write already found: " + old;
- }
+ // Copy to destination.
+ synchronized (dd) {
+ dstoff = dd.position() + prefixlen;
+ dd.put(bb);
+ assert dst.remaining() == (dstremaining - len) : "dst.remaining(): "
+ + dst.remaining()
+ + " expected: "
+ + dstremaining;
+ }
+ }
+ /*
+ * Insert record into destination.
+ *
+ * Note: The [orderedList] on the target buffer is not
+ * updated because we handle the propagation of the
+ * address allocation/clear notices separately and
+ * synchronously using prepareAddressMetadataForHA().
+ */
+ {
+ final RecordMetadata old = dst.recordMap.put(Long
+ .valueOf(fileOffset), new RecordMetadata(
+ fileOffset, dstoff/* bufferOffset */,
+ md.recordLength, md.latchedAddr));
- if (serviceRecordMap != null) {
- /*
- * Note: As soon as we update the service record map it
- * is possible that WriteCacheService.clearWrite() will
- * clear the record from [dst]. We can not rely on the
- * record remaining in [dst] after this method call!
- */
- final WriteCache tmp = serviceRecordMap.put(fileOffset,
- dst);
- assert src == tmp : "tmp=" + tmp + ",src=" + src
- + ", offset=" + fileOffset + ", md=" + md;
- }
+ assert old == null : "Write already found: " + old;
+ }
+ if (serviceRecordMap != null) {
+ /*
+ * Note: As soon as we update the service record map
+ * it is possible that
+ * WriteCacheService.clearWrite() will clear the
+ * record from [dst]. We can not rely on the record
+ * remaining in [dst] after this method call!
+ */
+ final WriteCache tmp = serviceRecordMap.put(
+ fileOffset, dst);
+ assert src == tmp : "tmp=" + tmp + ",src=" + src
+ + ", offset=" + fileOffset + ", md=" + md;
+ }
+ }
+
// Clear entry from src recordMap.
entries.remove();
}
@@ -2624,14 +2664,15 @@
} finally {
try {
- if (src.m_closedForWrites) {
- // the source buffer must not be closed for writes.
- throw new IllegalStateException();
- }
- if (dst.m_closedForWrites) {
- // the dst buffer must not be closed for writes.
- throw new IllegalStateException();
- }
+ // FIXME: check assumptions re closedForWrites and ReadCache
+// if (src.m_closedForWrites) {
+// // the source buffer must not be closed for writes.
+// throw new IllegalStateException();
+// }
+// if (dst.m_closedForWrites) {
+// // the dst buffer must not be closed for writes.
+// throw new IllegalStateException();
+// }
} finally {
if (dd != null)
dst.release();
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -66,6 +66,7 @@
import com.bigdata.io.DirectBufferPool;
import com.bigdata.io.IBufferAccess;
import com.bigdata.io.IReopenChannel;
+import com.bigdata.io.writecache.WriteCache.ReadCache;
import com.bigdata.journal.AbstractBufferStrategy;
import com.bigdata.journal.IBufferStrategy;
import com.bigdata.journal.IRootBlockView;
@@ -309,7 +310,7 @@
/**
* The current read cache.
*/
- final private AtomicReference<WriteCache> readCache = new AtomicReference<WriteCache>();
+ final private AtomicReference<ReadCache> readCache = new AtomicReference<ReadCache>();
/**
* Flag set if {@link WriteTask} encounters an error. The cause is set
@@ -348,7 +349,7 @@
* A map from the offset of the record on the backing file to the cache
* buffer on which that record was written.
*/
- final private ConcurrentMap<Long/* offset */, WriteCache> recordMap;
+ final private ConcurrentMap<Long/* offset */, WriteCache> serviceMap;
/**
* An immutable array of the {@link WriteCache} buffer objects owned by the
@@ -356,9 +357,15 @@
* placed onto the {@link #dirtyList} by
* {@link #writeChk(long, ByteBuffer, int)}).
*/
- final private WriteCache[] buffers;
+ final private WriteCache[] writeBuffers;
/**
+ * An immutable array of the {@link WriteCache} buffer objects owned by the
+ * {@link WriteCacheService}. These buffers are used for the readCache.
+ */
+ final private ReadCache[] readBuffers;
+
+ /**
* Debug arrays to chase down write/removal errors.
*
* Toggle comment appropriately to activate/deactivate
@@ -419,7 +426,7 @@
/**
* Allocates N buffers from the {@link DirectBufferPool}.
*
- * @param nbuffers
+ * @param nwriteBuffers
* The #of {@link WriteCache} buffers.
* @param maxDirtyListSize
* The maximum #of {@link WriteCache} buffers on the
@@ -459,30 +466,33 @@
*
* @throws InterruptedException
*/
- public WriteCacheService(final int nbuffers, int maxDirtyListSize,
+ public WriteCacheService(final int nwriteBuffers, int maxDirtyListSize,
+ final int nreadBuffers,
final boolean prefixWrites, final int compactionThreshold,
final boolean useChecksum, final long fileExtent,
final IReopenChannel<? extends Channel> opener, final Quorum quorum,
final IBackingReader reader)
throws InterruptedException {
- if (nbuffers <= 0)
+ if (nwriteBuffers <= 0)
throw new IllegalArgumentException();
if (maxDirtyListSize == 0) {
/*
* Setup a reasonable default if no value was specified.
+ * Just need to make sure we have a few spare buffers to
+ * prevent latency on acquiring a clean buffer for writing.
*/
- maxDirtyListSize = Math.max(nbuffers/2 /*leave half for readCache*/, 1);
+ maxDirtyListSize = Math.max(nwriteBuffers-4, 1);
}
if (maxDirtyListSize < 0)
throw new IllegalArgumentException();
- if (maxDirtyListSize > nbuffers)
+ if (maxDirtyListSize > nwriteBuffers)
throw new IllegalArgumentException();
if (compactionThreshold <= 0)
@@ -519,7 +529,7 @@
cleanList = new LinkedBlockingDeque<WriteCache>();
- buffers = new WriteCache[nbuffers];
+ writeBuffers = new WriteCache[nwriteBuffers];
/*
* Configure the desired dirtyListThreshold.
@@ -538,59 +548,82 @@
m_dirtyListThreshold = 1;
}
assert m_dirtyListThreshold >= 1;
- assert m_dirtyListThreshold <= buffers.length;
+ assert m_dirtyListThreshold <= writeBuffers.length;
- /*
- * HIRS cache setup
+ // Setup ReadCache
+ this.readListSize = nreadBuffers;
+ this.readList = new LinkedBlockingDeque<ReadCache>();
+
+ readBuffers = new ReadCache[nreadBuffers];
+
+ // pre-allocate all ReadCache
+ for (int i = 0; i < readBuffers.length; i++) {
+ readBuffers[i] = new ReadCache(DirectBufferPool.INSTANCE.acquire());
+ }
+
+ /*
+ * Hot cache setup
*
- * Let's aim for a 1/10 of the readCache/cleanList being HIRS
+ * Let's aim for a 1/10 of the readCache
*/
- hirsSize = Math.max(0, (buffers.length-m_dirtyListThreshold)/10);
- hirsList = new LinkedBlockingDeque<WriteCache>();
+ hotListSize = Math.max(0, readListSize/10);
+ hotList = new LinkedBlockingDeque<ReadCache>();
+
+ // pre-populate hotList and readList
+ for (int i = 0; i < hotListSize; i++) {
+ hotList.add(readBuffers[i]);
+ }
+ for (int i = hotListSize; i < readListSize; i++) {
+ readList.add(readBuffers[i]);
+ }
+
+ // set initial read cache
+ hotCache = hotList.poll();
+ readCache.set(readList.poll());
+
if (log.isInfoEnabled())
- log.info("nbuffers=" + nbuffers + ", dirtyListThreshold="
+ log.info("nbuffers=" + nwriteBuffers + ", dirtyListThreshold="
+ m_dirtyListThreshold + ", compactionThreshold="
+ compactionThreshold + ", compactionEnabled="
+ compactionEnabled + ", prefixWrites=" + prefixWrites
- + ", hirsSize=" + hirsSize
+ + ", hotListSize=" + hotListSize
+ ", useChecksum=" + useChecksum + ", quorum=" + quorum);
// save the current file extent.
this.fileExtent.set(fileExtent);
// Add [current] WriteCache.
- current.set(buffers[0] = newWriteCache(null/* buf */,
+ current.set(writeBuffers[0] = newWriteCache(null/* buf */,
useChecksum, false/* bufferHasData */, opener, fileExtent));
- if (nbuffers > 1) {
- readCache.set(buffers[1] = newWriteCache(null/* buf */,
- useChecksum, false/* bufferHasData */, opener, fileExtent));
-
- buffers[1].incrementReferenceCount(); // for readCache
- buffers[1].closeForWrites();
- }
+// if (nbuffers > 1) {
+// readCache.set(buffers[1] = newWriteCache(null/* buf */,
+// useChecksum, false/* bufferHasData */, opener, fileExtent));
+//
+// buffers[1].incrementReferenceCount(); // for readCache
+// buffers[1].closeForWrites();
+// }
// add remaining buffers.
- for (int i = 2; i < nbuffers; i++) {
+ for (int i = 1; i < nwriteBuffers; i++) {
final WriteCache tmp = newWriteCache(null/* buf */, useChecksum,
false/* bufferHasData */, opener, fileExtent);
- buffers[i] = tmp;
+ writeBuffers[i] = tmp;
- tmp.setSequence(nextCleanListTailSequence());
- cleanList.add(tmp);
+ cleanList.add(tmp);
}
// Set the same counters object on each of the write cache instances.
final WriteCacheServiceCounters counters = new WriteCacheServiceCounters(
- nbuffers, m_dirtyListThreshold, compactionThreshold);
+ nwriteBuffers, m_dirtyListThreshold, compactionThreshold);
- for (int i = 0; i < buffers.length; i++) {
+ for (int i = 0; i < writeBuffers.length; i++) {
- buffers[i].setCounters(counters);
+ writeBuffers[i].setCounters(counters);
}
@@ -600,7 +633,7 @@
capacity = current.get().capacity();
// set initial capacity based on an assumption of 1k buffers.
- recordMap = new ConcurrentHashMap<Long, WriteCache>(nbuffers
+ serviceMap = new ConcurrentHashMap<Long, WriteCache>(nwriteBuffers
* (capacity / 1024));
/*
@@ -665,6 +698,29 @@
private final int m_dirtyListThreshold;
/**
+ * The readCache is managed separately from the writeCache.
+ * <p>
+ * If active then the readCache may optionally be managed together
+ * with a hotList, to which frequently read buffers are transferred.
+ * <p>
+ * Data is added to the readCache:
+ * <li>after an evicted WriteCache is written to disk/HA
+ * <li>on a cache miss, disk reads are added to the cache
+ * <p>
+ * Data is added to the hotList when a readCache is evicted from the
+ * readList. resetWith uses the hitCount associated with live data
+ * records to determine which data is transferred to the hotList.
+ * <p>
+ * When a readCache is evicted from the hotList, the entire cache
+ * is moved to the readList.
+ */
+ private final int readListSize;
+ /**
+ * The readList - maximum of readListSize
+ */
+ final private BlockingQueue<ReadCache> readList;
+
+ /**
* Determines the size of the HIRS cache (will be zero if disabled)
* <p>
* Where HIRS captures High inter-reference vs Low inter-reference of
@@ -679,39 +735,19 @@
* then the per record hit count is used to determine which records are
* transferred to be maintained.
*/
- private final int hirsSize;
+ private final int hotListSize;
- /**
- * The hirsList - maximum of hirsSize - populated lazily from cleanList
+ /**
+ * The hotList - maximum of hirsSize - populated lazily from cleanList
*/
- final private BlockingQueue<WriteCache> hirsList;
+ final private BlockingQueue<ReadCache> hotList;
/**
- * The current hirsCache.
+ * The current hotCache.
*/
- private WriteCache hirsCache = null;
+ private ReadCache hotCache = null;
/**
- * The cleanListSequences are used to determine the position of a specific cache
- * in the clean list.
- * <p>
- * This utilizes the cacheSequence field used HA validation.
- * <p>
- * We maintain a simple long count. This value is sufficient to maintain
- * 1,000,000 additions per second for over 500,000 years, so should suffice
- * until the application is restarted.
- */
- private long m_cleanListHeadSequence = 0;
- private long m_cleanListTailSequence = 0;
-
- private long nextCleanListTailSequence() {
- return ++m_cleanListTailSequence;
- }
- private long prevCleanListHeadSequence() {
- return --m_cleanListHeadSequence;
- }
-
- /**
* Computes modular distance of a circular number list.
*
* eg start: 1, end:5, mod: 20 = 5-1 = ((5+20)-1)%20 = 4
@@ -768,7 +804,7 @@
try {
if (quorum != null) {
// allocate heap byte buffer for whole buffer checksum.
- checksumBuffer = ByteBuffer.allocate(buffers[0].peek()
+ checksumBuffer = ByteBuffer.allocate(writeBuffers[0].peek()
.capacity());
} else {
checksumBuffer = null;
@@ -940,7 +976,7 @@
: (double) nhit / ntests)));
final WriteCacheServiceCounters c = counters.get();
log.info("WriteCacheService: bufferCapacity="
- + buffers[0].capacity() + ",nbuffers="
+ + writeBuffers[0].capacity() + ",nbuffers="
+ tmp.nbuffers + ",nclean=" + tmp.nclean
+ ",ndirty=" + tmp.ndirty + ",maxDirty="
+ tmp.maxdirty + ",hitRate=" + hitRate + ",empty="
@@ -1011,7 +1047,7 @@
log.trace("Transferring to curCompactingCache");
done = WriteCache.transferTo(cache/* src */,
- curCompactingCache/* dst */, recordMap);
+ curCompactingCache/* dst */, serviceMap, 0/*threshold*/);
if (done) {
sendAddressMetadata(cache);
/*
@@ -1059,12 +1095,12 @@
if (log.isTraceEnabled())
log.trace("Setting curCompactingCache to reserve");
- reserve.resetWith(recordMap);//, fileExtent.get());
+ reserve.resetWith(serviceMap);//, fileExtent.get());
curCompactingCache = reserve;
if (log.isTraceEnabled())
log.trace("Transferring to curCompactingCache");
done = WriteCache.transferTo(cache/* src */,
- curCompactingCache/* dst */, recordMap);
+ curCompactingCache/* dst */, serviceMap, 0/*threshold*/);
if (!done) {
throw new AssertionError(
@@ -1142,10 +1178,10 @@
dirtyListLock.lockInterruptibly();
try {
assert m_dirtyListThreshold >= 1
- && m_dirtyListThreshold <= buffers.length : "dirtyListThreshold="
+ && m_dirtyListThreshold <= writeBuffers.length : "dirtyListThreshold="
+ m_dirtyListThreshold
+ ", #buffers="
- + buffers.length;
+ + writeBuffers.length;
/*
* Wait for a dirty buffer.
*
@@ -1489,7 +1525,7 @@
if (x != null) {
// reset if found.
- x.resetWith(recordMap);
+ x.resetWith(serviceMap);
// addClean(x, true/* addFirst */);
@@ -1527,7 +1563,7 @@
{
final WriteCacheServiceCounters c = counters.get();
c.ndirty = 0;
- c.nclean = buffers.length-1;
+ c.nclean = writeBuffers.length-1;
c.nreset++;
}
@@ -1591,9 +1627,8 @@
cleanListLock.lockInterruptibly();
try {
for (WriteCache x : c) {
- x.resetWith(recordMap);
+ x.resetWith(serviceMap);
cleanList.addFirst(x);
- x.setSequence(prevCleanListHeadSequence());
}
assert !cleanList.isEmpty();
@@ -1698,7 +1733,7 @@
try {
// close all buffers.
- for (WriteCache t : buffers) {
+ for (WriteCache t : writeBuffers) {
try {
t.close();
} catch (InterruptedException ex) {
@@ -1707,6 +1742,16 @@
}
}
+ // and any ReadCache buffers
+ for (ReadCache t : readBuffers) {
+ try {
+ t.close();
+ } catch (InterruptedException ex) {
+ interrupted = true;
+ continue;
+ }
+ }
+
// clear reference to the current buffer.
current.getAndSet(null);
@@ -1714,10 +1759,11 @@
compactingCache = null;
// clear reference to the readCache buffer.
- readCache.getAndSet(null);
+ readCache.getAndSet(null);
+ hotCache = null;
// clear the service record map.
- recordMap.clear();
+ serviceMap.clear();
// clear the file extent to an illegal value.
fileExtent.set(-1L);
@@ -2071,9 +2117,10 @@
}
// Guaranteed available hence non-blocking.
final WriteCache nxt = cleanList.take();
- this.m_cleanListHeadSequence = (int) nxt.getSequence() + 1;
counters.get().nclean--;
- nxt.resetWith(recordMap);//, fileExtent.get());
+
+ // FIXME: should already be pristine
+ nxt.resetWith(serviceMap);//, fileExtent.get());
current.set(nxt);
if (haLog.isInfoEnabled())
haLog.info("Flushed the write cache: seq=" + cacheSequence);
@@ -2234,7 +2281,7 @@
// write on the cache.
if (cache.write(offset, data, chk, useChecksum, latchedAddr)) {
- final WriteCache old = recordMap.put(offset, cache);
+ final WriteCache old = serviceMap.put(offset, cache);
// There should be no duplicate address in the record
// map since these entries should be removed, although
// write data may still exist in an old WriteCache.
@@ -2293,7 +2340,7 @@
* It fits: someone already changed to a new cache,
* which is fine.
*/
- if (recordMap.put(offset, cache) != null) {
+ if (serviceMap.put(offset, cache) != null) {
// The record should not already be in the cache.
throw new AssertionError("Record already in cache: offset=" + offset + " " + addrDebugInfo(offset));
}
@@ -2367,11 +2414,10 @@
// Take a buffer from the cleanList (guaranteed avail).
final WriteCache newBuffer = cleanList.take();
- m_cleanListHeadSequence = newBuffer.getSequence() + 1;
counters.get().nclean--;
// Clear the state on the new buffer and remove from
// cacheService map
- newBuffer.resetWith(recordMap);//, fileExtent.get());
+ newBuffer.resetWith(serviceMap);//, fileExtent.get());
// Set it as the new buffer.
current.set(cache = newBuffer);
@@ -2380,7 +2426,7 @@
if (cache.write(offset, data, chk, useChecksum, latchedAddr)) {
// This must be the only occurrence of this record.
- if (recordMap.put(offset, cache) != null) {
+ if (serviceMap.put(offset, cache) != null) {
throw new AssertionError("Record already in cache: offset=" + offset + " " + addrDebugInfo(offset));
}
@@ -2507,7 +2553,7 @@
* method for inserting an entry into the record map?)
* <p>
* Note: This method DOES NOT register the record with the shared
- * {@link #recordMap}. Since the record spans multiple {@link WriteCache}
+ * {@link #serviceMap}. Since the record spans multiple {@link WriteCache}
* objects it can not be directly recovered without reading it from the
* backing file.
*
@@ -2806,12 +2852,11 @@
// Take a buffer from the cleanList (guaranteed avail).
final WriteCache newBuffer = cleanList.take();
- m_cleanListHeadSequence = newBuffer.getSequence() + 1;
counters.get().nclean--;
// Clear state on new buffer and remove from cacheService map
- newBuffer.resetWith(recordMap);//, fileExtent.get());
+ newBuffer.resetWith(serviceMap);//, fileExtent.get());
// Set it as the new buffer.
current.set(newBuffer);
@@ -2828,21 +2873,51 @@
/**
* Add to the cleanList.
+ * <p>
+ * Since moving to an explicit readCache, we now call resetWith before
+ * adding the the cleanList. Potentially removing latency on acquiring
+ * a new cache from the clean list.
+ * <p>
+ * If a readCache is in operation then we will transfer to the read cache
*/
private void addClean(final WriteCache cache, final boolean addFirst)
throws InterruptedException {
if (cache == null)
throw new IllegalArgumentException();
+
+
+ if (this.readListSize > 0) { // if there is a readCache
+ synchronized (readCache) {
+ final ReadCache rcache = readCache.get();
+ if (!WriteCache.transferTo(cache, rcache, serviceMap, 0)) {
+ // full readCache
+ readCache.set(null);
+ readList.add(rcache);
+ final ReadCache ncache = getDirectReadCache();
+ if (ncache == null) {
+ throw new AssertionError();
+ }
+
+ // Now transfer remaining to new readCache
+ if (!WriteCache.transferTo(cache, ncache, serviceMap, 0)) {
+ throw new AssertionError();
+ }
+
+ readCache.set(ncache);
+ }
+ }
+ } else {
+ cache.resetWith(serviceMap);
+ }
+
cleanListLock.lockInterruptibly();
try {
assert cache.isEmpty() || cache.isClosedForWrites();
if (addFirst) {
cleanList.addFirst(cache);
- cache.setSequence(prevCleanListHeadSequence());
} else {
cleanList.addLast(cache);
- cache.setSequence(nextCleanListTailSequence());
}
cleanListNotEmpty.signalAll();
counters.get().nclean = cleanList.size();
@@ -2856,13 +2931,28 @@
if (tmp != null) {
counters.get().nclean--;
- m_cleanListHeadSequence = tmp.getSequence() + 1;
}
return tmp;
}
+ private ReadCache getDirectReadCache() throws InterruptedException {
+ final ReadCache tmp = readList.poll();
+
+ if (tmp != null) {
+ counters.get().nclean--;
+
+ // FIXME: add hot readCache data to hotCache
+ tmp.resetWith(serviceMap);
+ }
+
+
+
+ return tmp;
+
+ }
+
/**
* This is a non-blocking query of all write cache buffers (current, clean
* and dirty).
@@ -2934,7 +3024,7 @@
}
- final WriteCache cache = recordMap.get(off);
+ final WriteCache cache = serviceMap.get(off);
if (cache == null) {
@@ -2951,7 +3041,7 @@
final ByteBuffer ret = cache.read(off.longValue(), nbytes);
- if (ret == null && recordMap.get(off) == cache) {
+ if (ret == null && serviceMap.get(off) == cache) {
throw new IllegalStateException("Inconsistent cache for offset: " + off);
}
@@ -2961,74 +3051,74 @@
if (ret != null) {
- // check if on clean list AND hirs is enabled
- if (hirsSize > 0 && cache.isClosedForWrites()) {
- final long seq = cache.getSequence();
- if (seq > 0) { // NOT already HIRS cached
- final int cleanSize = cleanList.size();
- final int listPos = (int) (seq - m_cleanListHeadSequence);
-
- if (listPos < (cleanSize/4)) {
- // okay we've already got the heap buffer to return, now
- // we just want to transfer the data to the HIRS cache
- // Ideally we'd like to transfer using the two direct buffers
- // but initially we'll just copy the heap buffer since this avoids
- // extra locking and clean list interactions.
- // FIXME: optimize transfer to use direct buffers
- synchronized(hirsList) {
- // check to see if already transferred since we got the lock!
- final WriteCache curCache = recordMap.get(off);
- if (curCache != null && curCache.getSequence() > 0) { // not already in hirs cache
- // transfer
- if (hirsCache == null) {
- hirsCache = getDirectCleanCache();
- if (hirsCache != null)
- hirsCache.setSequence(-1);
- }
- if (hirsCache != null) {
- ByteBuffer dst = hirsCache.allocate(ret.limit());
- if (dst == null) {
- // add current hirsCache to hirsList tail
- hirsList.add(hirsCache);
-
- // check size of hirsList
- if (hirsList.size() >= hirsSize) { // include hirsCache
- hirsCache = getDirectCleanCache();
- if (hirsCache != null) {
- hirsCache.setSequence(-1);
- dst = hirsCache.allocate(ret.limit());
- }
- } else { // cycle current hirs buffers
- hirsCache = hirsList.take(); // MUST be available
- // FIXME: We could be throwing away good data
- hirsCache.resetWith(recordMap);
- hirsCache.setSequence(-1);
-
- dst = hirsCache.allocate(ret.limit());
- }
- }
-
- if (dst != null) {
- final int bpos = dst.position();
- dst.put(ret);
- ret.flip(); // reset for return
-
- hirsCache.commitToMap(off, bpos, nbytes);
- recordMap.put(off, hirsCache);
-
- // TODO: remove from original cache
- }
- }
-
-
- }
-
- }
-
- }
- }
- }
-
+// // check if on clean list AND hirs is enabled
+// if (hotListSize > 0 && cache.isClosedForWrites()) {
+// final long seq = cache.getSequence();
+// if (seq > 0) { // NOT already HIRS cached
+// final int cleanSize = cleanList.size();
+// final int listPos = (int) (seq - m_cleanListHeadSequence);
+//
+// if (listPos < (cleanSize/4)) {
+// // okay we've already got the heap buffer to return, now
+// // we just want to transfer the data to the HIRS cache
+// // Ideally we'd like to transfer using the two direct buffers
+// // but initially we'll just copy the heap buffer since this avoids
+// // extra locking and clean list interactions.
+// // FIXME: optimize transfer to use direct buffers
+// synchronized(hotList) {
+// // check to see if already transferred since we got the lock!
+// final WriteCache curCache = serviceMap.get(off);
+// if (curCache != null && curCache.getSequence() > 0) { // not already in hirs cache
+// // transfer
+// if (hotCache == null) {
+// hotCache = getDirectCleanCache();
+// if (hotCache != null)
+// hotCache.setSequence(-1);
+// }
+// if (hotCache != null) {
+// ByteBuffer dst = hotCache.allocate(ret.limit());
+// if (dst == null) {
+// // add current hirsCache to hirsList tail
+// hotList.add(hotCache);
+//
+// // check size of hirsList
+// if (hotList.size() >= hotListSize) { // include hirsCache
+// hotCache = getDirectCleanCache();
+// if (hotCache != null) {
+// hotCache.setSequence(-1);
+// dst = hotCache.allocate(ret.limit());
+// }
+// } else { // cycle current hirs buffers
+// hotCache = hotList.take(); // MUST be available
+// // FIXME: We could be throwing away good data
+// hotCache.resetWith(serviceMap);
+// hotCache.setSequence(-1);
+//
+// dst = hotCache.allocate(ret.limit());
+// }
+// }
+//
+// if (dst != null) {
+// final int bpos = dst.position();
+// dst.put(ret);
+// ret.flip(); // reset for return
+//
+// hotCache.commitToMap(off, bpos, nbytes);
+// serviceMap.put(off, hotCache);
+//
+// // TODO: remove from original cache
+// }
+// }
+//
+//
+// }
+//
+// }
+//
+// }
+// }
+// }
+//
return ret;
}
@@ -3278,6 +3368,7 @@
}
final boolean largeRecord = nbytes > capacity;
+ final boolean directRead = largeRecord || this.readListSize == 0;
/*
* The reader threads co-operatively manage the readCache on behalf of the
@@ -3293,9 +3384,9 @@
*/
// WriteCache.referenceCount := 0 ; // on reset() and init().
- WriteCache theCache = null;
+ ReadCache theCache = null;
ByteBuffer bb = null;
- if (!largeRecord) {
+ if (!directRead) {
synchronized (readCache) {
theCache = readCache.get();
@@ -3318,10 +3409,11 @@
addClean(theCache, false/* addFirst */);
}
- final WriteCache newCache = getDirectCleanCache(); // non-blocking
+ final ReadCache newCache = getDirectReadCache(); // non-blocking
// take
if (newCache != null) {
- newCache.resetWith(recordMap); // read for writes
+ // FIXME: resetWith should be a NOP
+ newCache.resetWith(serviceMap); // read for writes
newCache.closeForWrites(); // flag as read cache
@@ -3368,7 +3460,7 @@
// update record maps
theCache.commitToMap(offset, pos, nbytes);
- recordMap.put(offset, theCache);
+ serviceMap.put(offset, theCache);
// must copy to heap buffer from cache, allowing for checksum
final byte[] b = new byte[nbytes-4];
@@ -3463,14 +3555,14 @@
try {
counters.get().nclearAddrRequests++;
while (true) {
- final WriteCache cache = recordMap.get(offset);
+ final WriteCache cache = serviceMap.get(offset);
if (cache == null) {
// Not found.
return false;
}
cache.transferLock.lock();
try {
- final WriteCache cache2 = recordMap.get(offset);
+ final WriteCache cache2 = serviceMap.get(offset);
if (cache2 != cache) {
/*
* Not found in this WriteCache.
@@ -3484,7 +3576,7 @@
}
// Remove entry from the recordMap.
- final WriteCache oldValue = recordMap.remove(offset);
+ final WriteCache oldValue = serviceMap.remove(offset);
if (oldValue != null && cache != oldValue) {
/*
* Concurrent modification!
@@ -3574,7 +3666,7 @@
public boolean isPresent(final long addr) {
// System.out.println("Checking address: " + addr);
- return recordMap.get(addr) != null;
+ return serviceMap.get(addr) != null;
}
/**
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/FileMetadata.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -167,6 +167,11 @@
public final int writeCacheBufferCount;
/**
+ * The #of read cache buffers to be used if the write cache is enabled.
+ */
+ public final int readCacheBufferCount;
+
+ /**
* <code>true</code> iff record level checksums are enabled. These are used
* beginning with {@link RootBlockView#VERSION2} and for the
* {@link RWStrategy} from {@link RootBlockView#VERSION1}.
@@ -337,7 +342,7 @@
final boolean isEmptyFile, boolean deleteOnExit,
final boolean readOnly, final ForceEnum forceWrites,
final int offsetBits, final boolean writeCacheEnabled,
- final int writeCacheBufferCount, final boolean validateChecksum,
+ final int writeCacheBufferCount, final int readCacheBufferCount, final boolean validateChecksum,
final long createTime, final long quorumToken,
final boolean alternateRootBlock,
final Properties properties) throws RuntimeException {
@@ -389,6 +394,8 @@
this.writeCacheBufferCount = writeCacheBufferCount;
+ this.readCacheBufferCount = readCacheBufferCount;
+
this.fileMode = (readOnly ? "r" : forceWrites.asFileMode());
this.readOnly = readOnly;
@@ -886,6 +893,7 @@
FileMetadata(final File file, final boolean useDirectBuffers,
final boolean readOnly, final ForceEnum forceWrites,
final boolean writeCacheEnabled, final int writeCacheBufferCount,
+ final int readCacheBufferCount,
final boolean validateChecksum, final boolean alternateRootBlock,
final boolean ignoreBadRootBlock, final Properties properties)
throws RuntimeException {
@@ -909,6 +917,8 @@
this.writeCacheBufferCount = writeCacheBufferCount;
+ this.readCacheBufferCount = readCacheBufferCount;
+
this.fileMode = (readOnly ? "r" : forceWrites.asFileMode());
this.readOnly = readOnly;
@@ -1426,6 +1436,10 @@
properties, Options.WRITE_CACHE_BUFFER_COUNT,
Options.DEFAULT_WRITE_CACHE_BUFFER_COUNT));
+ final int readCacheBufferCount = Integer.parseInt(getProperty(
+ properties, Options.READ_CACHE_BUFFER_COUNT,
+ Options.DEFAULT_READ_CACHE_BUFFER_COUNT));
+
final boolean validateChecksum = Boolean.parseBoolean(getProperty(
properties, Options.VALIDATE_CHECKSUM,
Options.DEFAULT_VALIDATE_CHECKSUM));
@@ -1448,11 +1462,11 @@
/*
* Code path when the file exists and is non-empty.
*/
-
+
return new FileMetadata(file, useDirectBuffers, readOnly,
forceWrites, writeCacheEnabled, writeCacheBufferCount,
- validateChecksum, alternateRootBlock, ignoreBadRootBlock,
- properties);
+ readCacheBufferCount, validateChecksum, alternateRootBlock,
+ ignoreBadRootBlock, properties);
} else {
@@ -1474,10 +1488,10 @@
new LongRangeValidator(initialExtent, Long.MAX_VALUE));
/*
- * Note: The caller SHOULD specify an explicit [createTime] when
- * its value is critical. The default assigned here does NOT
- * attempt to use a clock that is consistent with the commit
- * protocol or even a clock that assigns unique timestamps.
+ * Note: The caller SHOULD specify an explicit [createTime] when its
+ * value is critical. The default assigned here does NOT attempt to
+ * use a clock that is consistent with the commit protocol or even a
+ * clock that assigns unique timestamps.
*/
final long createTime = Long.parseLong(getProperty(properties,
Options.CREATE_TIME, "" + System.currentTimeMillis()));
@@ -1495,9 +1509,10 @@
return new FileMetadata(file, bufferMode, useDirectBuffers,
initialExtent, maximumExtent, create, isEmptyFile,
deleteOnExit, readOnly, forceWrites, offsetBits,
- writeCacheEnabled, writeCacheBufferCount, validateChecksum,
- createTime, quorumToken, alternateRootBlock, properties);
-
+ writeCacheEnabled, writeCacheBufferCount,
+ readCacheBufferCount, validateChecksum, createTime,
+ quorumToken, alternateRootBlock, properties);
+
}
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/Options.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -240,6 +240,14 @@
String WRITE_CACHE_BUFFER_COUNT = AbstractJournal.class.getName()+".writeCacheBufferCount";
/**
+ * Option may be used to override the #of {@link ReadCache} buffers which
+ * will be used with a {@link WriteCacheService}.
+ *
+ * @see #DEFAULT_READ_CACHE_BUFFER_COUNT
+ */
+ String READ_CACHE_BUFFER_COUNT = AbstractJournal.class.getName()+".readCacheBufferCount";
+
+ /**
* Option may be used to control the maximum number of buffers on the
* {@link WriteCacheService} dirty list (default
* {@value #DEFAULT_WRITE_CACHE_MAX_DIRTY_LIST_SIZE}). This effectively
@@ -592,6 +600,13 @@
String DEFAULT_WRITE_CACHE_BUFFER_COUNT = "6";
/**
+ * The #of {@link ReadCache} buffers used by the {@link WriteCacheService}.
+ *
+ * @see #READ_CACHE_BUFFER_COUNT
+ */
+ String DEFAULT_READ_CACHE_BUFFER_COUNT = "0"; // 20
+
+ /**
* @see #WRITE_CACHE_MAX_DIRTY_LIST_SIZE
*/
String DEFAULT_WRITE_CACHE_MAX_DIRTY_LIST_SIZE = "0";
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/TemporaryRawStore.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -295,6 +295,7 @@
offsetBits,//
true, // writeCacheEnabled
3, // writeCacheBufferCount
+ 0, // readCacheBufferCount
false, // validateChecksum (desperation option for restart).
createTime,//
Quorum.NO_QUORUM,// Temporary stores are not HA.
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -946,7 +946,7 @@
final IReopenChannel<? extends Channel> opener,
final Quorum quorum) throws InterruptedException {
- super(writeCacheBufferCount, 0/* maxDirtyListSize */,
+ super(writeCacheBufferCount, 0/* maxDirtyListSize */, 0/*readBuffers*/,
false/* prefixWrites */, 100/* compactionThreshold */,
useChecksums, extent, opener, quorum, WORMStrategy.this /*reader*/);
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWStore.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -451,6 +451,13 @@
*/
private final int m_maxDirtyListSize;
+ /**
+ * The #of read buffers that will be used by the {@link WriteCacheService}.
+ *
+ * @see com.bigdata.journal.Options#READ_CACHE_BUFFER_COUNT
+ */
+ private final int m_readCacheBufferCount;
+
/**
* @see com.bigdata.journal.Options#WRITE_CACHE_COMPACTION_THRESHOLD
*/
@@ -721,6 +728,9 @@
m_writeCacheBufferCount = fileMetadata.writeCacheBufferCount;
+ // FIXME: DEBUG
+ m_readCacheBufferCount = 0; // fileMetadata.readCacheBufferCount;
+
if (log.isInfoEnabled())
log.info(com.bigdata.journal.Options.WRITE_CACHE_BUFFER_COUNT
+ "=" + m_writeCacheBufferCount);
@@ -937,7 +947,7 @@
final boolean prefixWrites = highlyAvailable;
return new RWWriteCacheService(m_writeCacheBufferCount,
- m_maxDirtyListSize, prefixWrites, m_compactionThreshold,
+ m_maxDirtyListSize, m_readCacheBufferCount, prefixWrites, m_compactionThreshold,
convertAddr(m_fileSize), m_reopener, m_quorum, DEBUG_USEREADCACHE ? this : null) {
@@ -1636,15 +1646,15 @@
+ m_writeCache.addrDebugInfo(paddr), t);
}
if (bbuf != null) {
- final byte[] in = bbuf.array(); // reads in with checksum - no need to check if in cache
- if (in.length != length-4) {
+ if (bbuf.limit() != length-4) {
assertAllocators();
throw new IllegalStateException(
"Incompatible buffer size for addr: " + paddr
- + ", " + in.length + " != "
+ + ", " + bbuf.limit() + " != "
+ (length - 4) + " writeCacheDebug: "
+ m_writeCache.addrDebugInfo(paddr));
}
+ final byte[] in = bbuf.array(); // reads in with checksum - no need to check if in cache
for (int i = 0; i < length-4; i++) {
buf[offset+i] = in[i];
}
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -47,14 +47,14 @@
protected static final Logger log = Logger.getLogger(RWWriteCacheService.class);
- public RWWriteCacheService(final int nbuffers, final int maxDirtyListSize,
+ public RWWriteCacheService(final int nbuffers, final int maxDirtyListSize, final int readBuffers,
final boolean prefixWrites, final int compactionThreshold,
final long fileExtent,
final IReopenChannel<? extends Channel> opener, final Quorum quorum,
final IBackingReader reader)
throws InterruptedException, IOException {
- super(nbuffers, maxDirtyListSize, prefixWrites, compactionThreshold,
+ super(nbuffers, maxDirtyListSize, readBuffers, prefixWrites, compactionThreshold,
true/* useChecksum */, fileExtent, opener, quorum, reader);
}
Modified: branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -148,7 +148,7 @@
final int compactionThreshold = 30;
writeCache = new RWWriteCacheService(5/* nbuffers */,
- 0/* maxDirtyListSize */, prefixWrites, compactionThreshold,
+ 0/* maxDirtyListSize */, 0/*readCacheSize*/, prefixWrites, compactionThreshold,
fileExtent, opener, quorum, null);
}
@@ -533,7 +533,7 @@
cache1.clearAddrMap(addr2, 0);
- WriteCache.transferTo(cache1, cache2, null);
+ WriteCache.transferTo(cache1, cache2, null, 0);
assertNull(cache1.read(addr1, data1.capacity()));
assertNotNull(cache2.read(addr1, data1.capacity()));
@@ -545,7 +545,7 @@
// now go back the other way
cache1.reset();
- WriteCache.transferTo(cache2, cache1, null);
+ WriteCache.transferTo(cache2, cache1, null, 0);
data1.position(0);
assertEquals(data1, cache1.read(addr1, data1.capacity()));
@@ -576,7 +576,7 @@
}
;
- assertTrue(WriteCache.transferTo(src, dst, null));
+ assertTrue(WriteCache.transferTo(src, dst, null, 0));
} finally {
src.close();
dst.close();
@@ -596,7 +596,7 @@
assertNotNull(src.read(addr, data.capacity()));
final int sb = src.bytesWritten();
- assertTrue(WriteCache.transferTo(src, dst, null));
+ assertTrue(WriteCache.transferTo(src, dst, null, 0));
final int db = dst.bytesWritten();
assertTrue(sb == db);
@@ -666,7 +666,7 @@
for (WriteCache src : srccaches) {
boolean done = false;
while (!done) {
- done = WriteCache.transferTo(src, dstcaches[dstIndex], null);
+ done = WriteCache.transferTo(src, dstcaches[dstIndex], null, 0);
if (!done)
dstIndex++;
}
Modified: branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
===================================================================
--- branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -2102,7 +2102,7 @@
throw new AssertionError();
}
writeCacheService = new WriteCacheService(nbuffers,
- maxDirtyListSize, prefixWrites, compactionThreshold,
+ maxDirtyListSize, 0, prefixWrites, compactionThreshold,
useChecksums, fileExtent, opener, quorum, null) {
/**
Modified: branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWriteCacheServiceLifetime.java
===================================================================
--- branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWriteCacheServiceLifetime.java 2012-12-18 20:17:48 UTC (rev 6780)
+++ branches/READ_CACHE/bigdata/src/test/com/bigdata/io/writecache/TestWriteCacheServiceLifetime.java 2012-12-19 17:06:01 UTC (rev 6781)
@@ -165,7 +165,7 @@
final boolean prefixWrites = rw;
final int compactionThreshold = 30;
config.service = new WriteCacheService(5/* nbuffers */,
- 0/* maxDirtyListSize */, prefixWrites, compactionThreshold,
+ 0/* maxDirtyListSize */, 0/* readCacheSize*/, prefixWrites, compactionThreshold,
true/* useChecksums */, fileExtent, config.opener,
config.quorum, null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mrp...@us...> - 2012-12-18 20:17:58
|
Revision: 6780
http://bigdata.svn.sourceforge.net/bigdata/?rev=6780&view=rev
Author: mrpersonick
Date: 2012-12-18 20:17:48 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
marked some openrdf forks. brought across some rio parser changes from 2.6.10
Modified Paths:
--------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Att.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Atts.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParserFactory.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriter.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriterFactory.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/SAXFilter.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BatchRDFValueResolver.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -32,7 +32,6 @@
import com.bigdata.rdf.model.BigdataBNodeImpl;
import com.bigdata.rdf.model.BigdataStatement;
import com.bigdata.rdf.model.BigdataValueFactory;
-import com.bigdata.rdf.model.StatementEnum;
/**
* RDF parser for N-Triples files. A specification of NTriples can be found in
@@ -54,6 +53,7 @@
*
* @author Arjohn Kampman
* @author Bryan Thompson
+ * @openrdf
*/
public class BigdataNTriplesParser extends RDFParserBase {
@@ -134,36 +134,36 @@
return stack.peek();
}
- /**
- * Return a buffer of zero length and non-zero capacity. The same buffer is
- * reused for each thing which is parsed. This reduces the heap churn
- * substantially. However, you have to watch out for side-effects and
- * convert the buffer to a {@link String} before the buffer is reused.
- *
- * @param capacityIsIgnored
-
- * @return
- */
- private StringBuilder getBuffer() {
- buffer.setLength(0);
- return buffer;
- }
-
- private final StringBuilder buffer = new StringBuilder(100);
-
- private StringBuilder getLanguageTagBuffer() {
- languageTagBuffer.setLength(0);
- return languageTagBuffer;
- }
-
- private final StringBuilder languageTagBuffer = new StringBuilder(8);
-
- private StringBuilder getDatatypeUriBuffer() {
- datatypeUriBuffer.setLength(0);
- return datatypeUriBuffer;
- }
-
- private final StringBuilder datatypeUriBuffer = new StringBuilder(40);
+// /**
+// * Return a buffer of zero length and non-zero capacity. The same buffer is
+// * reused for each thing which is parsed. This reduces the heap churn
+// * substantially. However, you have to watch out for side-effects and
+// * convert the buffer to a {@link String} before the buffer is reused.
+// *
+// * @param capacityIsIgnored
+//
+// * @return
+// */
+// private StringBuilder getBuffer() {
+// buffer.setLength(0);
+// return buffer;
+// }
+//
+// private final StringBuilder buffer = new StringBuilder(100);
+//
+// private StringBuilder getLanguageTagBuffer() {
+// languageTagBuffer.setLength(0);
+// return languageTagBuffer;
+// }
+//
+// private final StringBuilder languageTagBuffer = new StringBuilder(8);
+//
+// private StringBuilder getDatatypeUriBuffer() {
+// datatypeUriBuffer.setLength(0);
+// return datatypeUriBuffer;
+// }
+//
+// private final StringBuilder datatypeUriBuffer = new StringBuilder(40);
/*--------------*
* Constructors *
@@ -831,4 +831,68 @@
{
throw new RDFParseException("Unexpected end of file");
}
+
+
+ /**
+ * Return a buffer of zero length and non-zero capacity. The same buffer is
+ * reused for each thing which is parsed. This reduces the heap churn
+ * substantially. However, you have to watch out for side-effects and convert
+ * the buffer to a {@link String} before the buffer is reused.
+ *
+ * @param capacityIsIgnored
+ * @return
+ */
+ private StringBuilder getBuffer() {
+ buffer.setLength(0);
+ return buffer;
+ }
+
+ private final StringBuilder buffer = new StringBuilder(100);
+
+ /**
+ * Return a buffer for the use of parsing literal language tags. The buffer
+ * is of zero length and non-zero capacity. The same buffer is reused for
+ * each tag which is parsed. This reduces the heap churn substantially.
+ * However, you have to watch out for side-effects and convert the buffer to
+ * a {@link String} before the buffer is reused.
+ *
+ * @param capacityIsIgnored
+ * @return
+ */
+ private StringBuilder getLanguageTagBuffer() {
+ languageTagBuffer.setLength(0);
+ return languageTagBuffer;
+ }
+
+ private final StringBuilder languageTagBuffer = new StringBuilder(8);
+
+ /**
+ * Return a buffer for the use of parsing literal datatype URIs. The buffer
+ * is of zero length and non-zero capacity. The same buffer is reused for
+ * each datatype which is parsed. This reduces the heap churn substantially.
+ * However, you have to watch out for side-effects and convert the buffer to
+ * a {@link String} before the buffer is reused.
+ *
+ * @param capacityIsIgnored
+ * @return
+ */
+ private StringBuilder getDatatypeUriBuffer() {
+ datatypeUriBuffer.setLength(0);
+ return datatypeUriBuffer;
+ }
+
+ private final StringBuilder datatypeUriBuffer = new StringBuilder(40);
+
+// @Override
+// protected void clear() {
+// super.clear();
+// // get rid of anything large left in the buffers.
+// buffer.setLength(0);
+// buffer.trimToSize();
+// languageTagBuffer.setLength(0);
+// languageTagBuffer.trimToSize();
+// datatypeUriBuffer.setLength(0);
+// datatypeUriBuffer.trimToSize();
+// }
+
}
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -13,6 +13,7 @@
* An {@link RDFParserFactory} for N-Triples parsers.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class BigdataNTriplesParserFactory implements RDFParserFactory {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Att.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Att.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Att.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -7,6 +7,7 @@
/**
* An XML attribute.
+ * @openrdf
*/
class Att {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Atts.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Atts.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/Atts.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -11,6 +11,7 @@
/**
* A collection of XML attributes.
+ * @openrdf
*/
class Atts {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -88,6 +88,7 @@
* @see org.openrdf.rio.ParseLocationListener
* @author Arjohn Kampman
* @author Bryan Thompson
+ * @openrdf
*
* @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/439"> Class loader problems </a>
* @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/498"> Bring
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParserFactory.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParserFactory.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParserFactory.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -14,6 +14,7 @@
*
* @author Arjohn Kampman
* @author Bryan Thompson
+ * @openrdf
*/
public class BigdataRDFXMLParserFactory implements RDFParserFactory {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriter.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriter.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriter.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -39,6 +39,7 @@
*
* @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/498"> Bring
* bigdata RDF/XML parser up to openrdf 2.6.3.</a>
+ * @openrdf
*/
public class BigdataRDFXMLWriter implements RDFWriter {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriterFactory.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriterFactory.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLWriterFactory.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -18,6 +18,7 @@
*
* @author Arjohn Kampman
* @author Bryan Thompson
+ * @openrdf
*/
public class BigdataRDFXMLWriterFactory implements RDFWriterFactory {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/SAXFilter.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/SAXFilter.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/SAXFilter.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -31,6 +31,7 @@
* A filter on SAX events to make life easier on the RDF parser itself. This
* filter does things like combining a call to startElement() that is directly
* followed by a call to endElement() to a single call to emptyElement().
+ * @openrdf
*/
class SAXFilter implements ContentHandler {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -30,6 +30,7 @@
* </ul>
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class BigdataTurtleParser extends TurtleParser {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -14,6 +14,7 @@
* An {@link RDFParserFactory} for Turtle parsers.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class BigdataTurtleParserFactory implements RDFParserFactory {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -11,6 +11,8 @@
* Base class for visitors of the SPARQL AST.
*
* @author arjohn
+ * @openrdf
+ *
*/
public abstract class ASTVisitorBase implements SyntaxTreeBuilderVisitor {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -22,6 +22,7 @@
* precedence over the latter.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class BaseDeclProcessor {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BatchRDFValueResolver.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BatchRDFValueResolver.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BatchRDFValueResolver.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -87,6 +87,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class BatchRDFValueResolver extends ASTVisitorBase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -77,6 +77,7 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id: BigdataSPARQLParser.java 4793 2011-06-24 17:29:25Z thompsonbry
* $
+ * @openrdf
*/
public class Bigdata2ASTSPARQLParser implements QueryParser {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -54,6 +54,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class BigdataASTContext {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -56,6 +56,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public abstract class BigdataASTVisitorBase extends ASTVisitorBase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -109,6 +109,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class BigdataExprBuilder extends GroupGraphPatternBuilder {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -45,6 +45,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class BigdataParsedQuery extends ParsedQuery {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -45,6 +45,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class BigdataParsedUpdate extends ParsedUpdate {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -26,6 +26,7 @@
* retaining scope.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class BlankNodeVarProcessor extends ASTVisitorBase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/DatasetDeclProcessor.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -32,6 +32,7 @@
* @author Simon Schenk
* @author Arjohn Kampman
* @author Bryan Thompson
+ * @openrdf
*/
public class DatasetDeclProcessor {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -54,6 +54,7 @@
*
* @author Arjohn Kampman
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @openrdf
*/
class GroupGraphPattern {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -79,6 +79,7 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id: GroupGraphPatternBuilder.java 5064 2011-08-21 22:50:55Z
* thompsonbry $
+ * @openrdf
*/
public class GroupGraphPatternBuilder extends TriplePatternExprBuilder {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -19,6 +19,7 @@
* statement patterns.
*
* @author Jeen
+ * @openrdf
*/
public class NegatedPropertySet {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -34,6 +34,7 @@
* Processes the prefix declarations in a SPARQL query model.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class PrefixDeclProcessor {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -11,6 +11,7 @@
/**
*
* @author Jeen
+ * @openrdf
*/
public class PropertySetElem {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -11,6 +11,7 @@
* SPARQL-related utility methods.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class SPARQLUtil {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -18,6 +18,7 @@
* sequences in strings</a>.
*
* @author Arjohn Kampman
+ * @openrdf
*/
public class StringEscapesProcessor {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -56,6 +56,7 @@
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
+ * @openrdf
*/
public class TriplePatternExprBuilder extends ValueExprBuilder {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -93,6 +93,7 @@
*
* @author Jeen Broekstra
* @author Bryan Thompson
+ * @openrdf
*/
public class UpdateExprBuilder extends BigdataExprBuilder {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -134,6 +134,7 @@
* @version $Id$
*
* @see FunctionRegistry
+ * @openrdf
*/
public class ValueExprBuilder extends BigdataASTVisitorBase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -229,6 +229,7 @@
*/
static final Collection<String> testURIs = Arrays.asList(new String[] {
+// "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#
// "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#sameTerm-simple"
// "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2"
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -44,6 +44,7 @@
* easily executed using the {@link SPARQL11ManifestTest} format. This includes
* tests on queries with non-deterministic output (e.g. GROUP_CONCAT).
*
+ * @openrdf
* @author Jeen Broekstra
*/
public abstract class ComplexSPARQLQueryTest extends TestCase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -43,6 +43,7 @@
* Note: A variety of overrides have been made in order to run the test suite
* against Bigdata.
*
+ * @openrdf
* @author Arjohn Kampman
* @author Bryan Thompson
*/
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -28,6 +28,7 @@
* A variant on the {@link SPARQLQueryTest} which uses the bigdata AST and does
* not rely on {@link TupleExpr} and related classes.
*
+ * @openrdf
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
*/
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -66,6 +66,9 @@
import com.bigdata.rdf.sail.BigdataSailQuery;
+/**
+ * @openrdf
+ */
public abstract class SPARQLQueryTest extends TestCase {
/*-----------*
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -60,6 +60,7 @@
* @author Bryan Thompson
*
* @see TestSparqlUpdate
+ * @openrdf
*/
public abstract class SPARQLUpdateTest extends TestCase {
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java 2012-12-18 18:23:00 UTC (rev 6779)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java 2012-12-18 20:17:48 UTC (rev 6780)
@@ -46,6 +46,7 @@
* purely a test for data storage and retrieval which assumes that no
* inferencing or whatsoever is performed. This is an abstract class that should
* be extended for specific Sail implementations.
+ * @openrdf
*/
public abstract class RDFStoreTest extends TestCase {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-18 18:23:08
|
Revision: 6779
http://bigdata.svn.sourceforge.net/bigdata/?rev=6779&view=rev
Author: thompsonbry
Date: 2012-12-18 18:23:00 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Optimizations to PrefixDeclProcessor.
Tracked down the QUERY and UPDATE requests on which we are failing the syntax test suite. These are all compiled into BIgdataSPARQL2ASTParserTest.
Modified Paths:
--------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll.java
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll_AST.java
Added Paths:
-----------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java 2012-12-18 18:16:51 UTC (rev 6778)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java 2012-12-18 18:23:00 UTC (rev 6779)
@@ -37,9 +37,6 @@
*/
public class PrefixDeclProcessor {
- private static final Pattern hexPattern = Pattern.compile(
- "([^\\\\]|^)(%[A-F\\d][A-F\\d])", Pattern.CASE_INSENSITIVE);
-
/**
* Processes prefix declarations in queries. This method collects all
* prefixes that are declared in the supplied query, verifies that prefixes
@@ -101,7 +98,8 @@
assert colonIdx >= 0 : "colonIdx should be >= 0: " + colonIdx;
final String prefix = qname.substring(0, colonIdx);
- final String localName = processEscapesAndHex(qname.substring(colonIdx + 1));
+ final String localName0 = qname.substring(colonIdx + 1);
+ final String localName = processEscapesAndHex(localName0);
// Attempt to resolve the prefix to a namespace.
String namespace = prefixMap.get(prefix);
@@ -122,39 +120,58 @@
return null;
}
- private String processEscapesAndHex(String localName) {
+ private static final Pattern hexPattern = Pattern.compile(
+ "([^\\\\]|^)(%[A-F\\d][A-F\\d])", Pattern.CASE_INSENSITIVE);
+
+ private static final Pattern escapedCharPattern = Pattern
+ .compile("\\\\[_~\\.\\-!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=\\:\\/\\?#\\@\\%]");
+
+ /**
+ * Buffer is reused for the unencode and unescape of each localName
+ * within the scope of a given Query.
+ */
+ private final StringBuffer tmp = new StringBuffer();
+
+ private String processEscapesAndHex(final String localName) {
// first process hex-encoded chars.
- final StringBuffer unencoded = new StringBuffer();
- Matcher m = hexPattern.matcher(localName);
- boolean result = m.find();
- while (result) {
- // we match the previous char because we need to be sure we are not processing an escaped % char rather than
- // an actual hex encoding, for example: 'foo\%bar'.
- String previousChar = m.group(1);
- String encoded = m.group(2);
-
- int codePoint = Integer.parseInt(encoded.substring(1), 16);
- String decoded = String.valueOf( Character.toChars(codePoint));
-
- m.appendReplacement(unencoded, previousChar + decoded);
- result = m.find();
+ final String unencodedStr;
+ {
+ final StringBuffer unencoded = tmp; tmp.setLength(0);//new StringBuffer();
+ final Matcher m = hexPattern.matcher(localName);
+ boolean result = m.find();
+ while (result) {
+ // we match the previous char because we need to be sure we are not processing an escaped % char rather than
+ // an actual hex encoding, for example: 'foo\%bar'.
+ final String previousChar = m.group(1);
+ final String encoded = m.group(2);
+
+ final int codePoint = Integer.parseInt(encoded.substring(1), 16);
+ final String decoded = String.valueOf( Character.toChars(codePoint));
+
+ m.appendReplacement(unencoded, previousChar + decoded);
+ result = m.find();
+ }
+ m.appendTail(unencoded);
+ unencodedStr = unencoded.toString();
}
- m.appendTail(unencoded);
// then process escaped special chars.
- StringBuffer unescaped = new StringBuffer();
- Pattern escapedCharPattern = Pattern.compile("\\\\[_~\\.\\-!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=\\:\\/\\?#\\@\\%]");
- m = escapedCharPattern.matcher(unencoded.toString());
- result = m.find();
- while (result) {
- String escaped = m.group();
- m.appendReplacement(unescaped, escaped.substring(1));
- result = m.find();
- }
- m.appendTail(unescaped);
+ final String unescapedStr;
+ {
+ final StringBuffer unescaped = tmp; tmp.setLength(0);// new StringBuffer();
+ final Matcher m = escapedCharPattern.matcher(unencodedStr);
+ boolean result = m.find();
+ while (result) {
+ final String escaped = m.group();
+ m.appendReplacement(unescaped, escaped.substring(1));
+ result = m.find();
+ }
+ m.appendTail(unescaped);
+ unescapedStr = unescaped.toString();
+ }
- return unescaped.toString();
+ return unescapedStr;
}
/**
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java 2012-12-18 18:16:51 UTC (rev 6778)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java 2012-12-18 18:23:00 UTC (rev 6779)
@@ -33,6 +33,8 @@
import junit.framework.TestSuite;
import org.openrdf.query.MalformedQueryException;
+import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.parser.QueryParserUtil;
import org.openrdf.query.parser.sparql.SPARQL11SyntaxTest;
import org.openrdf.query.parser.sparql.SPARQLSyntaxTest;
@@ -57,6 +59,12 @@
public class Bigdata2ASTSPARQL11SyntaxTest extends SPARQL11SyntaxTest {
/**
+ * When <code>true</code> use the {@link Bigdata2ASTSPARQLParser} otherwise
+ * use the openrdf parser.
+ */
+ private static final boolean useBigdataParser = true;
+
+ /**
* @param testURI
* @param name
* @param queryFileURL
@@ -138,11 +146,28 @@
* This uses the {@link Bigdata2ASTSPARQLParser}.
*/
@Override
- protected void parseOperation(String query, String queryFileURL)
+ protected void parseOperation(final String query, final String queryFileURL)
throws MalformedQueryException {
- new Bigdata2ASTSPARQLParser(tripleStore).parseQuery(query, queryFileURL);
+ try {
+ if (useBigdataParser) {
+ // bigdata parser.
+ new Bigdata2ASTSPARQLParser(tripleStore).parseOperation(query,
+ queryFileURL);
+ } else {
+ // openrdf parser.
+ QueryParserUtil
+ .parseOperation(QueryLanguage.SPARQL, query, queryFileURL);
+ }
+
+ } catch (MalformedQueryException ex) {
+
+ throw new MalformedQueryException(ex + ": query=" + query
+ + ", queryFileURL=" + queryFileURL, ex);
+
+ }
+
}
public static Test suite() throws Exception {
Added: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java (rev 0)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java 2012-12-18 18:23:00 UTC (rev 6779)
@@ -0,0 +1,364 @@
+/**
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+/*
+ * Created on Nov 7, 2007
+ */
+package com.bigdata.rdf.sail.sparql;
+
+import org.openrdf.query.MalformedQueryException;
+import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.parser.QueryParserUtil;
+
+/**
+ * Non-manifest driven versions of the manifest driven test suite to facilitate
+ * debugging.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ */
+public class BigdataSPARQL2ASTParserTest extends AbstractBigdataExprBuilderTestCase {
+
+ public BigdataSPARQL2ASTParserTest() {
+ }
+
+ public BigdataSPARQL2ASTParserTest(String name) {
+ super(name);
+ }
+
+ /**
+ * PrefixName with backslash-escaped colons.
+ * <pre>
+ * SELECT * WHERE {
+ * ?page og:audio\:title ?title
+ * }
+ * </pre>
+ * @throws MalformedQueryException
+ * @see syntax-query/qname-escape-01.rq
+ */
+ public void test_qname_escape_01() throws MalformedQueryException {
+
+ final String query = " SELECT * WHERE {\n"+
+ " ?page og:audio\\:title ?title\n"+
+ "}";
+
+ parseOperation(query);
+
+ }
+
+ /**
+ * PrefixName with backslash-escaped colon (qname in select).
+ */
+ public void test_qname_escape_01b() throws MalformedQueryException {
+
+ final String query = "PREFIX og: <http://ogp.me/ns#>\n"
+ + "SELECT ( og:audio\\:title as ?x )"
+ + "WHERE {?page og:foo ?title}";
+
+ parseOperation(query);
+
+ }
+
+ /**
+ * PrefixName with hex-encoded colon.
+ */
+ public void test_qname_escape_02() throws MalformedQueryException {
+
+ final String query = "PREFIX og: <http://ogp.me/ns#>\n"
+ + "SELECT * WHERE { ?page og:audio%3Atitle ?title }";
+
+ parseOperation(query);
+
+ }
+
+ /**
+ * Positive test (originally failed because it was being passed to
+ * parseQuery() rather than parseUpdate()).
+ */
+ public void test_syntax_update_01() throws MalformedQueryException {
+
+ final String query="BASE <http://example/base#>\n"+
+ "PREFIX : <http://example/>\n"+
+ "LOAD <http://example.org/faraway>";
+
+ parseOperation(query);
+
+ }
+
+ /** grouping by expression, done wrong */
+ public void test_agg08() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://www.example.org/>\n"
+ + "SELECT ((?O1 + ?O2) AS ?O12) (COUNT(?O1) AS ?C)\n"
+ + "WHERE { ?S :p ?O1; :q ?O2 } GROUP BY (?O1 + ?O2)\n"
+ + "ORDER BY ?O12";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Projection of an ungrouped variable (not appearing in the GROUP BY
+ * expression)
+ */
+ public void test_agg09() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://www.example.org/>\n"
+ + "SELECT ?P (COUNT(?O) AS ?C)\n"
+ + "WHERE { ?S ?P ?O } GROUP BY ?S";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Projection of an ungrouped variable (no GROUP BY expression at all)
+ */
+ public void test_agg10() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://www.example.org/>\n"
+ + "SELECT ?P (COUNT(?O) AS ?C)\n"
+ + "WHERE { ?S ?P ?O }";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Use of an ungrouped variable in a project expression
+ */
+ public void test_agg11() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://www.example.org/>\n"
+ + "SELECT ((?O1 + ?O2) AS ?O12) (COUNT(?O1) AS ?C)\n"
+ + "WHERE { ?S :p ?O1; :q ?O2 } GROUP BY (?S)";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Use of an ungrouped variable in a project expression, where the variable
+ * appears in a GROUP BY expression
+ */
+ public void test_agg12() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://www.example.org/>\n"+
+ "SELECT ?O1 (COUNT(?O2) AS ?C)\n"+
+ "WHERE { ?S :p ?O1; :q ?O2 } GROUP BY (?O1 + ?O2)";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * projection of ungrouped variable
+ */
+ public void test_group06() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://example/>\n"+
+ "SELECT ?s ?v\n"+
+ "{\n"+
+ " ?s :p ?v .\n"+
+ "}\n"+
+ "GROUP BY ?s";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * projection of ungrouped variable, more complex example than Group-6
+ */
+ public void test_group07() throws MalformedQueryException {
+
+ final String query = "prefix lode: <http://linkedevents.org/ontology/>\n"+
+ "prefix dc: <http://purl.org/dc/elements/1.1/>\n"+
+"prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"+
+"select ?event ?eventName ?venue ?photo\n"+
+"where {\n"+
+" ?photo lode:illustrate ?event .\n"+
+" {\n"+
+" select ?event ?eventName ?venue\n"+
+" where {\n"+
+" ?event dc:title ?eventName .\n"+
+" ?event lode:atPlace ?venue .\n"+
+" ?venue rdfs:label \"Live Music Hall\" .\n"+
+" }\n"+
+" }\n"+
+"}\n"+
+"GROUP BY ?event\n"
+;
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Select * Not allowed with GROUP BY
+ */
+ public void test_syn_bad_01() throws MalformedQueryException {
+
+ final String query = "SELECT * { ?s ?p ?o } GROUP BY ?s";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * required syntax error : out of scope variable in SELECT from group.
+ */
+ public void test_syn_bad_02() throws MalformedQueryException {
+
+ final String query = "SELECT ?o { ?s ?p ?o } GROUP BY ?s";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+ /**
+ * Same variable can not be projected more than once.
+ */
+ public void test_syn_bad_03() throws MalformedQueryException {
+
+ final String query = "SELECT (1 AS ?X) (1 AS ?X) {}";
+
+ parseOperation(query);
+
+ fail("Negative test - should fail");
+
+ }
+
+
+ /** Empty UPDATE. */
+ public void test_syntax_update_38() throws MalformedQueryException {
+
+ final String query = "# Empty\n";
+
+ parseOperation(query);
+
+ }
+
+ /** BASE but otherwise empty UPDATE. */
+ public void test_syntax_update_39() throws MalformedQueryException {
+
+ final String query = "BASE <http://example/>\n# Otherwise empty\n";
+
+ parseOperation(query);
+
+ }
+ /** PREFIX but otherwise empty UPDATE. */
+ public void test_syntax_update_30() throws MalformedQueryException {
+
+ final String query = "PREFIX : <http://example/>\n# Otherwise empty\n";
+
+ parseOperation(query);
+
+ }
+
+ /**
+ * Variable in DELETE DATA's data.
+ */
+ public void test_syntax_update_bad_03() throws MalformedQueryException {
+
+ final String query = "DELETE DATA { ?s <p> <o> }";
+
+ parseOperation(query);
+
+ }
+
+ /** Variable in INSERT DATA's data. */
+ public void test_syntax_update_bad_04() throws MalformedQueryException {
+
+ final String query = "INSERT DATA { GRAPH ?g {<s> <p> <o> } }";
+
+ parseOperation(query);
+
+ }
+
+ /** Too many separators (in UPDATE request) */
+ public void test_syntax_update_bad_08() throws MalformedQueryException {
+
+ final String query = "CREATE GRAPH <g> ;; LOAD <remote> into GRAPH <g>";
+
+ parseOperation(query);
+
+ }
+
+ /** Too many separators (in UPDATE request) */
+ public void test_syntax_update_bad_09() throws MalformedQueryException {
+
+ final String query = "CREATE GRAPH <g> ; LOAD <remote> into GRAPH <g> ;;";
+
+ parseOperation(query);
+
+ }
+
+ /** BNode in DELETE WHERE */
+ public void test_syntax_update_bad_10() throws MalformedQueryException {
+
+ final String query = "DELETE WHERE { _:a <p> <o> }";
+
+ parseOperation(query);
+
+ }
+
+ /**
+ * When <code>true</code> use the {@link Bigdata2ASTSPARQLParser} otherwise
+ * use the openrdf parser.
+ */
+ private static final boolean useBigdataParser = true;
+
+ protected void parseOperation(final String query)
+ throws MalformedQueryException {
+
+ if (useBigdataParser) {
+
+ new Bigdata2ASTSPARQLParser(tripleStore).parseOperation(query,
+ baseURI);
+
+ } else {
+
+ QueryParserUtil.parseOperation(QueryLanguage.SPARQL, query, baseURI);
+
+ }
+
+ }
+
+}
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll.java 2012-12-18 18:16:51 UTC (rev 6778)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll.java 2012-12-18 18:23:00 UTC (rev 6779)
@@ -74,6 +74,9 @@
* parser and it is not aware of bigdata specific SPARQL extensions.
*/
+ // non-manifest driven suite for debugging.
+ suite.addTestSuite(BigdataSPARQL2ASTParserTest.class);
+
suite.addTest(Bigdata2ASTSPARQLSyntaxTest.suite());
suite.addTest(Bigdata2ASTSPARQL11SyntaxTest.suite());
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll_AST.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll_AST.java 2012-12-18 18:16:51 UTC (rev 6778)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestAll_AST.java 2012-12-18 18:23:00 UTC (rev 6779)
@@ -67,13 +67,13 @@
*/
suite.addTestSuite(TestTriplePatternBuilder.class);
- /*
- * Test suite for the proposed standardization of
- * "reification done right".
- *
- * @see https://sourceforge.net/apps/trac/bigdata/ticket/526
- * (Reification done right)
- */
+ /**
+ * Test suite for the proposed standardization of
+ * "reification done right".
+ *
+ * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/526">
+ * Reification done right </a>
+ */
if (false) // TODO Integrate into CI.
suite.addTestSuite(TestReificationDoneRightParser.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2012-12-18 18:16:58
|
Revision: 6778
http://bigdata.svn.sourceforge.net/bigdata/?rev=6778&view=rev
Author: thompsonbry
Date: 2012-12-18 18:16:51 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Added method to parse an "operation" without knowing in advance if it is a query or update (from openrdf QueryParserUtil).
Modified Paths:
--------------
branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java
Modified: branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java
===================================================================
--- branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java 2012-12-17 21:27:49 UTC (rev 6777)
+++ branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java 2012-12-18 18:16:51 UTC (rev 6778)
@@ -38,9 +38,11 @@
import org.openrdf.model.URI;
import org.openrdf.model.impl.URIImpl;
import org.openrdf.query.MalformedQueryException;
+import org.openrdf.query.parser.ParsedOperation;
import org.openrdf.query.parser.ParsedQuery;
import org.openrdf.query.parser.ParsedUpdate;
import org.openrdf.query.parser.QueryParser;
+import org.openrdf.query.parser.QueryParserUtil;
import org.openrdf.query.parser.sparql.SPARQLParser;
import com.bigdata.bop.BOpUtility;
@@ -96,6 +98,38 @@
}
/**
+ * Parse either a SPARQL QUERY or a SPARQL UPDATE request.
+ * @param operation The request.
+ * @param baseURI The base URI.
+ *
+ * @return The {@link ParsedOperation}
+ */
+ public ParsedOperation parseOperation(final String operation,
+ final String baseURI) throws MalformedQueryException {
+
+ final String strippedOperation = QueryParserUtil
+ .removeSPARQLQueryProlog(operation).toUpperCase();
+
+ final ParsedOperation parsedOperation;
+
+ if (strippedOperation.startsWith("SELECT")
+ || strippedOperation.startsWith("CONSTRUCT")
+ || strippedOperation.startsWith("DESCRIBE")
+ || strippedOperation.startsWith("ASK")) {
+
+ parsedOperation = parseQuery(operation, baseURI);
+
+ } else {
+
+ parsedOperation = parseUpdate(operation, baseURI);
+
+ }
+
+ return parsedOperation;
+
+ }
+
+ /**
* {@inheritDoc}
* <p>
* The use of the alternative {@link #parseQuery2(String, String)} is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
