From 212fa2e6d57a0d81c355b860b92a464b307ddc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E6=99=BA=E5=86=AC?= Date: Sun, 1 Sep 2019 21:08:40 +0800 Subject: [PATCH] HBASE-22962 Fix typo in javadoc description (#569) Signed-off-by: Duo Zhang --- .../java/org/apache/hadoop/hbase/util/CommonFSUtils.java | 2 +- .../org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestGlobalFilter.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestPathFilter.java | 2 +- .../org/apache/hadoop/hbase/http/TestServletFilter.java | 4 ++-- .../java/org/apache/hadoop/hbase/rest/client/Response.java | 2 +- .../hbase/io/hfile/CacheableDeserializerIdManager.java | 6 +++--- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../hbase/replication/regionserver/ReplicationSyncUp.java | 2 +- .../test/java/org/apache/hadoop/hbase/GenericTestUtils.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java index 688d9059c6c..9f682347338 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java @@ -337,7 +337,7 @@ public abstract class CommonFSUtils { } /** - * Return the 'path' component of a Path. In Hadoop, Path is an URI. This + * Return the 'path' component of a Path. In Hadoop, Path is a URI. This * method returns the 'path' component of a Path's URI: e.g. If a Path is * hdfs://example.org:9000/hbase_trunk/TestTable/compaction.dir, * this method returns /hbase_trunk/TestTable/compaction.dir. diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java index b42c270a9bb..090b87c70cc 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java @@ -119,7 +119,7 @@ public class JMXJsonServlet extends HttpServlet { /** * If query string includes 'description', then we will emit bean and attribute descriptions to * output IFF they are not null and IFF the description is not the same as the attribute name: - * i.e. specify an URL like so: /jmx?description=true + * i.e. specify a URL like so: /jmx?description=true */ private static final String INCLUDE_DESCRIPTION = "description"; diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java index 81902901f81..08901cfc01b 100644 --- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java +++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java @@ -114,7 +114,7 @@ public class TestGlobalFilter extends HttpServerFunctionalTest { public void testServletFilter() throws Exception { Configuration conf = new Configuration(); - //start a http server with CountingFilter + //start an http server with CountingFilter conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY, RecordingFilter.Initializer.class.getName()); HttpServer http = createTestServer(conf); diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java index 47e6ea26f15..571441714d2 100644 --- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java +++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java @@ -115,7 +115,7 @@ public class TestPathFilter extends HttpServerFunctionalTest { public void testPathSpecFilters() throws Exception { Configuration conf = new Configuration(); - //start a http server with CountingFilter + //start an http server with CountingFilter conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY, RecordingFilter.Initializer.class.getName()); String[] pathSpecs = { "/path", "/path/*" }; diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java index 6c70dbc9d83..22a79a759f6 100644 --- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java +++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java @@ -125,7 +125,7 @@ public class TestServletFilter extends HttpServerFunctionalTest { public void testServletFilter() throws Exception { Configuration conf = new Configuration(); - //start a http server with CountingFilter + //start an http server with CountingFilter conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY, SimpleFilter.Initializer.class.getName()); HttpServer http = createTestServer(conf); @@ -187,7 +187,7 @@ public class TestServletFilter extends HttpServerFunctionalTest { @Test public void testServletFilterWhenInitThrowsException() throws Exception { Configuration conf = new Configuration(); - // start a http server with ErrorFilter + // start an http server with ErrorFilter conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY, ErrorFilter.Initializer.class.getName()); HttpServer http = createTestServer(conf); diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java index adffc126b7b..518e9bb26b8 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java @@ -29,7 +29,7 @@ import org.apache.http.Header; import org.apache.http.HttpResponse; /** - * The HTTP result code, response headers, and body of a HTTP response. + * The HTTP result code, response headers, and body of an HTTP response. */ @InterfaceAudience.Public public class Response { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java index b1ed77dfac0..301d2b1490f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java @@ -34,9 +34,9 @@ public class CacheableDeserializerIdManager { private static final AtomicInteger identifier = new AtomicInteger(0); /** - * Register the given cacheable deserializer and generate an unique identifier - * id for it - * @param cd + * Register the given {@link Cacheable} -- usually an hfileblock instance, these implement + * the Cacheable Interface -- deserializer and generate a unique identifier id for it and return + * this as our result. * @return the identifier of given cacheable deserializer */ public static int registerDeserializer(CacheableDeserializer cd) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 9e97b7c02dd..c0e362d11f9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -457,7 +457,7 @@ public class HMaster extends HRegionServer implements MasterServices { redirectHost = request.getServerName(); if(!Addressing.isLocalAddress(InetAddress.getByName(redirectHost))) { LOG.warn("Couldn't resolve '" + redirectHost + "' as an address local to this node and '" + - MASTER_HOSTNAME_KEY + "' is not set; client will get a HTTP 400 response. If " + + MASTER_HOSTNAME_KEY + "' is not set; client will get an HTTP 400 response. If " + "your HBase deployment relies on client accessible names that the region server process " + "can't resolve locally, then you should set the previously mentioned configuration variable " + "to an appropriate hostname."); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java index 62068fdd3ea..255a08a2a38 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java @@ -105,7 +105,7 @@ public class ReplicationSyncUp extends Configured implements Tool { ZKWatcher zkw; DummyServer(ZKWatcher zkw) { - // an unique name in case the first run fails + // a unique name in case the first run fails hostname = System.currentTimeMillis() + ".SyncUpTool.replication.org"; this.zkw = zkw; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java index b1b09432af8..1bde5ae18d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java @@ -59,7 +59,7 @@ public abstract class GenericTestUtils { /** * Generates a process-wide unique sequence number. - * @return an unique sequence number + * @return a unique sequence number */ public static int uniqueSequenceId() { return sequence.incrementAndGet();