phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From codymar...@apache.org
Subject phoenix git commit: PHOENIX-2072 - (James Taylor) Fix Eclipse compiler errors in pherf module
Date Fri, 26 Jun 2015 16:20:35 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 bc3de5a3b -> a60436521


PHOENIX-2072 - (James Taylor) Fix Eclipse compiler errors in pherf module


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

Branch: refs/heads/4.x-HBase-1.0
Commit: a60436521165b68f80b540ef8f3361e1a0ab22ec
Parents: bc3de5a
Author: cmarcel <cmarcel@salesforce.com>
Authored: Fri Jun 26 09:20:56 2015 -0700
Committer: cmarcel <cmarcel@salesforce.com>
Committed: Fri Jun 26 09:20:56 2015 -0700

----------------------------------------------------------------------
 .../pherf/workload/MultithreadedDiffer.java     |  7 ++----
 .../apache/phoenix/pherf/RuleGeneratorTest.java | 26 ++++++++++++++------
 2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6043652/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultithreadedDiffer.java
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultithreadedDiffer.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultithreadedDiffer.java
index 1735754..91189e2 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultithreadedDiffer.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultithreadedDiffer.java
@@ -21,20 +21,18 @@ package org.apache.phoenix.pherf.workload;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.phoenix.pherf.PherfConstants;
 import org.apache.phoenix.pherf.configuration.Query;
 import org.apache.phoenix.pherf.result.RunTime;
 import org.apache.phoenix.pherf.result.ThreadTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class MultithreadedDiffer implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(MultiThreadedRunner.class);
     private Thread t;
     private Query query;
     private ThreadTime threadTime;
-    private String threadName;
     private long numberOfExecutions;
     private long executionDurationInMs;
     private QueryVerifier queryVerifier = new QueryVerifier(true);
@@ -72,7 +70,6 @@ class MultithreadedDiffer implements Runnable {
     MultithreadedDiffer(String threadName, Query query, ThreadTime threadTime,
             long numberOfExecutions, long executionDurationInMs) {
         this.query = query;
-        this.threadName = threadName;
         this.threadTime = threadTime;
         this.numberOfExecutions = numberOfExecutions;
         this.executionDurationInMs = executionDurationInMs;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6043652/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
index 92604d4..936eedb 100644
--- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
+++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
@@ -18,22 +18,32 @@
 
 package org.apache.phoenix.pherf;
 
-import org.apache.phoenix.pherf.configuration.*;
-import org.apache.phoenix.pherf.workload.WriteWorkload;
+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.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.phoenix.pherf.configuration.Column;
+import org.apache.phoenix.pherf.configuration.DataModel;
+import org.apache.phoenix.pherf.configuration.DataSequence;
+import org.apache.phoenix.pherf.configuration.DataTypeMapping;
+import org.apache.phoenix.pherf.configuration.Scenario;
+import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.rules.DataValue;
 import org.apache.phoenix.pherf.rules.RulesApplier;
-import org.apache.phoenix.pherf.util.PhoenixUtil;
+import org.apache.phoenix.pherf.workload.WriteWorkload;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.junit.Test;
 
-import java.util.*;
-
-import static org.junit.Assert.*;
-
 public class RuleGeneratorTest {
-    private static PhoenixUtil util = PhoenixUtil.create(true);
     private static final String matcherScenario = PherfConstants.SCENARIO_ROOT_PATTERN +
".xml";
 
     @Test


Mime
View raw message