Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8012] branches/RDR
|
From: <mrp...@us...> - 2014-03-23 22:45:17
|
Revision: 8012
http://sourceforge.net/p/bigdata/code/8012
Author: mrpersonick
Date: 2014-03-23 22:45:13 +0000 (Sun, 23 Mar 2014)
Log Message:
-----------
expose a bulk remove(ISPO) method on the sail
Modified Paths:
--------------
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/StatementWriter.java
branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java
branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/StatementWriter.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/StatementWriter.java 2014-03-23 17:46:59 UTC (rev 8011)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/StatementWriter.java 2014-03-23 22:45:13 UTC (rev 8012)
@@ -144,7 +144,7 @@
}
- private static long removeStatements(final AbstractTripleStore database,
+ public static long removeStatements(final AbstractTripleStore database,
final ISPO[] stmts,
final int numStmts,
final boolean computeClosureForStatementIdentifiers,
Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java 2014-03-23 17:46:59 UTC (rev 8011)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java 2014-03-23 22:45:13 UTC (rev 8012)
@@ -80,11 +80,6 @@
*/
private transient String hostAddress;
-// /**
-// * The IPv4 prefix byte.
-// */
-// private transient byte prefix;
-
/**
* The cached byte[] key for the encoding of this IV.
*/
@@ -128,8 +123,6 @@
this.value = value;
-// this.prefix = prefix;
-
}
/*
@@ -180,8 +173,6 @@
this.value = Inet4Address.textToAddr(s);
-// this.prefix = suffix != null ? Byte.valueOf(suffix) : (byte) 33;
-
} else {
throw new IllegalArgumentException("not an IP: " + hostAddress);
Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java 2014-03-23 17:46:59 UTC (rev 8011)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java 2014-03-23 22:45:13 UTC (rev 8012)
@@ -23,7 +23,7 @@
/*
Portions of this code are:
-Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
+Copyright Aduna (http://www.aduna-software.com/) 2001-2007
All rights reserved.
@@ -146,6 +146,7 @@
import com.bigdata.relation.accesspath.IElementFilter;
import com.bigdata.service.AbstractFederation;
import com.bigdata.service.IBigdataFederation;
+import com.bigdata.striterator.ChunkedArrayIterator;
import com.bigdata.striterator.CloseableIteratorWrapper;
import com.bigdata.striterator.IChunkedIterator;
import com.bigdata.striterator.IChunkedOrderedIterator;
@@ -2786,6 +2787,125 @@
}
+ /**
+ * Note: The CONTEXT is ignored when in statementIdentifier mode!
+ */
+ public synchronized int removeStatements(final ISPO[] stmts, final int numStmts) throws SailException {
+
+ assertWritableConn();
+
+ flushStatementBuffers(true/* flushAssertBuffer */, false/* flushRetractBuffer */);
+
+ if (m_listeners != null) {
+
+ /*
+ * FIXME to support the SailConnectionListener we need to
+ * pre-materialize the explicit statements that are to be
+ * deleted and then notify the listener for each such explicit
+ * statement. Since that is a lot of work, make sure that we do
+ * not generate notices unless there are registered listeners!
+ */
+
+ throw new UnsupportedOperationException();
+
+ }
+
+ // #of explicit statements removed.
+ long n = 0;
+
+ if (getTruthMaintenance()) {
+
+ /*
+ * Since we are doing truth maintenance we need to copy the
+ * matching "explicit" statements into a temporary store rather
+ * than deleting them directly. This uses the internal API to
+ * copy the statements to the temporary store without
+ * materializing them as Sesame Statement objects.
+ */
+
+ /*
+ * Obtain a chunked iterator using the triple pattern that
+ * visits only the explicit statements.
+ */
+ final IChunkedOrderedIterator<ISPO> itr =
+ new ChunkedArrayIterator<ISPO>(numStmts, stmts,
+ null/* keyOrder */);
+
+ // The tempStore absorbing retractions.
+ final AbstractTripleStore tempStore = getRetractionBuffer()
+ .getStatementStore();
+
+ // Copy explicit statements to tempStore.
+ n = tempStore.addStatements(tempStore, true/* copyOnly */,
+ itr, null/* filter */);
+
+ /*
+ * Nothing more happens until the commit or incremental write
+ * flushes the retraction buffer and runs TM.
+ */
+
+ } else {
+
+ /*
+ * Since we are not doing truth maintenance, just remove the
+ * statements from the database (synchronous, batch api, not
+ * buffered).
+ */
+
+ if (changeLog == null) {
+
+ n = database.removeStatements(stmts, numStmts);
+
+ } else {
+
+// final IChunkedOrderedIterator<ISPO> itr =
+// database.computeClosureForStatementIdentifiers(
+// new ChunkedArrayIterator<ISPO>(numStmts, stmts,
+// null/* keyOrder */));
+
+ // no need to compute closure for sids since we just did it
+ n = StatementWriter.removeStatements(database, stmts, numStmts,
+ database.getStatementIdentifiers()/* computeClosureForStatementIdentifiers */,
+ changeLog);
+
+// final IAccessPath<ISPO> ap =
+// database.getAccessPath(s, p, o, c);
+//
+// final IChunkedOrderedIterator<ISPO> itr = ap.iterator();
+//
+// if (itr.hasNext()) {
+//
+// final BigdataStatementIteratorImpl itr2 =
+// new BigdataStatementIteratorImpl(database, bnodes2, itr)
+// .start(database.getExecutorService());
+//
+// final BigdataStatement[] stmts =
+// new BigdataStatement[database.getChunkCapacity()];
+//
+// int i = 0;
+// while (i < stmts.length && itr2.hasNext()) {
+// stmts[i++] = itr2.next();
+// if (i == stmts.length) {
+// // process stmts[]
+// n += removeAndNotify(stmts, i);
+// i = 0;
+// }
+// }
+// if (i > 0) {
+// n += removeAndNotify(stmts, i);
+// }
+//
+// }
+
+ }
+
+ }
+
+ // avoid overflow.
+ return (int) Math.min(Integer.MAX_VALUE, n);
+
+ }
+
// private long removeAndNotify(final BigdataStatement[] stmts, final int numStmts) {
//
// final SPO[] tmp = new SPO[numStmts];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
