accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [2/2] accumulo git commit: Merge branch '1.6' into 1.7
Date Thu, 02 Jul 2015 18:09:52 GMT
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00d83914
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00d83914
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00d83914

Branch: refs/heads/1.7
Commit: 00d83914e789d3431bf54be8f4c8c34c3e458cd4
Parents: a3722ca 985c906
Author: Keith Turner <keith@deenlo.com>
Authored: Thu Jul 2 13:55:43 2015 -0400
Committer: Keith Turner <keith@deenlo.com>
Committed: Thu Jul 2 13:55:43 2015 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/ScannerBase.java       | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00d83914/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 92ab551,7eccdcf..b5692d2
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@@ -65,12 -63,14 +65,17 @@@ public interface ScannerBase extends It
    void updateScanIteratorOption(String iteratorName, String key, String value);
  
    /**
+    * <p>
     * Adds a column family to the list of columns that will be fetched by this scanner. By
default when no columns have been added the scanner fetches all
 -   * columns.
 +   * columns. To fetch multiple column families call this function multiple times.
 +   *
 +   * <p>
 +   * This can help limit which locality groups are read on the server side.
     *
+    * <p>
+    * When used in conjunction with custom iterators, the set of column families fetched
is passed to the top iterator's seek method. Custom iterators may change
+    * this set of column families when calling seek on their source.
+    *
     * @param col
     *          the column family to be fetched
     */


Mime
View raw message