Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7715] branches/BIGDATA_RELEASE_1_3_0
|
From: <tho...@us...> - 2014-01-04 17:43:56
|
Revision: 7715
http://bigdata.svn.sourceforge.net/bigdata/?rev=7715&view=rev
Author: thompsonbry
Date: 2014-01-04 17:43:49 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
@Override annotations.
Javadoc on AtOnceHint (it incorrectly stated that the source chunks would be merged before the operator was executed).
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/LocalChunkMessage.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -55,34 +55,42 @@
*/
private IBindingSet[][] bindingSetChunks;
+ @Override
public IQueryClient getQueryController() {
return queryController;
}
+ @Override
public UUID getQueryControllerId() {
return queryControllerId;
}
+ @Override
public UUID getQueryId() {
return queryId;
}
+ @Override
public int getBOpId() {
return bopId;
}
+ @Override
public int getPartitionId() {
return partitionId;
}
+ @Override
public boolean isLastInvocation() {
return false; // Never.
}
+ @Override
public boolean isMaterialized() {
return true;
}
+ @Override
public int getSolutionCount() {
return solutionCount;
}
@@ -153,6 +161,7 @@
}
+ @Override
public String toString() {
return getClass().getName() + "{queryId=" + queryId + ",bopId=" + bopId
@@ -161,10 +170,12 @@
}
+ @Override
public void materialize(FederatedRunningQuery runningQuery) {
// NOP
}
+ @Override
public void release() {
final ChunkAccessor tmp = chunkAccessor;
if (tmp != null) {
@@ -177,6 +188,7 @@
}
}
+ @Override
public IChunkAccessor<IBindingSet> getChunkAccessor() {
if (chunkAccessor == null) {
chunkAccessor = new ChunkAccessor();
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -65,34 +65,42 @@
final private boolean lastInvocation;
+ @Override
public IQueryClient getQueryController() {
return queryController;
}
+ @Override
public UUID getQueryControllerId() {
return queryControllerId;
}
+ @Override
public UUID getQueryId() {
return queryId;
}
+ @Override
public int getBOpId() {
return bopId;
}
+ @Override
public int getPartitionId() {
return partitionId;
}
+ @Override
public boolean isLastInvocation() {
return true; // Always.
}
+ @Override
public boolean isMaterialized() {
return true;
}
+ @Override
public int getSolutionCount() {
return 0;
}
@@ -101,6 +109,7 @@
return 0;
}
+ @Override
public String toString() {
return getClass().getName() + "{queryId=" + queryId + ",bopId=" + bopId
@@ -143,14 +152,17 @@
}
+ @Override
public void materialize(FederatedRunningQuery runningQuery) {
// NOP
}
+ @Override
public void release() {
// NOP
}
+ @Override
public IChunkAccessor<E> getChunkAccessor() {
return new IChunkAccessor<E>() {
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -103,26 +103,32 @@
*/
final private InetSocketAddress addr;
+ @Override
public IQueryClient getQueryController() {
return queryController;
}
+ @Override
public UUID getQueryControllerId() {
return queryControllerId;
}
+ @Override
public UUID getQueryId() {
return queryId;
}
+ @Override
public int getBOpId() {
return bopId;
}
+ @Override
public int getPartitionId() {
return partitionId;
}
+ @Override
public boolean isLastInvocation() {
return false; // Never.
}
@@ -132,6 +138,7 @@
*
* @todo we could track this in total and in {@link A} on a per-slice basis.
*/
+ @Override
public int getSolutionCount() {
return solutionCount;
}
@@ -149,6 +156,7 @@
return addr;
}
+ @Override
public String toString() {
return getClass().getName() + "{queryId=" + queryId + ",bopId=" + bopId
@@ -327,6 +335,7 @@
}
+ @Override
public boolean isMaterialized() {
return materialized != null;
@@ -335,6 +344,7 @@
private volatile List<IAllocation> materialized = null;
+ @Override
public void materialize(final FederatedRunningQuery runningQuery) {
final AllocationContextKey key = new ShardContext(queryId, bopId,
@@ -353,6 +363,7 @@
/**
* Discard the materialized data.
*/
+ @Override
public void release() {
if (chunkAccessor != null) {
@@ -441,6 +452,7 @@
}
+ @Override
public IChunkAccessor<E> getChunkAccessor() {
if (chunkAccessor == null) {
@@ -511,6 +523,7 @@
}
+ @Override
public void close() {
if(open) {
@@ -523,6 +536,7 @@
}
+ @Override
public boolean hasNext() {
if(open && src.hasNext())
@@ -534,6 +548,7 @@
}
+ @Override
@SuppressWarnings("unchecked")
public E[] next() {
@@ -556,6 +571,7 @@
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -84,34 +84,42 @@
private byte[] data;
+ @Override
public IQueryClient getQueryController() {
return queryController;
}
+ @Override
public UUID getQueryControllerId() {
return queryControllerId;
}
+ @Override
public UUID getQueryId() {
return queryId;
}
+ @Override
public int getBOpId() {
return bopId;
}
+ @Override
public int getPartitionId() {
return partitionId;
}
+ @Override
public boolean isLastInvocation() {
return false; // Never.
}
+ @Override
public boolean isMaterialized() {
return true;
}
+ @Override
public int getSolutionCount() {
return solutionCount;
}
@@ -120,6 +128,7 @@
return data.length;
}
+ @Override
public String toString() {
return getClass().getName() + "{queryId=" + queryId + ",bopId=" + bopId
@@ -197,10 +206,12 @@
}
+ @Override
public void materialize(final FederatedRunningQuery runningQuery) {
// NOP
}
+ @Override
public void release() {
if (chunkAccessor != null)
chunkAccessor.close();
@@ -208,6 +219,7 @@
private transient volatile ChunkAccessor chunkAccessor = null;
+ @Override
public IChunkAccessor<E> getChunkAccessor() {
return new ChunkAccessor();
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -71,6 +71,7 @@
current = src;
}
+ @Override
public void close() {
lock.lock();
try {
@@ -98,6 +99,7 @@
}
}
+ @Override
public boolean add(final ICloseableIterator<E> src) {
if (src == null)
throw new IllegalArgumentException();
@@ -164,6 +166,7 @@
}
}
+ @Override
public boolean hasNext() {
while (true) {
final ICloseableIterator<E> tmp = nextSource();
@@ -182,6 +185,7 @@
* {@link #next()} to throw {@link NoSuchElementException} if the
* iterator has been concurrently closed.
*/
+ @Override
public E next() {
while (true) {
final ICloseableIterator<E> tmp = nextSource();
@@ -192,6 +196,7 @@
}
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestNIOChunkMessage.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -298,6 +298,7 @@
/**
* Overridden to expose to the unit test.
*/
+ @Override
protected void materialize(
final ManagedResourceService resourceService,
final IAllocationContext allocationContext) {
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java 2014-01-04 17:15:04 UTC (rev 7714)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AtOnceHint.java 2014-01-04 17:43:49 UTC (rev 7715)
@@ -28,6 +28,7 @@
package com.bigdata.rdf.sparql.ast.hints;
import com.bigdata.bop.PipelineOp;
+import com.bigdata.bop.engine.QueryEngine;
import com.bigdata.rdf.sparql.ast.ASTBase;
import com.bigdata.rdf.sparql.ast.IQueryNode;
import com.bigdata.rdf.sparql.ast.QueryHints;
@@ -35,9 +36,11 @@
/**
* Query hint marks the operator as requiring "at-once" evaluation. All
- * solutions will be buffered by the query engine before the operator is
+ * solutions will be buffered by the {@link QueryEngine} before the operator is
* evaluated. When it is evaluated, it will receive all solutions in a single
- * "chunk".
+ * invocation of that operator. However, the solutions MAY appear in multiple
+ * chunks since the {@link QueryEngine} does not guarantee that the chunk will
+ * be merged before the operator is invoked.
* <p>
* Note: The "at-once" hint is basically turned into <code>NOT(PIPELINED)</code>.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
