Skip to content

Commit 941693d

Browse files
test: add tests for different bigtable-habse packaging (#4280)
* chore: remove stale test This test used to verify that jwt authentication worked correctly. However, this functionality is now part of java-bigtable and doesn't belong in bigtable-hbase Change-Id: I1f54f28cbdeee460aa2ea4f31e89ad300d31d92d * Add maven profiles for running integration tests for different sets of dependencies (1x) There are 3 configurations: 1. bigtable-hbase-1x-shaded & hbase-client 2. bigtable-hbase-1x & hbase-shaded-client 3. bigtable-hbase-1x-shaded & hbase-client with cherry picked & upgraded dependencies The primary intent is to have a test configuration for running the bigtable-hbase-1x-shaded adapter without all of the old HBase dependencies that have known CVEs Change-Id: If7c0ca616db345adec0e7cb630623675a24df447 * comments Change-Id: I8810f20225709ff145c45f00541137b9f60505fa * format Change-Id: Iba4272859d8fc96b4c1584e2b4004dc0e97b935f
1 parent 618e565 commit 941693d

File tree

8 files changed

+310
-174
lines changed

8 files changed

+310
-174
lines changed

bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableExtendedConfiguration.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020
import org.apache.hadoop.conf.Configuration;
2121

2222
/**
23-
* Allows users to set an explicit {@link Credentials} object.
24-
*
25-
* <p>For internal use only - public for technical reasons.
26-
*
27-
* @see BigtableConfiguration#withCredentials(Configuration, Credentials).
23+
* @deprecated bigtable-hbase is primarily a compatibility layer for HBase, adding Bigtable
24+
* extensions is out of scope
2825
*/
26+
@Deprecated
2927
@InternalApi("For internal usage only")
3028
public class BigtableExtendedConfiguration extends Configuration {
3129
private Credentials credentials;

bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/filter/BigtableFilter.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,13 @@
2424
import java.io.Serializable;
2525
import org.apache.hadoop.hbase.Cell;
2626
import org.apache.hadoop.hbase.exceptions.DeserializationException;
27-
import org.apache.hadoop.hbase.filter.Filter;
2827
import org.apache.hadoop.hbase.filter.FilterBase;
29-
import org.apache.hadoop.hbase.filter.FilterList;
3028

3129
/**
32-
* An HBase {@link Filter} that wraps a Cloud Bigtable {@link Filters.Filter}. Generally, users
33-
* should opt for a pure HBase {@link Filter}. There are complex cases where a Cloud Bigtable {@link
34-
* Filters.Filter} can express a more robust expression than the HBase semantics, or can be used to
35-
* express an expression that's more performant than a translation of a complex HBase {@link
36-
* FilterList}.
30+
* @deprecated This is a Bigtable extension will be removed in the future. bigtable-hbase is meant
31+
* to be a compatibility layer from HBase to Bigtable. Adding extensions is out of scope.
3732
*/
33+
@Deprecated
3834
@InternalExtensionOnly
3935
public class BigtableFilter extends FilterBase implements Serializable {
4036

bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/filter/TimestampRangeFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.apache.hadoop.hbase.filter.FilterBase;
2929

3030
/**
31-
* Defines a filter that only returns cells whose version matches a start and end (both are
32-
* inclusive)
31+
* @deprecated This is a Bigtable extension will be removed in the future. bigtable-hbase is meant
32+
* to be a compatibility layer from HBase to Bigtable. Adding extensions is out of scope.
3333
*/
3434
@InternalExtensionOnly
3535
public class TimestampRangeFilter extends FilterBase implements Serializable {

0 commit comments

Comments
 (0)