(hbase) branch branch-2 updated: HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always call getTableRelativePath method (#5886)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 860ac60733f HBASE-28586 Backport HBASE-24791 Improve
HFileOutputFormat2 to avoid always call getTableRelativePath method (#5886)
860ac60733f is described below
commit 860ac60733fcc711b2ef69a43fac3f5f7e23f85b
Author: szucsvillo <81696283+szucsvi...@users.noreply.github.com>
AuthorDate: Sun May 12 15:46:14 2024 +0200
HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always
call getTableRelativePath method (#5886)
Signed-off-by: Duo Zhang
---
.../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 21 -
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 43dd4a7160e..6ab3bdd2504 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -266,6 +266,7 @@ public class HFileOutputFormat2 extends
FileOutputFormat writers = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final Map previousRows = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final long now = EnvironmentEdgeManager.currentTime();
+ private byte[] tableNameBytes = writeMultipleTables ? null :
Bytes.toBytes(writeTableNames);
@Override
public void write(ImmutableBytesWritable row, V cell) throws IOException
{
@@ -279,7 +280,6 @@ public class HFileOutputFormat2 extends
FileOutputFormat 1) {
- tableRelPath = new Path(tableRelPath, tableName.split(":")[1]);
+ tableRelPath = new Path(tableRelPath, tableNameParts[1]);
}
return tableRelPath;
}
(hbase) branch branch-2.6 updated: HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always call getTableRelativePath method (#5890)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new ae25102b33a HBASE-28586 Backport HBASE-24791 Improve
HFileOutputFormat2 to avoid always call getTableRelativePath method (#5890)
ae25102b33a is described below
commit ae25102b33a6e9b0bd9359a8f67c082cce97e50d
Author: szucsvillo <81696283+szucsvi...@users.noreply.github.com>
AuthorDate: Sun May 12 15:47:03 2024 +0200
HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always
call getTableRelativePath method (#5890)
Signed-off-by: Duo Zhang
---
.../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 21 -
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 43dd4a7160e..6ab3bdd2504 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -266,6 +266,7 @@ public class HFileOutputFormat2 extends
FileOutputFormat writers = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final Map previousRows = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final long now = EnvironmentEdgeManager.currentTime();
+ private byte[] tableNameBytes = writeMultipleTables ? null :
Bytes.toBytes(writeTableNames);
@Override
public void write(ImmutableBytesWritable row, V cell) throws IOException
{
@@ -279,7 +280,6 @@ public class HFileOutputFormat2 extends
FileOutputFormat 1) {
- tableRelPath = new Path(tableRelPath, tableName.split(":")[1]);
+ tableRelPath = new Path(tableRelPath, tableNameParts[1]);
}
return tableRelPath;
}
(hbase) branch branch-2.4 updated: HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always call getTableRelativePath method (#5887)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 9466e473571 HBASE-28586 Backport HBASE-24791 Improve
HFileOutputFormat2 to avoid always call getTableRelativePath method (#5887)
9466e473571 is described below
commit 9466e473571ffcde0819ffa606dbe0808b8eb2a7
Author: szucsvillo <81696283+szucsvi...@users.noreply.github.com>
AuthorDate: Sun May 12 15:48:27 2024 +0200
HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always
call getTableRelativePath method (#5887)
Signed-off-by: Duo Zhang
---
.../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 21 -
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index bd08e5bab46..d86956b684c 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -242,6 +242,7 @@ public class HFileOutputFormat2 extends
FileOutputFormat writers = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final Map previousRows = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final long now = EnvironmentEdgeManager.currentTime();
+ private byte[] tableNameBytes = writeMultipleTables ? null :
Bytes.toBytes(writeTableNames);
@Override
public void write(ImmutableBytesWritable row, V cell) throws IOException
{
@@ -255,7 +256,6 @@ public class HFileOutputFormat2 extends
FileOutputFormat 1) {
- tableRelPath = new Path(tableRelPath, tableName.split(":")[1]);
+ tableRelPath = new Path(tableRelPath, tableNameParts[1]);
}
return tableRelPath;
}
(hbase) branch master updated (23fa363d360 -> 328df6abf3e)
This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hbase.git from 23fa363d360 HBASE-28563 Closing ZooKeeper in ZKMainServer (#5869) add 328df6abf3e HBASE-28576 Remove FirstKeyValueMatchingQualifiersFilter (#5891) No new revisions were added by this update. Summary of changes: .../FirstKeyValueMatchingQualifiersFilter.java | 47 -- .../hbase/TestPartialResultsFromClientSide.java| 6 --- 2 files changed, 53 deletions(-) delete mode 100644 hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
(hbase) branch master updated (328df6abf3e -> ca340100535)
This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hbase.git from 328df6abf3e HBASE-28576 Remove FirstKeyValueMatchingQualifiersFilter (#5891) add ca340100535 HBASE-28581 Remove deprecated methods in TableDescriotorBuilder (#5892) No new revisions were added by this update. Summary of changes: .../hadoop/hbase/client/TableDescriptorBuilder.java | 20 1 file changed, 20 deletions(-)
(hbase) branch branch-3 updated (e4407c16fcf -> aa39ccfc613)
This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a change to branch branch-3 in repository https://gitbox.apache.org/repos/asf/hbase.git from e4407c16fcf HBASE-28448 CompressionTest hangs when run over a Ozone ofs path (#5771) (#5812) new 8999bc7cb9b HBASE-28576 Remove FirstKeyValueMatchingQualifiersFilter (#5891) new aa39ccfc613 HBASE-28581 Remove deprecated methods in TableDescriotorBuilder (#5892) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../hbase/client/TableDescriptorBuilder.java | 20 - .../FirstKeyValueMatchingQualifiersFilter.java | 47 -- .../hbase/TestPartialResultsFromClientSide.java| 6 --- 3 files changed, 73 deletions(-) delete mode 100644 hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
(hbase) 01/02: HBASE-28576 Remove FirstKeyValueMatchingQualifiersFilter (#5891)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8999bc7cb9bb2f1e05977eaa16bd6172f3cf290e
Author: Liangjun He
AuthorDate: Sun May 12 21:50:38 2024 +0800
HBASE-28576 Remove FirstKeyValueMatchingQualifiersFilter (#5891)
Signed-off-by: Duo Zhang
(cherry picked from commit 328df6abf3e1dca21fe882f4de2329aa9fd40616)
---
.../FirstKeyValueMatchingQualifiersFilter.java | 47 --
.../hbase/TestPartialResultsFromClientSide.java| 6 ---
2 files changed, 53 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
deleted file mode 100644
index 67354b304f5..000
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.filter;
-
-import org.apache.hadoop.hbase.exceptions.DeserializationException;
-import org.apache.yetus.audience.InterfaceAudience;
-
-/**
- * This filter was deprecated in 2.0.0 and should be removed in 3.0.0. We keep
the code here to
- * prevent the proto serialization exceptions puzzle those users who use older
version clients to
- * communicate with newer version servers.
- * @deprecated Deprecated in 2.0.0 and will be removed in 3.0.0.
- * @see https://issues.apache.org/jira/browse/HBASE-13347";>HBASE-13347
- */
-@InterfaceAudience.Public
-@Deprecated
-public class FirstKeyValueMatchingQualifiersFilter extends FirstKeyOnlyFilter {
-
- /**
- * Parses a serialized representation of {@link
FirstKeyValueMatchingQualifiersFilter}
- * @param pbBytes A pb serialized {@link
FirstKeyValueMatchingQualifiersFilter} instance
- * @return An instance of {@link FirstKeyValueMatchingQualifiersFilter} made
from
- * bytes
- * @throws DeserializationException if an error occurred
- * @see #toByteArray
- */
- public static FirstKeyValueMatchingQualifiersFilter parseFrom(final byte[]
pbBytes)
-throws DeserializationException {
-throw new DeserializationException(
- "Stop using FirstKeyValueMatchingQualifiersFilter, which has been
permanently removed");
- }
-}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
index 1d50bfa37ba..299f833c7c8 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -39,7 +38,6 @@ import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;
import org.apache.hadoop.hbase.filter.ColumnRangeFilter;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
-import org.apache.hadoop.hbase.filter.FirstKeyValueMatchingQualifiersFilter;
import org.apache.hadoop.hbase.filter.RandomRowFilter;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -774,10 +772,6 @@ public class TestPartialResultsFromClientSide {
testPartialResultsWithColumnFilter(new
ColumnPrefixFilter(Bytes.toBytes("testQualifier5")));
testPartialResultsWithColumnFilter(new
ColumnRangeFilter(Bytes.toBytes("testQualifer1"), true,
Bytes.toBytes("testQualifier7"), true));
-
-// Throw an Exception to the old version client to remind them not to use
this filter anymore
-assertThrows("Stop using", DoNotRetryIOException.class,
- () -> testPartialResultsWithColumnFilter(new
Fi
(hbase) 02/02: HBASE-28581 Remove deprecated methods in TableDescriotorBuilder (#5892)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit aa39ccfc6130409b6fb7e285f3d671fdcaebd7dc
Author: Liangjun He
AuthorDate: Sun May 12 21:51:28 2024 +0800
HBASE-28581 Remove deprecated methods in TableDescriotorBuilder (#5892)
Signed-off-by: Duo Zhang
(cherry picked from commit ca340100535d6c2c43b979e26c9291d892153f1a)
---
.../hadoop/hbase/client/TableDescriptorBuilder.java | 20
1 file changed, 20 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java
index fcdbe4e4ae6..8636b006e83 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java
@@ -1380,26 +1380,6 @@ public class TableDescriptorBuilder {
return setCoprocessorToMap(value);
}
-/**
- * Add a table coprocessor to this table. The coprocessor type must be
- * org.apache.hadoop.hbase.coprocessor.RegionObserver or Endpoint. It
won't check if the class
- * can be loaded or not. Whether a coprocessor is loadable or not will be
determined when a
- * region is opened.
- * @param specStr The Coprocessor specification all in in one String
- * @return the modifyable TD
- * @deprecated used by HTableDescriptor and admin.rb. As of release 2.0.0,
this will be removed
- * in HBase 3.0.0.
- */
-@Deprecated
-public ModifyableTableDescriptor setCoprocessorWithSpec(final String
specStr)
- throws IOException {
- CoprocessorDescriptor cpDesc =
-toCoprocessorDescriptor(specStr).orElseThrow(() -> new
IllegalArgumentException(
- "Format does not match " + CP_HTD_ATTR_VALUE_PATTERN + ": " +
specStr));
- checkHasCoprocessor(cpDesc.getClassName());
- return setCoprocessorToMap(specStr);
-}
-
private void checkHasCoprocessor(final String className) throws
IOException {
if (hasCoprocessor(className)) {
throw new IOException("Coprocessor " + className + " already exists.");
(hbase-site) branch asf-site updated: INFRA-10751 Empty commit
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/hbase-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 055e164d8fd INFRA-10751 Empty commit 055e164d8fd is described below commit 055e164d8fd950addae8b1a1b43730e0c2f63e7b Author: jenkins AuthorDate: Sun May 12 14:43:41 2024 + INFRA-10751 Empty commit
(hbase) branch branch-2.5 updated: HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always call getTableRelativePath method (#5888)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 867a801a84a HBASE-28586 Backport HBASE-24791 Improve
HFileOutputFormat2 to avoid always call getTableRelativePath method (#5888)
867a801a84a is described below
commit 867a801a84a073568ad0aa427a54f358a88c2e26
Author: szucsvillo <81696283+szucsvi...@users.noreply.github.com>
AuthorDate: Sun May 12 17:20:24 2024 +0200
HBASE-28586 Backport HBASE-24791 Improve HFileOutputFormat2 to avoid always
call getTableRelativePath method (#5888)
Signed-off-by: Duo Zhang
---
.../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 21 -
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 5627e02dc81..ca689488451 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -252,6 +252,7 @@ public class HFileOutputFormat2 extends
FileOutputFormat writers = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final Map previousRows = new
TreeMap<>(Bytes.BYTES_COMPARATOR);
private final long now = EnvironmentEdgeManager.currentTime();
+ private byte[] tableNameBytes = writeMultipleTables ? null :
Bytes.toBytes(writeTableNames);
@Override
public void write(ImmutableBytesWritable row, V cell) throws IOException
{
@@ -265,7 +266,6 @@ public class HFileOutputFormat2 extends
FileOutputFormat 1) {
- tableRelPath = new Path(tableRelPath, tableName.split(":")[1]);
+ tableRelPath = new Path(tableRelPath, tableNameParts[1]);
}
return tableRelPath;
}
