You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:32:14 UTC
[26/50] [abbrv] incubator-apex-malhar git commit: MLHR-1796 -
#resolve Fixed compilation errors in benchmark application.
MLHR-1796 - #resolve Fixed compilation errors in benchmark application.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a980e061
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a980e061
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a980e061
Branch: refs/heads/master
Commit: a980e061dffb14b02d4426e59f5e3cdeaa0e2b24
Parents: 0be7372
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Tue Aug 4 20:54:24 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Tue Aug 4 20:54:24 2015 -0700
----------------------------------------------------------------------
.../algo/UniqueValueCountBenchmarkApplication.java | 9 +++++----
.../benchmark/script/RubyOperatorBenchmarkApplication.java | 2 +-
.../benchmark/memsql/MemsqlInputBenchmarkTest.java | 2 +-
.../datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java | 6 +++---
4 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a980e061/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java b/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
index 1109a85..2f25130 100644
--- a/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
+++ b/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
@@ -19,10 +19,11 @@ package com.datatorrent.benchmark.algo;
import org.apache.hadoop.conf.Configuration;
import com.datatorrent.lib.algo.UniqueCounter;
-import com.datatorrent.lib.algo.UniqueCounterValue;
import com.datatorrent.lib.converter.MapToKeyHashValuePairConverter;
import com.datatorrent.lib.io.ConsoleOutputOperator;
import com.datatorrent.common.partitioner.StatelessPartitioner;
+
+import com.datatorrent.lib.stream.Counter;
import com.datatorrent.lib.testbench.RandomEventGenerator;
import com.datatorrent.api.Context;
@@ -65,12 +66,12 @@ public class UniqueValueCountBenchmarkApplication implements StreamingApplicatio
dag.setInputPortAttribute(uniqCount.data, Context.PortContext.PARTITION_PARALLEL, true);
uniqCount.setCumulative(false);
- UniqueCounterValue counter = dag.addOperator("count", new UniqueCounterValue());
+ Counter counter = dag.addOperator("count", new Counter());
ConsoleOutputOperator output = dag.addOperator("output", new ConsoleOutputOperator());
dag.addStream("datain", randGen.integer_data, uniqCount.data);
dag.addStream("convert", uniqCount.count, converter.input).setLocality(Locality.THREAD_LOCAL);
- dag.addStream("consoutput", converter.output, counter.data);
- dag.addStream("final", counter.count, output.input);
+ dag.addStream("consoutput", converter.output, counter.input);
+ dag.addStream("final", counter.output, output.input);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a980e061/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java b/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
index db998b2..c7e09b4 100644
--- a/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
+++ b/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
@@ -22,7 +22,7 @@ import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.annotation.ApplicationAnnotation;
import com.datatorrent.benchmark.RandomMapOutput;
import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.script.RubyOperator;
+import com.datatorrent.contrib.ruby.RubyOperator;
import com.datatorrent.lib.testbench.RandomEventGenerator;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a980e061/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
----------------------------------------------------------------------
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
index 580e3da..abc86a1 100644
--- a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
+++ b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
@@ -53,7 +53,7 @@ public class MemsqlInputBenchmarkTest
AbstractMemsqlOutputOperatorTest.memsqlInitializeDatabase(memsqlStore);
- MemsqlOutputOperator outputOperator = new MemsqlOutputOperator();
+ MemsqlPOJOOutputOperator outputOperator = new MemsqlPOJOOutputOperator();
outputOperator.getStore().setDatabaseUrl(conf.get("dt.application.MemsqlInputBenchmark.operator.memsqlInputOperator.store.dbUrl"));
outputOperator.getStore().setConnectionProperties(conf.get("dt.application.MemsqlInputBenchmark.operator.memsqlInputOperator.store.connectionProperties"));
outputOperator.setBatchSize(BATCH_SIZE);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a980e061/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
----------------------------------------------------------------------
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
index 9195a45..04c0cb0 100644
--- a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
+++ b/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
@@ -19,7 +19,7 @@ import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.memsql.MemsqlOutputOperator;
+import com.datatorrent.contrib.memsql.MemsqlPOJOOutputOperator;
import com.datatorrent.lib.testbench.RandomEventGenerator;
import org.apache.hadoop.conf.Configuration;
import org.slf4j.Logger;
@@ -86,8 +86,8 @@ public class MemsqlOutputBenchmark implements StreamingApplication
randomEventGenerator.setTuplesBlast(TUPLE_BLAST);
LOG.debug("Before making output operator");
- MemsqlOutputOperator memsqlOutputOperator = dag.addOperator("memsqlOutputOperator",
- new MemsqlOutputOperator());
+ MemsqlPOJOOutputOperator memsqlOutputOperator = dag.addOperator("memsqlOutputOperator",
+ new MemsqlPOJOOutputOperator());
LOG.debug("After making output operator");
memsqlOutputOperator.setBatchSize(DEFAULT_BATCH_SIZE);