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:18:05 UTC
[1/2] phoenix git commit: This reverts commit
3a7c9033936779f5290f4fabdd4912c27f7af64f to just fix the JIRA No.
Repository: phoenix
Updated Branches:
refs/heads/5.x-HBase-2.0 3a7c90339 -> 09c017e3c
This reverts commit 3a7c9033936779f5290f4fabdd4912c27f7af64f to just fix the JIRA No.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3df50d8c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3df50d8c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3df50d8c
Branch: refs/heads/5.x-HBase-2.0
Commit: 3df50d8c2a38f53e7c978bd0d36197167256e306
Parents: 3a7c903
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Jun 1 14:15:14 2018 -0700
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Jun 1 14:15:14 2018 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/schema/stats/StatsCollectorIT.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3df50d8c/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 c2325ae..3af0d09 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
@@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver;
@@ -68,6 +69,7 @@ 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;
@@ -403,11 +405,13 @@ 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);
}
@@ -460,7 +464,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
Scan scan = new Scan();
scan.setRaw(true);
PhoenixConnection phxConn = conn.unwrap(PhoenixConnection.class);
- try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
+ try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {
@@ -473,7 +477,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
scan = new Scan();
scan.setRaw(true);
phxConn = conn.unwrap(PhoenixConnection.class);
- try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
+ try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {
[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/09c017e3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/09c017e3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/09c017e3
Branch: refs/heads/5.x-HBase-2.0
Commit: 09c017e3cc8a2d1ec4ce27c65a5c76b71de138a0
Parents: 3df50d8
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Jun 1 14:17:58 2018 -0700
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Jun 1 14:17:58 2018 -0700
----------------------------------------------------------------------
.../org/apache/phoenix/schema/stats/StatsCollectorIT.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/09c017e3/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 3af0d09..c2325ae 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
@@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver;
@@ -69,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;
@@ -405,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);
}
@@ -464,7 +460,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
Scan scan = new Scan();
scan.setRaw(true);
PhoenixConnection phxConn = conn.unwrap(PhoenixConnection.class);
- try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
+ try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {
@@ -477,7 +473,7 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
scan = new Scan();
scan.setRaw(true);
phxConn = conn.unwrap(PhoenixConnection.class);
- try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(tableName))) {
+ try (Table htable = phxConn.getQueryServices().getTable(Bytes.toBytes(physicalTableName))) {
ResultScanner scanner = htable.getScanner(scan);
Result result;
while ((result = scanner.next())!=null) {