Fixing docs.

src/edu/washington/escience/myria/expression/Expression.java

@@ -182,10 +182,10 @@ public boolean isConstant() {
   }
 
   /**
-   * An expression is iterable when it has a type of Iterable<T extends Type>. This is a requirement for being used in
+   * An expression is "multivalued" when it has a primitive array return type. This is a requirement for being used in
    * the FlatteningApply operator.
    * 
-   * @return if this expression evaluates to an Iterable<T>
+   * @return if the root expression has a primitive array return type
    */
   public boolean isMultivalued() {
     return rootExpressionOperator.hasArrayOutputType();

src/edu/washington/escience/myria/expression/evaluate/FlatteningGenericEvaluator.java

@@ -16,19 +16,18 @@
 import edu.washington.escience.myria.column.builder.ColumnFactory;
 import edu.washington.escience.myria.column.builder.WritableColumn;
 import edu.washington.escience.myria.expression.Expression;
-import edu.washington.escience.myria.operator.Apply;
-import edu.washington.escience.myria.operator.StatefulApply;
+import edu.washington.escience.myria.operator.FlatteningApply;
 import edu.washington.escience.myria.storage.AppendableTable;
 import edu.washington.escience.myria.storage.ReadableTable;
 import edu.washington.escience.myria.storage.TupleBatch;
 
 /**
- * An Expression evaluator for generic expressions. Used in {@link Apply} and {@link StatefulApply}.
+ * An Expression evaluator for generic expressions. Used in {@link FlatteningApply}.
  */
 public class FlatteningGenericEvaluator extends Evaluator {
 
   /** logger for this class. */
-  private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(GenericEvaluator.class);
+  private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(FlatteningGenericEvaluator.class);
 
   /**
    * Expression evaluator.
@@ -79,7 +78,7 @@ public void compile() throws DbException {
 
   /**
    * Evaluates the {@link #getJavaExpressionWithAppend()} using the {@link #evaluator}. Prefer to use
-   * {@link #evaluateColumn(TupleBatch)} as it can copy data without evaluating the expression.
+   * {@link #evaluateColumn(TupleBatch)} since it can evaluate an entire TupleBatch at a time for better locality.
    *
    * @param tb a tuple batch
    * @param rowIdx index of the row that should be used for input data
@@ -108,8 +107,8 @@ public String getJavaExpressionWithAppend() {
   }
 
   /**
-   * Evaluate an expression over an entire TupleBatch and return the column of results. This method cannot take state
-   * into consideration.
+   * Evaluate an expression over an entire TupleBatch, appending results to {@link #result} and returning a column of
+   * result counts.
    *
    * @param tb the tuples to be input to this expression
    * @param result a (single-column) table containing evaluation results