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 2014/01/17 15:41:18 UTC
svn commit: r1559122 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/query/ARQ.java com/hp/hpl/jena/query/ResultSetFormatter.java
org/apache/jena/atlas/data/ThresholdPolicyMemory.java
org/apache/jena/atlas/logging/LogCtl.java
Author: andy
Date: Fri Jan 17 14:41:18 2014
New Revision: 1559122
URL: http://svn.apache.org/r1559122
Log:
Change openjena.org URLs to jena.apache.org
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1559122&r1=1559121&r2=1559122&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Fri Jan 17 14:41:18 2014
@@ -66,7 +66,7 @@ public class ARQ
* Must also set log4j, or other logging system,
* for logger "com.hp.hpl.jena.sparql.exec"
* e.g. log4j.properties -- log4j.logger.com.hp.hpl.jena.sparql.exec=INFO
- * See the <a href="http://openjena.org/ARQ/Logging">ARQ Logging Documentation</a>.
+ * See the <a href="http://jena.apache.org/documentation/query/logging.html">ARQ Logging Documentation</a>.
*/
public static final Symbol symLogExec = ARQConstants.allocSymbol("logExec") ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java?rev=1559122&r1=1559121&r2=1559122&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java Fri Jan 17 14:41:18 2014
@@ -624,7 +624,7 @@ public class ResultSetFormatter
// ---- SSE
/** Output a boolean result in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
*
* @param booleanResult The boolean result to encode
*/
@@ -633,7 +633,7 @@ public class ResultSetFormatter
{ outputAsSSE(System.out, booleanResult ) ; }
/** Output a boolean result in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
*
* @param outStream output stream
* @param booleanResult The boolean result to encode
@@ -645,7 +645,7 @@ public class ResultSetFormatter
}
/** Output a result set in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
* @param resultSet result set
*/
@@ -653,7 +653,7 @@ public class ResultSetFormatter
{ outputAsSSE(System.out, resultSet) ; }
/** Output a result set in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
* @param resultSet result set
*/
@@ -661,7 +661,7 @@ public class ResultSetFormatter
{ outputAsSSE(System.out, resultSet, prologue) ; }
/** Output a result set in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
* @param outStream The output stream
* @param resultSet The result set
*/
@@ -670,7 +670,7 @@ public class ResultSetFormatter
{ outputAsSSE(outStream, resultSet, null) ; }
/** Output a result set in the SSE format
- * Format: <a href="http://openjena.org/wiki/SSE">SSE</a>
+ * Format: <a href="http://jena.apache.org/documentation/notes/sse.html">SSE</a>
* @param outStream output stream
* @param resultSet result set
* @param prologue
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java?rev=1559122&r1=1559121&r2=1559122&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java Fri Jan 17 14:41:18 2014
@@ -16,100 +16,99 @@
* limitations under the License.
*/
-package org.apache.jena.atlas.data;
-
-
+package org.apache.jena.atlas.data ;
/**
* A threshold policy based on the estimated memory size of the tuples added.
* <p>
- * TODO This policy isn't ready to be used because the SerializationFactorys don't support generating memory estimates yet.
+ * TODO This policy isn't ready to be used because the SerializationFactorys
+ * don't support generating memory estimates yet.
* <p>
- * TODO It might be too expensive to examine each tuple individually. We could change it to sample the first 100 tuples
- * to calculate an average tuple size.
+ * TODO It might be too expensive to examine each tuple individually. We could
+ * change it to sample the first 100 tuples to calculate an average tuple size.
*/
-public class ThresholdPolicyMemory<T> implements ThresholdPolicy<T>
-{
- protected final SerializationFactory<T> serializerFactory;
- protected final long threshold;
- protected long count;
- protected long size;
-
- public ThresholdPolicyMemory(long threshold, SerializationFactory<T> serializerFactory)
- {
- if (threshold < 0)
- {
- throw new IllegalArgumentException("Threshold must be greater than or equal to zero");
- }
- this.threshold = threshold;
- this.serializerFactory = serializerFactory;
- reset();
+public class ThresholdPolicyMemory<T> implements ThresholdPolicy<T> {
+ protected final SerializationFactory<T> serializerFactory ;
+ protected final long threshold ;
+ protected long count ;
+ protected long size ;
+
+ public ThresholdPolicyMemory(long threshold, SerializationFactory<T> serializerFactory) {
+ if ( threshold < 0 ) { throw new IllegalArgumentException("Threshold must be greater than or equal to zero") ; }
+ this.threshold = threshold ;
+ this.serializerFactory = serializerFactory ;
+ reset() ;
}
- /* (non-Javadoc)
- * @see org.openjena.atlas.io.ThresholdPolicy#increment(java.lang.Object)
+ /*
+ * (non-Javadoc)
+ *
+ * @see ThresholdPolicy#increment(java.lang.Object)
*/
@Override
- public void increment(T item)
- {
- count++;
- size += serializerFactory.getEstimatedMemorySize(item);
+ public void increment(T item) {
+ count++ ;
+ size += serializerFactory.getEstimatedMemorySize(item) ;
}
- /* (non-Javadoc)
- * @see org.openjena.atlas.io.ThresholdPolicy#isThresholdExceeded()
+ /*
+ * (non-Javadoc)
+ *
+ * @see ThresholdPolicy#isThresholdExceeded()
*/
@Override
- public boolean isThresholdExceeded()
- {
- return (size >= threshold);
+ public boolean isThresholdExceeded() {
+ return (size >= threshold) ;
}
/*
* (non-Javadoc)
+ *
* @see org.openjena.atlas.data.ThresholdPolicy#reset()
*/
@Override
- public void reset()
- {
- count = 0;
- size = 0;
+ public void reset() {
+ count = 0 ;
+ size = 0 ;
}
/**
* Returns the threshold before the list is written to disk.
+ *
* @return The threshold point.
*/
- public long getThreshold()
- {
- return threshold;
+ public long getThreshold() {
+ return threshold ;
}
-
+
/**
- * Returns the current count of the number of items incremented in this policy.
+ * Returns the current count of the number of items incremented in this
+ * policy.
+ *
* @return The item count.
*/
- public long getCount()
- {
- return count;
+ public long getCount() {
+ return count ;
}
-
+
/**
- * Returns the current total estimated memory size of all the items incremented in this policy.
+ * Returns the current total estimated memory size of all the items
+ * incremented in this policy.
+ *
* @return The item count.
*/
- public long getMemorySize()
- {
- return size;
+ public long getMemorySize() {
+ return size ;
}
-
+
/*
* (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
- public String toString()
- {
- return "ThresholdPolicyMemory: Threshold (bytes)=" + threshold + " Memory Size (bytes)=" + size + " Count=" + count;
+ public String toString() {
+ return "ThresholdPolicyMemory: Threshold (bytes)=" + threshold + " Memory Size (bytes)=" + size + " Count="
+ + count ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/LogCtl.java?rev=1559122&r1=1559121&r2=1559122&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/LogCtl.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/LogCtl.java Fri Jan 17 14:41:18 2014
@@ -195,11 +195,11 @@ public class LogCtl {
// Handlers - output
// All (comma
// separated)
- // "handlers=java.util.logging.ConsoleHandler,org.openjena.atlas.logging.java.ConsoleHandlerStdout",
+ // "handlers=java.util.logging.ConsoleHandler,org.apache.jena.atlas.logging.java.ConsoleHandlerStdout",
// Atlas.
"handlers=org.openjena.atlas.logging.java.ConsoleHandlerStdout",
- "org.openjena.atlas.logging.java.ConsoleHandlerStdout.level=INFO",
+ "org.apache.atlas.jena.logging.java.ConsoleHandlerStdout.level=INFO",
"java.util.logging.ConsoleHandler.formatter=atlas.logging.java.TextFormatter"
) ;