accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1452342 - in /accumulo/trunk: ./ assemble/ bin/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/impl/ docs/src/user_manual/ docs/src/user_manual/chapters/ examples/ fate/src/main...
Date Mon, 04 Mar 2013 15:11:03 GMT
Author: kturner
Date: Mon Mar  4 15:11:03 2013
New Revision: 1452342

URL: http://svn.apache.org/r1452342
Log:
merged changes from 1.5
ACCUMULO-1142 Enable redirectTestOutputToFile in surefire plugin to nuke test output
ACCUMULO-1002 Apply override annotation to the close method on the BatchScanner implementation
to be explicit
ACCUMULO-1002 Add a close method to ScannerBase and a no-op impl to ScannerOptions.
ACCUMULO-1104 Another update to account for 1.5 changes in the user manual
ACCUMULO-1071 Changing wording from "hadoop library type" to "Accumulo memory-map type"
ACCUMULO-1104 ACCUMULO-1136 Applying additional wording for using config as opposed to setiter.
Fix various other documentation which are now incorrect in 1.5.
ACCUMULO-1104 Correcting documented option to show timestamps in shell in user manual.

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/bin/bootstrap_config.sh
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
    accumulo/trunk/docs/src/user_manual/accumulo_user_manual.tex
    accumulo/trunk/docs/src/user_manual/chapters/administration.tex
    accumulo/trunk/docs/src/user_manual/chapters/clients.tex
    accumulo/trunk/docs/src/user_manual/chapters/shell.tex
    accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1451791-1452340

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1451791-1452340

Modified: accumulo/trunk/bin/bootstrap_config.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/bootstrap_config.sh?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/bin/bootstrap_config.sh (original)
+++ accumulo/trunk/bin/bootstrap_config.sh Mon Mar  4 15:11:03 2013
@@ -52,7 +52,7 @@ fi
 
 if [ -z "${TYPE}" ]; then
    echo
-   echo "Choose the hadoop library type:"
+   echo "Choose the Accumulo memory-map type:"
    select TYPENAME in Java Native; do
       if [ "${TYPENAME}" = "native" ]; then
          TYPE="native-standalone"

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1451791-1452340

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java Mon
Mar  4 15:11:03 2013
@@ -119,4 +119,9 @@ public interface ScannerBase extends Ite
    * @return the timeout configured for this scanner
    */
   public long getTimeout(TimeUnit timeUnit);
+
+  /**
+   * Closes any underlying connections on the scanner
+   */
+  public void close();
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
Mon Mar  4 15:11:03 2013
@@ -201,4 +201,9 @@ public class ScannerOptions implements S
   public long getTimeout(TimeUnit timeunit) {
     return timeunit.convert(timeOut, TimeUnit.MILLISECONDS);
   }
+
+  @Override
+  public void close() {
+    // Nothing needs to be closed
+  }
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
Mon Mar  4 15:11:03 2013
@@ -68,6 +68,7 @@ public class TabletServerBatchReader ext
     ranges = null;
   }
   
+  @Override
   public void close() {
     queryThreadPool.shutdownNow();
   }

Modified: accumulo/trunk/docs/src/user_manual/accumulo_user_manual.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/accumulo_user_manual.tex?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/accumulo_user_manual.tex (original)
+++ accumulo/trunk/docs/src/user_manual/accumulo_user_manual.tex Mon Mar  4 15:11:03 2013
@@ -16,7 +16,7 @@
 
 \documentclass[11pt]{report}
 \title{Apache Accumulo User Manual\\
-Version 1.4}
+Version 1.5}
 \usepackage{alltt}
 \usepackage{multirow}
 \usepackage{graphicx}

