You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/03/29 04:40:10 UTC

svn commit: r1582946 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/ hbase-server/src/main/ja...

Author: stack
Date: Sat Mar 29 03:40:10 2014
New Revision: 1582946

URL: http://svn.apache.org/r1582946
Log:
HBASE-10864 Spelling nit (Alex Newman)

Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
    hbase/trunk/hbase-shell/src/main/ruby/shell/commands/get.rb
    hbase/trunk/hbase-shell/src/main/ruby/shell/commands/scan.rb

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java Sat Mar 29 03:40:10 2014
@@ -170,7 +170,7 @@ public class Increment extends Mutation 
    * a map of families to a list of Longs.  Now, {@link #getFamilyCellMap()} returns
    * families by list of Cells.  This method has been added so you can have the
    * old behavior.
-   * @return Map of families to a Map of qualifers and their Long increments.
+   * @return Map of families to a Map of qualifiers and their Long increments.
    * @since 0.95.0
    */
   public Map<byte[], NavigableMap<byte [], Long>> getFamilyMapOfLongs() {

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Sat Mar 29 03:40:10 2014
@@ -676,7 +676,7 @@ public final class ProtobufUtil {
           byte[] qualifier = qv.getQualifier().toByteArray();
           if (!qv.hasValue()) {
             throw new DoNotRetryIOException(
-              "Missing required field: qualifer value");
+              "Missing required field: qualifier value");
           }
           byte[] value = qv.getValue().toByteArray();
           byte[] tags = null;
@@ -754,7 +754,7 @@ public final class ProtobufUtil {
         for (QualifierValue qv: column.getQualifierValueList()) {
           byte[] qualifier = qv.getQualifier().toByteArray();
           if (!qv.hasValue()) {
-            throw new DoNotRetryIOException("Missing required field: qualifer value");
+            throw new DoNotRetryIOException("Missing required field: qualifier value");
           }
           byte[] value = qv.getValue().toByteArray();
           byte[] tags = null;

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java Sat Mar 29 03:40:10 2014
@@ -63,7 +63,7 @@ public class TablePermission extends Per
 
   /**
    * Creates a new permission for the given table, restricted to the given
-   * column family and qualifer, allowing the assigned actions to be performed.
+   * column family and qualifier, allowing the assigned actions to be performed.
    * @param table the table
    * @param family the family, can be null if a global permission on the table
    * @param assigned the list of allowed actions
@@ -93,7 +93,7 @@ public class TablePermission extends Per
 
   /**
    * Creates a new permission for the given namespace or table, restricted to the given
-   * column family and qualifer, allowing the assigned actions to be performed.
+   * column family and qualifier, allowing the assigned actions to be performed.
    * @param namespace
    * @param table the table
    * @param family the family, can be null if a global permission on the table

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html Sat Mar 29 03:40:10 2014
@@ -981,7 +981,7 @@ timestamp.
 PUT and POST operations are equivalent here: Specified addresses without
 existing data will create new values. Specified addresses with existing data 
 will create new versions, overwriting an existing version if all of { row,
-column:qualifer, timestamp } match that of the existing value.
+column:qualifier, timestamp } match that of the existing value.
 <p>
 See "Cell Query (Single Value)" section for encoding examples.
 <p>
@@ -1018,7 +1018,7 @@ Supply commit data in the PUT or POST bo
 PUT and POST operations are equivalent here: Specified addresses without
 existing data will create new values. Specified addresses with existing data 
 will create new versions, overwriting an existing version if all of { row,
-column:qualifer, timestamp } match that of the existing value.
+column:qualifier, timestamp } match that of the existing value.
 <p>
 See "Cell or Row Query (Multiple Values)" for encoding examples.
 <p>

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java Sat Mar 29 03:40:10 2014
@@ -39,10 +39,10 @@ public class TestScanWildcardColumnTrack
 
     //Create list of qualifiers
     List<byte[]> qualifiers = new ArrayList<byte[]>();
-    qualifiers.add(Bytes.toBytes("qualifer1"));
-    qualifiers.add(Bytes.toBytes("qualifer2"));
-    qualifiers.add(Bytes.toBytes("qualifer3"));
-    qualifiers.add(Bytes.toBytes("qualifer4"));
+    qualifiers.add(Bytes.toBytes("qualifier1"));
+    qualifiers.add(Bytes.toBytes("qualifier2"));
+    qualifiers.add(Bytes.toBytes("qualifier3"));
+    qualifiers.add(Bytes.toBytes("qualifier4"));
 
     //Setting up expected result
     List<MatchCode> expected = new ArrayList<MatchCode>();
@@ -72,10 +72,10 @@ public class TestScanWildcardColumnTrack
 
     //Create list of qualifiers
     List<byte[]> qualifiers = new ArrayList<byte[]>();
-    qualifiers.add(Bytes.toBytes("qualifer1"));
-    qualifiers.add(Bytes.toBytes("qualifer1"));
-    qualifiers.add(Bytes.toBytes("qualifer1"));
-    qualifiers.add(Bytes.toBytes("qualifer2"));
+    qualifiers.add(Bytes.toBytes("qualifier1"));
+    qualifiers.add(Bytes.toBytes("qualifier1"));
+    qualifiers.add(Bytes.toBytes("qualifier1"));
+    qualifiers.add(Bytes.toBytes("qualifier2"));
 
     //Setting up expected result
     List<ScanQueryMatcher.MatchCode> expected = new ArrayList<MatchCode>();
@@ -106,8 +106,8 @@ public class TestScanWildcardColumnTrack
 
     //Create list of qualifiers
     List<byte[]> qualifiers = new ArrayList<byte[]>();
-    qualifiers.add(Bytes.toBytes("qualifer2"));
-    qualifiers.add(Bytes.toBytes("qualifer1"));
+    qualifiers.add(Bytes.toBytes("qualifier2"));
+    qualifiers.add(Bytes.toBytes("qualifier1"));
 
     boolean ok = false;
 

Modified: hbase/trunk/hbase-shell/src/main/ruby/shell/commands/get.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/src/main/ruby/shell/commands/get.rb?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/src/main/ruby/shell/commands/get.rb (original)
+++ hbase/trunk/hbase-shell/src/main/ruby/shell/commands/get.rb Sat Mar 29 03:40:10 2014
@@ -51,7 +51,7 @@ Example formatting cf:qualifier1 and cf:
   hbase> get 't1', 'r1' {COLUMN => ['cf:qualifier1:toInt',
     'cf:qualifier2:c(org.apache.hadoop.hbase.util.Bytes).toInt'] } 
 
-Note that you can specify a FORMATTER by column only (cf:qualifer).  You cannot specify
+Note that you can specify a FORMATTER by column only (cf:qualifier).  You cannot specify
 a FORMATTER for all columns of a column family.
     
 The same commands also can be run on a reference to a table (obtained via get_table or

Modified: hbase/trunk/hbase-shell/src/main/ruby/shell/commands/scan.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/src/main/ruby/shell/commands/scan.rb?rev=1582946&r1=1582945&r2=1582946&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/src/main/ruby/shell/commands/scan.rb (original)
+++ hbase/trunk/hbase-shell/src/main/ruby/shell/commands/scan.rb Sat Mar 29 03:40:10 2014
@@ -75,7 +75,7 @@ Example formatting cf:qualifier1 and cf:
   hbase> scan 't1', {COLUMNS => ['cf:qualifier1:toInt',
     'cf:qualifier2:c(org.apache.hadoop.hbase.util.Bytes).toInt'] } 
 
-Note that you can specify a FORMATTER by column only (cf:qualifer).  You cannot
+Note that you can specify a FORMATTER by column only (cf:qualifier).  You cannot
 specify a FORMATTER for all columns of a column family.
 
 Scan can also be used directly from a table, by first getting a reference to a