diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index e2c466526ed..ce50c283af2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -170,7 +170,7 @@ public class Increment extends Mutation implements Comparable { * 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> getFamilyMapOfLongs() { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java index 09dc4360b4e..97d3d27fff4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java @@ -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; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java index 55ff81bd790..944ebb1cdad 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java @@ -63,7 +63,7 @@ public class TablePermission extends Permission { /** * 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 Permission { /** * 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 diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html index c21e129770c..f4d6919cb22 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html @@ -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.

See "Cell Query (Single Value)" section for encoding examples.

@@ -1018,7 +1018,7 @@ Supply commit data in the PUT or POST body. 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.

See "Cell or Row Query (Multiple Values)" for encoding examples.

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java index 5b999402460..ca1e71c75ca 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java @@ -39,10 +39,10 @@ public class TestScanWildcardColumnTracker extends HBaseTestCase { //Create list of qualifiers List qualifiers = new ArrayList(); - 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 expected = new ArrayList(); @@ -72,10 +72,10 @@ public class TestScanWildcardColumnTracker extends HBaseTestCase { //Create list of qualifiers List qualifiers = new ArrayList(); - 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 expected = new ArrayList(); @@ -106,8 +106,8 @@ public class TestScanWildcardColumnTracker extends HBaseTestCase { //Create list of qualifiers List qualifiers = new ArrayList(); - qualifiers.add(Bytes.toBytes("qualifer2")); - qualifiers.add(Bytes.toBytes("qualifer1")); + qualifiers.add(Bytes.toBytes("qualifier2")); + qualifiers.add(Bytes.toBytes("qualifier1")); boolean ok = false; diff --git a/hbase-shell/src/main/ruby/shell/commands/get.rb b/hbase-shell/src/main/ruby/shell/commands/get.rb index c6e2dc6a0eb..817abc51245 100644 --- a/hbase-shell/src/main/ruby/shell/commands/get.rb +++ b/hbase-shell/src/main/ruby/shell/commands/get.rb @@ -51,7 +51,7 @@ Example formatting cf:qualifier1 and cf:qualifier2 both as Integers: 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 diff --git a/hbase-shell/src/main/ruby/shell/commands/scan.rb b/hbase-shell/src/main/ruby/shell/commands/scan.rb index 81a9264245c..4c6f1c1b774 100644 --- a/hbase-shell/src/main/ruby/shell/commands/scan.rb +++ b/hbase-shell/src/main/ruby/shell/commands/scan.rb @@ -75,7 +75,7 @@ Example formatting cf:qualifier1 and cf:qualifier2 both as Integers: 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