Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7707] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/solutions
|
From: <tho...@us...> - 2013-12-31 17:08:42
|
Revision: 7707
http://bigdata.svn.sourceforge.net/bigdata/?rev=7707&view=rev
Author: thompsonbry
Date: 2013-12-31 17:08:36 +0000 (Tue, 31 Dec 2013)
Log Message:
-----------
@Override, final.
Added public methods to access some annotations.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java 2013-12-31 17:06:32 UTC (rev 7706)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByOp.java 2013-12-31 17:08:36 UTC (rev 7707)
@@ -29,7 +29,6 @@
import java.util.Map;
-
import com.bigdata.bop.BOp;
import com.bigdata.bop.PipelineOp;
import com.bigdata.bop.aggregate.IAggregate;
@@ -136,4 +135,22 @@
*/
abstract public boolean isPipelinedAggregationOp();
+ /**
+ * @see Annotations#GROUP_BY_STATE
+ */
+ public IGroupByState getGroupByState() {
+
+ return (IGroupByState) getRequiredProperty(Annotations.GROUP_BY_STATE);
+
+ }
+
+ /**
+ * @see Annotations#GROUP_BY_REWRITE
+ */
+ public IGroupByRewriteState getGroupByRewrite() {
+
+ return (IGroupByRewriteState) getRequiredProperty(Annotations.GROUP_BY_REWRITE);
+
+ }
+
}
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java 2013-12-31 17:06:32 UTC (rev 7706)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java 2013-12-31 17:08:36 UTC (rev 7707)
@@ -76,6 +76,7 @@
private final IValueExpression<?>[] select2;
private final IConstraint[] having2;
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
@@ -101,6 +102,7 @@
* {@link IAggregate} functions. All {@link IAggregate} functions have been
* lifted out into {@link #aggExpr}.
*/
+ @Override
public IValueExpression<?>[] getSelect2() {
return select2;
}
@@ -112,6 +114,7 @@
* {@link IAggregate} functions. All {@link IAggregate} functions have been
* lifted out into {@link #aggExpr}.
*/
+ @Override
public IConstraint[] getHaving2() {
return having2;
}
@@ -460,6 +463,7 @@
* Return a new anonymous variable (this is overridden by some unit tests in
* order to have predictable variable names).
*/
+ @Override
public IVariable<?> var() {
return Var.var();
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java 2013-12-31 17:06:32 UTC (rev 7706)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java 2013-12-31 17:08:36 UTC (rev 7707)
@@ -28,6 +28,7 @@
package com.bigdata.bop.solutions;
import java.io.Serializable;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -71,26 +72,43 @@
final private boolean nestedAggregates;
final private boolean simpleHaving;
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getClass().getSimpleName());
+ sb.append("{select=" + Arrays.toString(select));
+ sb.append(",groupBy=" + Arrays.toString(groupBy));
+ sb.append(",having=" + Arrays.toString(having));
+ sb.append("}");
+ return sb.toString();
+ }
+
+ @Override
public IValueExpression<?>[] getGroupByClause() {
return groupBy;
}
+ @Override
public LinkedHashSet<IVariable<?>> getGroupByVars() {
return groupByVars;
}
+ @Override
public IValueExpression<?>[] getSelectClause() {
return select;
}
+ @Override
public LinkedHashSet<IVariable<?>> getSelectVars() {
return selectVars;
}
+ @Override
public IConstraint[] getHavingClause() {
return having;
}
+ @Override
public LinkedHashSet<IVariable<?>> getColumnVars() {
return columnVars;
}
@@ -99,18 +117,22 @@
// return distinctColumnVars;
// }
+ @Override
public boolean isAnyDistinct() {
return anyDistinct;
}
+ @Override
public boolean isSelectDependency() {
return selectDependency;
}
+ @Override
public boolean isNestedAggregates() {
return nestedAggregates;
}
+ @Override
public boolean isSimpleHaving() {
return simpleHaving;
}
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java 2013-12-31 17:06:32 UTC (rev 7706)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java 2013-12-31 17:08:36 UTC (rev 7707)
@@ -87,6 +87,7 @@
* Returns <code>false</code>. This is a generalized aggregation operator
* and may be used to evaluate any aggregation request.
*/
+ @Override
final public boolean isPipelinedAggregationOp() {
return false;
@@ -145,6 +146,7 @@
}
+ @Override
public FutureTask<Void> eval(final BOpContext<IBindingSet> context) {
return new FutureTask<Void>(new GroupByTask(this, context));
@@ -165,6 +167,7 @@
*/
private final IConstant<?>[] vals;
+ @Override
public String toString() {
return super.toString() + //
"{group=" + Arrays.toString(vals) + //
@@ -234,10 +237,12 @@
this.hash = java.util.Arrays.hashCode(vals);
}
+ @Override
public int hashCode() {
return hash;
}
+ @Override
public boolean equals(final Object o) {
if (this == o)
return true;
@@ -368,6 +373,7 @@
}
+ @Override
public Void call() throws Exception {
final ICloseableIterator<IBindingSet[]> itr = context
@@ -914,12 +920,14 @@
}
+ @Override
public int hashCode() {
return hash;
}
+ @Override
public boolean equals(final Object o) {
if (this == o)
return true;
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java 2013-12-31 17:06:32 UTC (rev 7706)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/solutions/PipelinedAggregationOp.java 2013-12-31 17:08:36 UTC (rev 7707)
@@ -83,6 +83,7 @@
* MAY NOT be used to evaluate aggregation requests which use DISTINCT or
* which nest {@link IAggregate}s in other {@link IAggregate}s.
*/
+ @Override
public boolean isPipelinedAggregationOp() {
return true;
@@ -173,6 +174,7 @@
}
+ @Override
public FutureTask<Void> eval(final BOpContext<IBindingSet> context) {
return new FutureTask<Void>(new ChunkTask(this, context));
@@ -193,6 +195,7 @@
*/
private final IConstant<?>[] vals;
+ @Override
public String toString() {
return super.toString() + //
"{group=" + Arrays.toString(vals) + //
@@ -252,10 +255,12 @@
this.hash = java.util.Arrays.hashCode(vals);
}
+ @Override
public int hashCode() {
return hash;
}
+ @Override
public boolean equals(final Object o) {
if (this == o)
return true;
@@ -622,6 +627,7 @@
}
+ @Override
public Void call() throws Exception {
final ICloseableIterator<IBindingSet[]> itr = context
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