Modified: accumulo/trunk/docs/src/user_manual/chapters/administration.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/administration.tex?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/administration.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/administration.tex Mon Mar  4 15:11:03 2013
@@ -45,7 +45,7 @@ by the environment variable \texttt{\$AC
 
 \small
 \begin{verbatim}
-$ tar xzf $ACCUMULO_HOME/accumulo.tar.gz
+$ tar xzf $ACCUMULO_HOME/apache-accumulo-1.5.tar.gz
 \end{verbatim}
 \normalsize
 

Modified: accumulo/trunk/docs/src/user_manual/chapters/clients.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/clients.tex?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/clients.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/clients.tex Mon Mar  4 15:11:03 2013
@@ -169,7 +169,7 @@ can easily supply their own buffer if th
 large.
 
 For an example, look at the following\\ 
-\texttt{src/examples/src/main/java/org/apache/accumulo/examples/isolation/InterferenceTest.java}
+\texttt{examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java}
 
 \subsection{BatchScanner}
 

Modified: accumulo/trunk/docs/src/user_manual/chapters/shell.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/shell.tex?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/shell.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/shell.tex Mon Mar  4 15:11:03 2013
@@ -35,7 +35,7 @@ and then display the following prompt:
 \begin{verbatim}
 Shell - Apache Accumulo Interactive Shell
 -
-- version 1.3
+- version 1.5
 - instance name: myinstance
 - instance id: 00000000-0000-0000-0000-000000000000
 -
@@ -88,7 +88,7 @@ row1 colf:colq [] value1
 \normalsize
 
 The value in brackets "[]" would be the visibility labels.  Since none were used, this is
empty for this row.
-You can use the "-t" option to scan to see the timestamp for the cell, too.
+You can use the "-st" option to scan to see the timestamp for the cell, too.
 
 \section{Table Maintenance}
 

Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Mon Mar  4 15:11:03
2013
@@ -117,7 +117,7 @@ change to an existing constraint class r
 
 An example of constraints can be found in\\
 \texttt{accumulo/docs/examples/README.constraints} with corresponding code under\\
-\texttt{accumulo/src/examples/simple/main/java/accumulo/examples/simple/constraints} .
+\texttt{accumulo/examples/simple/main/java/accumulo/examples/simple/constraints} .
 
 \section{Bloom Filters}
 As mutations are applied to an Accumulo table, several files are created per tablet. If
@@ -142,16 +142,35 @@ TabletServers when scanning or compactin
 summarize, filter, and aggregate data. In fact, the built-in features of cell-level
 security and column fetching are implemented using Iterators.
 Some useful Iterators are provided with Accumulo and can be found in the org.apache.accumulo.core.iterators.user
package.
+In each case, any custom Iterators must be included in Accumulo's classpath,
+typically by including a jar in \texttt{\$ACCUMULO\_HOME/lib} or
+\texttt{\$ACCUMULO\_HOME/lib/ext}, although the VFS classloader allows for
+classpath manipulation using a variety of schemes including URLs and HDFS URIs.
 
 \subsection{Setting Iterators via the Shell}
 
+Iterators can be configured on a table at scan, minor compaction and/or major
+compaction scopes. If the Iterator implements the OptionDescriber interface, the
+setiter command can be used which will interactively prompt the user to provide
+values for the given necessary options. 
+
 \small
 \begin{verbatim}
 usage: setiter [-?] -ageoff | -agg | -class <name> | -regex | 
 -reqvis | -vers   [-majc] [-minc] [-n <itername>] -p <pri>   
 [-scan] [-t <table>]
 
-user@myinstance mytable> setiter -t mytable -scan -p 10 -n myiter
+user@myinstance mytable> setiter -t mytable -scan -p 15 -n myiter -class com.company.MyIterator
+\end{verbatim}
+\normalsize
+
+The config command can always be used to manually configure iterators which is useful 
+in cases where the Iterator does not implement the OptionDescriber interface.
+
+\small
+\begin{verbatim}
+config -t mytable -s table.iterator.{scan|minc|majc}.myiter=15,com.company.MyIterator
+config -t mytable -s table.iteartor.{scan|minc|majc}.myiter.opt.myoptionname=myoptionvalue
 \end{verbatim}
 \normalsize
 
@@ -351,7 +370,7 @@ Additional Combiners can be added by cre
 class to Accumulo's lib/ext directory.
 
 An example of a Combiner can be found under\\
-accumulo/src/examples/simple/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
+accumulo/examples/simple/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
 
 
 \section{Block Cache}

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1451791-1452340

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451791-1452340

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451791-1452340

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Mar  4 15:11:03 2013
@@ -222,6 +222,9 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
       </plugin>
     </plugins>
 

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1451791-1452340

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java?rev=1452342&r1=1452341&r2=1452342&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
Mon Mar  4 15:11:03 2013
@@ -101,4 +101,6 @@ public class NullScanner implements Scan
     return 0;
   }
   
+  @Override
+  public void close() {}
 }

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1451791-1452340



Mime
View raw message