You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/07/13 15:28:09 UTC
svn commit: r1361206 - in
/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb: TDB.java
base/objectfile/ObjectFileMem.java index/IndexLib.java lib/TupleLib.java
transaction/DatasetGraphTxn.java
Author: andy
Date: Fri Jul 13 13:28:09 2012
New Revision: 1361206
URL: http://svn.apache.org/viewvc?rev=1361206&view=rev
Log:
Removed deprecated code.
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileMem.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1361206&r1=1361205&r2=1361206&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Fri Jul 13 13:28:09 2012
@@ -89,12 +89,6 @@ public class TDB
/** Symbol to use the union of named graphs as the default graph of a query */
public static final Symbol symUnionDefaultGraph = SystemTDB.allocSymbol("unionDefaultGraph") ;
- /** Symbol to use the union of named graphs as the default graph of a query
- * @deprecated Use ARQ.symLogExec instead.
- */
- @Deprecated
- public static final Symbol symLogExec = ARQ.symLogExec ;
-
public static Context getContext() { return ARQ.getContext() ; }
// Called on assembler loading.
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java?rev=1361206&r1=1361205&r2=1361206&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java Fri Jul 13 13:28:09 2012
@@ -28,18 +28,6 @@ import com.hp.hpl.jena.tdb.store.NodeId;
public class IndexLib
{
-// @Deprecated
-// public static Iterator<Tuple<NodeId>> tuples(RangeIndex index)
-// {
-// return tuplesRaw(index.iterator()) ;
-// }
-//
-// @Deprecated
-// public static void print(RangeIndex index)
-// {
-// print(tuples(index)) ;
-// }
-
public static void print(Iterator<Tuple<NodeId>> iter)
{
@@ -50,27 +38,4 @@ public class IndexLib
}
}
-// @Deprecated
-// public static Iterator<Tuple<NodeId>> tuplesRaw(Iterator<Record> iter)
-// {
-// Transform<Record, Tuple<NodeId>> transform = new Transform<Record, Tuple<NodeId>>() {
-// @Override
-// public Tuple<NodeId> convert(Record item)
-// {
-// return tuplesRaw(item) ;
-// }} ;
-// return Iter.map(iter, transform) ;
-// }
-// // ----
-//
-// @Deprecated
-// public static Tuple<NodeId> tuplesRaw(Record e)
-// {
-// // In index native order
-// NodeId x = NodeLib.getNodeId(e, 0) ;
-// NodeId y = NodeLib.getNodeId(e, NodeId.SIZE) ;
-// NodeId z = NodeLib.getNodeId(e, 2*NodeId.SIZE) ;
-// return Tuple.create(x, y, z) ;
-// }
-
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java?rev=1361206&r1=1361205&r2=1361206&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java Fri Jul 13 13:28:09 2012
@@ -66,7 +66,6 @@ public class TupleLib
return Iter.map(iter, action) ;
}
- //@Deprecated
//Leave - bypasses extract step in Tuple<NodeId> -> Tuple<Node> -> Triple
public static Iterator<Triple> convertToTriples(final NodeTable nodeTable, Iterator<Tuple<NodeId>> iter)
{
@@ -79,7 +78,6 @@ public class TupleLib
return Iter.map(iter, action) ;
}
- //@Deprecated
public static Iterator<Quad> convertToQuads(final NodeTable nodeTable, Iterator<Tuple<NodeId>> iter)
{
Transform<Tuple<NodeId>, Quad> action = new Transform<Tuple<NodeId>, Quad>(){
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java?rev=1361206&r1=1361205&r2=1361206&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java Fri Jul 13 13:28:09 2012
@@ -55,13 +55,4 @@ public class DatasetGraphTxn extends Dat
transaction.close() ;
}
- /** Do not end a transaction this way - use .end() - compatiblity only
- * @deprecated Strongly deprecated -- use {@link #end}*/
- @Override
- @Deprecated
- public void close()
- {
- end() ;
- }
-
}