You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2018/06/01 21:43:07 UTC
[1/2] phoenix git commit: PHOENIX-4769 Annotate SystemCatalogIT so
that it will run with the test suite
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.2 445f72750 -> ce834bec4
PHOENIX-4769 Annotate SystemCatalogIT so that it will run with the test suite
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/091ffbd8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/091ffbd8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/091ffbd8
Branch: refs/heads/4.x-HBase-1.2
Commit: 091ffbd856275a95f826a7915db57e8918448e53
Parents: 445f727
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Jun 1 14:42:50 2018 -0700
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Jun 1 14:42:50 2018 -0700
----------------------------------------------------------------------
.../apache/phoenix/end2end/SystemCatalogIT.java | 23 +++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/091ffbd8/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
index 7b6a543..6f49518 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -26,14 +25,18 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionLocator;
+import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-public class SystemCatalogIT {
+@Category(NeedsOwnMiniClusterTest.class)
+public class SystemCatalogIT extends BaseTest {
private HBaseTestingUtility testUtil = null;
@After
@@ -57,13 +60,17 @@ public class SystemCatalogIT {
TableName systemCatalog = TableName.valueOf("SYSTEM.CATALOG");
RegionLocator rl = testUtil.getConnection().getRegionLocator(systemCatalog);
assertEquals(rl.getAllRegionLocations().size(), 1);
+ try {
+ // now attempt to split SYSTEM.CATALOG
+ testUtil.getHBaseAdmin().split(systemCatalog);
- // now attempt to split SYSTEM.CATALOG
- testUtil.getHBaseAdmin().split(systemCatalog);
-
- // make sure the split finishes (there's no synchronous splitting before HBase 2.x)
- testUtil.getHBaseAdmin().disableTable(systemCatalog);
- testUtil.getHBaseAdmin().enableTable(systemCatalog);
+ // make sure the split finishes (there's no synchronous splitting before HBase 2.x)
+ testUtil.getHBaseAdmin().disableTable(systemCatalog);
+ testUtil.getHBaseAdmin().enableTable(systemCatalog);
+ } catch (DoNotRetryIOException e) {
+ // table is not splittable
+ assert (e.getMessage().contains("NOT splittable"));
+ }
// test again... Must still be exactly one region.
rl = testUtil.getConnection().getRegionLocator(systemCatalog);
[2/2] phoenix git commit: PHOENIX-4768 Re-enable
testCompactUpdatesStats and testCompactUpdatesStatsWithMinStatsUpdateFreq of
StatsCollectorIT
Posted by an...@apache.org.
PHOENIX-4768 Re-enable testCompactUpdatesStats and testCompactUpdatesStatsWithMinStatsUpdateFreq of StatsCollectorIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ce834bec
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ce834bec
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ce834bec
Branch: refs/heads/4.x-HBase-1.2
Commit: ce834bec46bbbb2094a203e1c99b52ce82b8da89
Parents: 091ffbd
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Jun 1 14:43:01 2018 -0700
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Jun 1 14:43:01 2018 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/schema/stats/StatsCollectorIT.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ce834bec/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index 09d28f8..5436311 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -68,7 +68,6 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -404,13 +403,11 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
}
@Test
- @Ignore //TODO remove this once https://issues.apache.org/jira/browse/TEPHRA-208 is fixed
public void testCompactUpdatesStats() throws Exception {
testCompactUpdatesStats(0, fullTableName);
}
@Test
- @Ignore //TODO remove this once https://issues.apache.org/jira/browse/TEPHRA-208 is fixed
public void testCompactUpdatesStatsWithMinStatsUpdateFreq() throws Exception {
testCompactUpdatesStats(QueryServicesOptions.DEFAULT_STATS_UPDATE_FREQ_MS, fullTableName);
}
@@ -463,7 +460,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
Scan scan = new Scan();
scan.setRaw(true);
PhoenixConnection phxConn = conn.unwrap(PhoenixConnection.class);
- try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
+ try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {
@@ -476,7 +473,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
scan = new Scan();
scan.setRaw(true);
phxConn = conn.unwrap(PhoenixConnection.class);
- try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
+ try (HTableInterface htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {