From 554932bf638a12fe32b11984749688e08a6e293a Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Thu, 5 Feb 2009 22:24:59 +0000
Subject: [PATCH] HBASE-1184 HColumnDescriptor is too resrictive with family
 names

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@741317 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                             | 2 ++
 src/java/org/apache/hadoop/hbase/HColumnDescriptor.java | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bd3df7f03a2..09a47bc626f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -42,6 +42,8 @@ Release 0.20.0 - Unreleased
    HBASE-1167  JSP doesn't work in a git checkout (Nitay Joffe via Andrew
                Purtell)
    HBASE-1178  Add shutdown command to shell
+   HBASE-1184  HColumnDescriptor is too restrictive with family names
+               (Toby White via Andrew Purtell)
 
 Release 0.19.0 - 01/21/2009
   INCOMPATIBLE CHANGES
diff --git a/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index e0168da8353..4265a7e70a7 100644
--- a/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -242,12 +242,11 @@ public class HColumnDescriptor implements ISerializable, WritableComparable<HCol
         Bytes.toString(b));
     }
     for (int i = 0; i < (b.length - 1); i++) {
-      if (Character.isLetterOrDigit(b[i]) || b[i] == '_' || b[i] == '.') {
-        continue;
+      if (Character.isISOControl(b[i])) {
+        throw new IllegalArgumentException("Illegal character <" + b[i] +
+          ">. Family names cannot contain control characters: " +
+          Bytes.toString(b));
       }
-      throw new IllegalArgumentException("Illegal character <" + b[i] +
-        ">. Family names  can only contain  'word characters' and must end" +
-        "with a colon: " + Bytes.toString(b));
     }
     return b;
   }