[23/50] [abbrv] phoenix git commit: PHOENIX-2715 Query Log (addendum 2)
PHOENIX-2715 Query Log (addendum 2) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81f88758 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81f88758 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81f88758 Branch: refs/heads/4.14-HBase-1.3 Commit: 81f887584e3e4c86e487e0c3ed8f4729b1283f1f Parents: f3e49f3 Author: Ankit Singhal Authored: Thu May 24 22:35:16 2018 -0700 Committer: Ankit Singhal Committed: Thu May 24 22:35:16 2018 -0700 -- bin/hbase-site.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f88758/bin/hbase-site.xml -- diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml index 2f360e2..0ab9fd8 100644 --- a/bin/hbase-site.xml +++ b/bin/hbase-site.xml @@ -24,8 +24,4 @@ hbase.regionserver.wal.codec org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec - -phoenix.log.level -DEBUG -
[08/50] [abbrv] phoenix git commit: PHOENIX-2715 Query Log (addendum 2)
PHOENIX-2715 Query Log (addendum 2) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8d80d5a9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8d80d5a9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8d80d5a9 Branch: refs/heads/4.x-HBase-1.4 Commit: 8d80d5a987376dfde822ea60be93618682a45d9c Parents: f043061 Author: Ankit Singhal Authored: Thu May 24 22:36:03 2018 -0700 Committer: Ankit Singhal Committed: Thu May 24 22:36:03 2018 -0700 -- bin/hbase-site.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d80d5a9/bin/hbase-site.xml -- diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml index 2f360e2..0ab9fd8 100644 --- a/bin/hbase-site.xml +++ b/bin/hbase-site.xml @@ -24,8 +24,4 @@ hbase.regionserver.wal.codec org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec - -phoenix.log.level -DEBUG -
[08/24] phoenix git commit: PHOENIX-2715 Query Log (addendum 2)
PHOENIX-2715 Query Log (addendum 2) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81f88758 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81f88758 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81f88758 Branch: refs/heads/omid2 Commit: 81f887584e3e4c86e487e0c3ed8f4729b1283f1f Parents: f3e49f3 Author: Ankit Singhal Authored: Thu May 24 22:35:16 2018 -0700 Committer: Ankit Singhal Committed: Thu May 24 22:35:16 2018 -0700 -- bin/hbase-site.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f88758/bin/hbase-site.xml -- diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml index 2f360e2..0ab9fd8 100644 --- a/bin/hbase-site.xml +++ b/bin/hbase-site.xml @@ -24,8 +24,4 @@ hbase.regionserver.wal.codec org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec - -phoenix.log.level -DEBUG -
phoenix git commit: PHOENIX-2715 Query Log (addendum 2)
Repository: phoenix Updated Branches: refs/heads/master f04306112 -> 8d80d5a98 PHOENIX-2715 Query Log (addendum 2) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8d80d5a9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8d80d5a9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8d80d5a9 Branch: refs/heads/master Commit: 8d80d5a987376dfde822ea60be93618682a45d9c Parents: f043061 Author: Ankit SinghalAuthored: Thu May 24 22:36:03 2018 -0700 Committer: Ankit Singhal Committed: Thu May 24 22:36:03 2018 -0700 -- bin/hbase-site.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d80d5a9/bin/hbase-site.xml -- diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml index 2f360e2..0ab9fd8 100644 --- a/bin/hbase-site.xml +++ b/bin/hbase-site.xml @@ -24,8 +24,4 @@ hbase.regionserver.wal.codec org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec - -phoenix.log.level -DEBUG -
phoenix git commit: PHOENIX-2715 Query Log (addendum 2)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 f3e49f38e -> 81f887584 PHOENIX-2715 Query Log (addendum 2) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/81f88758 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/81f88758 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/81f88758 Branch: refs/heads/4.x-HBase-1.3 Commit: 81f887584e3e4c86e487e0c3ed8f4729b1283f1f Parents: f3e49f3 Author: Ankit SinghalAuthored: Thu May 24 22:35:16 2018 -0700 Committer: Ankit Singhal Committed: Thu May 24 22:35:16 2018 -0700 -- bin/hbase-site.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f88758/bin/hbase-site.xml -- diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml index 2f360e2..0ab9fd8 100644 --- a/bin/hbase-site.xml +++ b/bin/hbase-site.xml @@ -24,8 +24,4 @@ hbase.regionserver.wal.codec org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec - -phoenix.log.level -DEBUG -
[04/50] [abbrv] phoenix git commit: PHOENIX-2715 Query Log (addendum)
PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ed636616 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ed636616 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ed636616 Branch: refs/heads/system-catalog Commit: ed636616138cbb8db4b71c9cf8a1b2fa7b503aa0 Parents: 0bc0368 Author: Ankit SinghalAuthored: Tue Apr 10 15:41:51 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:41:51 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ed636616/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
[06/50] [abbrv] phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d48518bc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d48518bc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d48518bc Branch: refs/heads/system-catalog Commit: d48518bc2ddea3f4c6cd9ef5a6c2504b65255da2 Parents: 2e6dc81 Author: Ankit SinghalAuthored: Wed Apr 11 17:36:03 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:36:03 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 76ca9c9..9e9a15b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -483,7 +477,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 357bc2d..3780d8d 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index bdcaef4..09547c5 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 62b2a3e18 -> 751043d8f PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/751043d8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/751043d8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/751043d8 Branch: refs/heads/4.x-HBase-0.98 Commit: 751043d8f6aa2f9aa54035b58255462456cfb196 Parents: 62b2a3e Author: Ankit SinghalAuthored: Fri Apr 20 10:57:05 2018 +0530 Committer: Ankit Singhal Committed: Fri Apr 20 10:57:05 2018 +0530 -- .../phoenix/end2end/SystemCatalogCreationOnConnectionIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/751043d8/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java index beb31c2..fbc8cd7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java @@ -76,7 +76,7 @@ public class SystemCatalogCreationOnConnectionIT { private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX", "SYSTEM.LOG")); +"SYSTEM:MUTEX", "SYSTEM:LOG")); private static class PhoenixSysCatCreationServices extends ConnectionQueryServicesImpl {
[05/21] phoenix git commit: PHOENIX-2715 Query Log (addendum)
PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6e899e50 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6e899e50 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6e899e50 Branch: refs/heads/4.x-cdh5.14 Commit: 6e899e50c090e40934d6f7ad2e65aa9eef616766 Parents: b291068 Author: Ankit SinghalAuthored: Tue Apr 10 11:12:38 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:26 2018 +0100 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e899e50/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 0d64ca9..d20ffa9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -39,31 +59,15 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
[07/21] phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe06c3b0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe06c3b0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe06c3b0 Branch: refs/heads/4.x-cdh5.14 Commit: fe06c3b0717e484ada82a208968a9e773e4d0b98 Parents: 79c25f6 Author: Ankit SinghalAuthored: Wed Apr 11 13:07:08 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:50 2018 +0100 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8fe8a10..e1f8e2a 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -529,7 +523,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 0883e5e..d61a9aa 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 8718f5f..af6b4fe 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
[07/21] phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe06c3b0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe06c3b0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe06c3b0 Branch: refs/heads/4.x-cdh5.13 Commit: fe06c3b0717e484ada82a208968a9e773e4d0b98 Parents: 79c25f6 Author: Ankit SinghalAuthored: Wed Apr 11 13:07:08 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:50 2018 +0100 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8fe8a10..e1f8e2a 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -529,7 +523,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 0883e5e..d61a9aa 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 8718f5f..af6b4fe 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
[05/21] phoenix git commit: PHOENIX-2715 Query Log (addendum)
PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6e899e50 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6e899e50 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6e899e50 Branch: refs/heads/4.x-cdh5.13 Commit: 6e899e50c090e40934d6f7ad2e65aa9eef616766 Parents: b291068 Author: Ankit SinghalAuthored: Tue Apr 10 11:12:38 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:26 2018 +0100 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e899e50/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 0d64ca9..d20ffa9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -39,31 +59,15 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
[07/21] phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe06c3b0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe06c3b0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe06c3b0 Branch: refs/heads/4.x-cdh5.12 Commit: fe06c3b0717e484ada82a208968a9e773e4d0b98 Parents: 79c25f6 Author: Ankit SinghalAuthored: Wed Apr 11 13:07:08 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:50 2018 +0100 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8fe8a10..e1f8e2a 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -529,7 +523,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 0883e5e..d61a9aa 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 8718f5f..af6b4fe 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
[05/21] phoenix git commit: PHOENIX-2715 Query Log (addendum)
PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6e899e50 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6e899e50 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6e899e50 Branch: refs/heads/4.x-cdh5.12 Commit: 6e899e50c090e40934d6f7ad2e65aa9eef616766 Parents: b291068 Author: Ankit SinghalAuthored: Tue Apr 10 11:12:38 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:26 2018 +0100 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e899e50/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 0d64ca9..d20ffa9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -39,31 +59,15 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
[07/20] phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe06c3b0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe06c3b0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe06c3b0 Branch: refs/heads/4.x-cdh5.11 Commit: fe06c3b0717e484ada82a208968a9e773e4d0b98 Parents: 79c25f6 Author: Ankit SinghalAuthored: Wed Apr 11 13:07:08 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:50 2018 +0100 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8fe8a10..e1f8e2a 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -529,7 +523,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 0883e5e..d61a9aa 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe06c3b0/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 8718f5f..af6b4fe 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
[05/20] phoenix git commit: PHOENIX-2715 Query Log (addendum)
PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6e899e50 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6e899e50 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6e899e50 Branch: refs/heads/4.x-cdh5.11 Commit: 6e899e50c090e40934d6f7ad2e65aa9eef616766 Parents: b291068 Author: Ankit SinghalAuthored: Tue Apr 10 11:12:38 2018 +0100 Committer: Pedro Boado Committed: Fri Apr 13 23:26:26 2018 +0100 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e899e50/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 0d64ca9..d20ffa9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -39,31 +59,15 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 d3ae4ccef -> fad5095d7 PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fad5095d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fad5095d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fad5095d Branch: refs/heads/4.x-HBase-1.1 Commit: fad5095d7739f406b27ae2142b275814b67fbb8b Parents: d3ae4cc Author: Ankit SinghalAuthored: Wed Apr 11 17:37:37 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:37:37 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fad5095d/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index f918e5d..b1075e8 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -483,7 +477,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fad5095d/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index c1972a7..6fb5160 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/fad5095d/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 3055d85..4a18325 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 97954332d -> 250f2ceca PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/250f2cec Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/250f2cec Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/250f2cec Branch: refs/heads/4.x-HBase-1.2 Commit: 250f2ceca5cda177660b1dcd592307ce62a8fdcf Parents: 9795433 Author: Ankit SinghalAuthored: Wed Apr 11 17:37:08 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:37:08 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/250f2cec/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index d7c922a..4eab0fe 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -483,7 +477,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/250f2cec/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 2c6d078..bb2df76 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/250f2cec/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 551a464..40bccc8 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 c4afcb2c8 -> a9c38bcd2 PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a9c38bcd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a9c38bcd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a9c38bcd Branch: refs/heads/4.x-HBase-1.3 Commit: a9c38bcd250e24ddab42c41e64b20cd57c806ba1 Parents: c4afcb2 Author: Ankit SinghalAuthored: Wed Apr 11 17:36:45 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:36:45 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a9c38bcd/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index bab86c5..93f5938 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -483,7 +477,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/a9c38bcd/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index cd957b2..4307b3c 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/a9c38bcd/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 200b6d2..1966634 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
Repository: phoenix Updated Branches: refs/heads/master 2e6dc818d -> d48518bc2 PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d48518bc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d48518bc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d48518bc Branch: refs/heads/master Commit: d48518bc2ddea3f4c6cd9ef5a6c2504b65255da2 Parents: 2e6dc81 Author: Ankit SinghalAuthored: Wed Apr 11 17:36:03 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:36:03 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 76ca9c9..9e9a15b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core @@ -483,7 +477,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 357bc2d..3780d8d 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/d48518bc/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index bdcaef4..09547c5 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency
Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 4d94f2f7d -> 763b9e598 PHOENIX-2715 Query Log (addendum) Fix old com.lmax.disruptor dependency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/763b9e59 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/763b9e59 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/763b9e59 Branch: refs/heads/5.x-HBase-2.0 Commit: 763b9e5981276b1703493b810d12df185b87bfa3 Parents: 4d94f2f Author: Ankit SinghalAuthored: Wed Apr 11 17:34:00 2018 +0530 Committer: Ankit Singhal Committed: Wed Apr 11 17:34:00 2018 +0530 -- phoenix-core/pom.xml | 7 --- phoenix-flume/pom.xml | 6 -- phoenix-kafka/pom.xml | 6 -- 3 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/763b9e59/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 901c896..bcbd42f 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -345,12 +345,6 @@ test - com.lmax - disruptor - 3.3.6 - test - - org.apache.htrace htrace-core @@ -508,7 +502,6 @@ com.lmax disruptor -${disruptor.version} http://git-wip-us.apache.org/repos/asf/phoenix/blob/763b9e59/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 3b9b6cd..0c0386a 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -69,12 +69,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core http://git-wip-us.apache.org/repos/asf/phoenix/blob/763b9e59/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 5fa6d7a..98bb858 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -143,12 +143,6 @@ test - com.lmax - disruptor - 3.2.0 - test - - org.apache.htrace htrace-core
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 4cc1242db -> d3ae4ccef PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d3ae4cce Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d3ae4cce Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d3ae4cce Branch: refs/heads/4.x-HBase-1.1 Commit: d3ae4ccef36e3e1c714d346483d59e8ffb56d1ed Parents: 4cc1242 Author: Ankit SinghalAuthored: Tue Apr 10 15:44:08 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:44:08 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d3ae4cce/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 5e3d432d9 -> 83038873a PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/83038873 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83038873 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83038873 Branch: refs/heads/4.x-HBase-1.2 Commit: 83038873af85e54eb77ad03e770e8ef34b99df80 Parents: 5e3d432 Author: Ankit SinghalAuthored: Tue Apr 10 15:42:38 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:42:38 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/83038873/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/master 0bc036845 -> ed6366161 PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ed636616 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ed636616 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ed636616 Branch: refs/heads/master Commit: ed636616138cbb8db4b71c9cf8a1b2fa7b503aa0 Parents: 0bc0368 Author: Ankit SinghalAuthored: Tue Apr 10 15:41:51 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:41:51 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ed636616/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 6468abb00 -> 768bff97e PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/768bff97 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/768bff97 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/768bff97 Branch: refs/heads/4.x-HBase-1.3 Commit: 768bff97e28fa5def199c8303b84fc71ca93df9a Parents: 6468abb Author: Ankit SinghalAuthored: Tue Apr 10 15:42:16 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:42:16 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/768bff97/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();
phoenix git commit: PHOENIX-2715 Query Log (addendum)
Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 8d82a0ec7 -> e35b18d3a PHOENIX-2715 Query Log (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e35b18d3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e35b18d3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e35b18d3 Branch: refs/heads/5.x-HBase-2.0 Commit: e35b18d3aba8abe602daec5c9a637f8a85664d5e Parents: 8d82a0e Author: Ankit SinghalAuthored: Tue Apr 10 15:27:41 2018 +0530 Committer: Ankit Singhal Committed: Tue Apr 10 15:27:41 2018 +0530 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 40 +++- 1 file changed, 22 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e35b18d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index c36cdd3..7cb5857 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -16,6 +16,26 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.security.PrivilegedExceptionAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -38,31 +58,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.security.PrivilegedExceptionAction; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX")); +"SYSTEM.MUTEX","SYSTEM.LOG")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", -"SYSTEM:MUTEX")); +"SYSTEM:MUTEX","SYSTEM:LOG")); private static final String SCHEMA_NAME = "MIGRATETEST"; private static final String TABLE_NAME = SCHEMA_NAME + "." + MigrateSystemTablesToSystemNamespaceIT.class.getSimpleName().toUpperCase();