You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by an...@apache.org on 2013/11/16 04:45:50 UTC

svn commit: r1542461 - /hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java

Author: anoopsamjohn
Date: Sat Nov 16 03:45:50 2013
New Revision: 1542461

URL: http://svn.apache.org/r1542461
Log:
HBASE-9970 HBase BulkLoad, table is creating with the timestamp key also as a column to the table. (Sreenivasulu)

Modified:
    hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java?rev=1542461&r1=1542460&r2=1542461&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java Sat Nov 16 03:45:50 2013
@@ -359,7 +359,8 @@ public class ImportTsv extends Configure
     HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));
     Set<String> cfSet = new HashSet<String>();
     for (String aColumn : columns) {
-      if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)) continue;
+      if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)
+          || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)) continue;
       // we are only concerned with the first one (in case this is a cf:cq)
       cfSet.add(aColumn.split(":", 2)[0]);
     }