From 3f786f071c5c037b9b837fad222d3c178cba035d Mon Sep 17 00:00:00 2001 From: gkanade Date: Fri, 12 Feb 2016 15:54:50 -0800 Subject: [PATCH 01/31] New data type --- .../pherf/configuration/DataTypeMapping.java | 3 ++- .../apache/phoenix/pherf/rules/RulesApplier.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataTypeMapping.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataTypeMapping.java index c266a5743bf..6216b52b301 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataTypeMapping.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataTypeMapping.java @@ -25,7 +25,8 @@ public enum DataTypeMapping { CHAR("CHAR", Types.CHAR), DECIMAL("DECIMAL", Types.DECIMAL), INTEGER("INTEGER", Types.INTEGER), - DATE("DATE", Types.DATE); + DATE("DATE", Types.DATE), + YCSBKEY("YCSBKEY", Types.VARCHAR); private final String sType; diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index 06a046d9407..e4ff0a35d13 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -137,6 +137,11 @@ public DataValue getDataValue(Column column) throws Exception{ } switch (column.getType()) { + case YCSBKEY: + Preconditions.checkArgument(length > 0, "length needs to be > 0"); + data = getSuperSequentialDataValue(column); + break; + case VARCHAR: // Use the specified data values from configs if they exist if ((column.getDataValues() != null) && (column.getDataValues().size() > 0)) { @@ -400,4 +405,14 @@ private DataValue getRandomDataValue(Column column) { varchar = StringUtils.left(varchar, column.getLength()); return new DataValue(column.getType(), varchar); } + + private DataValue getSuperSequentialDataValue(Column column) { + DataValue data = null; + long inc = COUNTER.getAndIncrement(); + String strInc = String.valueOf(inc); + String varchar = "user_"; + varchar = varchar + strInc; + data = new DataValue(column.getType(), varchar); + return data; + } } From 26ead8dadd1a544073228e14cee2614f10a91012 Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 13:36:59 -0800 Subject: [PATCH 02/31] New sequence type --- .../phoenix/pherf/configuration/DataSequence.java | 2 +- .../org/apache/phoenix/pherf/rules/RulesApplier.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataSequence.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataSequence.java index 056a913c1f6..8bce7076014 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataSequence.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/DataSequence.java @@ -19,5 +19,5 @@ package org.apache.phoenix.pherf.configuration; public enum DataSequence { - RANDOM, SEQUENTIAL,LIST; + RANDOM, SEQUENTIAL,LIST,SUPERSEQUENTIAL; } \ No newline at end of file diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index 67867a3b64e..5fa3c6c1324 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -139,11 +139,7 @@ public DataValue getDataValue(Column column) throws Exception{ } switch (column.getType()) { - case YCSBKEY: - Preconditions.checkArgument(length > 0, "length needs to be > 0"); - data = getSuperSequentialDataValue(column); - break; - + case VARCHAR: // Use the specified data values from configs if they exist if ((column.getDataValues() != null) && (column.getDataValues().size() > 0)) { @@ -162,7 +158,10 @@ public DataValue getDataValue(Column column) throws Exception{ data = pickDataValueFromList(dataValues); } else { Preconditions.checkArgument(length > 0, "length needs to be > 0"); - if (column.getDataSequence() == DataSequence.SEQUENTIAL) { + if(column.getDataSequence() == DataSequence.SUPERSEQUENTIAL) { + data = getSuperSequentialDataValue(column); + } + else if (column.getDataSequence() == DataSequence.SEQUENTIAL) { data = getSequentialDataValue(column); } else { data = getRandomDataValue(column); From 1a4277b589a599dd2d503671ef310247df8f35fb Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 14:21:30 -0800 Subject: [PATCH 03/31] testing new data type --- .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index 5fa3c6c1324..567980a30d6 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -158,6 +158,7 @@ public DataValue getDataValue(Column column) throws Exception{ data = pickDataValueFromList(dataValues); } else { Preconditions.checkArgument(length > 0, "length needs to be > 0"); + System.out.print(column.getDataSequence()); if(column.getDataSequence() == DataSequence.SUPERSEQUENTIAL) { data = getSuperSequentialDataValue(column); } From fefad5698a78efeb0ccdb31dadd25db0662220bc Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 14:38:26 -0800 Subject: [PATCH 04/31] New sequence type --- .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index 567980a30d6..d19156057ec 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -163,7 +163,8 @@ public DataValue getDataValue(Column column) throws Exception{ data = getSuperSequentialDataValue(column); } else if (column.getDataSequence() == DataSequence.SEQUENTIAL) { - data = getSequentialDataValue(column); + //data = getSequentialDataValue(column); + data = getSuperSequentialDataValue(column); } else { data = getRandomDataValue(column); } From a61f3245ae46c180d718d2a7afbd681188ee0c1b Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 15:12:56 -0800 Subject: [PATCH 05/31] New sequence type --- .../org/apache/phoenix/pherf/rules/RulesApplier.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index d19156057ec..822fa728d51 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -163,8 +163,8 @@ public DataValue getDataValue(Column column) throws Exception{ data = getSuperSequentialDataValue(column); } else if (column.getDataSequence() == DataSequence.SEQUENTIAL) { - //data = getSequentialDataValue(column); - data = getSuperSequentialDataValue(column); + data = getSequentialDataValue(column); + //data = getSuperSequentialDataValue(column); } else { data = getRandomDataValue(column); } @@ -416,7 +416,7 @@ private Column getColumnForRule(List ruleList, Column phxMetaColumn) { * @param column {@link org.apache.phoenix.pherf.configuration.Column} * @return {@link org.apache.phoenix.pherf.rules.DataValue} */ - private DataValue getSequentialDataValue(Column column) { + /*private DataValue getSequentialDataValue(Column column) { DataValue data = null; long inc = COUNTER.getAndIncrement(); String strInc = String.valueOf(inc); @@ -428,7 +428,7 @@ private DataValue getSequentialDataValue(Column column) { varchar = StringUtils.left(varchar,column.getLength()); data = new DataValue(column.getType(), varchar); return data; - } + }*/ private DataValue getRandomDataValue(Column column) { String varchar = RandomStringUtils.randomAlphanumeric(column.getLength()); @@ -439,7 +439,7 @@ private DataValue getRandomDataValue(Column column) { return new DataValue(column.getType(), varchar); } - private DataValue getSuperSequentialDataValue(Column column) { + private DataValue getSequentialDataValue(Column column) { DataValue data = null; long inc = COUNTER.getAndIncrement(); String strInc = String.valueOf(inc); From a2959dcdd936c1ab61c28327ac838992664adaf5 Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 15:22:16 -0800 Subject: [PATCH 06/31] New sequence type --- .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index 822fa728d51..b45faa207ab 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -160,7 +160,7 @@ public DataValue getDataValue(Column column) throws Exception{ Preconditions.checkArgument(length > 0, "length needs to be > 0"); System.out.print(column.getDataSequence()); if(column.getDataSequence() == DataSequence.SUPERSEQUENTIAL) { - data = getSuperSequentialDataValue(column); + //data = getSuperSequentialDataValue(column); } else if (column.getDataSequence() == DataSequence.SEQUENTIAL) { data = getSequentialDataValue(column); From 3d3a22c797641286e659f297da994377a20343a8 Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 16:32:37 -0800 Subject: [PATCH 07/31] New sequence type --- .../org/apache/phoenix/pherf/rules/RulesApplier.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index b45faa207ab..f7663d92ddf 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -160,11 +160,10 @@ public DataValue getDataValue(Column column) throws Exception{ Preconditions.checkArgument(length > 0, "length needs to be > 0"); System.out.print(column.getDataSequence()); if(column.getDataSequence() == DataSequence.SUPERSEQUENTIAL) { - //data = getSuperSequentialDataValue(column); + data = getSuperSequentialDataValue(column); } else if (column.getDataSequence() == DataSequence.SEQUENTIAL) { data = getSequentialDataValue(column); - //data = getSuperSequentialDataValue(column); } else { data = getRandomDataValue(column); } @@ -416,7 +415,7 @@ private Column getColumnForRule(List ruleList, Column phxMetaColumn) { * @param column {@link org.apache.phoenix.pherf.configuration.Column} * @return {@link org.apache.phoenix.pherf.rules.DataValue} */ - /*private DataValue getSequentialDataValue(Column column) { + private DataValue getSequentialDataValue(Column column) { DataValue data = null; long inc = COUNTER.getAndIncrement(); String strInc = String.valueOf(inc); @@ -428,7 +427,7 @@ private Column getColumnForRule(List ruleList, Column phxMetaColumn) { varchar = StringUtils.left(varchar,column.getLength()); data = new DataValue(column.getType(), varchar); return data; - }*/ + } private DataValue getRandomDataValue(Column column) { String varchar = RandomStringUtils.randomAlphanumeric(column.getLength()); @@ -439,11 +438,11 @@ private DataValue getRandomDataValue(Column column) { return new DataValue(column.getType(), varchar); } - private DataValue getSequentialDataValue(Column column) { + private DataValue getSuperSequentialDataValue(Column column) { DataValue data = null; long inc = COUNTER.getAndIncrement(); String strInc = String.valueOf(inc); - String varchar = "user_"; + String varchar = "user"; varchar = varchar + strInc; data = new DataValue(column.getType(), varchar); return data; From 231fd93dd7e9c87861720e9dbf358abc45803ef1 Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 16 Feb 2016 16:46:10 -0800 Subject: [PATCH 08/31] New sequence type --- .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java index f7663d92ddf..e5211ba16f2 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java @@ -158,7 +158,7 @@ public DataValue getDataValue(Column column) throws Exception{ data = pickDataValueFromList(dataValues); } else { Preconditions.checkArgument(length > 0, "length needs to be > 0"); - System.out.print(column.getDataSequence()); + if(column.getDataSequence() == DataSequence.SUPERSEQUENTIAL) { data = getSuperSequentialDataValue(column); } From 4c2c056da941912764dd4af30072f429af3c8f56 Mon Sep 17 00:00:00 2001 From: gkanade Date: Wed, 17 Feb 2016 10:47:34 -0800 Subject: [PATCH 09/31] New sequence type sync up --- .../phoenix/pherf/result/ResultManager.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/ResultManager.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/ResultManager.java index 4d4ca4a2f96..d42b0a31a41 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/ResultManager.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/ResultManager.java @@ -18,17 +18,20 @@ package org.apache.phoenix.pherf.result; +import org.apache.commons.collections.IteratorUtils; import org.apache.phoenix.pherf.PherfConstants; import org.apache.phoenix.pherf.result.file.ResultFileDetails; import org.apache.phoenix.pherf.result.impl.CSVFileResultHandler; import org.apache.phoenix.pherf.result.impl.ImageResultHandler; import org.apache.phoenix.pherf.result.impl.XMLResultHandler; -import org.apache.phoenix.util.InstanceResolver; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.ServiceLoader; public class ResultManager { private static final Logger logger = LoggerFactory.getLogger(ResultManager.class); @@ -71,10 +74,25 @@ public ResultManager(String fileNameSeed) { @SuppressWarnings("unchecked") public ResultManager(String fileNameSeed, boolean writeRuntimeResults) { this(fileNameSeed, writeRuntimeResults ? - InstanceResolver.get(ResultHandler.class, defaultHandlers) : - InstanceResolver.get(ResultHandler.class, minimalHandlers)); + instanceResolverGet(ResultHandler.class, defaultHandlers) : + instanceResolverGet(ResultHandler.class, minimalHandlers)); + } + // Workaround running against phoenix-4.4 not having this method in InstanceResolver. + @SuppressWarnings("unchecked") + public static List instanceResolverGet(Class clazz, List defaultInstances) { + Iterator iterator = ServiceLoader.load(clazz).iterator(); + if (defaultInstances != null) { + defaultInstances.addAll(IteratorUtils.toList(iterator)); + } else { + defaultInstances = IteratorUtils.toList(iterator); + } + + return defaultInstances; + } + + public ResultManager(String fileNameSeed, List resultHandlers) { this.resultHandlers = resultHandlers; util = new ResultUtil(); From cdcff31c8eb9438edf95be6f32e36df6f0dd2532 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 12:24:59 -0800 Subject: [PATCH 10/31] Intercepting query sets --- .../apache/phoenix/pherf/configuration/QuerySet.java | 11 ++++++++++- .../apache/phoenix/pherf/configuration/Scenario.java | 8 ++++++++ .../apache/phoenix/pherf/result/QuerySetResult.java | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java index 17d415354c4..8e0cc026b74 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java @@ -31,7 +31,16 @@ public class QuerySet { private long numberOfExecutions = PherfConstants.DEFAULT_NUMBER_OF_EXECUTIONS; private long executionDurationInMs = PherfConstants.DEFAULT_THREAD_DURATION_IN_MS; private ExecutionType executionType = ExecutionType.SERIAL; - + private boolean randomPointRead = false; + + @XmlAttribute + public boolean isRandomPointRead() { + return randomPointRead; + } + public void setRandomPointRead(boolean value) { + randomPointRead = value; + } + /** * List of queries in each query set * @return diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index 200fdc531eb..91699a673bc 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -126,6 +126,14 @@ public void setDataOverride(DataOverride dataOverride) { * @return */ public List getQuerySet() { + for(QuerySet qs : querySet){ + if(qs.isRandomPointRead()){ + List queryList = new ArrayList(); + Query query = new Query(); + query.setStatement("select * from PHERF.SIMPLE where TENANT_ID = 'user145');"); + queryList.add(query); + } + } return querySet; } diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/QuerySetResult.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/QuerySetResult.java index c2be5a316e9..c109ae74135 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/QuerySetResult.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/QuerySetResult.java @@ -32,6 +32,7 @@ public QuerySetResult(QuerySet querySet) { this.setNumberOfExecutions(querySet.getNumberOfExecutions()); this.setExecutionDurationInMs(querySet.getExecutionDurationInMs()); this.setExecutionType(querySet.getExecutionType()); + this.setRandomPointRead(querySet.isRandomPointRead()); } public QuerySetResult() { From 476ee0bbaad53facff9036e20e72942efdc4357f Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 13:24:39 -0800 Subject: [PATCH 11/31] Intercepting query sets --- .../phoenix/pherf/configuration/XMLConfigParser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java index 93dc94cc4a5..828ff359247 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java @@ -168,6 +168,16 @@ private void init(String pattern) throws Exception { } for (Path path : this.paths) { System.out.println("Adding model for path:" + path.toString()); + DataModel dm = XMLConfigParser.readDataModel(path); + List sl = dm.getScenarios(); + for(Scenario s : sl) { + List lqs = s.getQuerySet(); + for(QuerySet qs : lqs) { + System.out.println("Concurrency is " + qs.getConcurrency()); + System.out.println("Exec duration is " + qs.getExecutionDurationInMs()); + System.out.println("RandomPointRead is " + qs.isRandomPointRead()); + } + } this.dataModels.add(XMLConfigParser.readDataModel(path)); } } @@ -176,3 +186,4 @@ private Collection getResources(String pattern) throws Exception { return resourceList.getResourceList(pattern); } } +; \ No newline at end of file From 522e306bca4ebca938796159124410719cb737c4 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 13:42:46 -0800 Subject: [PATCH 12/31] Intercepting query sets --- .../java/org/apache/phoenix/pherf/configuration/Scenario.java | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index 91699a673bc..d3966fb2ba4 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -132,6 +132,7 @@ public List getQuerySet() { Query query = new Query(); query.setStatement("select * from PHERF.SIMPLE where TENANT_ID = 'user145');"); queryList.add(query); + qs.setQuery(queryList); } } return querySet; From ad5e36cfe9e7a592ee1e084996b89edc0b34bf26 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 13:56:32 -0800 Subject: [PATCH 13/31] Intercepting query sets --- .../java/org/apache/phoenix/pherf/configuration/Scenario.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index d3966fb2ba4..fcdb06df233 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -130,7 +130,8 @@ public List getQuerySet() { if(qs.isRandomPointRead()){ List queryList = new ArrayList(); Query query = new Query(); - query.setStatement("select * from PHERF.SIMPLE where TENANT_ID = 'user145');"); + + query.setStatement("select * from " + this.getTableName() + " where TENANT_ID = 'user145'"); queryList.add(query); qs.setQuery(queryList); } From 7d55a53a279d2dcf67396b0f86c0dcb68e6e5ef2 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 14:17:29 -0800 Subject: [PATCH 14/31] Intercepting query sets --- .../java/org/apache/phoenix/pherf/PherfConstants.java | 1 + .../org/apache/phoenix/pherf/configuration/QuerySet.java | 8 ++++++++ .../org/apache/phoenix/pherf/configuration/Scenario.java | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java index e7ba056eb5b..7c6693f0323 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java @@ -38,6 +38,7 @@ public static enum CompareType { private static PherfConstants instance = null; private static Properties instanceProperties = null; + public static final String DEFAULT_PRIMARY_KEY = "TENANT_ID"; public static final int DEFAULT_THREAD_POOL_SIZE = 10; public static final int DEFAULT_BATCH_SIZE = 1000; public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS"; diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java index 8e0cc026b74..a83b53ba435 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/QuerySet.java @@ -32,7 +32,15 @@ public class QuerySet { private long executionDurationInMs = PherfConstants.DEFAULT_THREAD_DURATION_IN_MS; private ExecutionType executionType = ExecutionType.SERIAL; private boolean randomPointRead = false; + private String primaryKey = PherfConstants.DEFAULT_PRIMARY_KEY; + @XmlAttribute + public String getPrimaryKey() { + return primaryKey; + } + public void setPrimaryKey(String pk){ + primaryKey=pk; + } @XmlAttribute public boolean isRandomPointRead() { return randomPointRead; diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index fcdb06df233..1c98119fb60 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -130,8 +130,9 @@ public List getQuerySet() { if(qs.isRandomPointRead()){ List queryList = new ArrayList(); Query query = new Query(); - - query.setStatement("select * from " + this.getTableName() + " where TENANT_ID = 'user145'"); + String tableName = this.getTableName(); + String primaryKey = qs.getPrimaryKey(); + query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user145'"); queryList.add(query); qs.setQuery(queryList); } From b9b2f0887ea1621c77d1ce0a81de8fc80c3d2a2d Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 14:28:52 -0800 Subject: [PATCH 15/31] Intercepting query sets --- .../apache/phoenix/pherf/configuration/Scenario.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index 1c98119fb60..3839ec3642d 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -129,11 +129,15 @@ public List getQuerySet() { for(QuerySet qs : querySet){ if(qs.isRandomPointRead()){ List queryList = new ArrayList(); - Query query = new Query(); + String tableName = this.getTableName(); String primaryKey = qs.getPrimaryKey(); - query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user145'"); - queryList.add(query); + for(int i = 0; i < 10; i++) { + Query query = new Query(); + query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user1" + i+"'"); + queryList.add(query); + } + qs.setQuery(queryList); } } From 731351e80d997e0a1fc9dcfa9d82e3389ecd5add Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 14:42:24 -0800 Subject: [PATCH 16/31] Intercepting query sets --- .../java/org/apache/phoenix/pherf/configuration/Scenario.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index 3839ec3642d..a969a18b4b1 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -132,7 +132,7 @@ public List getQuerySet() { String tableName = this.getTableName(); String primaryKey = qs.getPrimaryKey(); - for(int i = 0; i < 10; i++) { + for(int i = 10; i < 20; i++) { Query query = new Query(); query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user1" + i+"'"); queryList.add(query); From 0728f924c23b4478570100e5bf945a5aa2ce64e6 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 18 Feb 2016 15:59:14 -0800 Subject: [PATCH 17/31] Intercepting query sets --- .../org/apache/phoenix/pherf/configuration/Scenario.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index a969a18b4b1..a26e24b4afc 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.RandomUtils; import org.apache.phoenix.pherf.util.PhoenixUtil; @XmlRootElement(namespace = "org.apache.phoenix.pherf.configuration.DataModel") @@ -128,13 +129,13 @@ public void setDataOverride(DataOverride dataOverride) { public List getQuerySet() { for(QuerySet qs : querySet){ if(qs.isRandomPointRead()){ - List queryList = new ArrayList(); - + List queryList = new ArrayList(); String tableName = this.getTableName(); String primaryKey = qs.getPrimaryKey(); - for(int i = 10; i < 20; i++) { + for(int i = 0; i < 10; i++) { Query query = new Query(); - query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user1" + i+"'"); + long keyInt = RandomUtils.nextLong(100, 10000100); + query.setStatement("select * from " + this.getTableName() + " where " + primaryKey + " = 'user" + keyInt+"'"); queryList.add(query); } From 9d0f422995661097bd364e7c94b0a424af107719 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 10:19:30 -0800 Subject: [PATCH 18/31] Batch writes --- .../phoenix/pherf/workload/WriteWorkload.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index e536eb9e734..1f03f0130e9 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -23,6 +23,7 @@ import java.sql.Date; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Statement; import java.sql.Types; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -241,7 +242,8 @@ public Future upsertData(final Scenario scenario, final List colum long start = 0, last = 0, duration, totalDuration; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Connection connection = null; - PreparedStatement stmt = null; + //PreparedStatement stmt = null; + Statement stmt = null; try { connection = pUtil.getConnection(scenario.getTenantId()); long logStartTime = System.currentTimeMillis(); @@ -253,13 +255,20 @@ public Future upsertData(final Scenario scenario, final List colum last = start = System.currentTimeMillis(); String sql = buildSql(columns, tableName); - stmt = connection.prepareStatement(sql); + stmt = connection.createStatement(); + //stmt = connection.prepareStatement(sql); for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { - stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); - rowsCreated += stmt.executeUpdate(); + //stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); + String specificSql = buildStatement(scenario, columns, (PreparedStatement) stmt, simpleDateFormat).toString(); + System.out.print(specificSql); + stmt.addBatch(specificSql); + //rowsCreated += stmt.executeUpdate(); if ((i % getBatchSize()) == 0) { + System.out.print("Executing batch"); + stmt.executeBatch(); connection.commit(); + stmt.clearBatch(); duration = System.currentTimeMillis() - last; logger.info("Writer (" + Thread.currentThread().getName() + ") committed Batch. Total " + getBatchSize() @@ -281,6 +290,8 @@ public Future upsertData(final Scenario scenario, final List colum } } finally { if (stmt != null) { + System.out.print("Executing batch"); + stmt.executeBatch(); stmt.close(); } if (connection != null) { From 413aa9514bbb584279f167001dd107b19d43cf76 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 10:52:31 -0800 Subject: [PATCH 19/31] Batch writes --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 1f03f0130e9..797a95863cc 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -255,7 +255,9 @@ public Future upsertData(final Scenario scenario, final List colum last = start = System.currentTimeMillis(); String sql = buildSql(columns, tableName); + System.out.print("going to create statement"); stmt = connection.createStatement(); + System.out.print("statement created"); //stmt = connection.prepareStatement(sql); for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { From 4c2631ac00b87edbbb91d8292c1ea3aef5719c0e Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 11:07:37 -0800 Subject: [PATCH 20/31] Batch writes --- phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java index 154d6ff7a09..9957d3291fb 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java @@ -254,6 +254,7 @@ public void run() throws Exception { // Schema and Data Load if (preLoadData) { logger.info("\nStarting Data Load..."); + System.out.print("Starting Data Load ..."); Workload workload = new WriteWorkload(parser, generateStatistics); try { workloadExecutor.add(workload); From 2babed5431571bd243273af50c9a983f716ce16e Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 12:29:24 -0800 Subject: [PATCH 21/31] Batch writes --- .../org/apache/phoenix/pherf/workload/WriteWorkload.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 797a95863cc..64fbf4f3d08 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -242,7 +242,7 @@ public Future upsertData(final Scenario scenario, final List colum long start = 0, last = 0, duration, totalDuration; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Connection connection = null; - //PreparedStatement stmt = null; + PreparedStatement pstmt = null; Statement stmt = null; try { connection = pUtil.getConnection(scenario.getTenantId()); @@ -258,11 +258,11 @@ public Future upsertData(final Scenario scenario, final List colum System.out.print("going to create statement"); stmt = connection.createStatement(); System.out.print("statement created"); - //stmt = connection.prepareStatement(sql); + pstmt = connection.prepareStatement(sql); for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { //stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); - String specificSql = buildStatement(scenario, columns, (PreparedStatement) stmt, simpleDateFormat).toString(); + String specificSql = buildStatement(scenario, columns, pstmt, simpleDateFormat).toString(); System.out.print(specificSql); stmt.addBatch(specificSql); //rowsCreated += stmt.executeUpdate(); From 36aae6e707f108c31d3778a5f90bd522c51ca8e4 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 13:25:52 -0800 Subject: [PATCH 22/31] Batch writes --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 64fbf4f3d08..fd7cdff08fa 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -320,7 +320,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns PreparedStatement statement, SimpleDateFormat simpleDateFormat) throws Exception { int count = 1; for (Column column : columns) { - + System.out.print("Column is " + column.getName()); DataValue dataValue = getRulesApplier().getDataForRule(scenario, column); switch (column.getType()) { case VARCHAR: @@ -367,6 +367,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns } count++; } + System.out.print("Returning statement " + statement.toString()); return statement; } From cf0fcedd9e733de13bae99bb87732de1340efc24 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 13:39:10 -0800 Subject: [PATCH 23/31] Batch writes --- .../phoenix/pherf/workload/WriteWorkload.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index fd7cdff08fa..5d2e96b510e 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -242,8 +242,8 @@ public Future upsertData(final Scenario scenario, final List colum long start = 0, last = 0, duration, totalDuration; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Connection connection = null; - PreparedStatement pstmt = null; - Statement stmt = null; + PreparedStatement stmt = null; + try { connection = pUtil.getConnection(scenario.getTenantId()); long logStartTime = System.currentTimeMillis(); @@ -256,15 +256,15 @@ public Future upsertData(final Scenario scenario, final List colum last = start = System.currentTimeMillis(); String sql = buildSql(columns, tableName); System.out.print("going to create statement"); - stmt = connection.createStatement(); + System.out.print("statement created"); - pstmt = connection.prepareStatement(sql); + stmt = connection.prepareStatement(sql); for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { - //stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); - String specificSql = buildStatement(scenario, columns, pstmt, simpleDateFormat).toString(); - System.out.print(specificSql); - stmt.addBatch(specificSql); + + stmt = buildStatement(scenario, columns, pstmt, simpleDateFormat); + //System.out.print(specificSql); + stmt.addBatch(); //rowsCreated += stmt.executeUpdate(); if ((i % getBatchSize()) == 0) { System.out.print("Executing batch"); From 01c5e13e00fced6e2a6cee278ed3bf8e9424ba89 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 13:43:18 -0800 Subject: [PATCH 24/31] Batch writes --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 5d2e96b510e..7c63a928d5c 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -262,7 +262,7 @@ public Future upsertData(final Scenario scenario, final List colum for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { - stmt = buildStatement(scenario, columns, pstmt, simpleDateFormat); + stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); //System.out.print(specificSql); stmt.addBatch(); //rowsCreated += stmt.executeUpdate(); From d2b08fbebf0b6db3bad9c733a9336931ab1f6bd8 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 13:57:18 -0800 Subject: [PATCH 25/31] Batch writes --- .../org/apache/phoenix/pherf/workload/WriteWorkload.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 7c63a928d5c..b9339221300 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -255,9 +255,9 @@ public Future upsertData(final Scenario scenario, final List colum last = start = System.currentTimeMillis(); String sql = buildSql(columns, tableName); - System.out.print("going to create statement"); + //System.out.print("going to create statement"); - System.out.print("statement created"); + //System.out.print("statement created"); stmt = connection.prepareStatement(sql); for (long i = rowCount; (i > 0) && ((System.currentTimeMillis() - logStartTime) < maxDuration); i--) { @@ -320,7 +320,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns PreparedStatement statement, SimpleDateFormat simpleDateFormat) throws Exception { int count = 1; for (Column column : columns) { - System.out.print("Column is " + column.getName()); + //System.out.print("Column is " + column.getName()); DataValue dataValue = getRulesApplier().getDataForRule(scenario, column); switch (column.getType()) { case VARCHAR: @@ -367,7 +367,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns } count++; } - System.out.print("Returning statement " + statement.toString()); + //System.out.print("Returning statement " + statement.toString()); return statement; } From 49ba0fb692990a19f27b8f5c5f36e0434aa0f7a7 Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 25 Feb 2016 15:06:53 -0800 Subject: [PATCH 26/31] Batch writes --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index b9339221300..cd2fa6453d0 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -267,7 +267,7 @@ public Future upsertData(final Scenario scenario, final List colum stmt.addBatch(); //rowsCreated += stmt.executeUpdate(); if ((i % getBatchSize()) == 0) { - System.out.print("Executing batch"); + //System.out.print("Executing batch"); stmt.executeBatch(); connection.commit(); stmt.clearBatch(); From 95369c21b1032597f087f82b7d73815a16da49f1 Mon Sep 17 00:00:00 2001 From: gkanade Date: Fri, 26 Feb 2016 10:01:29 -0800 Subject: [PATCH 27/31] Stupid --- bin/pherf-cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pherf-cluster.py b/bin/pherf-cluster.py index 37f29a8daa7..04ce50d404a 100755 --- a/bin/pherf-cluster.py +++ b/bin/pherf-cluster.py @@ -75,7 +75,7 @@ stderr=subprocess.PIPE).communicate() java_cmd = java +' -cp "' + hbasecp + os.pathsep + phoenix_utils.pherf_conf_path + os.pathsep + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_pherf_jar + \ - '" -Dlog4j.configuration=file:' + \ + os.pathsep + phoenix_utils.phoenix_thin_client_jar + '" -Dlog4j.configuration=file:' + \ os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ " org.apache.phoenix.pherf.Pherf " + args From d0d8ed94fbf23ef72a4d22a982720b639ba7d7b9 Mon Sep 17 00:00:00 2001 From: gkanade Date: Tue, 8 Mar 2016 16:50:15 -0800 Subject: [PATCH 28/31] Logging --- .../org/apache/phoenix/pherf/workload/WriteWorkload.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index cd2fa6453d0..a564c49d9d9 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -263,7 +263,7 @@ public Future upsertData(final Scenario scenario, final List colum < maxDuration); i--) { stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); - //System.out.print(specificSql); + System.out.print(stmt); stmt.addBatch(); //rowsCreated += stmt.executeUpdate(); if ((i % getBatchSize()) == 0) { @@ -320,7 +320,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns PreparedStatement statement, SimpleDateFormat simpleDateFormat) throws Exception { int count = 1; for (Column column : columns) { - //System.out.print("Column is " + column.getName()); + System.out.print("Column is " + column.getName()); DataValue dataValue = getRulesApplier().getDataForRule(scenario, column); switch (column.getType()) { case VARCHAR: @@ -331,6 +331,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns } break; case CHAR: + System.out.print("Data value "+ dataValue.getValue()); if (dataValue.getValue().equals("")) { statement.setNull(count, Types.CHAR); } else { From a5fcecc98ef6f8a20fb9faf4605937dfb9a65c75 Mon Sep 17 00:00:00 2001 From: gkanade Date: Wed, 30 Mar 2016 17:14:42 -0700 Subject: [PATCH 29/31] remove logging --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index a564c49d9d9..6dce56b433e 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -263,7 +263,7 @@ public Future upsertData(final Scenario scenario, final List colum < maxDuration); i--) { stmt = buildStatement(scenario, columns, stmt, simpleDateFormat); - System.out.print(stmt); + //System.out.print(stmt); stmt.addBatch(); //rowsCreated += stmt.executeUpdate(); if ((i % getBatchSize()) == 0) { @@ -320,7 +320,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns PreparedStatement statement, SimpleDateFormat simpleDateFormat) throws Exception { int count = 1; for (Column column : columns) { - System.out.print("Column is " + column.getName()); + //System.out.print("Column is " + column.getName()); DataValue dataValue = getRulesApplier().getDataForRule(scenario, column); switch (column.getType()) { case VARCHAR: From 3b92cf2592cba80bb20f1b7373053ca69194d200 Mon Sep 17 00:00:00 2001 From: gkanade Date: Wed, 30 Mar 2016 18:47:52 -0700 Subject: [PATCH 30/31] remove logging --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 6dce56b433e..60769915f46 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -331,7 +331,7 @@ private PreparedStatement buildStatement(Scenario scenario, List columns } break; case CHAR: - System.out.print("Data value "+ dataValue.getValue()); + //System.out.print("Data value "+ dataValue.getValue()); if (dataValue.getValue().equals("")) { statement.setNull(count, Types.CHAR); } else { From ed5f25762e330b8f91a1d3283c34f9a1e353a41b Mon Sep 17 00:00:00 2001 From: gkanade Date: Thu, 31 Mar 2016 09:35:29 -0700 Subject: [PATCH 31/31] remove clearbatch --- .../java/org/apache/phoenix/pherf/workload/WriteWorkload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java index 60769915f46..e963381a052 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WriteWorkload.java @@ -270,7 +270,7 @@ public Future upsertData(final Scenario scenario, final List colum //System.out.print("Executing batch"); stmt.executeBatch(); connection.commit(); - stmt.clearBatch(); + //stmt.clearBatch(); duration = System.currentTimeMillis() - last; logger.info("Writer (" + Thread.currentThread().getName() + ") committed Batch. Total " + getBatchSize()