phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mujt...@apache.org
Subject phoenix git commit: PHOENIX-2280 - Fix failing unit test in Pherf
Date Mon, 21 Sep 2015 21:40:56 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.1 dc594854f -> 9f4e19536


PHOENIX-2280 - Fix failing unit test in Pherf


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9f4e1953
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9f4e1953
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9f4e1953

Branch: refs/heads/4.5-HBase-1.1
Commit: 9f4e19536b0f009490e6f87b80d4cec5bcb52a78
Parents: dc59485
Author: Mujtaba <mujtaba@apache.org>
Authored: Mon Sep 21 14:40:50 2015 -0700
Committer: Mujtaba <mujtaba@apache.org>
Committed: Mon Sep 21 14:40:50 2015 -0700

----------------------------------------------------------------------
 .../org/apache/phoenix/pherf/DataIngestIT.java    |  3 ++-
 .../resources/datamodel/test_schema_mt_view.sql   | 18 ------------------
 .../src/test/resources/scenario/test_scenario.xml |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index f2a1a07..f301dec 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -74,7 +74,7 @@ public class DataIngestIT extends ResultBaseTestIT {
             WorkloadExecutor executor = new WorkloadExecutor();
             executor.add(loader);
             executor.get();
-
+            
             RulesApplier rulesApplier = loader.getRulesApplier();
             List<Map> modelList = rulesApplier.getModelList();
             assertTrue("Could not generate the modelList", modelList.size() > 0);
@@ -101,6 +101,7 @@ public class DataIngestIT extends ResultBaseTestIT {
             Workload query = new QueryExecutor(parser, util, executor);
             executor.add(query);
             executor.get();
+            executor.shutdown();
 
         } catch (Exception e) {
             fail("We had an exception: " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql b/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
deleted file mode 100644
index 26549fd..0000000
--- a/phoenix-pherf/src/test/resources/datamodel/test_schema_mt_view.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  -- Licensed to the Apache Software Foundation (ASF) under one
-  -- or more contributor license agreements.  See the NOTICE file
-  -- distributed with this work for additional information
-  -- regarding copyright ownership.  The ASF licenses this file
-  -- to you under the Apache License, Version 2.0 (the
-  -- "License"); you may not use this file except in compliance
-  -- with the License.  You may obtain a copy of the License at
-  --
-  -- http://www.apache.org/licenses/LICENSE-2.0
-  --
-  -- Unless required by applicable law or agreed to in writing, software
-  -- distributed under the License is distributed on an "AS IS" BASIS,
-  -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  -- See the License for the specific language governing permissions and
-  -- limitations under the License.
-*/
-CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2 VARCHAR) AS SELECT * FROM
PHERF.TEST_MULTI_TENANT_TABLE

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f4e1953/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
index 50a603e..f23e71a 100644
--- a/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
+++ b/phoenix-pherf/src/test/resources/scenario/test_scenario.xml
@@ -228,7 +228,9 @@
              the tablename attribute. This assumes the tenant specific view has been created.
To 
              dynamically create the view see comments below with regard to the ddl attribute.

         -->
-        <scenario tableName="PHERF.TEST_VIEW" tenantId="abcdefghijklmno" rowCount="100"
name="testMTWriteScenario">
+        <scenario tableName="PHERF.TEST_VIEW" tenantId="xyzdefghijklmno"
+                    ddl="CREATE VIEW IF NOT EXISTS PHERF.TEST_VIEW (field1 VARCHAR, field2
VARCHAR) AS SELECT * FROM PHERF.TEST_MULTI_TENANT_TABLE" 
+                    rowCount="100" name="testMTWriteScenario">
         </scenario>
         <!--  Scenario level DDL that is dynamically executed before the Write Workload
is run.
               This pattern is really useful when you want to write data to multi-tenant view
and the tenant id is


Mime
View raw message