[Mulgara-svn] r903 - in trunk/src/jar: content-n3/java/org/mulgara/content/n3 resolver-nodetype/java/org/mulgara/resolver/nodetype resolver-prefix/java/org/mulgara/resolver/prefix resolver-spi/java/org/mulgara/resolver/spi resolver-store/java/org/mulgara/store/statement/xa store-stringpool-memory/java/org/mulgara/store/stringpool/memory store-stringpool-xa/java/org/mulgara/store/stringpool/xa tuples/java/org/mulgara/store/tuples tuples-hybrid/java/org/mulgara/store/xa
pag at mulgara.org
pag at mulgara.org
Wed May 7 14:24:03 UTC 2008
Author: pag
Date: 2008-05-07 07:24:02 -0700 (Wed, 07 May 2008)
New Revision: 903
Modified:
trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java
trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/TuplesWrapperResolution.java
trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesWrapperResolution.java
trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/WrappedTuples.java
Log:
Added a method to allow possibly filtered Tuples to provide access to the raw unfiltered data
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -125,7 +125,8 @@
// We recognize a fixed set of extensions
return path.endsWith(".n3") ||
- path.endsWith(".nt");
+ path.endsWith(".nt") ||
+ path.endsWith(".ttl");
}
/**
Modified: trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/TuplesWrapperResolution.java
===================================================================
--- trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/TuplesWrapperResolution.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/TuplesWrapperResolution.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -302,6 +302,11 @@
return tuples.getColumnValue(column);
}
+ /** {@inheritDoc} */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return tuples.getColumnValue(column);
+ }
+
/**
* Renames the variables which label the tuples if they have the "magic" names
* such as "Subject", "Predicate", "Object" and "Meta".
Modified: trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java
===================================================================
--- trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/TuplesWrapperResolution.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -285,6 +285,11 @@
return tuples.getColumnValue(column);
}
+ /** {@inheritDoc} */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return tuples.getColumnValue(column);
+ }
+
/**
* Renames the variables which label the tuples if they have the "magic" names
* such as "Subject", "Predicate", "Object" and "Meta".
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesContext.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -77,7 +77,7 @@
*/
public long getColumnValue(int columnNumber) throws QueryException {
try {
- return tuples.getColumnValue(columnNumber);
+ return tuples.getRawColumnValue(columnNumber);
} catch (Exception te) { // TuplesException
throw new QueryException("Error resolving value", te);
}
@@ -90,7 +90,7 @@
*/
public boolean isBound(int columnNumber) throws QueryException {
try {
- return columnNumber != NOT_BOUND && tuples.getColumnValue(columnNumber) != Tuples.UNBOUND;
+ return columnNumber != NOT_BOUND && tuples.getRawColumnValue(columnNumber) != Tuples.UNBOUND;
} catch (Exception te) { // TuplesException
throw new QueryException("Error resolving column", te);
}
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesWrapperResolution.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesWrapperResolution.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/TuplesWrapperResolution.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -301,6 +301,11 @@
return tuples.getColumnValue(column);
}
+ /** @see org.mulgara.store.tuples.Tuples#getRawColumnValue(int) */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return tuples.getColumnValue(column);
+ }
+
/**
* Renames the variables which label the tuples if they have the "magic" names
* such as "Subject", "Predicate", "Object" and "Meta".
Modified: trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/resolver-store/java/org/mulgara/store/statement/xa/TripleAVLFile.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -1959,6 +1959,10 @@
}
+ public long getRawColumnValue(int column) throws TuplesException {
+ return getColumnValue(column);
+ }
+
public long getColumnValue(int column) throws TuplesException {
try {
return tripleBlock.getLong(
Modified: trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java
===================================================================
--- trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/store-stringpool-memory/java/org/mulgara/store/stringpool/memory/MemoryStringPoolImpl.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -573,9 +573,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public long getColumnValue(int column) throws TuplesException {
if (column != 0) {
throw new TuplesException("Column does not exist");
@@ -583,6 +581,11 @@
return stringToNodePool.get(currentRow);
}
+ /** {@inheritDoc} */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return getColumnValue(column);
+ }
+
/**
* {@inheritDoc}
*/
Modified: trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java
===================================================================
--- trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/store-stringpool-xa/java/org/mulgara/store/stringpool/xa/XAStringPoolImpl.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -2524,6 +2524,10 @@
return avlNode.getPayloadLong(IDX_GRAPH_NODE);
}
+ public long getRawColumnValue(int column) throws TuplesException {
+ return getColumnValue(column);
+ }
+
public Variable[] getVariables() {
// Clone the variables array in case the caller changes the returned
// array.
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -218,13 +218,25 @@
/**
* Gets the ColumnValue attribute of the AbstractTuples object
*
- * @param column PARAMETER TO DO
+ * @param column The column offset to get data from
* @return The ColumnValue value
- * @throws TuplesException EXCEPTION TO DO
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
*/
public abstract long getColumnValue(int column) throws TuplesException;
/**
+ * Gets the raw (unfiltered) ColumnValue attribute of the AbstractTuples object.
+ * By default this returns the normal column value.
+ *
+ * @param column The column offset to get data from
+ * @return The column value as a gNode
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
+ */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return getColumnValue(column);
+ }
+
+ /**
* Returns a copy of the internal variables.
*
* @return a copy of the internal variables.
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -86,7 +86,13 @@
return unfiltered.getColumnValue(column);
}
+
+ /** {@inheritDoc} */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return unfiltered.getColumnValue(column);
+ }
+
/** {@inheritDoc} */
public long getRowUpperBound() throws TuplesException {
return unfiltered.getRowUpperBound();
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -204,11 +204,21 @@
*
* @param column the column number; columns are numbered starting from 0
* @return the value of the column, or {@link #UNBOUND}
- * @throws TuplesException EXCEPTION TO DO
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
*/
public long getColumnValue(int column) throws TuplesException;
/**
+ * Gets the raw (unfiltered) ColumnValue attribute of the AbstractTuples object.
+ * This is only useful for filtered tuples. By default will return the normal column value.
+ *
+ * @param column The column offset to get data from
+ * @return The column value as a gNode
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
+ */
+ public long getRawColumnValue(int column) throws TuplesException;
+
+ /**
* Renames the variables which label the tuples if they have the "magic" names
* such as "Subject", "Predicate", "Object" and "Meta".
*
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/WrappedTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/WrappedTuples.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/WrappedTuples.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -116,11 +116,11 @@
}
/**
- * Gets the ColumnValue attribute of the WrappedTuples object
+ * Get the binding of a variable (column) in the currect product term (row)
*
- * @param column PARAMETER TO DO
- * @return The ColumnValue value
- * @throws TuplesException EXCEPTION TO DO
+ * @param column the column number; columns are numbered starting from 0
+ * @return the value of the column, or {@link #UNBOUND}
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
*/
public long getColumnValue(int column) throws TuplesException {
@@ -131,6 +131,18 @@
}
/**
+ * Gets the raw (unfiltered) ColumnValue attribute of the AbstractTuples object.
+ * This is only useful for filtered tuples. By default will return the normal column value.
+ *
+ * @param column The column offset to get data from
+ * @return The column value as a gNode
+ * @throws TuplesException If there was a Tuples specific error accessing the data.
+ */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return getColumnValue(column);
+ }
+
+ /**
* Gets the Comparator attribute of the WrappedTuples object
*
* @return The Comparator value
@@ -201,7 +213,7 @@
return tuples.isMaterialized();
}
- public List getOperands() {
+ public List<Tuples> getOperands() {
return Collections.singletonList(tuples);
}
@@ -316,7 +328,7 @@
/**
* Copied from AbstractTuples.
*/
- public Annotation getAnnotation(Class annotationClass) throws TuplesException {
+ public Annotation getAnnotation(Class<?> annotationClass) throws TuplesException {
return null;
}
}
Modified: trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java
===================================================================
--- trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java 2008-05-07 14:19:46 UTC (rev 902)
+++ trunk/src/jar/tuples-hybrid/java/org/mulgara/store/xa/HybridTuples.java 2008-05-07 14:24:02 UTC (rev 903)
@@ -357,6 +357,11 @@
}
+ /** {@inheritDoc} */
+ public long getRawColumnValue(int column) throws TuplesException {
+ return tuples.getColumnValue(column);
+ }
+
/**
* Required by Cursor.
*/
More information about the Mulgara-svn
mailing list