hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: Revert "HBASE-13352 Add hbase.import.version to Import usage (Lars Hofhansl)"
Date Tue, 14 Jul 2015 23:41:51 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 3094ecb26 -> 9c3fa44ec


Revert "HBASE-13352 Add hbase.import.version to Import usage (Lars Hofhansl)"

This reverts commit deba1d0a1075c62647eb63be09b87b20329fe44a.

Java 6 and Hadoop 1 profile compilation problems


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9c3fa44e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9c3fa44e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9c3fa44e

Branch: refs/heads/0.98
Commit: 9c3fa44ec2118943823dea04a64ffba7d69ac470
Parents: 3094ecb
Author: Andrew Purtell <apurtell@apache.org>
Authored: Tue Jul 14 16:41:03 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Tue Jul 14 16:41:03 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/mapreduce/Import.java | 13 -------------
 1 file changed, 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9c3fa44e/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java
index e4d5658..3ed2061 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java
@@ -53,7 +53,6 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.zookeeper.ZKClusterId;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.TaskCounter;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
 import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
@@ -482,8 +481,6 @@ public class Import {
         + " Filter#filterKeyValue(KeyValue) method to determine if the KeyValue should be
added;"
         + " Filter.ReturnCode#INCLUDE and #INCLUDE_AND_NEXT_COL will be considered as including"
         + " the KeyValue.");
-    System.err.println("To import data exported from HBase 0.94, use");
-    System.err.println("  -Dhbase.import.version=0.94");
     System.err.println("For performance consider the following options:\n"
         + "  -Dmapred.map.tasks.speculative.execution=false\n"
         + "  -Dmapred.reduce.tasks.speculative.execution=false\n"
@@ -540,16 +537,6 @@ public class Import {
       // Flush all the regions of the table
       flushRegionsIfNecessary(conf);
     }
-    long inputRecords = job.getCounters().findCounter(TaskCounter.MAP_INPUT_RECORDS).getValue();
-    long outputRecords = job.getCounters().findCounter(TaskCounter.MAP_OUTPUT_RECORDS).getValue();
-    if (outputRecords < inputRecords) {
-      System.err.println("Warning, not all records were imported (maybe filtered out).");
-      if (outputRecords == 0) {
-        System.err.println("If the data was exported from HBase 0.94 "+
-            "consider using -Dhbase.import.version=0.94.");
-      }
-    }
-
     System.exit(job.waitForCompletion(true) ? 0 : 1);
   }
 }


Mime
View raw message