You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/05/16 21:00:36 UTC
svn commit: r1483510 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/client/mapreduce/
docs/src/main/latex/accumulo_user_manual/chapters/ examples/
fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org...
Author: kturner
Date: Thu May 16 19:00:35 2013
New Revision: 1483510
URL: http://svn.apache.org/r1483510
Log:
merge changes from 1.5
ACCUMULO-1421 simplify reflection lookup of SafeModeAction
ACCUMULO-???? changed getConfiguration to be package protected so that it is not in the public API
ACCUMULO-1274 classpath command shows two java configured classpaths before showing Accumulo configured classpaths.
ACCUMULO-970 use reasonable defaults for batchwriter in documentation
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.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 (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1483481-1483495,1483497-1483507
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Thu May 16 19:00:35 2013
@@ -1345,7 +1345,7 @@ public abstract class InputFormatBase<K,
}
// use reflection to pull the Configuration out of the JobContext for Hadoop 1 and Hadoop 2 compatibility
- public static Configuration getConfiguration(JobContext context) {
+ static Configuration getConfiguration(JobContext context) {
try {
Class<?> c = InputFormatBase.class.getClassLoader().loadClass("org.apache.hadoop.mapreduce.JobContext");
Method m = c.getMethod("getConfiguration");
Modified: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex (original)
+++ accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex Thu May 16 19:00:35 2013
@@ -146,8 +146,8 @@ AccumuloOutputFormat.setZooKeeperInstanc
\small
\begin{verbatim}
-AccumuloOutputFormat.setMaxLatency(job, 300); // milliseconds
-AccumuloOutputFormat.setMaxMutationBufferSize(job, 5000000); // bytes
+AccumuloOutputFormat.setMaxLatency(job, 300000); // milliseconds
+AccumuloOutputFormat.setMaxMutationBufferSize(job, 50000000); // bytes
\end{verbatim}
\normalsize
Modified: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex (original)
+++ accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex Thu May 16 19:00:35 2013
@@ -100,10 +100,10 @@ Mutations are added to a BatchWriter thu
\small
\begin{verbatim}
+
+//BatchWriterConfig has reasonable defaults
BatchWriterConfig config = new BatchWriterConfig();
-config.setMaxMemory(1000000L); // bytes to store before sending a batch
-config.setMaxLatency(1000L); // milliseconds to wait before sending
-config.maxWriteThreads(10); // number of threads used to write to tablet servers
+config.setMaxMemory(10000000L); // bytes available to batchwriter for buffering mutations
BatchWriter writer = conn.createBatchWriter("table", config)
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1483481-1483495,1483497-1483507
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:r1483481-1483495,1483497-1483507
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:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1483481-1483495,1483497-1483507
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1483481-1483495,1483497-1483507
Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java (original)
+++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java Thu May 16 19:00:35 2013
@@ -305,10 +305,10 @@ public class AccumuloVFSClassLoader {
switch (level) {
case 1:
- classLoaderDescription = level + ": Java System Classloader (loads Java)";
+ classLoaderDescription = level + ": Java System Classloader (loads Java system resources)";
break;
case 2:
- classLoaderDescription = level + ": Accumulo Start Classloader (loads the classloader)";
+ classLoaderDescription = level + ": Java Classloader (loads everything defined by java classpath)";
break;
case 3:
classLoaderDescription = level + ": Accumulo Classloader (loads everything defined by general.classpaths)";
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Thu May 16 19:00:35 2013
@@ -97,7 +97,7 @@ public class LargeRowTest extends Functi
UtilWaitThread.sleep(12000);
Logger.getLogger(LargeRowTest.class).warn("checking splits");
- checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS);
+ checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS * 2);
verify(REG_TABLE_NAME);
}
Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1483510&r1=1483509&r2=1483510&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Thu May 16 19:00:35 2013
@@ -394,7 +394,7 @@ public class ShellServerTest {
@Test(timeout = 30000)
public void classpath() throws Exception {
// classpath
- exec("classpath", true, "Level 2: Accumulo Start Classloader (loads the classloader) URL classpath items are", true);
+ exec("classpath", true, "Level 2: Java Classloader (loads everything defined by java classpath) URL classpath items are", true);
}
@Test(timeout = 30000)