Repository: phoenix Updated Branches: refs/heads/4.0 53e2195dd -> 15939f295
Adding missing files from fix for PHOENIX-1284 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/15939f29 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/15939f29 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/15939f29 Branch: refs/heads/4.0 Commit: 15939f2953ee0b27a201a853abc18b5b65a85f91 Parents: 53e2195 Author: James Taylor <jtay...@salesforce.com> Authored: Tue Sep 23 02:29:12 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Tue Sep 23 02:29:12 2014 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java | 4 ++-- .../it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java | 2 +- .../it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/15939f29/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java index 805ec3b..f7409a9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java @@ -50,10 +50,10 @@ import com.google.common.collect.Maps; @Category(HBaseManagedTimeTest.class) public class ReverseScanIT extends BaseClientManagedTimeIT { @BeforeClass - @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class) + @Shadower(classBeingShadowed = BaseClientManagedTimeIT.class) public static void doSetup() throws Exception { Map<String,String> props = Maps.newHashMapWithExpectedSize(1); - setUpTestDriver(getUrl(), new ReadOnlyProps(props.entrySet().iterator())); + setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); // Ensures our split points will be used // TODO: do deletePriorTables before test? Connection conn = DriverManager.getConnection(getUrl()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/15939f29/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java index 06e4d86..76dd281 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java @@ -71,7 +71,7 @@ public class LocalIndexIT extends BaseIndexIT { // Drop the HBase table metadata for this test props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true)); // Must update config before starting server - setUpTestDriver(getUrl(), new ReadOnlyProps(props.entrySet().iterator())); + setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } private void createBaseTable(String tableName, Integer saltBuckets, String splits) throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/15939f29/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java index cad56d0..b99a3c5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java @@ -47,7 +47,7 @@ public class ViewIndexIT extends BaseIndexIT { // Drop the HBase table metadata for this test props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true)); // Must update config before starting server - setUpTestDriver(getUrl(), new ReadOnlyProps(props.entrySet().iterator())); + setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } private void createBaseTable(String tableName, Integer saltBuckets, String splits) throws SQLException {