This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new d21256b08e PHOENIX-7374 5.1 branch does not compile with Hbase 2.1 and
2.2
d21256b08e is described below
commit d21256b08e3826ab18f3be53616bd4dac9e88529
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Jul 25 15:54:05 2024 +0200
PHOENIX-7374 5.1 branch does not compile with Hbase 2.1 and 2.2
---
.../phoenix/end2end/ScanUncommittedWithRegionMovesIT.java | 7 +++++--
.../phoenix/end2end/ServerPagingWithRegionMovesIT.java | 12 ++++++++----
.../end2end/index/GlobalIndexCheckerWithRegionMovesIT.java | 10 +++++++---
.../org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java | 7 +++++--
.../src/test/java/org/apache/phoenix/util/QueryUtilTest.java | 10 ++++++++--
5 files changed, 33 insertions(+), 13 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java
index 45fa4d77bd..a9902f2b0a 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.iterate.ScanningResultPostDummyResultCaller;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
@@ -130,7 +131,8 @@ public class ScanUncommittedWithRegionMovesIT extends
ParallelStatsDisabledIT {
regionsOnServer1.forEach(regionInfo -> {
if (regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server2);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server2.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -139,7 +141,8 @@ public class ScanUncommittedWithRegionMovesIT extends
ParallelStatsDisabledIT {
regionsOnServer2.forEach(regionInfo -> {
if (regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server1);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server1.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java
index 76aea5b681..7cfdc7a3e5 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java
@@ -304,7 +304,8 @@ public class ServerPagingWithRegionMovesIT extends
ParallelStatsDisabledIT {
regionsOnServer1.forEach(regionInfo -> {
if (regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server2);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server2.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -313,7 +314,8 @@ public class ServerPagingWithRegionMovesIT extends
ParallelStatsDisabledIT {
regionsOnServer2.forEach(regionInfo -> {
if (regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server1);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server1.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -341,14 +343,16 @@ public class ServerPagingWithRegionMovesIT extends
ParallelStatsDisabledIT {
}
regionsOnServer1.forEach(regionInfo -> {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server2);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server2.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
});
regionsOnServer2.forEach(regionInfo -> {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(), server1);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server1.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerWithRegionMovesIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerWithRegionMovesIT.java
index 4bd47ea30c..943337d575 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerWithRegionMovesIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerWithRegionMovesIT.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionStatesCount;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.end2end.IndexToolIT;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
@@ -176,7 +177,8 @@ public class GlobalIndexCheckerWithRegionMovesIT extends
BaseTest {
regionStatesCount.getTotalRegions()) {
LOGGER.info("Moving region {} to {}",
regionInfo.getRegionNameAsString(),
server2);
- admin.move(regionInfo.getEncodedNameAsBytes(),
server2);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server2.getServerName()));
break;
} else {
LOGGER.info("Table {} has some region(s) in RIT or
not online",
@@ -198,9 +200,11 @@ public class GlobalIndexCheckerWithRegionMovesIT extends
BaseTest {
if (regionStatesCount.getRegionsInTransition() == 0 &&
regionStatesCount.getOpenRegions() ==
regionStatesCount.getTotalRegions()) {
- admin.move(regionInfo.getEncodedNameAsBytes(),
server1);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server1.getServerName()));
LOGGER.info("Moving region {} to {}",
- regionInfo.getRegionNameAsString(),
server1);
+ regionInfo.getRegionNameAsString(),
+ Bytes.toBytes(server1.getServerName()));
break;
} else {
LOGGER.info("Table {} has some region(s) in RIT or
not online",
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
index 1452b0e670..392976e407 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.util.Bytes;
import
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
@@ -280,7 +281,8 @@ public class PhoenixQueryTimeoutIT extends
ParallelStatsDisabledIT {
regionsOnServer1.forEach(regionInfo -> {
if
(regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(),
server2);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server2.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -289,7 +291,8 @@ public class PhoenixQueryTimeoutIT extends
ParallelStatsDisabledIT {
regionsOnServer2.forEach(regionInfo -> {
if
(regionInfo.getTable().equals(TableName.valueOf(tableName))) {
try {
- admin.move(regionInfo.getEncodedNameAsBytes(),
server1);
+ admin.move(regionInfo.getEncodedNameAsBytes(),
+ Bytes.toBytes(server1.getServerName()));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
index 945f3e474a..b6d7e7a189 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.sql.Types;
import java.util.Arrays;
@@ -28,7 +29,7 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.client.TestZKConnectionRegistry;
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.phoenix.jdbc.ZKConnectionInfo;
import org.apache.phoenix.parse.HintNode.Hint;
import org.junit.Test;
@@ -38,6 +39,10 @@ import
org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
public class QueryUtilTest {
+ //Copied from HBase HConstants, so that the test compiles with HBase 2.1
and 2.2
+ private static final String CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY =
+ "hbase.client.registry.impl";
+
private static final ColumnInfo ID_COLUMN = new ColumnInfo("ID",
Types.BIGINT);
private static final ColumnInfo NAME_COLUMN = new ColumnInfo("NAME",
Types.VARCHAR);
@@ -121,11 +126,12 @@ public class QueryUtilTest {
*/
@Test
public void testCreateConnectionFromConfiguration() throws Exception {
+ assumeTrue(VersionInfo.compareVersion(VersionInfo.getVersion(), "2.3")
>= 0);
Properties props = new Properties();
// standard lookup. this already checks if we set
hbase.zookeeper.clientPort
Configuration conf = new Configuration(false);
// Need this for HBase 3 where ZK is not the default
- conf.set(HConstants.CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
+ conf.set(CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
ZKConnectionInfo.ZK_REGISTRY_NAME);
conf.set(HConstants.ZOOKEEPER_QUORUM, "localhost");
conf.set(HConstants.ZOOKEEPER_CLIENT_PORT, "2181");
