accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch master updated: Fix formatting for #481
Date Wed, 09 May 2018 21:42:17 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 636229c  Fix formatting for #481
636229c is described below

commit 636229ce96c869a77ea1df753e1832cd577807d0
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed May 9 17:41:35 2018 -0400

    Fix formatting for #481
---
 .../core/client/impl/TabletServerBatchWriter.java  |  3 +--
 .../core/security/crypto/BlockedOutputStream.java  |  6 ++---
 .../fate/zookeeper/DistributedReadWriteLock.java   |  4 ++--
 .../master/tableOps/bulkVer1/BulkImport.java       | 27 ++++++++++------------
 .../master/tableOps/bulkVer2/BulkImportMove.java   | 27 ++++++++++------------
 .../main/java/org/apache/accumulo/shell/Token.java |  9 ++++----
 .../org/apache/accumulo/test/NamespacesIT.java     |  5 ++--
 7 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 8d3eb8d..b3dc9dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -79,7 +79,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Joiner;
 
-/**
+/*
  * Differences from previous TabletServerBatchWriter
  *   + As background threads finish sending mutations to tablet servers they decrement memory
usage
  *   + Once the queue of unprocessed mutations reaches 50% it is always pushed
@@ -98,7 +98,6 @@ import com.google.common.base.Joiner;
  * Memory accounting
  *   + when a mutation enters the system memory is incremented
  *   + when a mutation successfully leaves the system memory is decremented
- *
  */
 public class TabletServerBatchWriter {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
index 3161284..e43911d 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
@@ -22,9 +22,9 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
 /**
- * Buffers all input in a growing buffer until flush() is called. Then entire
- * buffer is written, with size information, and padding to force the
- * underlying crypto output stream to also fully flush
+ * Buffers all input in a growing buffer until flush() is called. Then entire buffer is written,
+ * with size information, and padding to force the underlying crypto output stream to also
fully
+ * flush
  */
 public class BlockedOutputStream extends OutputStream {
   int blockSize;
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index 7b350be..97520aa 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -32,8 +32,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A ReadWriteLock that can be implemented in ZooKeeper. Features the ability to store data
- * with the lock, and recover the lock using that data to find the lock.
+ * A ReadWriteLock that can be implemented in ZooKeeper. Features the ability to store data
with the
+ * lock, and recover the lock using that data to find the lock.
  */
 public class DistributedReadWriteLock implements java.util.concurrent.locks.ReadWriteLock
{
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
index 01d6a58..a645c1d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java
@@ -52,22 +52,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Bulk import makes requests of tablet servers, and those requests can take a
- * long time. Our communications to the tablet server may fail, so we won't know
- * the status of the request. The master will repeat failed requests so now
- * there are multiple requests to the tablet server. The tablet server will not
- * execute the request multiple times, so long as the marker it wrote in the
- * metadata table stays there. The master needs to know when all requests have
- * finished so it can remove the markers. Did it start? Did it finish? We can see
- * that *a* request completed by seeing the flag written into the metadata
- * table, but we won't know if some other rogue thread is still waiting to start
- * a thread and repeat the operation.
+ * Bulk import makes requests of tablet servers, and those requests can take a long time.
Our
+ * communications to the tablet server may fail, so we won't know the status of the request.
The
+ * master will repeat failed requests so now there are multiple requests to the tablet server.
The
+ * tablet server will not execute the request multiple times, so long as the marker it wrote
in the
+ * metadata table stays there. The master needs to know when all requests have finished so
it can
+ * remove the markers. Did it start? Did it finish? We can see that *a* request completed
by seeing
+ * the flag written into the metadata table, but we won't know if some other rogue thread
is still
+ * waiting to start a thread and repeat the operation.
  *
- * The master can ask the tablet server if it has any requests still running.
- * Except the tablet server might have some thread about to start a request, but
- * before it has made any bookkeeping about the request. To prevent problems
- * like this, an Arbitrator is used. Before starting any new request, the tablet
- * server checks the Arbitrator to see if the request is still valid.
+ * The master can ask the tablet server if it has any requests still running. Except the
tablet
+ * server might have some thread about to start a request, but before it has made any bookkeeping
+ * about the request. To prevent problems like this, an Arbitrator is used. Before starting
any new
+ * request, the tablet server checks the Arbitrator to see if the request is still valid.
  */
 public class BulkImport extends MasterRepo {
   public static final String FAILURES_TXT = "failures.txt";
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
index db7f1f1..71abea8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
@@ -41,22 +41,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Bulk import makes requests of tablet servers, and those requests can take a
- * long time. Our communications to the tablet server may fail, so we won't know
- * the status of the request. The master will repeat failed requests so now
- * there are multiple requests to the tablet server. The tablet server will not
- * execute the request multiple times, so long as the marker it wrote in the
- * metadata table stays there. The master needs to know when all requests have
- * finished so it can remove the markers. Did it start? Did it finish? We can see
- * that *a* request completed by seeing the flag written into the metadata
- * table, but we won't know if some other rogue thread is still waiting to start
- * a thread and repeat the operation.
+ * Bulk import makes requests of tablet servers, and those requests can take a long time.
Our
+ * communications to the tablet server may fail, so we won't know the status of the request.
The
+ * master will repeat failed requests so now there are multiple requests to the tablet server.
The
+ * tablet server will not execute the request multiple times, so long as the marker it wrote
in the
+ * metadata table stays there. The master needs to know when all requests have finished so
it can
+ * remove the markers. Did it start? Did it finish? We can see that *a* request completed
by seeing
+ * the flag written into the metadata table, but we won't know if some other rogue thread
is still
+ * waiting to start a thread and repeat the operation.
  *
- * The master can ask the tablet server if it has any requests still running.
- * Except the tablet server might have some thread about to start a request, but
- * before it has made any bookkeeping about the request. To prevent problems
- * like this, an Arbitrator is used. Before starting any new request, the tablet
- * server checks the Arbitrator to see if the request is still valid.
+ * The master can ask the tablet server if it has any requests still running. Except the
tablet
+ * server might have some thread about to start a request, but before it has made any bookkeeping
+ * about the request. To prevent problems like this, an Arbitrator is used. Before starting
any new
+ * request, the tablet server checks the Arbitrator to see if the request is still valid.
  */
 class BulkImportMove extends MasterRepo {
 
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index 8919c46..3a11e41 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -22,11 +22,10 @@ import java.util.Iterator;
 import java.util.Set;
 
 /**
- * A token is a word in a command in the shell.  The tree that this builds is used for
- * tab-completion of tables, users, commands and certain other parts of the shell that
- * can be realistically and quickly gathered. Tokens can have multiple commands grouped
- * together and many possible subcommands, although they are stored in a set so duplicates
- * aren't allowed.
+ * A token is a word in a command in the shell. The tree that this builds is used for tab-completion
+ * of tables, users, commands and certain other parts of the shell that can be realistically
and
+ * quickly gathered. Tokens can have multiple commands grouped together and many possible
+ * subcommands, although they are stored in a set so duplicates aren't allowed.
  */
 public class Token {
   private Set<String> command = new HashSet<>();
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index ad2b0c4..db27ceb 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@ -86,9 +86,8 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 /**
- * Testing default namespace configuration with inheritance requires altering
- * the system state and restoring it back to normal. Punt on this for now and
- * just let it use a minicluster.
+ * Testing default namespace configuration with inheritance requires altering the system
state and
+ * restoring it back to normal. Punt on this for now and just let it use a minicluster.
  */
 @Category(MiniClusterOnlyTests.class)
 public class NamespacesIT extends AccumuloClusterHarness {

-- 
To stop receiving notification emails like this one, please contact
mwalch@apache.org.

Mime
View raw message