svn commit: r31549 - /dev/hbase/hbase-1.5.0-SNAPSHOT/
Author: apurtell Date: Sat Dec 15 02:55:59 2018 New Revision: 31549 Log: Refresh hbase-1.5.0-SNAPSHOT 20181215T012402Z Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.asc dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.sha512 dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz.asc dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz.sha512 Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz == Binary files - no diff available. Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.asc == --- dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.asc (original) +++ dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.asc Sat Dec 15 02:55:59 2018 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwP/u8ACgkQhZd1TdU2 -XM2pxhAAqW/H2xCAo0SO1VqQH9JKRfIFtAdtR/sLMdMxAjT4dBAmn58aWlk8ltX4 -reata9US0E0qozgGXYPXZtZ7pKJ99qm1AKRJAWaJUapd4ZcKPSD+JnpE/RM8Y34S -JV9z256h76G/j2bzrz98CgB/9ykevTOc1Ej7ovriAae+noAzMu3XtB8upr+Aw8zL -Qo0EitK+MVIdYDckDetmqkjyiA7Ce9SNogVrD8FbMjofgz6zLURhpYCiXQqGmboN -8fs1vgK84jc+oZBPE71augMSqDTDeOC5Rs+bLCi+70REWLErxxLvtTTPGh5pq2IA -USZebbo3u5c88C74DXk5sUYSLM/vXBHQROHUFNDspr0y8Qm/BUxW51YzP/Bq5/wm -ZlmBuIfbQKxDWZQM7MheSLT3NYB0Qwv6R6zbV7TbDA6yrqIkD4J8+ePzD2fNsgq5 -SJYMt6TxNYgz1BIDpawGNHgoImyKMaRzQFIksk1xQ5XGQI1Gfee4aYOA8+zMIoH7 -rV4ljwQOk4nUxQuIrPq4pEtV0iO1XGenhZHsz1XFWRA/aLbeVkUfPrcl1zDjQCBT -wF2rwCuXZAbkxo+21uqPzmIOUlEhTOfXihFwst8op2jHg4pbVC4nxgI+dqTR/5Nn -NxbpFZjs+uWCpRTv8TEzKD8MlAjPzSvSlYcr67/bSEhFMV474kM= -=u9LF +iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwUa6IACgkQhZd1TdU2 +XM1HfBAAqmJMik2DQC1u9nNtLBTl+hdIS9SAoHHLlHVEwEZtixvuXkgFy8xkppCd +icJE0Mte7yWFbrfBBipxH7BioKzMaPiAW7h0jdvcbMGFJgxfPeXhEBSRMHBakTiz +JNpvRUJn0kMO4/Cj+RuATMODqew5caoMaIDLd5+zJ92hpV3k+D4TVhobT550pljr +pl7KZwbtXDp9iis1te6lAG2Dbl3g+fEcTukZQylKSiBta0zY0lSbCK6i5rCAUOoP +7llOkafYf8tqyB3U2wj2Pwu86TJNe2z3jI8ULlfq6xpdkH8R+zOTfvQ5ZyN9Q86Q +sHw5AaEX0Ls35AIktKFEKdUDHEMikjx3kVfizh9ubHrOOAzKUn09VA9nP0bm/rej +5hjKlnPT5VmQQJCbq3az561/Oq0X1HOzP1H4kDyLP9I+Qmiy0tCzukohYE5Edil+ +uPZbRkoCKTOSqhabQ3xvbTSYVJewoZOWY5siwPlimrejIQg42aAKWZ1zX0+4q4KL +ZWo0q76n5JaN+rxi722Qnj/zCCPxh3n6jHHhDoXHDFx920f9aVEGrigNf5RfBZpD +k4Gn6OpVIxHQOsLzRl/vRg16YC8qYuhuO+mNoLUQb0a+bUkXhXIHzgNzD8AmcCip +f9ARHojMJ58Lz8GXGLBOLpeVTlHOXeDdf8ir1Ro8346cbuBXS0U= +=jtYX -END PGP SIGNATURE- Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.sha512 == --- dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.sha512 (original) +++ dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-bin.tar.gz.sha512 Sat Dec 15 02:55:59 2018 @@ -1,4 +1,4 @@ -hbase-1.5.0-SNAPSHOT-bin.tar.gz: E6E1A3D1 DFB04BC0 0730868A AC248512 C3233E16 - 14EA9FAE 263B02C8 1364DA31 438C8698 3A42998F - 48E93C7E 8E4EA0EB 577C14C3 27F48062 3EBF2BB0 - 7D8E8E16 +hbase-1.5.0-SNAPSHOT-bin.tar.gz: 7BFD50ED E4397441 420AB614 E95B9875 0DB3F5FA + 2843BC09 EB123442 9CF90C15 61D4DE4E 3E2DA44A + 59388292 27A1657B 26419CE6 B9A4D23C B6B17FB1 + 3A0FCE75 Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz == Binary files - no diff available. Modified: dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz.asc == --- dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz.asc (original) +++ dev/hbase/hbase-1.5.0-SNAPSHOT/hbase-1.5.0-SNAPSHOT-src.tar.gz.asc Sat Dec 15 02:55:59 2018 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwP/vIACgkQhZd1TdU2 -XM1ZBQ/9EPpsgQzy8yVuFI4R52xFAinIelBP8hoPUKLAon5X1Vg+LTWwdc1nksPc -Z2qJB6v3FCk/32MQPLLi/VKeQYAfHp4E3AyXIaYVjzsZintDmvEri0ze7c2RvCeF -DNhBwOSBYVgb0rS7tC5EiRy+bxNALEr4G+g2M1AtnVGqgGBzXrt4XkOCVC44EtRV -9P/N0WMzeTWW3uDEfrxEvfk8xqhjXJ7GshVIVxeWs2vLZ8OZ2HrryUk37fjrSF+M -TwyFc8Qswpbf80jEt7I68LEYnkTwuSqvndIpBU0O5NLBi9un4YyFXcHFa1GcXmWC -t8SW6zbE28uRn0Q6Tx2NdYRDTrZfPHOAu+Z/HqqoFhzusav4P8YFzxcFk81/ebHy -qcpoz8GT8jmtEj276lxPQkIqOuuh9ziQGbq9Ue8siLXIA8feq6YclF9EpHjqWrJo -ad2Qvg7Wz36zLqLlsje1NKRo5CN3g4iLyin5EdD0o8EOJy08q3oG+jYHmR4Sf7QH -ob1J/DNhZiTYuiV2+ivmSBqRWOaQuXopuw3ofd+BqrJUmobf1kUWoQ8W9XlzvKrO -SJCsOcY740rpJLbQpaY8FXOSnJp6BlZ48lqVnpw+gcdrFoA4FeR80lm8XjggnIBX
svn commit: r31547 - in /dev/hbase/hbase-1.3.3RC0: hbase-1.3.3-bin.tar.gz hbase-1.3.3-bin.tar.gz.asc hbase-1.3.3-bin.tar.gz.sha512 hbase-1.3.3-src.tar.gz hbase-1.3.3-src.tar.gz.asc hbase-1.3.3-src.tar
Author: apurtell Date: Sat Dec 15 01:04:30 2018 New Revision: 31547 Log: Stage updated HBase 1.3.3RC0 artifacts Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.asc dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.sha512 dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz.asc dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz.sha512 Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz == Binary files - no diff available. Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.asc == --- dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.asc (original) +++ dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.asc Sat Dec 15 01:04:30 2018 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwTFVwACgkQhZd1TdU2 -XM3CXBAAiuATf0LKQtD8261wetn7ttzcS3hmZ7bJ0RMytUBNsQ3vDf+RMzj461uW -Gmnc9JbfsAE1yDz2meE7Efs0ZAnK3y1mlTjeXk0hkwWq4dzEyWl74b/w02QDSAaG -tN4TMC+D/oPOm2gguS3Sp2isYE5giHw5cGfn6vpjd9sN7wpCZ1lPfPaY/HKxccpn -dW6Uebqh94rEJhCp7mY41erSK3kUxYw4RslbxTmvOtK039vEaYKy7JJKjzDCjVlL -ZDIS2o0/BqtA+jeUgmma1a85TXK5MxhD7dtz6Fa85O4NmwQHqqf6rTvBEQnMeP09 -UEUXP34Q8yabtS85MXMQNNxYjBnAXmi64XqQ4kFdOWExs5qgX7iPpc16GNKn9vvW -C+iexUHGAF5CiffETUKppfhngNJ1cT1x+BM+HSAA+yoRIkAmlPpzf+Pasj2Hg3JQ -nzqQapAvjpX/s/wjHKebV3eBVuYKdIS+2msPcsk9L8qO2jfcadtykND8fskjel2E -ngscOXOY3seCSBGrk7kOywm9bmRKURpEIk/CCb5e585czSLOTl74Yf4ZU+axOfPN -1i8SkRy1EsgJ+ykUOC1/hmGFZRRgufxA1ZOTNgoe95nOXMyTXpgXXS/pzCHf6gbz -76DPRGtrB3WqxQcp06gGEYrs61b1oGak+ddbBdz9YoZsTaULhfI= -=lapH +iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwUUYEACgkQhZd1TdU2 +XM3knQ/9EQ98Q3iuMffbJdkWCtVg/wlDMieKVTaVn20Dy/jqzjrB8a8hliBt4ajJ +/VS5WxL7izVYvbCcrRcBEuDyC3ca30MGhMiUKympb9vr/cGPW6OyokzA2u96K9Ka +P0ZU6q/6HACCov2MfYzQf/OZC6FLV62LoUOwQJusthyZP/eFCJ7u+zhmdbs91MuR +FAh6isj9o9wqAnHnpBVcKktkSJZViyDjdcQJN6QEs4W89bYBPLlBjrQq1hks4Pb3 +ILkKmJUR4z5jOUbISkiNjGLLAi/AJJUQ2G97D5IQ2RKETJI/Pm5e0blQEtHKUs0D +mjzYEMInNuP1qHg2vQr8pxyFv1CNB6Lhi5Q5OS8nEmmWjOJXAfwMeslw1WK+RWT1 +riKncHhSs8PkiBJR/GW10ga+ZZexPaGILAkXyHUGVEAhHfnS9hloHd6peA8lvz5z +SMH/s99wuite9NyLhXhXhLDpuDz2vwsOHF/dS+DYtz+yeTvuwe01ARAv/3r43tuY +wzKLbtZIDZA4kBFT9IPyCWJWwyu2nAOS3GdqIHOvaHXHGrgZHRLq/v4NpvsP4PkA +ejVcQ17xddq9+kfFjTcjQKKPFTGqZucqwXjamtw4ZQUrCIzxdgObHFRifVSMy7SX +oexaA/LfA+gd2HEFqd8UdHaQo37Km+hrnlQi9id9GTwLypmB/sE= +=sH0a -END PGP SIGNATURE- Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.sha512 == --- dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.sha512 (original) +++ dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-bin.tar.gz.sha512 Sat Dec 15 01:04:30 2018 @@ -1,3 +1,3 @@ -hbase-1.3.3-bin.tar.gz: B50CF997 2FD02E1B E8E782B1 A810DA06 AA2A83B2 96C37998 -3A2D6B2C 6BC667A6 D83234E2 089CA2DD 91C9CF41 D14AEBA5 -B004E4EE C737E80A BDB0A1F7 9F3A724E +hbase-1.3.3-bin.tar.gz: B003F978 2C7AB460 43F83487 2C72C0D1 22273AC2 D78C5662 +6F01B460 40782678 A25CE825 3929B14A 4BB00A27 6F2074EE +7AFABD11 D83585FD 53195226 C37B3DEA Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz == Binary files - no diff available. Modified: dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz.asc == --- dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz.asc (original) +++ dev/hbase/hbase-1.3.3RC0/hbase-1.3.3-src.tar.gz.asc Sat Dec 15 01:04:30 2018 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwTFVwACgkQhZd1TdU2 -XM1oThAAmVBBGJTaZKPo1bhRPDbG+BZbJrL1IJ3DsbhOCyg+4iJhwFE5VuV4XtNa -46YKu6en/P0byV8colwICEuTiQO2/8Iyv49A5EeKRwVzoZeusyUgvvaJ/rc4lPIl -h/gLPQ+I+uyGWyRVwO6k2ETRvV6Cs99FF4ItK++0kEoiAIXtEOT8rSjInsukaROa -9BCElrzoQhyp24JR9s9P8mLK4ivvmbyiIXeLYE8LGcjcZeYZD89tKNlC3yISRHF6 -ICWvNWxJLpYvKXsN4yKiP6dN2h3eXpX3nWWzf7UEX/w4PJB0p45bbE6Nwf2lEJ6Y -mnMtfWc43OQvQaLc+SYO1btawF1T9/ygsPgIjguX/PJbQQAT/I2BOY6faatkU4Wk -6WL9raz5KOQLupkfT1zB+TzwLp62hefKCHcQ/yEpA18TXpUUdgiRfPLN2aP68ynk -cbXAT6/FRYzrYAp1PTbfjsMfqyhI7DLn3S02ZJNEhRUylb5+jl3fRNpf2qr4NWaP -fvtt51W+JW6wLHnNKQlpq3ntUSeDAESAsoe4zNZy2KEy7uF9525G2e83BhxN13af -vm3Rx4/shfmTtD0RHMkvy2ZXPjq9aUjhLTognRV6e5Wp8elWSg4JjFhZd6sRe6k9 -XLdpJXpeJVzDqrqyHfT1scFkUqKEUufuZN2Z/dgU7qdXHgyXTPs= -=j4+d +iQIzBAABCAAdFiEEUPHou3xnqxS9/AohhZd1TdU2XM0FAlwUUYQACgkQhZd1TdU2 +XM1w+BAApkNf6tzdwbX/o4tu/8pkDoYDLlowKtS3ZhlHVKK9q+uxHYiQJlXo+gfP +gHViVPeO3GgiryochLREzwUWEqaV0iOU9Mqvg6twmjzRtNAQ9l9g0XshvJkzfN0m +3kP+wa3fgSU7S9SpJjfn46EKvTl0TSFuI1WUtTbkZ1MMnGJL16tjgehEweKOAI76 +yvQb0V5cWx7oK3AKx/4XsdwrKOn4chTnemjf9DCjUqCPdPsXp2du+CrBeVbh+Hel
[1/2] hbase git commit: Revert "HBASE-21504 If enable FIFOCompactionPolicy, a compaction may write a "empty" hfile whose maxTimeStamp is long max. This kind of hfile will never be archived."
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 05fed6558 -> a75a458e0
Revert "HBASE-21504 If enable FIFOCompactionPolicy, a compaction may write a
"empty" hfile whose maxTimeStamp is long max. This kind of hfile will never be
archived."
This reverts commit 57222ff0aa66047fc405c488f86a27b622beea64.
Repeatable TestFIFOCompactionPolicy test failure
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d2c1deef
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d2c1deef
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d2c1deef
Branch: refs/heads/branch-1.3
Commit: d2c1deef1c1dd858fcf0b110753e57be466e676f
Parents: 05fed65
Author: Andrew Purtell
Authored: Fri Dec 14 15:35:14 2018 -0800
Committer: Andrew Purtell
Committed: Fri Dec 14 15:35:14 2018 -0800
--
.../compactions/FIFOCompactionPolicy.java | 44 ++-
.../compactions/TestFIFOCompactionPolicy.java | 57
2 files changed, 15 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/d2c1deef/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.java
index 52e1b72..d339898 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.java
@@ -97,29 +97,17 @@ public class FIFOCompactionPolicy extends
ExploringCompactionPolicy {
return hasExpiredStores(storeFiles);
}
- /**
- * The FIFOCompactionPolicy only choose those TTL expired HFiles as the
compaction candidates. So
- * if all HFiles are TTL expired, then the compaction will generate a new
empty HFile. While its
- * max timestamp will be Long.MAX_VALUE. If not considered separately, the
HFile will never be
- * archived because its TTL will be never expired. So we'll check the empty
store file separately.
- * (See HBASE-21504)
- */
- private boolean isEmptyStoreFile(StoreFile sf) {
-return sf.getReader().getEntries() == 0;
- }
-
- private boolean hasExpiredStores(Collection files) {
+ private boolean hasExpiredStores(Collection files) {
long currentTime = EnvironmentEdgeManager.currentTime();
-for (StoreFile sf : files) {
- if (isEmptyStoreFile(sf)) {
-return true;
- }
+for(StoreFile sf: files){
// Check MIN_VERSIONS is in HStore removeUnneededFiles
Long maxTs = sf.getReader().getMaxTimestamp();
long maxTtl = storeConfigInfo.getStoreFileTtl();
- if (maxTs == null || maxTtl == Long.MAX_VALUE || (currentTime - maxTtl <
maxTs)) {
-continue;
- } else {
+ if(maxTs == null
+ || maxTtl == Long.MAX_VALUE
+ || (currentTime - maxTtl < maxTs)){
+continue;
+ } else{
return true;
}
}
@@ -127,20 +115,18 @@ public class FIFOCompactionPolicy extends
ExploringCompactionPolicy {
}
private Collection getExpiredStores(Collection files,
- Collection filesCompacting) {
+Collection filesCompacting) {
long currentTime = EnvironmentEdgeManager.currentTime();
-Collection expiredStores = new ArrayList();
-for (StoreFile sf : files) {
- if (isEmptyStoreFile(sf)) {
-expiredStores.add(sf);
-continue;
- }
+Collection expiredStores = new ArrayList();
+for(StoreFile sf: files){
// Check MIN_VERSIONS is in HStore removeUnneededFiles
Long maxTs = sf.getReader().getMaxTimestamp();
long maxTtl = storeConfigInfo.getStoreFileTtl();
- if (maxTs == null || maxTtl == Long.MAX_VALUE || (currentTime - maxTtl <
maxTs)) {
-continue;
- } else if (filesCompacting == null || filesCompacting.contains(sf) ==
false) {
+ if(maxTs == null
+ || maxTtl == Long.MAX_VALUE
+ || (currentTime - maxTtl < maxTs)){
+continue;
+ } else if(filesCompacting == null || filesCompacting.contains(sf) ==
false){
expiredStores.add(sf);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d2c1deef/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
[2/2] hbase git commit: Update CHANGES.txt for 1.3.3RC0 again
Update CHANGES.txt for 1.3.3RC0 again Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a75a458e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a75a458e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a75a458e Branch: refs/heads/branch-1.3 Commit: a75a458e0c8f3c60db57f30ec4b06a606c9027b4 Parents: d2c1dee Author: Andrew Purtell Authored: Fri Dec 14 15:36:21 2018 -0800 Committer: Andrew Purtell Committed: Fri Dec 14 15:36:21 2018 -0800 -- CHANGES.txt | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a75a458e/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 9377707..6aba7fb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -120,7 +120,6 @@ Release Notes - HBase - Version 1.3.3 12/21/2018 * [HBASE-21417] - Pre commit build is broken due to surefire plugin crashes * [HBASE-21439] - StochasticLoadBalancer RegionLoads arenât being used in RegionLoad cost functions * [HBASE-21445] - CopyTable by bulkload will write hfile into yarn's HDFS -* [HBASE-21504] - If enable FIFOCompactionPolicy, a compaction may write a "empty" hfile whose maxTimeStamp is long max. This kind of hfile will never be archived. * [HBASE-21546] - ConnectException in TestThriftHttpServer * [HBASE-21553] - schedLock not released in MasterProcedureScheduler * [HBASE-21582] - If call HBaseAdmin#snapshotAsync but forget call isSnapshotFinished, then SnapshotHFileCleaner will skip to run every time
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/1.3.3RC0 86009810a -> d029d59b9
[1/6] hbase git commit: HBASE-20917 MetaTableMetrics#stop references uninitialized requestsMap for non-meta region
Repository: hbase
Updated Branches:
refs/heads/branch-1 4e7fc18fb -> 5c8c945e3
refs/heads/branch-1.4 64369d04c -> 55ce6479b
refs/heads/branch-2 c494e9ff2 -> aa36c3f6b
refs/heads/branch-2.0 26e1c5e71 -> c856758a3
HBASE-20917 MetaTableMetrics#stop references uninitialized requestsMap for
non-meta region
with addendum
(cherry picked from commit 654480326b9a8a5fa9d9314d1cfced6a45cfa941)
(cherry picked from commit 3787c729530ab7cf7f759decf2cbe961ff95f497)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5d94ad6a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5d94ad6a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5d94ad6a
Branch: refs/heads/branch-2.0
Commit: 5d94ad6a431bf58d8a6a57f057ca5a03fe0468f9
Parents: 26e1c5e
Author: tedyu
Authored: Sun Jul 22 20:51:58 2018 -0700
Committer: Sean Busbey
Committed: Fri Dec 14 12:57:33 2018 -0600
--
.../hbase/coprocessor/MetaTableMetrics.java | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/5d94ad6a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java
index 9bf35c0..3bb47ae 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java
@@ -197,9 +197,8 @@ public class MetaTableMetrics implements RegionCoprocessor {
}
private boolean
isMetaTableOp(ObserverContext e) {
- return TableName.META_TABLE_NAME.toString()
- .equals(new
String(e.getEnvironment().getRegionInfo().getTable().getName(),
- StandardCharsets.UTF_8));
+ return TableName.META_TABLE_NAME
+ .equals(e.getEnvironment().getRegionInfo().getTable());
}
private void
clientMetricRegisterAndMark(ObserverContext e) {
@@ -309,9 +308,8 @@ public class MetaTableMetrics implements RegionCoprocessor {
public void start(CoprocessorEnvironment env) throws IOException {
if (env instanceof RegionCoprocessorEnvironment
&& ((RegionCoprocessorEnvironment) env).getRegionInfo().getTable() !=
null
-&& ((RegionCoprocessorEnvironment)
env).getRegionInfo().getTable().getName() != null
-&& new String(((RegionCoprocessorEnvironment)
env).getRegionInfo().getTable().getName(),
-
StandardCharsets.UTF_8).equals(TableName.META_TABLE_NAME.toString())) {
+&& ((RegionCoprocessorEnvironment) env).getRegionInfo().getTable()
+ .equals(TableName.META_TABLE_NAME)) {
regionCoprocessorEnv = (RegionCoprocessorEnvironment) env;
observer = new ExampleRegionObserverMeta();
requestsMap = new ConcurrentHashMap<>();
@@ -324,11 +322,13 @@ public class MetaTableMetrics implements
RegionCoprocessor {
}
@Override
- public void stop(CoprocessorEnvironment e) throws IOException {
+ public void stop(CoprocessorEnvironment env) throws IOException {
// since meta region can move around, clear stale metrics when stop.
-for (String meterName : requestsMap.keySet()) {
- MetricRegistry registry =
regionCoprocessorEnv.getMetricRegistryForRegionServer();
- registry.remove(meterName);
+if (requestsMap != null) {
+ for (String meterName : requestsMap.keySet()) {
+MetricRegistry registry =
regionCoprocessorEnv.getMetricRegistryForRegionServer();
+registry.remove(meterName);
+ }
}
}
[5/6] hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26)
(cherry picked from commit aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5c8c945e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5c8c945e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5c8c945e
Branch: refs/heads/branch-1
Commit: 5c8c945e34771b7caa5536330d8d333eb184f22d
Parents: 4e7fc18
Author: Sean Busbey
Authored: Fri Dec 14 11:23:36 2018 -0600
Committer: Sean Busbey
Committed: Fri Dec 14 15:56:36 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java| 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/5c8c945e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 96d5946..d51fdf0 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -801,8 +801,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
@@ -826,8 +827,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
[3/6] hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit.
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit.
(cherry picked from commit 11193d7cc1f5a0a7ffb73777da7ce5c1b6af6c8c)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4020fd4c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4020fd4c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4020fd4c
Branch: refs/heads/branch-2.0
Commit: 4020fd4c4268facbaee40bd6733168635103ee4e
Parents: 5d94ad6
Author: Lars Hofhansl
Authored: Thu Dec 13 11:56:39 2018 -0800
Committer: Sean Busbey
Committed: Fri Dec 14 15:50:10 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/4020fd4c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 1ca1faa..cd2ab40 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -785,12 +785,16 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
@VisibleForTesting
protected boolean trySkipToNextRow(Cell cell) throws IOException {
Cell nextCell = null;
+// used to guard against a changed next indexed key by doing a identity
comparison
+// when the identity changes we need to compare the bytes again
+Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0) {
+ && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
+previousIndexedKey = nextIndexedKey;
} else {
return false;
}
@@ -806,12 +810,16 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
@VisibleForTesting
protected boolean trySkipToNextColumn(Cell cell) throws IOException {
Cell nextCell = null;
+// used to guard against a changed next indexed key by doing a identity
comparison
+// when the identity changes we need to compare the bytes again
+Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0) {
+ && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
+previousIndexedKey = nextIndexedKey;
} else {
return false;
}
hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
Repository: hbase
Updated Branches:
refs/heads/master 2b003c5d6 -> 491153488
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/49115348
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/49115348
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/49115348
Branch: refs/heads/master
Commit: 491153488ee5b19de22fd72e55dd5039399bb727
Parents: 2b003c5
Author: Sean Busbey
Authored: Fri Dec 14 11:23:36 2018 -0600
Committer: Sean Busbey
Committed: Fri Dec 14 17:08:22 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java| 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/49115348/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index e7a4528..91ca592 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -807,8 +807,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
@@ -832,8 +833,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
[2/6] hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aa36c3f6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aa36c3f6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aa36c3f6
Branch: refs/heads/branch-2
Commit: aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad
Parents: c494e9f
Author: Sean Busbey
Authored: Fri Dec 14 11:23:36 2018 -0600
Committer: Sean Busbey
Committed: Fri Dec 14 15:30:31 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java| 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/aa36c3f6/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index e7a4528..91ca592 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -807,8 +807,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
@@ -832,8 +833,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
[4/6] hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26)
(cherry picked from commit aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c856758a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c856758a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c856758a
Branch: refs/heads/branch-2.0
Commit: c856758a3a92181b7ae9d9e269a3d015c4e9e37b
Parents: 4020fd4
Author: Sean Busbey
Authored: Fri Dec 14 11:23:36 2018 -0600
Committer: Sean Busbey
Committed: Fri Dec 14 15:50:16 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java| 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/c856758a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index cd2ab40..37424dd 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -790,8 +790,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
@@ -815,8 +816,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
[6/6] hbase git commit: HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
HBASE-21590 Optimize trySkipToNextColumn in StoreScanner a bit. (addendum)
(cherry picked from commit a284c493b127fbf785fbee401f0854ad1979eb26)
(cherry picked from commit aa36c3f6b69ef47b6f53158eda4a87e1a72e4fad)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/55ce6479
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/55ce6479
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/55ce6479
Branch: refs/heads/branch-1.4
Commit: 55ce6479b955aa0848a327259e27bd6dbb8b60cb
Parents: 64369d0
Author: Sean Busbey
Authored: Fri Dec 14 11:23:36 2018 -0600
Committer: Sean Busbey
Committed: Fri Dec 14 17:03:06 2018 -0600
--
.../apache/hadoop/hbase/regionserver/StoreScanner.java| 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/55ce6479/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 96d5946..d51fdf0 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -801,8 +801,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextRow(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
@@ -826,8 +827,9 @@ public class StoreScanner extends
NonReversedNonLazyKeyValueScanner
Cell previousIndexedKey = null;
do {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY
- && (nextIndexedKey == previousIndexedKey ||
matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
+ if (nextIndexedKey != null && nextIndexedKey !=
KeyValueScanner.NO_NEXT_INDEXED_KEY &&
+ (nextIndexedKey == previousIndexedKey ||
+ matcher.compareKeyForNextColumn(nextIndexedKey, cell) >= 0)) {
this.heap.next();
++kvsScanned;
previousIndexedKey = nextIndexedKey;
hbase git commit: Update downloads.xml for release 1.4.9
Repository: hbase Updated Branches: refs/heads/master 1b08ba738 -> 2b003c5d6 Update downloads.xml for release 1.4.9 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2b003c5d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b003c5d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b003c5d Branch: refs/heads/master Commit: 2b003c5d685160eeaf90387e887b433dadb8695e Parents: 1b08ba7 Author: Andrew Purtell Authored: Fri Dec 14 13:54:57 2018 -0800 Committer: Andrew Purtell Committed: Fri Dec 14 13:54:57 2018 -0800 -- src/site/xdoc/downloads.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/2b003c5d/src/site/xdoc/downloads.xml -- diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml index 5d3f2a6..4bb7f51 100644 --- a/src/site/xdoc/downloads.xml +++ b/src/site/xdoc/downloads.xml @@ -88,23 +88,23 @@ under the License. -1.4.8 +1.4.9 -2018/10/08 +2018/12/14 -https://apache.org/dist/hbase/1.4.8/compat-check-report.html;>1.4.7 vs 1.4.8 +https://apache.org/dist/hbase/1.4.9/compat-check-report.html;>1.4.8 vs 1.4.9 -https://github.com/apache/hbase/blob/rel/1.4.8/CHANGES.txt;>Changes +https://github.com/apache/hbase/blob/rel/1.4.9/CHANGES.txt;>Changes -https://s.apache.org/hbase-1.4.8-jira-release-notes;>Release Notes +https://s.apache.org/hbase-1.4.9-jira-release-notes;>Release Notes -https://www.apache.org/dyn/closer.lua/hbase/1.4.8/hbase-1.4.8-src.tar.gz;>src (https://apache.org/dist/hbase/1.4.8/hbase-1.4.8-src.tar.gz.sha512;>sha512 https://apache.org/dist/hbase/1.4.8/hbase-1.4.8-src.tar.gz.asc;>asc) -https://www.apache.org/dyn/closer.lua/hbase/1.4.8/hbase-1.4.8-bin.tar.gz;>bin (https://apache.org/dist/hbase/1.4.8/hbase-1.4.8-bin.tar.gz.sha512;>sha512 https://apache.org/dist/hbase/1.4.8/hbase-1.4.8-bin.tar.gz.asc;>asc) +https://www.apache.org/dyn/closer.lua/hbase/1.4.9/hbase-1.4.9-src.tar.gz;>src (https://apache.org/dist/hbase/1.4.9/hbase-1.4.9-src.tar.gz.sha512;>sha512 https://apache.org/dist/hbase/1.4.9/hbase-1.4.9-src.tar.gz.asc;>asc) +https://www.apache.org/dyn/closer.lua/hbase/1.4.9/hbase-1.4.9-bin.tar.gz;>bin (https://apache.org/dist/hbase/1.4.9/hbase-1.4.9-bin.tar.gz.sha512;>sha512 https://apache.org/dist/hbase/1.4.9/hbase-1.4.9-bin.tar.gz.asc;>asc)
svn commit: r31546 - in /release/hbase: 1.4.8/ stable
Author: apurtell Date: Fri Dec 14 21:08:22 2018 New Revision: 31546 Log: Remove old HBase release 1.4.8 and update stable pointer to 1.4.9 Removed: release/hbase/1.4.8/ Modified: release/hbase/stable Modified: release/hbase/stable == --- release/hbase/stable (original) +++ release/hbase/stable Fri Dec 14 21:08:22 2018 @@ -1 +1 @@ -link 1.4.8 \ No newline at end of file +link 1.4.9 \ No newline at end of file
svn commit: r31545 - /dev/hbase/hbase-1.4.9RC1/ /release/hbase/1.4.9/
Author: apurtell Date: Fri Dec 14 21:07:13 2018 New Revision: 31545 Log: Release HBase 1.4.9 Added: release/hbase/1.4.9/ - copied from r31544, dev/hbase/hbase-1.4.9RC1/ Removed: dev/hbase/hbase-1.4.9RC1/
[3/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RpcThrottlingException.html
--
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RpcThrottlingException.html
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RpcThrottlingException.html
index d589905..7accbf5 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RpcThrottlingException.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RpcThrottlingException.html
@@ -37,106 +37,123 @@
029 @InterfaceAudience.Public
030 public enum Type {
031NumRequestsExceeded,
RequestSizeExceeded, NumReadRequestsExceeded, NumWriteRequestsExceeded,
-032WriteSizeExceeded,
ReadSizeExceeded,
-033 }
-034
-035 private static final String[] MSG_TYPE
=
-036 new String[] { "number of requests
exceeded", "request size limit exceeded",
-037"number of read requests
exceeded", "number of write requests exceeded",
-038"write size limit exceeded",
"read size limit exceeded", };
-039
-040 private static final String MSG_WAIT =
" - wait ";
+032WriteSizeExceeded, ReadSizeExceeded,
RequestCapacityUnitExceeded, ReadCapacityUnitExceeded,
+033WriteCapacityUnitExceeded
+034 }
+035
+036 private static final String[] MSG_TYPE
=
+037 new String[] { "number of requests
exceeded", "request size limit exceeded",
+038"number of read requests
exceeded", "number of write requests exceeded",
+039"write size limit exceeded",
"read size limit exceeded", "request capacity unit exceeded",
+040"read capacity unit exceeded",
"write capacity unit exceeded" };
041
-042 private long waitInterval;
-043 private Type type;
-044
-045 public RpcThrottlingException(String
msg) {
-046super(msg);
-047
-048// Dirty workaround to get the
information after
-049//
((RemoteException)e.getCause()).unwrapRemoteException()
-050for (int i = 0; i
MSG_TYPE.length; ++i) {
-051 int index =
msg.indexOf(MSG_TYPE[i]);
-052 if (index = 0) {
-053String waitTimeStr =
msg.substring(index + MSG_TYPE[i].length() + MSG_WAIT.length());
-054type = Type.values()[i];
-055waitInterval =
timeFromString(waitTimeStr);
-056break;
-057 }
-058}
-059 }
-060
-061 public RpcThrottlingException(final
Type type, final long waitInterval, final String msg) {
-062super(msg);
-063this.waitInterval = waitInterval;
-064this.type = type;
-065 }
-066
-067 public Type getType() {
-068return this.type;
-069 }
-070
-071 public long getWaitInterval() {
-072return this.waitInterval;
-073 }
-074
-075 public static void
throwNumRequestsExceeded(final long waitInterval) throws
-076 RpcThrottlingException {
-077
throwThrottlingException(Type.NumRequestsExceeded, waitInterval);
-078 }
-079
-080 public static void
throwRequestSizeExceeded(final long waitInterval)
-081 throws RpcThrottlingException {
-082
throwThrottlingException(Type.RequestSizeExceeded, waitInterval);
-083 }
-084
-085 public static void
throwNumReadRequestsExceeded(final long waitInterval)
-086 throws RpcThrottlingException {
-087
throwThrottlingException(Type.NumReadRequestsExceeded, waitInterval);
-088 }
-089
-090 public static void
throwNumWriteRequestsExceeded(final long waitInterval)
-091 throws RpcThrottlingException {
-092
throwThrottlingException(Type.NumWriteRequestsExceeded, waitInterval);
-093 }
-094
-095 public static void
throwWriteSizeExceeded(final long waitInterval) throws RpcThrottlingException
{
-096
throwThrottlingException(Type.WriteSizeExceeded, waitInterval);
-097 }
-098
-099 public static void
throwReadSizeExceeded(final long waitInterval) throws RpcThrottlingException
{
-100
throwThrottlingException(Type.ReadSizeExceeded, waitInterval);
-101 }
-102
-103 private static void
throwThrottlingException(final Type type, final long waitInterval)
-104 throws RpcThrottlingException {
-105String msg = MSG_TYPE[type.ordinal()]
+ MSG_WAIT + StringUtils.formatTime(waitInterval);
-106throw new
RpcThrottlingException(type, waitInterval, msg);
-107 }
-108
-109 private static long
timeFromString(String timeDiff) {
-110Pattern[] patterns =
-111new Pattern[] {
Pattern.compile("^(\\d+\\.\\d\\d)sec"),
-112Pattern.compile("^(\\d+)mins,
(\\d+\\.\\d\\d)sec"),
-113Pattern.compile("^(\\d+)hrs,
(\\d+)mins, (\\d+\\.\\d\\d)sec") };
+042 private static final String MSG_WAIT =
" - wait ";
+043
+044 private long waitInterval;
+045 private Type type;
+046
+047 public RpcThrottlingException(String
msg) {
+048super(msg);
+049
+050// Dirty workaround to get the
information after
+051//
((RemoteException)e.getCause()).unwrapRemoteException()
+052for (int i = 0; i
MSG_TYPE.length; ++i) {
+053 int index =
[6/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28. Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/611be1f3 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/611be1f3 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/611be1f3 Branch: refs/heads/asf-site Commit: 611be1f3ee6eccaba1b1753df695bf89815cc8e4 Parents: c413205 Author: jenkins Authored: Fri Dec 14 14:52:45 2018 + Committer: jenkins Committed: Fri Dec 14 14:52:45 2018 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 4 +- apidocs/index-all.html | 6 + .../quotas/RpcThrottlingException.Type.html | 38 +- .../hbase/quotas/RpcThrottlingException.html| 82 ++- .../class-use/RpcThrottlingException.html | 12 + .../quotas/RpcThrottlingException.Type.html | 213 +++--- .../hbase/quotas/RpcThrottlingException.html| 213 +++--- book.html | 2 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 46 +- checkstyle.rss | 4 +- coc.html| 4 +- dependencies.html | 4 +- dependency-convergence.html | 4 +- dependency-info.html| 4 +- dependency-management.html | 4 +- devapidocs/constant-values.html | 4 +- devapidocs/index-all.html | 6 + .../hadoop/hbase/backup/package-tree.html | 4 +- .../hadoop/hbase/client/package-tree.html | 24 +- .../hadoop/hbase/filter/package-tree.html | 8 +- .../hadoop/hbase/io/hfile/package-tree.html | 6 +- .../apache/hadoop/hbase/ipc/package-tree.html | 2 +- .../hadoop/hbase/mapreduce/package-tree.html| 4 +- .../hadoop/hbase/master/package-tree.html | 2 +- .../hbase/master/procedure/package-tree.html| 4 +- .../hadoop/hbase/monitoring/package-tree.html | 2 +- .../org/apache/hadoop/hbase/package-tree.html | 16 +- .../hadoop/hbase/procedure2/package-tree.html | 6 +- .../quotas/RpcThrottlingException.Type.html | 38 +- .../hbase/quotas/RpcThrottlingException.html| 96 ++- .../class-use/RpcThrottlingException.html | 12 + .../hadoop/hbase/quotas/package-tree.html | 6 +- .../hadoop/hbase/regionserver/StoreScanner.html | 36 +- .../hadoop/hbase/regionserver/package-tree.html | 18 +- .../regionserver/querymatcher/package-tree.html | 2 +- .../hbase/regionserver/wal/package-tree.html| 2 +- .../replication/regionserver/package-tree.html | 2 +- .../hbase/security/access/package-tree.html | 4 +- .../hadoop/hbase/security/package-tree.html | 2 +- .../hadoop/hbase/thrift/package-tree.html | 2 +- .../apache/hadoop/hbase/util/package-tree.html | 8 +- .../apache/hadoop/hbase/wal/package-tree.html | 2 +- .../org/apache/hadoop/hbase/Version.html| 4 +- .../quotas/RpcThrottlingException.Type.html | 213 +++--- .../hbase/quotas/RpcThrottlingException.html| 213 +++--- .../hadoop/hbase/quotas/TimeBasedLimiter.html | 8 +- .../hadoop/hbase/regionserver/StoreScanner.html | 716 ++- downloads.html | 4 +- export_control.html | 4 +- index.html | 4 +- integration.html| 4 +- issue-tracking.html | 4 +- license.html| 4 +- mail-lists.html | 4 +- metrics.html| 4 +- old_news.html | 4 +- plugin-management.html | 4 +- plugins.html| 4 +- poweredbyhbase.html | 4 +- project-info.html | 4 +- project-reports.html| 4 +- project-summary.html| 4 +- pseudo-distributed.html | 4 +- replication.html| 4 +- resources.html | 4 +- source-repository.html | 4 +- sponsors.html | 4 +- supportingprojects.html | 4 +- team-list.html | 4 +- 71 files changed, 1256 insertions(+), 952 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/acid-semantics.html
[5/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/constant-values.html -- diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html index 2044dc9..c285e85 100644 --- a/devapidocs/constant-values.html +++ b/devapidocs/constant-values.html @@ -3831,7 +3831,7 @@ publicstaticfinalhttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String date -"Thu Dec 13 14:43:55 UTC 2018" +"Fri Dec 14 14:44:11 UTC 2018" @@ -3845,7 +3845,7 @@ publicstaticfinalhttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String srcChecksum -"2d03196b76e1858daf2dd9c5c30b9310" +"a4dd87b6f708183c1f48d23f79345f1a" http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/index-all.html -- diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html index 68dbcc5..2a04e97 100644 --- a/devapidocs/index-all.html +++ b/devapidocs/index-all.html @@ -114800,12 +114800,16 @@ service. Deprecated. +throwReadCapacityUnitExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException + throwReadSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException throwReadSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.ThrottlingException Deprecated. +throwRequestCapacityUnitExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException + throwRequestSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException throwRequestSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.ThrottlingException @@ -114822,6 +114826,8 @@ service. throwTimeoutException(long) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin.TableFuture.TableWaitForStateCallable +throwWriteCapacityUnitExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException + throwWriteSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.RpcThrottlingException throwWriteSizeExceeded(long) - Static method in exception org.apache.hadoop.hbase.quotas.ThrottlingException http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html index 06e7f45..0761683 100644 --- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html @@ -167,10 +167,10 @@ java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.backup.BackupType +org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand org.apache.hadoop.hbase.backup.BackupInfo.BackupPhase +org.apache.hadoop.hbase.backup.BackupType org.apache.hadoop.hbase.backup.BackupInfo.BackupState -org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/org/apache/hadoop/hbase/client/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html index 54ae119..f24d0a1 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html @@ -555,24 +555,24 @@ java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.client.AbstractResponse.ResponseType +org.apache.hadoop.hbase.client.Scan.ReadType org.apache.hadoop.hbase.client.IsolationLevel org.apache.hadoop.hbase.client.ScannerCallable.MoreResults
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site 611be1f3e -> b262afab0 INFRA-10751 Empty commit Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/b262afab Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/b262afab Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/b262afab Branch: refs/heads/asf-site Commit: b262afab0d7b2c487c595d71dc4de0a9da5534b1 Parents: 611be1f Author: jenkins Authored: Fri Dec 14 14:53:01 2018 + Committer: jenkins Committed: Fri Dec 14 14:53:01 2018 + -- --
[1/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
Repository: hbase-site Updated Branches: refs/heads/asf-site c41320576 -> 611be1f3e http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/pseudo-distributed.html -- diff --git a/pseudo-distributed.html b/pseudo-distributed.html index b56a5d3..2c157f6 100644 --- a/pseudo-distributed.html +++ b/pseudo-distributed.html @@ -7,7 +7,7 @@ - + Apache HBase Running Apache HBase (TM) in pseudo-distributed mode @@ -318,7 +318,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/replication.html -- diff --git a/replication.html b/replication.html index 45d173b..a76e21c 100644 --- a/replication.html +++ b/replication.html @@ -7,7 +7,7 @@ - + Apache HBase Apache HBase (TM) Replication @@ -313,7 +313,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/resources.html -- diff --git a/resources.html b/resources.html index 1e0fcb3..b774d37 100644 --- a/resources.html +++ b/resources.html @@ -7,7 +7,7 @@ - + Apache HBase Other Apache HBase (TM) Resources @@ -341,7 +341,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/source-repository.html -- diff --git a/source-repository.html b/source-repository.html index 3816e44..3c76c13 100644 --- a/source-repository.html +++ b/source-repository.html @@ -7,7 +7,7 @@ - + Apache HBase Source Code Management @@ -309,7 +309,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/sponsors.html -- diff --git a/sponsors.html b/sponsors.html index 20a21e5..a47f96b 100644 --- a/sponsors.html +++ b/sponsors.html @@ -7,7 +7,7 @@ - + Apache HBase Apache HBase Sponsors @@ -343,7 +343,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/supportingprojects.html -- diff --git a/supportingprojects.html b/supportingprojects.html index f6170cb..b026d07 100644 --- a/supportingprojects.html +++ b/supportingprojects.html @@ -7,7 +7,7 @@ - + Apache HBase Supporting Projects @@ -530,7 +530,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/team-list.html -- diff --git a/team-list.html b/team-list.html index 7841e60..712ecd0 100644 --- a/team-list.html +++ b/team-list.html @@ -7,7 +7,7 @@ - + Apache HBase Project Team @@ -776,7 +776,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-12-13 + Last Published: 2018-12-14
[2/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
--
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 4041360..24feb2d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -810,360 +810,368 @@
802 @VisibleForTesting
803 protected boolean trySkipToNextRow(Cell
cell) throws IOException {
804Cell nextCell = null;
-805do {
-806 Cell nextIndexedKey =
getNextIndexedKey();
-807 if (nextIndexedKey != null
nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY
-808
matcher.compareKeyForNextRow(nextIndexedKey, cell) = 0) {
-809this.heap.next();
-810++kvsScanned;
-811 } else {
-812return false;
-813 }
-814} while ((nextCell =
this.heap.peek()) != null CellUtil.matchingRows(cell, nextCell));
-815return true;
-816 }
-817
-818 /**
-819 * See {@link
org.apache.hadoop.hbase.regionserver.StoreScanner#trySkipToNextRow(Cell)}
-820 * @param cell current cell
-821 * @return true means skip to next
column, false means not
-822 */
-823 @VisibleForTesting
-824 protected boolean
trySkipToNextColumn(Cell cell) throws IOException {
-825Cell nextCell = null;
-826do {
-827 Cell nextIndexedKey =
getNextIndexedKey();
-828 if (nextIndexedKey != null
nextIndexedKey != KeyValueScanner.NO_NEXT_INDEXED_KEY
-829
matcher.compareKeyForNextColumn(nextIndexedKey, cell) = 0) {
-830this.heap.next();
-831++kvsScanned;
-832 } else {
-833return false;
-834 }
-835} while ((nextCell =
this.heap.peek()) != null CellUtil.matchingRowColumn(cell,
nextCell));
-836// We need this check because it may
happen that the new scanner that we get
-837// during heap.next() is requiring
reseek due of fake KV previously generated for
-838// ROWCOL bloom filter optimization.
See HBASE-19863 for more details
-839if (nextCell != null
matcher.compareKeyForNextColumn(nextCell, cell) 0) {
-840 return false;
-841}
-842return true;
-843 }
-844
-845 @Override
-846 public long getReadPoint() {
-847return this.readPt;
-848 }
-849
-850 private static void
clearAndClose(ListKeyValueScanner scanners) {
-851for (KeyValueScanner s : scanners)
{
-852 s.close();
-853}
-854scanners.clear();
-855 }
-856
-857 // Implementation of
ChangedReadersObserver
-858 @Override
-859 public void
updateReaders(ListHStoreFile sfs, ListKeyValueScanner
memStoreScanners)
-860 throws IOException {
-861if (CollectionUtils.isEmpty(sfs)
CollectionUtils.isEmpty(memStoreScanners)) {
-862 return;
-863}
-864flushLock.lock();
-865try {
-866 flushed = true;
-867 final boolean isCompaction =
false;
-868 boolean usePread = get ||
scanUsePread;
-869 // SEE HBASE-19468 where the
flushed files are getting compacted even before a scanner
-870 // calls next(). So its better we
create scanners here rather than next() call. Ensure
-871 // these scanners are properly
closed() whether or not the scan is completed successfully
-872 // Eagerly creating scanners so
that we have the ref counting ticking on the newly created
-873 // store files. In case of stream
scanners this eager creation does not induce performance
-874 // penalty because in scans (that
uses stream scanners) the next() call is bound to happen.
-875 ListKeyValueScanner
scanners = store.getScanners(sfs, cacheBlocks, get, usePread,
-876isCompaction, matcher,
scan.getStartRow(), scan.getStopRow(), this.readPt, false);
-877
flushedstoreFileScanners.addAll(scanners);
-878 if
(!CollectionUtils.isEmpty(memStoreScanners)) {
-879
clearAndClose(memStoreScannersAfterFlush);
-880
memStoreScannersAfterFlush.addAll(memStoreScanners);
-881 }
-882} finally {
-883 flushLock.unlock();
-884}
-885// Let the next() call handle
re-creating and seeking
-886 }
-887
-888 /**
-889 * @return if top of heap has changed
(and KeyValueHeap has to try the next KV)
-890 */
-891 protected final boolean
reopenAfterFlush() throws IOException {
-892// here we can make sure that we have
a Store instance so no null check on store.
-893Cell lastTop = heap.peek();
-894// When we have the scan object,
should we not pass it to getScanners() to get a limited set of
-895// scanners? We did so in the
constructor and we could have done it now by storing the scan
-896// object from the constructor
-897ListKeyValueScanner
scanners;
-898flushLock.lock();
-899try {
-900 ListKeyValueScanner
[4/6] hbase-site git commit: Published site at 1b08ba7385d0dd914a6fb9722b786e4ece116b28.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/611be1f3/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html index 8bdd840..b8306a6 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html @@ -1589,7 +1589,7 @@ implements trySkipToNextColumn -protectedbooleantrySkipToNextColumn(Cellcell) +protectedbooleantrySkipToNextColumn(Cellcell) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException See trySkipToNextRow(Cell) @@ -1608,7 +1608,7 @@ implements getReadPoint -publiclonggetReadPoint() +publiclonggetReadPoint() Specified by: getReadPointin interfaceChangedReadersObserver @@ -1623,7 +1623,7 @@ implements clearAndClose -private staticvoidclearAndClose(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScannerscanners) +private staticvoidclearAndClose(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScannerscanners) @@ -1632,7 +1632,7 @@ implements updateReaders -publicvoidupdateReaders(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHStoreFilesfs, +publicvoidupdateReaders(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHStoreFilesfs, https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScannermemStoreScanners) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Description copied from interface:ChangedReadersObserver @@ -1654,7 +1654,7 @@ implements reopenAfterFlush -protected finalbooleanreopenAfterFlush() +protected finalbooleanreopenAfterFlush() throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Returns: @@ -1670,7 +1670,7 @@ implements resetQueryMatcher -privatevoidresetQueryMatcher(CelllastTopKey) +privatevoidresetQueryMatcher(CelllastTopKey) @@ -1679,7 +1679,7 @@ implements checkScanOrder -protectedvoidcheckScanOrder(CellprevKV, +protectedvoidcheckScanOrder(CellprevKV, Cellkv, CellComparatorcomparator) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException @@ -1700,7 +1700,7 @@ implements seekToNextRow -protectedbooleanseekToNextRow(Cellc) +protectedbooleanseekToNextRow(Cellc) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Throws: @@ -1714,7 +1714,7 @@ implements seekAsDirection -protectedbooleanseekAsDirection(Cellkv) +protectedbooleanseekAsDirection(Cellkv) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Do a reseek in a normal StoreScanner(scan forward) @@ -1733,7 +1733,7 @@ implements reseek -publicbooleanreseek(Cellkv) +publicbooleanreseek(Cellkv) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Description copied from interface:KeyValueScanner Reseek the scanner at or after the specified KeyValue. @@ -1758,7 +1758,7 @@ implements trySwitchToStreamRead -voidtrySwitchToStreamRead() +voidtrySwitchToStreamRead() @@ -1767,7 +1767,7 @@ implements checkFlushed -protected finalbooleancheckFlushed() +protected finalbooleancheckFlushed() @@ -1776,7 +1776,7 @@ implements parallelSeek -privatevoidparallelSeek(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">List? extends KeyValueScannerscanners, +privatevoidparallelSeek(https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">List? extends KeyValueScannerscanners, Cellkv) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
hbase git commit: HBASE-21578 Fix wrong throttling exception for capacity unit
Repository: hbase
Updated Branches:
refs/heads/branch-2 11193d7cc -> c494e9ff2
HBASE-21578 Fix wrong throttling exception for capacity unit
Signed-off-by: Guanghao Zhang
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c494e9ff
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c494e9ff
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c494e9ff
Branch: refs/heads/branch-2
Commit: c494e9ff20f5d6c7778281db0a08011474cfe2a1
Parents: 11193d7
Author: meiyi
Authored: Fri Dec 14 09:42:48 2018 +0800
Committer: Guanghao Zhang
Committed: Fri Dec 14 18:22:34 2018 +0800
--
.../hbase/quotas/RpcThrottlingException.java| 21 ++--
.../hadoop/hbase/quotas/TimeBasedLimiter.java | 8
2 files changed, 23 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/c494e9ff/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
index 9baf91f..4c48f65 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
@@ -29,13 +29,15 @@ public class RpcThrottlingException extends
HBaseIOException {
@InterfaceAudience.Public
public enum Type {
NumRequestsExceeded, RequestSizeExceeded, NumReadRequestsExceeded,
NumWriteRequestsExceeded,
-WriteSizeExceeded, ReadSizeExceeded,
+WriteSizeExceeded, ReadSizeExceeded, RequestCapacityUnitExceeded,
ReadCapacityUnitExceeded,
+WriteCapacityUnitExceeded
}
private static final String[] MSG_TYPE =
new String[] { "number of requests exceeded", "request size limit
exceeded",
"number of read requests exceeded", "number of write requests
exceeded",
-"write size limit exceeded", "read size limit exceeded", };
+"write size limit exceeded", "read size limit exceeded", "request
capacity unit exceeded",
+"read capacity unit exceeded", "write capacity unit exceeded" };
private static final String MSG_WAIT = " - wait ";
@@ -100,6 +102,21 @@ public class RpcThrottlingException extends
HBaseIOException {
throwThrottlingException(Type.ReadSizeExceeded, waitInterval);
}
+ public static void throwRequestCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.RequestCapacityUnitExceeded, waitInterval);
+ }
+
+ public static void throwReadCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.ReadCapacityUnitExceeded, waitInterval);
+ }
+
+ public static void throwWriteCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.WriteCapacityUnitExceeded, waitInterval);
+ }
+
private static void throwThrottlingException(final Type type, final long
waitInterval)
throws RpcThrottlingException {
String msg = MSG_TYPE[type.ordinal()] + MSG_WAIT +
StringUtils.formatTime(waitInterval);
http://git-wip-us.apache.org/repos/asf/hbase/blob/c494e9ff/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
index 771eed1..6b5349f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
@@ -148,7 +148,7 @@ public class TimeBasedLimiter implements QuotaLimiter {
reqSizeLimiter.waitInterval(estimateWriteSize + estimateReadSize));
}
if (!reqCapacityUnitLimiter.canExecute(estimateWriteCapacityUnit +
estimateReadCapacityUnit)) {
- RpcThrottlingException.throwRequestSizeExceeded(
+ RpcThrottlingException.throwRequestCapacityUnitExceeded(
reqCapacityUnitLimiter.waitInterval(estimateWriteCapacityUnit +
estimateReadCapacityUnit));
}
@@ -161,7 +161,7 @@ public class TimeBasedLimiter implements QuotaLimiter {
writeSizeLimiter.waitInterval(estimateWriteSize));
}
if (!writeCapacityUnitLimiter.canExecute(estimateWriteCapacityUnit)) {
-RpcThrottlingException.throwWriteSizeExceeded(
+RpcThrottlingException.throwWriteCapacityUnitExceeded(
hbase git commit: HBASE-21578 Fix wrong throttling exception for capacity unit
Repository: hbase
Updated Branches:
refs/heads/master 3ff274e22 -> 1b08ba738
HBASE-21578 Fix wrong throttling exception for capacity unit
Signed-off-by: Guanghao Zhang
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b08ba73
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b08ba73
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b08ba73
Branch: refs/heads/master
Commit: 1b08ba7385d0dd914a6fb9722b786e4ece116b28
Parents: 3ff274e
Author: meiyi
Authored: Fri Dec 14 09:42:48 2018 +0800
Committer: Guanghao Zhang
Committed: Fri Dec 14 18:17:47 2018 +0800
--
.../hbase/quotas/RpcThrottlingException.java| 21 ++--
.../hadoop/hbase/quotas/TimeBasedLimiter.java | 8
2 files changed, 23 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b08ba73/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
index 9baf91f..4c48f65 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/RpcThrottlingException.java
@@ -29,13 +29,15 @@ public class RpcThrottlingException extends
HBaseIOException {
@InterfaceAudience.Public
public enum Type {
NumRequestsExceeded, RequestSizeExceeded, NumReadRequestsExceeded,
NumWriteRequestsExceeded,
-WriteSizeExceeded, ReadSizeExceeded,
+WriteSizeExceeded, ReadSizeExceeded, RequestCapacityUnitExceeded,
ReadCapacityUnitExceeded,
+WriteCapacityUnitExceeded
}
private static final String[] MSG_TYPE =
new String[] { "number of requests exceeded", "request size limit
exceeded",
"number of read requests exceeded", "number of write requests
exceeded",
-"write size limit exceeded", "read size limit exceeded", };
+"write size limit exceeded", "read size limit exceeded", "request
capacity unit exceeded",
+"read capacity unit exceeded", "write capacity unit exceeded" };
private static final String MSG_WAIT = " - wait ";
@@ -100,6 +102,21 @@ public class RpcThrottlingException extends
HBaseIOException {
throwThrottlingException(Type.ReadSizeExceeded, waitInterval);
}
+ public static void throwRequestCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.RequestCapacityUnitExceeded, waitInterval);
+ }
+
+ public static void throwReadCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.ReadCapacityUnitExceeded, waitInterval);
+ }
+
+ public static void throwWriteCapacityUnitExceeded(final long waitInterval)
+ throws RpcThrottlingException {
+throwThrottlingException(Type.WriteCapacityUnitExceeded, waitInterval);
+ }
+
private static void throwThrottlingException(final Type type, final long
waitInterval)
throws RpcThrottlingException {
String msg = MSG_TYPE[type.ordinal()] + MSG_WAIT +
StringUtils.formatTime(waitInterval);
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b08ba73/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
index 771eed1..6b5349f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TimeBasedLimiter.java
@@ -148,7 +148,7 @@ public class TimeBasedLimiter implements QuotaLimiter {
reqSizeLimiter.waitInterval(estimateWriteSize + estimateReadSize));
}
if (!reqCapacityUnitLimiter.canExecute(estimateWriteCapacityUnit +
estimateReadCapacityUnit)) {
- RpcThrottlingException.throwRequestSizeExceeded(
+ RpcThrottlingException.throwRequestCapacityUnitExceeded(
reqCapacityUnitLimiter.waitInterval(estimateWriteCapacityUnit +
estimateReadCapacityUnit));
}
@@ -161,7 +161,7 @@ public class TimeBasedLimiter implements QuotaLimiter {
writeSizeLimiter.waitInterval(estimateWriteSize));
}
if (!writeCapacityUnitLimiter.canExecute(estimateWriteCapacityUnit)) {
-RpcThrottlingException.throwWriteSizeExceeded(
+RpcThrottlingException.throwWriteCapacityUnitExceeded(
