hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/7] hbase git commit: HBASE-19179 Remove hbase-prefix-tree
Date Sat, 04 Nov 2017 17:14:53 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 22b07e91d -> f812218ff


http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
index bfd3a2b..2d23376 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
@@ -149,10 +149,6 @@ public class TestHFileDataBlockEncoder {
   @Test
   public void testEncodingWithOffheapKeyValue() throws IOException {
     // usually we have just block without headers, but don't complicate that
-    if(blockEncoder.getDataBlockEncoding() == DataBlockEncoding.PREFIX_TREE) {
-      // This is a TODO: Only after PrefixTree is fixed we can remove this check
-      return;
-    }
     try {
       List<Cell> kvs = generator.generateTestExtendedOffheapKeyValues(60, true);
       HFileContext meta = new HFileContextBuilder().withIncludesMvcc(includesMemstoreTS)

http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
index 91894dc..e594629 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
@@ -316,12 +316,7 @@ public class TestSeekTo {
     assertEquals("i", toRowStr(scanner.getCell()));
 
     assertEquals(1, scanner.seekTo(toKV("l", tagUsage)));
-    if (encoding == DataBlockEncoding.PREFIX_TREE) {
-      // TODO : Fix this
-      assertEquals(null, scanner.getCell());
-    } else {
-      assertEquals("k", toRowStr(scanner.getCell()));
-    }
+    assertEquals("k", toRowStr(scanner.getCell()));
 
     reader.close();
     deleteTestDir(fs);

http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
index 8e3c372..479d98f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
@@ -116,8 +116,7 @@ public class TestTags {
       HTableDescriptor desc = new HTableDescriptor(tableName);
       HColumnDescriptor colDesc = new HColumnDescriptor(fam);
       colDesc.setBlockCacheEnabled(true);
-      // colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
-      colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
+      colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
       desc.addFamily(colDesc);
       Admin admin = TEST_UTIL.getAdmin();
       admin.createTable(desc);
@@ -183,7 +182,7 @@ public class TestTags {
       HColumnDescriptor colDesc = new HColumnDescriptor(fam);
       colDesc.setBlockCacheEnabled(true);
       // colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
-      colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
+      // colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
       desc.addFamily(colDesc);
       Admin admin = TEST_UTIL.getAdmin();
       admin.createTable(desc);

http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/hbase-shell/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 19ec0c2..86f1426 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -207,11 +207,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-prefix-tree</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 137e416..41ebbf7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,6 @@
     <module>hbase-endpoint</module>
     <module>hbase-it</module>
     <module>hbase-examples</module>
-    <module>hbase-prefix-tree</module>
     <module>hbase-assembly</module>
     <module>hbase-testing-util</module>
     <module>hbase-annotations</module>
@@ -1717,14 +1716,6 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-prefix-tree</artifactId>
-        <version>${project.version}</version>
-        <!-- unfortunately, runtime scope causes Eclipse to give compile time access which
isn't
-          needed, however it is apparently needed to run things within Eclipse -->
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
         <artifactId>hbase-examples</artifactId>
         <groupId>org.apache.hbase</groupId>
         <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/hbase/blob/f812218f/src/main/asciidoc/_chapters/compression.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/compression.adoc b/src/main/asciidoc/_chapters/compression.adoc
index 4f86631..23ceeaf 100644
--- a/src/main/asciidoc/_chapters/compression.adoc
+++ b/src/main/asciidoc/_chapters/compression.adoc
@@ -115,12 +115,7 @@ The data format is nearly identical to Diff encoding, so there is not
an image t
 Prefix Tree::
   Prefix tree encoding was introduced as an experimental feature in HBase 0.96.
   It provides similar memory savings to the Prefix, Diff, and Fast Diff encoder, but provides
faster random access at a cost of slower encoding speed.
-+
-Prefix Tree may be appropriate for applications that have high block cache hit ratios. It
introduces new 'tree' fields for the row and column.
-The row tree field contains a list of offsets/references corresponding to the cells in that
row. This allows for a good deal of compression.
-For more details about Prefix Tree encoding, see link:https://issues.apache.org/jira/browse/HBASE-4676[HBASE-4676].
-+
-It is difficult to graphically illustrate a prefix tree, so no image is included. See the
Wikipedia article for link:http://en.wikipedia.org/wiki/Trie[Trie] for more general information
about this data structure.
+  It was removed in hbase-2.0.0. It was a good idea but little uptake. If interested in reviving
this effort, write the hbase dev list.
 
 [[data.block.encoding.types]]
 === Which Compressor or Data Block Encoder To Use


Mime
View raw message