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:31:49 UTC
[01/50] [abbrv] incubator-apex-malhar git commit: Fixed the category,
display name, and tags for POJO operators.
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/master ff31e3cb0 -> 0690700b3
Fixed the category, display name, and tags for POJO operators.
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/56de133e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/56de133e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/56de133e
Branch: refs/heads/master
Commit: 56de133ed8b4261da26ad39bd7c81f4551b3857c
Parents: 47ef1c8
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Mon Jul 27 16:17:46 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Mon Jul 27 19:36:22 2015 -0700
----------------------------------------------------------------------
.../AerospikePOJONonTransactionalPutOperator.java | 7 ++++---
.../AerospikePOJOTransactionalPutOperator.java | 6 +++---
.../cassandra/CassandraPOJOInputOperator.java | 4 ++--
.../cassandra/CassandraPOJOOutputOperator.java | 2 +-
.../couchbase/CouchBasePOJOInputOperator.java | 4 ++--
.../couchbase/CouchbasePOJOSetOperator.java | 6 +++++-
.../contrib/couchdb/CouchDBPOJOInputOperator.java | 3 +++
.../couchdb/CouchDBPOJOOutputOperator.java | 6 +++---
.../contrib/hbase/HBasePOJOInputOperator.java | 17 +++++++++++------
.../contrib/hbase/HBasePOJOPutOperator.java | 11 +++++------
.../memcache/MemcachePOJOOutputOperator.java | 18 +++++++++---------
.../contrib/memsql/MemsqlPOJOInputOperator.java | 4 ++--
.../contrib/memsql/MemsqlPOJOOutputOperator.java | 5 +++++
.../mongodb/MongoDBPOJOOutputOperator.java | 6 +++---
.../snapshot/AppDataSnapshotServerPOJO.java | 2 +-
.../lib/db/jdbc/JdbcPOJOOutputOperator.java | 2 +-
16 files changed, 60 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
index 9fb7bd1..4b0a1f3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
@@ -34,9 +34,10 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* A generic implementation of {@link AbstractAerospikeNonTransactionalPutOperator} which can
* take a POJO.
* </p>
- * @displayName Aerospike Non-Transactional Put
- * @category Database
- * @tags output operator, put, non-transactional, POJO
+ *
+ * @displayName Aerospike Non-Transactional Put Operator
+ * @category Output
+ * @tags database, nosql, pojo, aerospike
* @since 2.1.0
*/
public class AerospikePOJONonTransactionalPutOperator extends AbstractAerospikeNonTransactionalPutOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
index 0fd9620..057d7b0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
@@ -35,9 +35,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* {@link com.datatorrent.contrib.aerospike.AbstractAerospikeTransactionalPutOperator} which can
* take a POJO.
* </p>
- * @displayName Aerospike Transactional Put
- * @category Database
- * @tags output operator, put, transactional, POJO
+ * @displayName Aerospike Transactional Put Operator
+ * @category Output
+ * @tags data, nosql, pojo, aerospike
* @since 2.1.0
*/
public class AerospikePOJOTransactionalPutOperator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
index b6ecbe4..37c54d8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
@@ -43,9 +43,9 @@ import com.datatorrent.api.Context.OperatorContext;
* and %l for limit. The start value is continuously updated with the value of a primary key column of the last row from
* the result of the previous run of the query. The primary key column is also identified by the user using a property.
*
- * @displayName Cassandra POJO Input Operator
+ * @displayName Cassandra Input Operator
* @category Input
- * @tags input operator
+ * @tags database, nosql, pojo, cassandra
*/
public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
index ab337dc..2b9d612 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*
* @displayName Cassandra Output Operator
* @category Output
- * @tags output operator
+ * @tags database, nosql, pojo, cassandra
* @since 2.1.0
*/
public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionableOutputOperatorPS<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
index 3f57b4d..305546b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
@@ -43,9 +43,9 @@ import com.datatorrent.api.Context.OperatorContext;
* emit(doc._id, [doc.username, doc.first_name, doc.last_name, doc.last_login]);
* }
*
- * @displayName Couchbase POJO Input Operator
+ * @displayName Couchbase Input Operator
* @category Input
- * @tags input operator
+ * @tags database, nosql, pojo, couchbase
*/
public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Object, CouchBaseStore>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
index 89909b8..6809dd8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
@@ -25,9 +25,13 @@ import org.slf4j.LoggerFactory;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.Getter;
-/*
+/**
* An implementation of Couchbase Output Operator which takes a POJO,serializes it into key,value
* pair and then writes to couchbase.
+ *
+ * @displayName Couchbase Output Operator
+ * @category Output
+ * @tags database, nosql, pojo, couchbase
*/
public class CouchbasePOJOSetOperator extends AbstractCouchBaseSetOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
index 9e9153d..c53b8ad 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
@@ -47,6 +47,9 @@ import com.datatorrent.api.Context.OperatorContext;
* emit(doc._id, doc);
* }
*
+ * @displayName CouchDb Input Operator
+ * @category Input
+ * @tags database, nosql, pojo, couchdb
*/
public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
index f949861..afa500a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
@@ -23,9 +23,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
/**
* Implementation of {@link AbstractCouchDBOutputOperator} that saves a POJO in the couch database. <br/>
* <p>
- * @displayName POJO Based CouchDb Output Operator
- * @category Database
- * @tags output operator
+ * @displayName CouchDb Output Operator
+ * @category Output
+ * @tags database, nosql, pojo, couchdb
* @since 0.3.5
*/
public class CouchDBPOJOOutputOperator extends AbstractCouchDBOutputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
index 8de1cca..f4696d5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
@@ -18,6 +18,11 @@ import com.datatorrent.lib.util.TableInfo;
import com.datatorrent.api.Context.OperatorContext;
+/**
+ * @displayName HBase Input Operator
+ * @category Input
+ * @tags database, nosql, pojo, hbase
+ */
public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
{
private TableInfo<HBaseFieldInfo> tableInfo;
@@ -25,12 +30,12 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
private String pojoTypeName;
private String startRow;
private String lastReadRow;
-
+
protected transient Class pojoType;
private transient Setter<Object, String> rowSetter;
protected transient FieldValueGenerator<HBaseFieldInfo> fieldValueGenerator;
protected transient BytesValueConverter valueConverter;
-
+
public static class BytesValueConverter implements ValueConverter<HBaseFieldInfo>
{
@Override
@@ -39,7 +44,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
return fieldInfo.toValue( (byte[])value );
}
}
-
+
@Override
public void setup(OperatorContext context)
{
@@ -91,7 +96,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
Object instance = pojoType.newInstance();
rowSetter.set(instance, readRow);
-
+
List<Cell> cells = result.listCells();
for (Cell cell : cells) {
@@ -99,7 +104,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
byte[] value = CellUtil.cloneValue(cell);
fieldValueGenerator.setColumnValue( instance, columnName, value, valueConverter );
}
-
+
outputPort.emit(instance);
lastReadRow = readRow;
}
@@ -109,7 +114,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
}
}
-
+
protected Scan nextScan()
{
if(lastReadRow==null && startRow==null )
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
index 58166c8..8055456 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
@@ -27,10 +27,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
import com.datatorrent.lib.util.TableInfo;
/**
- *
- * @displayName HBase Put Output
- * @category Database
- * @tags hbase put, output operator, Pojo
+ * @displayName HBase Output Operator
+ * @category Output
+ * @tags database, nosql, pojo, hbase
*/
public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object>
{
@@ -42,7 +41,7 @@ public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object>
private transient Getter<Object, String> rowGetter;
private transient HBaseFieldValueHandler valueHandler = new HBaseFieldValueHandler();
-
+
@Override
public Put operationPut(Object obj)
{
@@ -77,7 +76,7 @@ public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object>
this.tableInfo = tableInfo;
}
-
+
public static class HBaseFieldValueHandler implements FieldValueHandler<HBaseFieldInfo>
{
public Put put;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
index 1b67c26..6e2c014 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
@@ -24,10 +24,10 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
import com.datatorrent.lib.util.TableInfo;
/**
- *
+ *
* @displayName Memcache Output Operator
- * @category Database
- * @tags Memcache, output operator, Pojo
+ * @category Output
+ * @tags pojo, memcache
*/
public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< Object >
{
@@ -35,7 +35,7 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator<
private TableInfo<FieldInfo> tableInfo;
private transient FieldValueGenerator<FieldInfo> fieldValueGenerator;
private transient Getter<Object, String> rowGetter;
-
+
@Override
public void processTuple(Object tuple)
{
@@ -51,15 +51,15 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator<
if (fieldValueGenerator == null) {
fieldValueGenerator = FieldValueGenerator.getFieldValueGenerator(tuple.getClass(), fieldsInfo);
}
-
+
value = fieldValueGenerator.getFieldsValueAsMap(tuple);
}
-
+
getStore().put( rowGetter.get(tuple), value);
}
/**
- *
+ *
* the information to convert pojo
*/
public TableInfo<FieldInfo> getTableInfo()
@@ -68,12 +68,12 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator<
}
/**
- *
+ *
* the information to convert pojo
*/
public void setTableInfo(TableInfo<FieldInfo> tableInfo)
{
this.tableInfo = tableInfo;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
index 3beb677..64d0227 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
@@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory;
* and %l for limit. The start value is continuously updated with the value of a primary key column of the last row from
* the result of the previous run of the query. The primary key column is also identified by the user using a property.
*
- * @displayName Memsql POJO Input Operator
+ * @displayName Memsql Input Operator
* @category Input
- * @tags input operator
+ * @tags database, sql, pojo, memsql
*/
public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
index b83a811..bba60f7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
@@ -36,6 +36,11 @@ import org.slf4j.LoggerFactory;
* A generic implementation of AbstractMemsqlOutputOperator which can take in a POJO.
*
* @since 2.1.0
+ *
+ * @displayName Memsql Output Operator
+ * @category Output
+ * @tags database, sql, pojo, memsql
+ *
*/
public class MemsqlPOJOOutputOperator extends AbstractMemsqlOutputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
index 304a6ea..285ed90 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
@@ -26,9 +26,9 @@ import javax.validation.constraints.NotNull;
/**
* Implementation of {@link MongoDBOutputOperator} that saves a POJO in the mongodb database. <br/>
* <p>
- * @displayName POJO Based MongoDb Output Operator
- * @category Database
- * @tags output operator
+ * @displayName MongoDb Output Operator
+ * @category Output
+ * @tags database, nosql, pojo, mongodb
* @since 0.3.5
*/
public class MongoDBPOJOOutputOperator extends MongoDBOutputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
index 32d7cb8..bfd578a 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
@@ -28,7 +28,7 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils;
/**
* This operator accepts a list of POJOs, and serves the data under the {@link SnapshotSchema}.
* Each POJO represents a row in the table, and the full list of POJOs represents a table.
- * @displayName App Data Snapshot POJO Server
+ * @displayName App Data Snapshot Server
* @category App Data
* @tags appdata, snapshot, pojo
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
index 45e6671..4da989d 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*
* @displayName Jdbc Output Operator
* @category Output
- * @tags output operator,transactional, POJO
+ * @tags database, sql, pojo, jdbc
* @since 2.1.0
*/
public class JdbcPOJOOutputOperator extends AbstractJdbcTransactionableOutputOperator<Object>
[29/50] [abbrv] incubator-apex-malhar git commit: Fixed Twitter demo
for App Builder
Posted by ch...@apache.org.
Fixed Twitter demo for App Builder
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/f40ba346
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/f40ba346
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/f40ba346
Branch: refs/heads/master
Commit: f40ba346ae660e1b89de1ebbb3f8e1f7ba31cad0
Parents: a028069
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Thu Aug 6 16:07:03 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Thu Aug 6 22:14:05 2015 -0700
----------------------------------------------------------------------
.../contrib/twitter/TwitterSampleInput.java | 32 ++++++++++++++++++++
demos/pom.xml | 4 +--
demos/twitter/pom.xml | 2 +-
.../demos/twitter/WindowedTopCounter.java | 5 +++
4 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f40ba346/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java b/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
index 916bea8..9daef7f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
@@ -293,6 +293,14 @@ public class TwitterSampleInput implements InputOperator, ActivationListener<Ope
}
/**
+ * @return the consumerKey
+ */
+ public String getConsumerKey()
+ {
+ return consumerKey;
+ }
+
+ /**
* @param consumerKey the consumerKey to set
*/
public void setConsumerKey(String consumerKey)
@@ -301,6 +309,14 @@ public class TwitterSampleInput implements InputOperator, ActivationListener<Ope
}
/**
+ * @return the consumerSecret
+ */
+ public String getConsumerSecret()
+ {
+ return consumerSecret;
+ }
+
+ /**
* @param consumerSecret the consumerSecret to set
*/
public void setConsumerSecret(String consumerSecret)
@@ -309,6 +325,14 @@ public class TwitterSampleInput implements InputOperator, ActivationListener<Ope
}
/**
+ * @return the accessToken
+ */
+ public String getAccessToken()
+ {
+ return accessToken;
+ }
+
+ /**
* @param accessToken the accessToken to set
*/
public void setAccessToken(String accessToken)
@@ -317,6 +341,14 @@ public class TwitterSampleInput implements InputOperator, ActivationListener<Ope
}
/**
+ * @return the accessTokenSecret
+ */
+ public String getAccessTokenSecret()
+ {
+ return accessTokenSecret;
+ }
+
+ /**
* @param accessTokenSecret the accessTokenSecret to set
*/
public void setAccessTokenSecret(String accessTokenSecret)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f40ba346/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 64c6c4a..c17120f 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -173,7 +173,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-library</artifactId>
- <version>${datatorrent.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -184,7 +184,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-library</artifactId>
- <version>${datatorrent.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f40ba346/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index c55ee79..8a0bec9 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-contrib</artifactId>
- <version>${datatorrent.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f40ba346/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
----------------------------------------------------------------------
diff --git a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
index 2edf7fd..3354ed4 100644
--- a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
+++ b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
@@ -179,6 +179,11 @@ public class WindowedTopCounter<T> extends BaseOperator
topCount = count;
}
+ public int getTopCount()
+ {
+ return topCount;
+ }
+
/**
* @return the windows
*/
[47/50] [abbrv] incubator-apex-malhar git commit: Preparing for
Release 3.1.0-RC2
Posted by ch...@apache.org.
Preparing for Release 3.1.0-RC2
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/8df703a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/8df703a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/8df703a0
Branch: refs/heads/master
Commit: 8df703a06eb1dee8dc931ad028ba57a9409f400a
Parents: 9df821f
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Mon Aug 31 19:10:24 2015 +0530
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Mon Aug 31 19:10:24 2015 +0530
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 10 +++++-----
samples/pom.xml | 2 +-
21 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 3c4b04d..09df741 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 72d1f7e..61adc07 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.1.0-RC1</datatorrent.version>
+ <datatorrent.version>3.1.0-RC2</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 259bf41..b7f9843 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 3a1e9aa..ceed7f2 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index 0d57086..13a6502 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 64126c8..326069d 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index d05a52a..9c40b35 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 443885d..739df85 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index c1afd0a..50ff7ed 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 9377b0b..533263f 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index 93e9de5..7b579e2 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 43a1247..caf7e71 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index a4c5452..38fbd6e 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.1.0-RC1</datatorrent.version>
+ <datatorrent.version>3.1.0-RC2</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<semver.plugin.skip>true</semver.plugin.skip>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 584b76e..e7cd886 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 71163f2..2d676d0 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 07121f5..1660d18 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 4f59b68..a22ba26 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 1af8ea3..88dd6f2 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 0d8bf73..fcaa8de 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb31a2a..45d3692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -31,14 +31,14 @@
</repositories>
<prerequisites>
- <maven>3.1.0-RC1</maven>
+ <maven>3.1.0-RC2</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.1.0-RC1</dt.framework.version>
+ <dt.framework.version>3.1.0-RC2</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>${project.artifactId}</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</dependency>
</oldVersion>
<newVersion>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8df703a0/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 334c561..c16c240 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC1</version>
+ <version>3.1.0-RC2</version>
</parent>
<artifactId>malhar-samples</artifactId>
[43/50] [abbrv] incubator-apex-malhar git commit: Version Changes for
v3.1.0-RC1
Posted by ch...@apache.org.
Version Changes for v3.1.0-RC1
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/4645e842
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/4645e842
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/4645e842
Branch: refs/heads/master
Commit: 4645e84296d257892df52ffd620fbb4ff87b0c74
Parents: c4a6d8d
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Tue Aug 25 12:04:39 2015 +0530
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Tue Aug 25 12:04:39 2015 +0530
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 10 +++++-----
samples/pom.xml | 2 +-
21 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index ce0f4ce..3c4b04d 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index e816985..72d1f7e 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.0.0</datatorrent.version>
+ <datatorrent.version>3.1.0-RC1</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 0d07203..259bf41 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 50d7234..3a1e9aa 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index 068aea7..0d57086 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index ad20744..64126c8 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 13c9fcd..d05a52a 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 3498d0d..443885d 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index cd55a7b..c1afd0a 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 181343a..9377b0b 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index 4e09392..93e9de5 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 5719b2c..43a1247 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 7b3aa08..a4c5452 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.0.0</datatorrent.version>
+ <datatorrent.version>3.1.0-RC1</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<semver.plugin.skip>true</semver.plugin.skip>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 42c203c..584b76e 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 8a0bec9..71163f2 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 8b7d3fc..07121f5 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 779b4f7..4f59b68 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 3b4db0c..1af8ea3 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 77b8506..0d8bf73 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ccdc00a..cb31a2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -31,14 +31,14 @@
</repositories>
<prerequisites>
- <maven>3.0.0</maven>
+ <maven>3.1.0-RC1</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.0.0</dt.framework.version>
+ <dt.framework.version>3.1.0-RC1</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>${project.artifactId}</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-RC1</version>
</dependency>
</oldVersion>
<newVersion>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4645e842/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 7e8b274..334c561 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-RC1</version>
</parent>
<artifactId>malhar-samples</artifactId>
[42/50] [abbrv] incubator-apex-malhar git commit: update japicmp
plugin version
Posted by ch...@apache.org.
update japicmp plugin version
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/c4a6d8d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/c4a6d8d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/c4a6d8d7
Branch: refs/heads/master
Commit: c4a6d8d75538bf623eaf803a42c27044ebbfd6da
Parents: e0ee8ab
Author: thomas <th...@datatorrent.com>
Authored: Fri Aug 21 22:45:39 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Fri Aug 21 22:45:39 2015 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c4a6d8d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba86445..ccdc00a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.5.1</version>
+ <version>0.5.3</version>
<configuration>
<oldVersion>
<dependency>
[38/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1534 from ishark/redisStore
Posted by ch...@apache.org.
Merge pull request #1534 from ishark/redisStore
MLHR-1748 #resolve #comment Created concrete input and output operators for Redis Store
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/717168bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/717168bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/717168bc
Branch: refs/heads/master
Commit: 717168bc8768d4376b5f724fb7a31c975878aea5
Parents: 0b3bb88 ada42ab
Author: Chandni Singh <si...@gmail.com>
Authored: Fri Aug 14 15:17:27 2015 -0700
Committer: Chandni Singh <si...@gmail.com>
Committed: Fri Aug 14 15:17:27 2015 -0700
----------------------------------------------------------------------
contrib/pom.xml | 8 +-
.../redis/AbstractRedisInputOperator.java | 225 +++++++++++++++++-
.../redis/RedisKeyValueInputOperator.java | 55 +++++
.../redis/RedisMapAsValueInputOperator.java | 45 ++++
.../contrib/redis/RedisPOJOInputOperator.java | 204 ++++++++++++++++
.../contrib/redis/RedisPOJOOutputOperator.java | 155 +++++++++++++
.../datatorrent/contrib/redis/RedisStore.java | 27 +++
.../contrib/redis/RedisInputOperatorTest.java | 193 ++++++++++++++++
.../contrib/redis/RedisPOJOOperatorTest.java | 230 +++++++++++++++++++
demos/machinedata/pom.xml | 2 +-
10 files changed, 1138 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[25/50] [abbrv] incubator-apex-malhar git commit: Set the uri of app
data pub sub operators to be the GATEWAY_CONNECT_ADDRESS by default.
Posted by ch...@apache.org.
Set the uri of app data pub sub operators to be the GATEWAY_CONNECT_ADDRESS by default.
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/0be7372b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0be7372b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0be7372b
Branch: refs/heads/master
Commit: 0be7372b1129b616d33ccaddc4c05441b52a6968
Parents: 93ce29c
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Fri Jul 24 20:07:41 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Tue Aug 4 09:42:07 2015 -0700
----------------------------------------------------------------------
.../lib/io/PubSubWebSocketAppDataQuery.java | 48 ++++++++++++-
.../lib/io/PubSubWebSocketAppDataResult.java | 27 ++++++-
.../lib/io/WebSocketInputOperator.java | 4 +-
.../lib/io/WebSocketOutputOperator.java | 4 +-
.../io/PubSubWebSocketAppDataOperatorTest.java | 74 ++++++++++++++++++++
.../lib/io/PubSubWebSocketAppDataQueryTest.java | 66 ++++++++++++++---
.../io/PubSubWebSocketAppDataResultTest.java | 20 ++----
7 files changed, 212 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
index f2b1fdb..14a2d2b 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
@@ -16,6 +16,9 @@
package com.datatorrent.lib.io;
+import java.net.URI;
+import java.net.URISyntaxException;
+
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -23,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.api.DAG;
import com.datatorrent.common.experimental.AppData;
import com.datatorrent.common.util.PubSubMessage;
@@ -50,9 +54,51 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St
@Override
public void setup(OperatorContext context)
{
+ this.uri = uriHelper(context, uri);
+ logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic());
super.setup(context);
+ }
- logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic());
+ public static URI uriHelper(OperatorContext context, URI uri)
+ {
+ if (uri == null) {
+ if (context.getValue(DAG.GATEWAY_CONNECT_ADDRESS) == null) {
+ throw new IllegalArgumentException("The uri property is not set and the dt.attr.GATEWAY_CONNECT_ADDRESS is not defined");
+ }
+
+ try {
+ uri = new URI("ws://"
+ + context.getValue(DAG.GATEWAY_CONNECT_ADDRESS)
+ + "/pubsub");
+ } catch (URISyntaxException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ return uri;
+ }
+
+ /**
+ * Gets the URI for WebSocket connection.
+ *
+ * @return the URI
+ */
+ @Override
+ public URI getUri()
+ {
+ return uri;
+ }
+
+ /**
+ * The URI for WebSocket connection. If this is not set, the value of the dt.attr.GATEWAY_CONNECT_ADDRESS DAG attribute is used. If neither this
+ * property or dt.attr.GATEWAY_CONNECT_ADDRESS attribute is set, then this operator will fail with an {@link IllegalArgumentException}.
+ *
+ * @param uri
+ */
+ @Override
+ public void setUri(URI uri)
+ {
+ this.uri = uri;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
index 3401233..5f0b947 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
@@ -26,6 +26,7 @@ import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.common.experimental.AppData;
import com.datatorrent.common.util.PubSubMessage.PubSubMessageType;
+import java.net.URI;
/**
* This is an app data pub sub result operator. This operator is used to send results to
* App Data dashboards produced by App Data store operators.
@@ -47,8 +48,9 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<
@Override
public void setup(OperatorContext context)
{
+ this.uri = PubSubWebSocketAppDataQuery.uriHelper(context, uri);
+ logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic());
super.setup(context);
- logger.debug("Setting up: ");
}
@Override
@@ -57,6 +59,29 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<
return "pubsub";
}
+ /**
+ * Gets the URI for WebSocket connection.
+ *
+ * @return the URI
+ */
+ @Override
+ public URI getUri()
+ {
+ return uri;
+ }
+
+ /**
+ * The URI for WebSocket connection. If this is not set, the value of the dt.attr.GATEWAY_CONNECT_ADDRESS DAG attribute is used. If neither this
+ * property or dt.attr.GATEWAY_CONNECT_ADDRESS attribute is set, then this operator will fail with an {@link IllegalArgumentException}.
+ *
+ * @param uri
+ */
+ @Override
+ public void setUri(URI uri)
+ {
+ this.uri = uri;
+ }
+
@Override
public String convertMapToMessage(String t) throws IOException
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index dabcacb..a8cfa6e 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -51,8 +51,8 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
* Timeout interval for reading from server. 0 or negative indicates no timeout.
*/
public int readTimeoutMillis = 0;
- @NotNull
- private URI uri;
+ //Do not make this @NotNull since null is a valid value for some child classes
+ protected URI uri;
private transient AsyncHttpClient client;
private transient final JsonFactory jsonFactory = new JsonFactory();
protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index a92f8b3..a7ab3bd 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -49,8 +49,8 @@ import com.datatorrent.api.DefaultInputPort;
public class WebSocketOutputOperator<T> extends BaseOperator
{
private static final Logger LOG = LoggerFactory.getLogger(WebSocketOutputOperator.class);
- @NotNull
- private URI uri;
+ //Do not make this @NotNull since null is a valid value for some child classes
+ protected URI uri;
private transient AsyncHttpClient client;
private transient final JsonFactory jsonFactory = new JsonFactory();
protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java
new file mode 100644
index 0000000..bc379ce
--- /dev/null
+++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015 DataTorrent
+ *
+ * Licensed 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.
+ */
+
+package com.datatorrent.lib.io;
+
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.datatorrent.common.experimental.AppData;
+
+public abstract class PubSubWebSocketAppDataOperatorTest
+{
+ public static final String GATEWAY_CONNECT_ADDRESS_STRING = "my.gateway.com";
+ public static final String URI_ADDRESS_STRING = "ws://localhost:6666/pubsub";
+ public static final URI GATEWAY_CONNECT_ADDRESS;
+ public static final URI URI_ADDRESS;
+
+ static
+ {
+ try {
+ GATEWAY_CONNECT_ADDRESS = new URI("ws://" + GATEWAY_CONNECT_ADDRESS_STRING + "/pubsub");
+ URI_ADDRESS = new URI(URI_ADDRESS_STRING);
+ } catch (URISyntaxException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ public abstract AppData.ConnectionInfoProvider getOperator();
+
+ @Test
+ public void testGetAppDataURL() throws Exception
+ {
+ String topic = "test";
+ String correct = "pubsub";
+
+ AppData.ConnectionInfoProvider pubsub = getOperator();
+
+ setUri(pubsub, URI_ADDRESS);
+ setTopic(pubsub, topic);
+
+ Assert.assertEquals("The url is incorrect.", correct, pubsub.getAppDataURL());
+ }
+
+ public void setUri(Object o, URI uri) throws Exception
+ {
+ Class<?> clazz = o.getClass();
+ Method m = clazz.getMethod("setUri", URI.class);
+ m.invoke(o, uri);
+ }
+
+ public void setTopic(Object o, String topic) throws Exception
+ {
+ Class<?> clazz = o.getClass();
+ Method m = clazz.getMethod("setTopic", String.class);
+ m.invoke(o, topic);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
index 894ed72..c2aa0da 100644
--- a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
@@ -15,23 +15,69 @@
*/
package com.datatorrent.lib.io;
-import java.net.URI;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class PubSubWebSocketAppDataQueryTest
+import com.datatorrent.lib.helper.OperatorContextTestHelper;
+
+import com.datatorrent.api.Attribute;
+import com.datatorrent.api.Context;
+import com.datatorrent.api.Context.OperatorContext;
+
+import com.datatorrent.common.experimental.AppData.ConnectionInfoProvider;
+
+public class PubSubWebSocketAppDataQueryTest extends PubSubWebSocketAppDataOperatorTest
{
+ private static OperatorContext context;
+ private static OperatorContext emptyContext;
+
+ @BeforeClass
+ public static void setupContext() throws Exception
+ {
+ Attribute.AttributeMap attributes = new Attribute.AttributeMap.DefaultAttributeMap();
+ attributes.put(Context.DAGContext.GATEWAY_CONNECT_ADDRESS, GATEWAY_CONNECT_ADDRESS_STRING);
+ context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes);
+
+ attributes = new Attribute.AttributeMap.DefaultAttributeMap();
+ emptyContext = new OperatorContextTestHelper.TestIdOperatorContext(1, attributes);
+ }
+
+ @Override
+ public ConnectionInfoProvider getOperator()
+ {
+ return new PubSubWebSocketAppDataQuery();
+ }
+
@Test
- public void testGetAppDataURL() throws Exception
+ public void testURISet() throws Exception
{
- URI uri = URI.create("ws://localhost:6666/pubsub");
- String topic = "test";
- String correct = "pubsub";
+ Assert.assertEquals(URI_ADDRESS, PubSubWebSocketAppDataQuery.uriHelper(emptyContext, URI_ADDRESS));
+ }
- PubSubWebSocketAppDataQuery pubsub = new PubSubWebSocketAppDataQuery();
- pubsub.setUri(uri);
- pubsub.setTopic(topic);
+ @Test
+ public void testNoURISet() throws Exception
+ {
+ boolean threwException = false;
+
+ try {
+ PubSubWebSocketAppDataQuery.uriHelper(emptyContext, null);
+ } catch (Exception e) {
+ threwException = e instanceof IllegalArgumentException;
+ }
- Assert.assertEquals("The url is incorrect.", correct, pubsub.getAppDataURL());
+ Assert.assertTrue(threwException);
+ }
+
+ @Test
+ public void testAttrSet() throws Exception
+ {
+ Assert.assertEquals(GATEWAY_CONNECT_ADDRESS, PubSubWebSocketAppDataQuery.uriHelper(context, null));
+ }
+
+ @Test
+ public void testAttrAndURISet() throws Exception
+ {
+ Assert.assertEquals(URI_ADDRESS, PubSubWebSocketAppDataQuery.uriHelper(context, URI_ADDRESS));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0be7372b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
index e38e439..7afa211 100644
--- a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
@@ -15,23 +15,13 @@
*/
package com.datatorrent.lib.io;
-import java.net.URI;
-import org.junit.Assert;
-import org.junit.Test;
+import com.datatorrent.common.experimental.AppData.ConnectionInfoProvider;
-public class PubSubWebSocketAppDataResultTest
+public class PubSubWebSocketAppDataResultTest extends PubSubWebSocketAppDataOperatorTest
{
- @Test
- public void testGetAppDataURL() throws Exception
+ @Override
+ public ConnectionInfoProvider getOperator()
{
- URI uri = URI.create("ws://localhost:6666/pubsub");
- String topic = "test";
- String correct = "pubsub";
-
- PubSubWebSocketAppDataResult pubsub = new PubSubWebSocketAppDataResult();
- pubsub.setUri(uri);
- pubsub.setTopic(topic);
-
- Assert.assertEquals("The url is incorrect.", correct, pubsub.getAppDataURL());
+ return new PubSubWebSocketAppDataResult();
}
}
[44/50] [abbrv] incubator-apex-malhar git commit: Fixed version
compatibility issues
Posted by ch...@apache.org.
Fixed version compatibility issues
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/fb8e4862
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/fb8e4862
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/fb8e4862
Branch: refs/heads/master
Commit: fb8e4862e5ff567b470ef0d200702bdf5d0384c0
Parents: c4a6d8d
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Fri Aug 28 18:54:35 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Fri Aug 28 19:29:57 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 6 +++---
.../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 6 +++---
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 2 +-
.../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
index 14a2d2b..1510155 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
@@ -54,7 +54,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St
@Override
public void setup(OperatorContext context)
{
- this.uri = uriHelper(context, uri);
+ setUri(uriHelper(context, getUri()));
logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic());
super.setup(context);
}
@@ -86,7 +86,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St
@Override
public URI getUri()
{
- return uri;
+ return super.getUri();
}
/**
@@ -98,7 +98,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St
@Override
public void setUri(URI uri)
{
- this.uri = uri;
+ super.setUri(uri);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
index 5f0b947..cdae7b8 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
@@ -48,7 +48,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<
@Override
public void setup(OperatorContext context)
{
- this.uri = PubSubWebSocketAppDataQuery.uriHelper(context, uri);
+ setUri(PubSubWebSocketAppDataQuery.uriHelper(context, getUri()));
logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic());
super.setup(context);
}
@@ -67,7 +67,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<
@Override
public URI getUri()
{
- return uri;
+ return super.getUri();
}
/**
@@ -79,7 +79,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<
@Override
public void setUri(URI uri)
{
- this.uri = uri;
+ super.setUri(uri);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index 69ebfa3..02b9ef2 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -53,7 +53,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
*/
public int readTimeoutMillis = 0;
//Do not make this @NotNull since null is a valid value for some child classes
- protected URI uri;
+ private URI uri;
private transient AsyncHttpClient client;
private transient final JsonFactory jsonFactory = new JsonFactory();
protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index f46ccb8..a0cf465 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -49,7 +49,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator
{
private static final Logger LOG = LoggerFactory.getLogger(WebSocketOutputOperator.class);
//Do not make this @NotNull since null is a valid value for some child classes
- protected URI uri;
+ private URI uri;
private transient AsyncHttpClient client;
private transient final JsonFactory jsonFactory = new JsonFactory();
protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
[31/50] [abbrv] incubator-apex-malhar git commit: enable server plugin
Posted by ch...@apache.org.
enable server plugin
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/2e5813d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/2e5813d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/2e5813d4
Branch: refs/heads/master
Commit: 2e5813d4a395f8f3d85ffd7f518bdf7672c3b9cc
Parents: 93ce29c
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 10 11:53:27 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 10 11:56:29 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 1 +
demos/pom.xml | 1 +
pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/2e5813d4/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 7321baa..ce0f4ce 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -15,6 +15,7 @@
<properties>
<maven.deploy.skip>false</maven.deploy.skip>
<skipTests>false</skipTests>
+ <semver.plugin.skip>true</semver.plugin.skip>
</properties>
<name>Logstream Application</name>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/2e5813d4/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 64c6c4a..a5601a5 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -30,6 +30,7 @@
<properties>
<datatorrent.version>3.0.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
+ <semver.plugin.skip>true</semver.plugin.skip>
</properties>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/2e5813d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81a699b..ba86445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,60 @@
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
<jetty.version>8.1.10.v20130312</jetty.version>
+ <semver.plugin.skip>false</semver.plugin.skip>
</properties>
+ <profiles>
+ <profile>
+ <activation>
+ <file>
+ <exists>src</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.5.1</version>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <file>
+ <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+ </file>
+ </newVersion>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <accessModifier>protected</accessModifier>
+ <breakBuildOnModifications>false</breakBuildOnModifications>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+ <includeSynthetic>false</includeSynthetic>
+ <ignoreMissingClasses>true</ignoreMissingClasses>
+ </parameter>
+ <skip>${semver.plugin.skip}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<modules>
<module>library</module>
<module>contrib</module>
[28/50] [abbrv] incubator-apex-malhar git commit: Removed references
to name property in BaseOperator
Posted by ch...@apache.org.
Removed references to name property in BaseOperator
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/a0280691
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a0280691
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a0280691
Branch: refs/heads/master
Commit: a0280691b82f54dd6e33f7cc01772a94373aa1da
Parents: 0a4250e
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Mon Aug 3 14:17:02 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Thu Aug 6 15:20:44 2015 -0700
----------------------------------------------------------------------
.../test/java/com/datatorrent/demos/mobile/ApplicationTest.java | 2 --
.../com/datatorrent/lib/io/SimpleSinglePortInputOperator.java | 3 ++-
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 3 ++-
.../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 5 ++---
.../com/datatorrent/lib/multiwindow/SortedMovingWindow.java | 3 ++-
.../com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java | 1 -
.../java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java | 1 -
.../com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java | 2 --
8 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java b/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
index d58e8ff..3494417 100644
--- a/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
+++ b/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
@@ -67,12 +67,10 @@ public class ApplicationTest
URI uri = URI.create("ws://localhost:" + connector[0].getLocalPort() + "/pubsub");
PubSubWebSocketOutputOperator<Object> outputOperator = new PubSubWebSocketOutputOperator<Object>();
- outputOperator.setName("testOutputOperator");
outputOperator.setUri(uri);
outputOperator.setTopic(conf.get("dt.application.MobileDemo.operator.QueryLocation.topic"));
PubSubWebSocketInputOperator<Map<String, String>> inputOperator = new PubSubWebSocketInputOperator<Map<String, String>>();
- inputOperator.setName("testInputOperator");
inputOperator.setUri(uri);
inputOperator.setTopic(conf.get("dt.application.MobileDemo.operator.LocationResults.topic"));
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
index 07bcaf5..1fbd45f 100644
--- a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import com.datatorrent.api.*;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.common.util.BaseOperator;
+import org.apache.commons.lang3.ClassUtils;
/**
* This an input operator which passes data from an asynchronous data source to a port processing thread.
@@ -60,7 +61,7 @@ public abstract class SimpleSinglePortInputOperator<T> extends BaseOperator impl
{
isActive = true;
if (this instanceof Runnable) {
- ioThread = new Thread((Runnable)this, "io-" + this.getName());
+ ioThread = new Thread((Runnable)this, "io-" + ClassUtils.getShortClassName(this.getClass()));
ioThread.start();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index a8cfa6e..69ebfa3 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -28,6 +28,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import javax.validation.constraints.NotNull;
+import org.apache.commons.lang3.ClassUtils;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
@@ -178,7 +179,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
public Thread newThread(Runnable r)
{
Thread t = new Thread(r);
- t.setName(WebSocketInputOperator.this.getName() + "-AsyncHttpClient-" + count++);
+ t.setName(ClassUtils.getShortClassName(this.getClass()) + "-AsyncHttpClient-" + count++);
return t;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index a7ab3bd..f46ccb8 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -19,8 +19,6 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.*;
-import javax.validation.constraints.NotNull;
-
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfigBean;
import com.ning.http.client.websocket.WebSocket;
@@ -32,6 +30,7 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.ClassUtils;
import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultInputPort;
@@ -193,7 +192,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator
public Thread newThread(Runnable r)
{
Thread t = new Thread(r);
- t.setName(WebSocketOutputOperator.this.getName() + "-AsyncHttpClient-" + count++);
+ t.setName(ClassUtils.getShortClassName(this.getClass()) + "-AsyncHttpClient-" + count++);
return t;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
index 84388e4..df4d482 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
@@ -28,6 +28,7 @@ import javax.validation.constraints.NotNull;
import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
import com.google.common.base.Function;
+import org.apache.commons.lang.ClassUtils;
/**
*
@@ -114,7 +115,7 @@ public class SortedMovingWindow<T, K> extends AbstractSlidingWindow<T, List<T>>
k = ((Comparable<T>) expiredTuple).compareTo(minElemInSortedList);
} else {
errorOutput.emit(expiredTuple);
- throw new IllegalArgumentException("Operator \"" + getName() + "\" encounters an invalid tuple " + expiredTuple + "\nNeither the tuple is comparable Nor Comparator is specified!");
+ throw new IllegalArgumentException("Operator \"" + ClassUtils.getShortClassName(this.getClass()) + "\" encounters an invalid tuple " + expiredTuple + "\nNeither the tuple is comparable Nor Comparator is specified!");
}
} else {
k = comparator.compare(expiredTuple, minElemInSortedList);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
index 3adf90b..a3f5dc0 100644
--- a/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
@@ -92,7 +92,6 @@ public class HttpJsonChunksInputOperatorTest
CollectorTestSink sink = new CollectorTestSink();
operator.outputPort.setSink(sink);
- operator.setName("testHttpInputNode");
operator.setUrl(new URI(url));
operator.setup(null);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
index 538b6b4..d8b3778 100644
--- a/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
@@ -80,7 +80,6 @@ public class HttpLinesInputOperatorTest
final HttpLinesInputOperator operator = new HttpLinesInputOperator();
CollectorTestSink<String> sink = TestUtils.setSink(operator.outputPort, new CollectorTestSink<String>());
- operator.setName("testHttpInputNode");
operator.setUrl(new URI(url));
operator.setup(null);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
index 4bfcf45..778524b 100644
--- a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
@@ -51,12 +51,10 @@ public class PubSubWebSocketOperatorTest
URI uri = URI.create("ws://localhost:" + connector[0].getLocalPort() + "/pubsub");
PubSubWebSocketOutputOperator<Object> outputOperator = new PubSubWebSocketOutputOperator<Object>();
- outputOperator.setName("testOutputOperator");
outputOperator.setUri(uri);
outputOperator.setTopic("testTopic");
PubSubWebSocketInputOperator<Object> inputOperator = new PubSubWebSocketInputOperator<Object>();
- inputOperator.setName("testInputOperator");
inputOperator.setUri(uri);
inputOperator.setTopic("testTopic");
[20/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1517 from sashadt/release-3.0
Posted by ch...@apache.org.
Merge pull request #1517 from sashadt/release-3.0
SPOI-5746 #resolve Correcting memory settings for Mobile demo to laun…
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/40d93121
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/40d93121
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/40d93121
Branch: refs/heads/master
Commit: 40d93121ead2133a8070ef23c452fc8c4d3b330d
Parents: ba8d612 d87dd50
Author: Thomas Weise <th...@gmail.com>
Authored: Thu Jul 30 19:02:23 2015 -0700
Committer: Thomas Weise <th...@gmail.com>
Committed: Thu Jul 30 19:02:23 2015 -0700
----------------------------------------------------------------------
demos/mobile/src/main/resources/META-INF/properties.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[34/50] [abbrv] incubator-apex-malhar git commit: Added default NOOP
instance for idempotency manager
Posted by ch...@apache.org.
Added default NOOP instance for idempotency manager
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/4dc4788f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/4dc4788f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/4dc4788f
Branch: refs/heads/master
Commit: 4dc4788f74178509eb01cc1d4402522601095dcd
Parents: 13a3fbe
Author: ishark <is...@datatorrent.com>
Authored: Tue Aug 11 15:10:01 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Tue Aug 11 15:10:01 2015 -0700
----------------------------------------------------------------------
contrib/pom.xml | 6 ------
.../contrib/rabbitmq/AbstractRabbitMQInputOperator.java | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4dc4788f/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 76e8144..9776e2f 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -565,11 +565,5 @@
<version>${dt.framework.version}</version>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>com.datatorrent</groupId>
- <artifactId>dt-engine</artifactId>
- <version>${dt.framework.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4dc4788f/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
index e408f5e..955a2c8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
@@ -111,6 +111,7 @@ public abstract class AbstractRabbitMQInputOperator<T> implements
currentWindowRecoveryState = new HashMap<Long, byte[]>();
pendingAck = new HashSet<Long>();
recoveredTags = new HashSet<Long>();
+ idempotentStorageManager = new IdempotentStorageManager.NoopIdempotentStorageManager();
}
[09/50] [abbrv] incubator-apex-malhar git commit: Remove unnecessary
import
Posted by ch...@apache.org.
Remove unnecessary import
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/bd84a40d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/bd84a40d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/bd84a40d
Branch: refs/heads/master
Commit: bd84a40d1b11327cb39f226ee5a805dc2a31296b
Parents: 0588626
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Jul 28 13:24:26 2015 -0700
Committer: Chandni Singh <ch...@datatorrent.com>
Committed: Tue Jul 28 13:45:24 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/bd84a40d/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
index 1ab63d0..52679bf 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.lib.db.AbstractStoreInputOperator;
[13/50] [abbrv] incubator-apex-malhar git commit: Fix category, tags,
properties, and display names for app builder.
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
index 0c2bd69..5aea7e1 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
@@ -25,7 +25,7 @@ import java.util.TreeMap;
* <b>Properties : </b> <br>
* <b> columnName : </b> Name of column for ordering tuples. <br>
* @displayName OrderBy Rule
- * @category Streamquery
+ * @category Stream Manipulators
* @tags orderby, sort, comparison
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
index 07f95f8..4759f31 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
@@ -25,7 +25,7 @@ package com.datatorrent.lib.streamquery;
* <b> isLeftJoin : </b> Left join flag. <br>
* <b> isFullJoin : </b> Full join flag. <br>
* @displayName Outer Join
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql, outer join operator
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
index 39d4133..bfce750 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
@@ -39,7 +39,7 @@ import com.datatorrent.lib.streamquery.function.FunctionIndex;
* <b> Properties : </b> <br>
* <b> functions : </b> Sql function for rows. <br>
* @displayName Select Function
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql top, sql limit, sql select operator
* @since 0.3.4
*/
@@ -50,7 +50,7 @@ public class SelectFunctionOperator implements Operator
* array of rows.
*/
private ArrayList<Map<String, Object>> rows;
-
+
/**
* Aggregate function for rows.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
index 9fcabc0..41fe364 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.streamquery.index.Index;
* <b> columns : </b> Column names/aggregate functions for select. <br>
* <br>
* @displayName Select
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql select operator, index, sql condition
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
index 9b97edf..a03e7dd 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
@@ -42,7 +42,7 @@ import com.datatorrent.api.Operator;
* <b> isPercentage : </b> top values count is percentage flag.
* <br>
* @displayName Select Top
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql select, sql top operator
* @since 0.3.4
*/
@@ -51,7 +51,7 @@ public class SelectTopOperator implements Operator
private ArrayList<Map<String, Object>> list;
private int topValue = 1;
private boolean isPercentage = false;
-
+
/**
* Input port that takes a map of <string,object>.
*/
@@ -62,19 +62,19 @@ public class SelectTopOperator implements Operator
list.add(tuple);
}
};
-
+
@Override
public void setup(OperatorContext context)
{
// TODO Auto-generated method stub
-
+
}
@Override
public void teardown()
{
// TODO Auto-generated method stub
-
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
index 83557f5..69ca3c3 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
@@ -40,22 +40,22 @@ import com.datatorrent.lib.streamquery.condition.Condition;
* <b> columns : </b> Column names/aggregate functions for select. <br>
* <br>
* @displayName Update
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql update operator, sql condition
* @since 0.3.3
*/
public class UpdateOperator extends BaseOperator
-{
+{
/**
* Update value map.
*/
Map<String, Object> updates = new HashMap<String, Object>();
-
+
/**
* condition.
*/
private Condition condition = null;
-
+
/**
* set condition.
*/
@@ -63,7 +63,7 @@ public class UpdateOperator extends BaseOperator
{
this.condition = condition;
}
-
+
/**
* Input port that takes a map of <string,object>.
*/
@@ -87,16 +87,16 @@ public class UpdateOperator extends BaseOperator
outport.emit(result);
}
};
-
+
/**
* Output port that emits a map of <string,object>.
*/
public final transient DefaultOutputPort<Map<String, Object>> outport = new DefaultOutputPort<Map<String, Object>>();
-
+
/**
* Add update value.
*/
- public void addUpdate(String name, Object value)
+ public void addUpdate(String name, Object value)
{
updates.put(name, value);
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
index 1bcf627..2214aaf 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
@@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
* <b> rightValue : </b> right range od column value. <br>
* <br>
* @displayName Between Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition
* @since 0.3.4
*/
@@ -37,33 +37,33 @@ public class BetweenCondition extends Condition
/**
* Column name to be checked.
*/
- @NotNull
+ @NotNull
private String column;
-
+
/**
* Left range value.
*/
@NotNull
private Object leftValue;
-
+
/**
* Right range value.
*/
@NotNull
private Object rightValue;
-
+
/**
* @param column Name of column, must be non null. <br>
* @param leftValue Left range for value, mut be non null. <br>
* @param rightValue right range for value, mut be non null. <br>
*/
- public BetweenCondition(@NotNull String column, @NotNull Object leftValue, @NotNull Object rightValue)
+ public BetweenCondition(@NotNull String column, @NotNull Object leftValue, @NotNull Object rightValue)
{
this.column = column;
this.leftValue = leftValue;
this.rightValue = rightValue;
}
-
+
/**
* Validate given row.
*/
@@ -80,7 +80,7 @@ public class BetweenCondition extends Condition
}
/**
- * Must not be called.
+ * Must not be called.
*/
@Override
public boolean isValidJoin(@NotNull Map<String, Object> row1, Map<String, Object> row2)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
index 82c16f8..981c95c 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
@@ -31,7 +31,7 @@ import javax.validation.constraints.NotNull;
* <b> logicalOr : </b> OR/AND logical metric flag. <br>
* <br>
* @displayName Compound Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition, logical
* @since 0.3.4
*/
@@ -42,18 +42,18 @@ public class CompoundCondition extends Condition
*/
@NotNull
private Condition leftCondition;
-
+
/**
* Right validate row condition .
*/
@NotNull
private Condition rightCondition;
-
+
/**
* AND/OR metric flag.
*/
private boolean logicalOr = true;
-
+
/**
* Constructor for logical or metric.
* @param leftCondition Left validate row condition, must be non null. <br>
@@ -63,7 +63,7 @@ public class CompoundCondition extends Condition
this.leftCondition = leftCondition;
this.rightCondition = rightCondition;
}
-
+
/**
* Constructor for logical and metric if logical and parameter is true.
* <br>
@@ -76,7 +76,7 @@ public class CompoundCondition extends Condition
this.rightCondition = rightCondition;
logicalOr = !isLogicalAnd;
}
-
+
@Override
public boolean isValidRow(Map<String, Object> row)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
index a45c985..4fa3321 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
@@ -20,11 +20,11 @@ import java.util.Map;
import javax.validation.constraints.NotNull;
/**
- * A base class for select condition for selecting or filtering the rows. Subclasses should provide the
+ * A base class for select condition for selecting or filtering the rows. Subclasses should provide the
implementation to filter valid rows and valid joins.
* <p>
* @displayName Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition, filter
* @since 0.3.3
*/
@@ -35,7 +35,7 @@ abstract public class Condition
* @return row validation status.
*/
abstract public boolean isValidRow(@NotNull Map<String, Object> row);
-
+
/**
* Filter valid rows only.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
index 08015b3..13d7ea7 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
@@ -20,14 +20,14 @@ import java.util.Map;
/**
- * An implementation of condition on column equality.
+ * An implementation of condition on column equality.
* <p>
* A valid row must have all key/value map in column name/value map.
*
* <b> Properties : </b> <br>
* <b> equalMap : </b> Column equal value map store.
* @displayName Equal Value Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition
* @since 0.3.4
*/
@@ -77,7 +77,7 @@ public class EqualValueCondition extends Condition
/**
* check valid join, not implemented
- *
+ *
* @return false
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
index dc4adef..5552f29 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
@@ -31,7 +31,7 @@ import com.datatorrent.lib.streamquery.function.FunctionIndex;
* <b> compareValue : </b> Value to be compared. <br>
* <b> compareType : </b> Type of comparison -1 == lt, 0 == eq, 1 == gt. <br>
* @displayName Having Compare Value
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags compare, sql condition
* @since 0.3.4
*/
@@ -42,12 +42,12 @@ public class HavingCompareValue<T extends Comparable> extends HavingCondition
* Value to be compared.
*/
private T compareValue;
-
+
/**
* Type of comparison -1 == lt, 0 == eq, 1 == gt.
*/
- private int compareType;
-
+ private int compareType;
+
/**
* @param aggregateIndex aggregate index for comparison. <br>
* @param compareValue Value to be compared. <br>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
index fc530ab..4be9032 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
@@ -23,11 +23,11 @@ import javax.validation.constraints.NotNull;
import com.datatorrent.lib.streamquery.function.FunctionIndex;
/**
- * A base class for Group,Having operator with aggregate index constraint.&nsbsp; Subclasses should provide the
+ * A base class for Group,Having operator with aggregate index constraint.&nsbsp; Subclasses should provide the
implementation to check if aggregate is valid.
* <p>
* @displayName Having Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition, index, group
* @since 0.3.4
*/
@@ -37,14 +37,14 @@ public abstract class HavingCondition
* Aggregate index to be validated.
*/
protected FunctionIndex aggregateIndex = null;
-
+
/**
* @param aggregateIndex Aggregate index to be validated.
*/
public HavingCondition(FunctionIndex aggregateIndex) {
this.aggregateIndex = aggregateIndex;
}
-
+
/**
* Check if aggregate is valid.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
index 5822a1c..6278b2a 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
@@ -29,30 +29,30 @@ import javax.validation.constraints.NotNull;
* <b> column : </b> Column name for which value is checked in values set. <br>
* <b> inValues : </b> Set of values in which column value is checked. <br>
* @displayName In Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition
* @since 0.3.4
*/
public class InCondition extends Condition
{
/**
- * Column name for which value is checked in values set.
+ * Column name for which value is checked in values set.
*/
@NotNull
private String column;
-
+
/**
* Set of values in which column value is checked.
*/
private Set<Object> inValues = new HashSet<Object>();
-
+
/**
* @param column Column name for which value is checked in values set.
*/
public InCondition(@NotNull String column) {
this.column = column;
}
-
+
@Override
public boolean isValidRow(@NotNull Map<String, Object> row)
{
@@ -75,9 +75,9 @@ public class InCondition extends Condition
{
this.column = column;
}
-
+
public void addInValue(Object value) {
this.inValues.add(value);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
index 8f6da2f..08a69b0 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull;
/**
- * An implementation of equal join condition class.
+ * An implementation of equal join condition class.
* <p>
* This compares values of given keys in both row data.
* <br>
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotNull;
* <b. equalkeys : </b> Keys for which value must be compared. <br>
* <br>
* @displayName Join Column Equal Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql condition, equal join
* @since 0.3.3
*/
@@ -38,18 +38,18 @@ public class JoinColumnEqualCondition extends Condition
{
/**
- * column names to be compared.
+ * column names to be compared.
*/
@NotNull
private String column1;
@NotNull
private String column2;
-
+
public JoinColumnEqualCondition(@NotNull String column1,@NotNull String column2) {
this.column1 = column1;
this.column2 = column2;
}
-
+
/**
* Must never be called.
*/
@@ -61,7 +61,7 @@ public class JoinColumnEqualCondition extends Condition
}
/**
- *
+ *
*/
@Override
public boolean isValidJoin(Map<String, Object> row1, Map<String, Object> row2)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
index d5a0068..73c3405 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
@@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull;
*<b> column : < /b> Column to be matched with regular expression. <br>
*<b> pattern : </b> Regular expression pattern.<br>
* @displayName Like Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
* @tags sql, like condition, regular expression
* @since 0.3.4
*/
@@ -40,13 +40,13 @@ public class LikeCondition extends Condition
*/
@NotNull
private String column;
-
+
/**
* Regular expression pattern.
*/
@NotNull
private Pattern pattern;
-
+
/**
* @param column Column to be matched with regular expression, must be non-null.
* @param pattern Regular expression pattern, must be non-null.
@@ -55,9 +55,9 @@ public class LikeCondition extends Condition
setColumn(column);
setPattern(pattern);
}
-
+
/**
- * For valid row column value string must match regular expression.
+ * For valid row column value string must match regular expression.
* @return row valid status.
*/
@Override
@@ -70,7 +70,7 @@ public class LikeCondition extends Condition
}
/**
- * Must not be called.
+ * Must not be called.
*/
@Override
public boolean isValidJoin(Map<String, Object> row1, Map<String, Object> row2)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
index 484601c..b64996d 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
@@ -31,17 +31,17 @@ import org.apache.commons.lang.StringUtils;
* <b> column : </b> Aggregate over given column values. <br>
* <b> alias : </b> Alias name for aggregate output. <br>
* @displayName Average Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql average
* @since 0.3.4
*/
public class AverageFunction extends FunctionIndex
{
/**
- * @param column Aggregate over given column values, must be non null.
+ * @param column Aggregate over given column values, must be non null.
* @param alias Alias name for aggregate output.
*/
- public AverageFunction(@NotNull String column, String alias)
+ public AverageFunction(@NotNull String column, String alias)
{
super(column, alias);
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
index 0bb4992..65bb03b 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
@@ -32,14 +32,14 @@ import org.apache.commons.lang.StringUtils;
* <b> column : </b> column name for values count. <br>
* <b> alias : </b> Alias name for aggregate output. <br>
* @displayName Count Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql count
* @since 0.3.4
*/
public class CountFunction extends FunctionIndex
{
/**
- * @param column column for values count, must be non null.
+ * @param column column for values count, must be non null.
* @param alias Alias name for aggregate output.
*/
public CountFunction(@NotNull String column, String alias)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
index 37e6fc2..d0e8ead 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils;
* <b> alias : </b> Alias name for output. <br>
* <b> isFirst : </b> return first value if true.
* @displayName First Last Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql first, sql last
* @since 0.3.4
*/
@@ -42,7 +42,7 @@ public class FirstLastFunction extends FunctionIndex
* return first value if true.
*/
private boolean isFirst;
-
+
/**
* @param column column name for first/last value.
* @param alias Alias name for output.
@@ -53,7 +53,7 @@ public class FirstLastFunction extends FunctionIndex
super(column, alias);
isFirst = !isLast;
}
-
+
/**
* Get first/last non null value for column.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
index 6fbfcbf..0330a0e 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
@@ -21,54 +21,54 @@ import java.util.Map;
import javax.validation.constraints.NotNull;
/**
- * A base class for select aggregate function implementation. Subclasses should provide the
- implementation for aggregate compute functions.
+ * A base class for select aggregate function implementation. Subclasses should provide the
+ implementation for aggregate compute functions.
* <p>
* <br>
* <b>Properties : </b> <br>
* <b>column : </b> Column name for aggregation.
* <b>alias : </b> Output value alias name.
* @displayName Function Index
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql aggregate
* @since 0.3.4
*/
-abstract public class FunctionIndex
+abstract public class FunctionIndex
{
/**
* Column name.
*/
@NotNull
protected String column;
-
+
/**
* Alias name.
*/
protected String alias;
-
+
/**
* @param column Column name for aggregation.
* @param alias Output value alias name.
*/
- public FunctionIndex(@NotNull String column, String alias)
+ public FunctionIndex(@NotNull String column, String alias)
{
this.column = column;
this.alias = alias;
}
-
+
/**
* Aggregate compute function, implementation in sub class.
* @param rows Tuple list over application window.
* @return aggregate result object.
*/
abstract public Object compute(@NotNull ArrayList<Map<String, Object>> rows) throws Exception;
-
+
/**
* Get aggregate output value name.
* @return name string.
*/
abstract protected String aggregateName();
-
+
/**
* Apply compute function to given rows and store result in collect by output value name.
* @param rows Tuple list over application window.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
index 06d6f51..3020428 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils;
* <b> alias : </b> Alias name for output value. <br>
* <b> isMax : </b> Flag to indicate max/min compute value. <br>
* @displayName Max Min Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql max, sql min
* @since 0.3.4
*/
@@ -42,7 +42,7 @@ public class MaxMinFunction extends FunctionIndex
* Flag to indicate max/min compute value, compute max if true.
*/
private boolean isMax = true;
-
+
/**
* @param column column name for values max/min computation. <br>
* @param alias Alias name for output. <br>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
index ef33d21..5603f60 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
* <p> An implementation of sql sum function. </p>
* <p>
* @displayName Sum Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
* @tags sql sum, aggregate
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
index 00e50fb..1baa2ed 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
@@ -19,11 +19,11 @@ import javax.validation.constraints.NotNull;
/**
- * Abstract class to filter row by binary expression index.
+ * Abstract class to filter row by binary expression index.
* <p>
* Sub class will implement filter/getExpressionName functions.
* @displayName Binary Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags alias
* @since 0.3.4
*/
@@ -34,13 +34,13 @@ abstract public class BinaryExpression implements Index
*/
@NotNull
protected String left;
-
+
/**
* Right column name argument for expression.
*/
@NotNull
protected String right;
-
+
/**
* Alias name for output field.
*/
@@ -51,7 +51,7 @@ abstract public class BinaryExpression implements Index
* @param Right column name argument for expression.
* @param Alias name for output field.
*/
- public BinaryExpression(@NotNull String left, @NotNull String right, String alias)
+ public BinaryExpression(@NotNull String left, @NotNull String right, String alias)
{
this.left = left;
this.right = right;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
index 5323264..c466835 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
* <p>An implementation of an index that overrides filter method on basis on columns. </p>
* <p>
* @displayName Column Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags alias
* @since 0.3.4
*/
@@ -39,7 +39,7 @@ public class ColumnIndex implements Index
public ColumnIndex()
{
}
-
+
public ColumnIndex(@NotNull String column, String alias)
{
this.setColumn(column);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
index 0529fd7..b50739e 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
* Interface to define sql select statement indexes for column names,aggregate.
* <p>
* @displayName Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags index
* @since 0.3.2
*/
@@ -32,5 +32,5 @@ public interface Index
/**
* Function can key/value hash map, does metric implemented by sub class.
*/
- public void filter(@NotNull Map<String,Object> row, @NotNull Map<String, Object> collect);
+ public void filter(@NotNull Map<String,Object> row, @NotNull Map<String, Object> collect);
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
index 63cd7b0..6e664d8 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
* <p>An implementation of Column Index that implements filter method based on mid index. </p>
* <p>
* @displayName Mid Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags index
* @since 0.3.4
*/
@@ -31,12 +31,12 @@ public class MidIndex extends ColumnIndex
{
private int start;
private int length = 0;
-
+
public MidIndex(@NotNull String column, String alias, int start)
{
super(column, alias);
assert(start >= 0);
- this.start = start;
+ this.start = start;
}
@Override
@@ -48,7 +48,7 @@ public class MidIndex extends ColumnIndex
}
String name = getColumn();
if (alias != null) name = alias;
-
+
int endIndex = start + length;
if ((length == 0)||(endIndex > ((String)row.get(column)).length())) {
collect.put(name, row.get(column));
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
index a2e900b..356d2ea 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.Null;
* An implementation of Unary Expression that implements filter method using negate metric sql semantic on column value.
* <p>
* @displayName Negate Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags expression, alias
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
index 587888c..2b6c0d7 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
@@ -21,9 +21,9 @@ import javax.validation.constraints.NotNull;
/**
* <p>An implementation of column index that implements filter method using Round Double Index. </p>
- *
+ *
* @displayName Round Double Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags alias, maths
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
index 49ddf11..56fbb25 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
@@ -21,15 +21,15 @@ import javax.validation.constraints.NotNull;
/**
* <p>An implementation of Column Index that implements filter method using case of a string index. </p>
- *
+ *
* @displayName String Case Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags alias
* @since 0.3.4
*/
public class StringCaseIndex extends ColumnIndex
{
- private boolean toUpperCase = true;
+ private boolean toUpperCase = true;
public StringCaseIndex(@NotNull String column, String alias, boolean toLowerCase)
{
super(column, alias);
@@ -43,7 +43,7 @@ public class StringCaseIndex extends ColumnIndex
if (!(row.get(column) instanceof String)) {
assert(false);
}
-
+
String name = getColumn();
if (alias != null) name = alias;
if (toUpperCase) {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
index 72ff067..3cfc650 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
* <p>An implementation of Column Index that implements filter method using length of a string Index. </p>
* <p>
* @displayName String Length Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags alias
* @since 0.3.4
*/
@@ -41,7 +41,7 @@ public class StringLenIndex extends ColumnIndex
if (!(row.get(column) instanceof String)) {
assert(false);
}
-
+
String name = getColumn();
if (alias != null) name = alias;
collect.put(name, ((String)row.get(column)).length());
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
index ad7af0f..aceae5c 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
@@ -21,11 +21,11 @@ import javax.validation.constraints.NotNull;
/**
- * Implements sum on column index.
+ * Implements sum on column index.
* <p>
* Select index class for implementing sum column index.
* @displayName Sum Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags sum
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
index 0e08be9..49223cd 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
@@ -19,12 +19,12 @@ import javax.validation.constraints.NotNull;
/**
- * A base implementation of an index that filters row by unary expression. Subclasses should provide the
+ * A base implementation of an index that filters row by unary expression. Subclasses should provide the
implementation of filter/getExpressionName functions.
* <p>
* Sub class will implement filter/getExpressionName functions.
* @displayName Unary Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
* @tags unary, alias
* @since 0.3.4
*/
@@ -35,7 +35,7 @@ abstract public class UnaryExpression implements Index
*/
@NotNull
protected String column;
-
+
/**
* Alias name for output field.
*/
@@ -45,7 +45,7 @@ abstract public class UnaryExpression implements Index
* @param Column name argument for unary expression.
* @param Alias name for output field.
*/
- public UnaryExpression(@NotNull String column, String alias)
+ public UnaryExpression(@NotNull String column, String alias)
{
this.column = column;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
index b6f946b..4910fdd 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
@@ -22,10 +22,10 @@ import java.util.HashMap;
import org.apache.commons.lang.mutable.MutableInt;
/**
- * A sink implementation to collect expected test results in a HashMap.
+ * A sink implementation to collect expected test results in a HashMap.
* <p>
* @displayName ArrayList Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags sink
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
index 75d90c1..093bec5 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
@@ -21,10 +21,10 @@ import java.util.ArrayList;
import java.util.List;
/**
- * A sink implementation to collect expected test results.
+ * A sink implementation to collect expected test results.
* <p>
* @displayName Collector Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags sink
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java b/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
index 364ff4a..d314890 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
@@ -26,7 +26,7 @@ import com.datatorrent.api.DefaultOutputPort;
* <p>Implements Compare Filter Tuples class.</p>
* <p>
* @displayName Compare Filter Tuples
- * @category Testbench
+ * @category Test Bench
* @tags map, compare
* @since 0.3.2
*/
@@ -35,7 +35,7 @@ public class CompareFilterTuples<k> extends BaseOperator
// Compare type function
private Compare compareType = Compare.Equal;
public enum Compare { Smaller, Equal, Greater }
-
+
/**
* Compare the incoming value with the Property value.
* @param type Compare
@@ -44,17 +44,17 @@ public class CompareFilterTuples<k> extends BaseOperator
{
compareType = type;
}
-
- // compare value
+
+ // compare value
private int value;
public void setValue(int value)
{
this.value = value;
}
-
+
// Collected result tuples
private Map<k, Integer> result;
-
+
/**
* Input port that takes a map of integer values.
*/
@@ -63,34 +63,34 @@ public class CompareFilterTuples<k> extends BaseOperator
public void process(Map<k, Integer> map) {
for(Map.Entry<k, Integer> entry : map.entrySet())
{
- if ( compareType == Compare.Equal ) if(entry.getValue().intValue() == value) result.put(entry.getKey(), entry.getValue());
- if ( compareType == Compare.Greater ) if(entry.getValue().intValue() > value) result.put(entry.getKey(), entry.getValue());
- if ( compareType == Compare.Smaller ) if(entry.getValue().intValue() < value) result.put(entry.getKey(), entry.getValue());
+ if ( compareType == Compare.Equal ) if(entry.getValue().intValue() == value) result.put(entry.getKey(), entry.getValue());
+ if ( compareType == Compare.Greater ) if(entry.getValue().intValue() > value) result.put(entry.getKey(), entry.getValue());
+ if ( compareType == Compare.Smaller ) if(entry.getValue().intValue() < value) result.put(entry.getKey(), entry.getValue());
}
}
};
-
+
/**
* Output port that emits a map of integer values.
*/
public final transient DefaultOutputPort<Map<k, Integer>> outport = new DefaultOutputPort<Map<k, Integer>>();
-
+
/**
* Output redis port that emits a map of <integer,string> values.
*/
public final transient DefaultOutputPort<Map<Integer, String>> redisport = new DefaultOutputPort<Map<Integer, String>>();
-
+
@Override
public void beginWindow(long windowId)
{
result = new HashMap<k, Integer>();
}
-
+
@Override
public void endWindow()
{
outport.emit(result);
-
+
int numOuts = 1;
Integer total = 0;
for (Map.Entry<k, Integer> entry : result.entrySet())
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
index cace693..9b2f0d8 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
@@ -16,10 +16,10 @@
package com.datatorrent.lib.testbench;
/**
- * A sink implementation to collect expected test results.
+ * A sink implementation to collect expected test results.
* <p>
* @displayName Count And Last Tuple Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags count, sink
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java b/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
index 220b8c3..508b094 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
@@ -28,7 +28,7 @@ import com.datatorrent.api.Context.OperatorContext;
* <p>A base implementation of an operator which does count occurrence.</p>
* <p>
* @displayName Count Occurrence
- * @category Testbench
+ * @category Test Bench
* @tags count
* @since 0.3.2
*/
@@ -63,22 +63,22 @@ public class CountOccurance<k> extends BaseOperator
{
collect = new HashMap<k, Integer>();
}
-
+
/**
* Output port that emits a map of integer values.
*/
public final transient DefaultOutputPort<Map<k, Integer>> outport = new DefaultOutputPort<Map<k, Integer>>();
-
+
/**
* Output dimensions port that emits a map of <string,object> values.
*/
public final transient DefaultOutputPort<Map<String, Object>> dimensionOut = new DefaultOutputPort<Map<String, Object>>();
-
+
/**
* Output total port that emits a map of <string,integer> count values.
*/
public final transient DefaultOutputPort<Map<String,Integer>> total = new DefaultOutputPort<Map<String,Integer>>();
-
+
@Override
public void endWindow()
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
index 3fc9c8e..05c70ae 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
@@ -19,7 +19,7 @@ package com.datatorrent.lib.testbench;
* A sink implementation to count expected test results.
* <p>
* @displayName Count Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags count, sink
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
index 5ab226a..d703ecb 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
@@ -58,7 +58,7 @@ import java.util.Random;
* <b>Benchmarks</b>: This node has been benchmarked at over 5 million tuples/second in local/inline mode<br>
* <p>
* @displayName Event Classifier
- * @category Testbench
+ * @category Test Bench
* @tags hashmap,classification
* @since 0.3.2
*/
@@ -116,7 +116,7 @@ public class EventClassifier extends BaseOperator
}
}
};
-
+
/**
* Output data port that emits a hashmap of <string,double>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
index ef5c83e..cb3717a 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* <br>
* <b>Benchmarks</b>: This node has been benchmarked at over 5 million tuples/second in local/inline mode<br>
* @displayName Event Classifier Number To HashDouble
- * @category Testbench
+ * @category Test Bench
* @tags number, classifier
* @since 0.3.2
*/
@@ -79,7 +79,7 @@ public class EventClassifierNumberToHashDouble<K extends Number> extends BaseOpe
}
}
};
-
+
/**
* Output data port that emits a hashmap of <string,double>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
index 12d02d6..97a848f 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
@@ -64,24 +64,24 @@ import com.datatorrent.api.InputOperator;
* String schema does about 26 Million tuples/sec in throughput<br>
* HashMap schema does about 10 Million tuples/sec in throughput<br>
* @displayName Event Generator
- * @category Testbench
+ * @category Test Bench
* @tags input operator, generator
* @since 0.3.2
*/
public class EventGenerator implements InputOperator
{
private static final Logger LOG = LoggerFactory.getLogger(EventGenerator.class);
-
+
/**
* Output string port that emits string data.
*/
public final transient DefaultOutputPort<String> string_data = new DefaultOutputPort<String>();
-
+
/**
* Output hash data port that emits a hashmap of <string,double>.
*/
public final transient DefaultOutputPort<HashMap<String, Double>> hash_data = new DefaultOutputPort<HashMap<String, Double>>();
-
+
/**
* Output count port that emits a hashmap of <string,number> which contains per window count of throughput.
*/
@@ -239,9 +239,9 @@ public class EventGenerator implements InputOperator
public void teardown()
{
}
-
+
/**
- * Maximum number of Windows for this operation to run.
+ * Maximum number of Windows for this operation to run.
* @param i
*/
public void setMaxCountOfWindows(int i)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java b/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
index fca98df..9501322 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Creates a random movement by taking in a seed stream and incrementing this data.
+ * Creates a random movement by taking in a seed stream and incrementing this data.
* <p>
* Takes in a seed stream on port seed and then increments this data on port increment. Data is immediately emitted on output port data.
* Emits number of tuples on port count<p>
@@ -52,7 +52,7 @@ import java.util.Map;
* Processing tuples on increment port are at 10 Million tuples/sec<br>
* <br>
* @displayName Event Incrementer
- * @category Testbench
+ * @category Test Bench
* @tags increment, hashmap
* @since 0.3.2
*/
@@ -86,7 +86,7 @@ public class EventIncrementer extends BaseOperator
}
}
};
-
+
/**
* Input increment port that takes a hashmap of <string,hashmap of <string,number>> which provides small random increments to the seed data.
*/
@@ -124,12 +124,12 @@ public class EventIncrementer extends BaseOperator
}
}
};
-
+
/**
* Output data port that emits a hashmap of <string,string> which is the addition of seed and increment.
*/
public final transient DefaultOutputPort<HashMap<String, String>> data = new DefaultOutputPort<HashMap<String, String>>();
-
+
/**
* Output count port that emits a hashmap of <string,integer> which contains number of processed tuples per window.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
index 5b4ca31..ee48836 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
@@ -52,7 +52,7 @@ import java.util.Random;
* <br>
* </p>
* @displayName Filter Classifier
- * @category Testbench
+ * @category Test Bench
* @tags filter
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
index 7c5b5c8..5201f66 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
@@ -63,7 +63,7 @@ import java.util.Random;
* This node has been benchmarked at over 20 million tuples/second in local/inline mode<br>
* </p>
* @displayName Filtered Event Classifier
- * @category Testbench
+ * @category Test Bench
* @tags filter
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
index 4f2860d..5e2db89 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang.mutable.MutableInt;
* A sink implementation, which counts the number of times each tuples is collected and stores the results in a hash map.
* <p></p>
* @displayName Hash Count Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags sink, count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java b/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
index 12c10ce..d1c63f3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
@@ -30,7 +30,7 @@ import com.datatorrent.api.Context.OperatorContext;
* At the end of the application window each key and the number of times it occurred is emitted.
* <p></p>
* @displayName HTTP Status Filter
- * @category Testbench
+ * @category Test Bench
* @tags filter, count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java b/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
index 7ad8a12..48d1d5f 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
@@ -28,7 +28,7 @@ import com.datatorrent.api.Context.OperatorContext;
* In each application window the values for each key are summed and each string/sum pair is emitted at the end of each window.
* <p></p>
* @displayName Key Val Sum
- * @category Testbench
+ * @category Test Bench
* @tags count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
index 6fa693a..2b6c3c3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
@@ -54,7 +54,7 @@ import javax.validation.constraints.Min;
* Compile time error checking includes<br>
* </p>
* @displayName Random Event Generator
- * @category Testbench
+ * @category Test Bench
* @tags generate
* @since 0.3.2
*/
@@ -127,7 +127,7 @@ public class RandomEventGenerator extends BaseOperator implements InputOperator
}
/**
- * Maximum number of Windows across which this operator will work.
+ * Maximum number of Windows across which this operator will work.
* @param i
*/
public void setMaxCountOfWindows(int i)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
index 4d24486..f398cb3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.Min;
/**
* This is an input operator which generates random tuples that are an array of bytes.
- *
+ * @category Test Bench
* @since 2.0.0
*/
public class RandomWordGenerator implements InputOperator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java b/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
index 37252f6..236a675 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
@@ -27,8 +27,8 @@ import com.datatorrent.api.Context.OperatorContext;
/**
* This operator collects integer tuples, then emits their sum at the end of the window.
*
- * @displayName Redis Sum Oper
- * @category Testbench
+ * @displayName Redis Sum Operator
+ * @category Test Bench
* @tags count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
index e362038..1dcea6b 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
@@ -65,7 +65,7 @@ import javax.validation.constraints.NotNull;
* Integer: Benchmarked at over 7 million tuples/second in local/in-line mode<br>
* </p>
* @displayName Seed Event Classifier
- * @category Testbench
+ * @category Test Bench
* @tags generate
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
index 6863045..b57077e 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* Without key: Benchmarked at over 4 million tuples/second in local/in-line mode<br>
* </p>
* @displayName Seed Event Generator
- * @category Testbench
+ * @category Test Bench
* @tags generate
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
index a57e895..79c3447 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
@@ -21,7 +21,7 @@ import com.datatorrent.api.Sink;
* A sink implementation which collects Number tuples and sums their values.
* <p></p>
* @displayName Sum Test Sink
- * @category Testbench
+ * @category Test Bench
* @tags numeric
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java b/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
index 91112e9..f362362 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* Benchmarked at over 17 million tuples/second in local/in-line mode<br>
* </p>
* @displayName Throughput Counter
- * @category Testbench
+ * @category Test Bench
* @tags count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java b/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
index de6e151..cb53c17 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
@@ -29,7 +29,7 @@ import com.datatorrent.api.DefaultOutputPort;
* If the value of a pair is greater than the specified threshold then the tuple is emitted.
* <p></p>
* @displayName Top Occurrence
- * @category Testbench
+ * @category Test Bench
* @tags numeric, compare
* @since 0.3.2
*/
@@ -120,7 +120,7 @@ public class TopOccurrence extends BaseOperator
/**
* Output n top values
- * @param n
+ * @param n
*/
public void setN(int n)
{
@@ -134,7 +134,7 @@ public class TopOccurrence extends BaseOperator
/**
* Emit the tuples only if it's value is greater than the threshold.
- * @param threshold
+ * @param threshold
*/
public void setThreshold(int threshold)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
index 5547d2b..43e98f9 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;
* <b>data</b>: expects String<br>
* </p>
* @displayName Base Line Tokenizer
- * @category Stream Manipulator
+ * @category Stream Manipulators
* @tags string
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
index 7887df9..6611650 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
@@ -128,6 +128,19 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
return ret;
}
+ /**
+ * The comparator function to use.
+ * @param type The comparator function to user.
+ */
+ public void setType(ComparatorFunction type)
+ {
+ this.comparator = type;
+ }
+
+ /**
+ * The comparator function.
+ * @return The comparator function.
+ */
public ComparatorFunction getType()
{
return comparator;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java b/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
index 6163b55..49387ff 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
@@ -39,7 +39,7 @@ public class BaseNumberValueOperator<V extends Number> extends BaseKeyOperator<V
@NotNull
protected V_TYPE type = V_TYPE.DOUBLE;
- public V_TYPE getType()
+ public V_TYPE getVType()
{
return type;
}
@@ -50,6 +50,16 @@ public class BaseNumberValueOperator<V extends Number> extends BaseKeyOperator<V
}
/**
+ * Gets the type.
+ * @omitFromUI
+ * @return The type.
+ */
+ public V_TYPE getType()
+ {
+ return type;
+ }
+
+ /**
* This call ensures that type enum is set at setup time. At run time a switch statement suffices
* If you derive your
* @param ctype the type to set the operator to
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java b/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
index f3d999a..430e349 100644
--- a/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
* and the emitted map's values are another map from value fields to and accumulated value.
* <p></p>
* @displayName Dimension Time Bucket Sum
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags count, key value, numeric
* @since 0.3.2
*/
[14/50] [abbrv] incubator-apex-malhar git commit: Fix category, tags,
properties, and display names for app builder.
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
index 0f57062..ee59aa7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
@@ -27,8 +27,8 @@ import java.net.Socket;
* The output operator for Splunk, which writes to a TCP port on which splunk server is configured.
* <p></p>
* @displayName Splunk TCP Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags splunk
* @since 1.0.4
*/
public class SplunkTcpOutputOperator<T> extends AbstractStoreOutputOperator<T, SplunkStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java b/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
index e7b4502..1bb12c6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
@@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory;
* This is an SQLite input operator.
* <p></p>
* @displayName Sqlite Stream
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags sqlite
* @since 0.3.2
*/
public class SqliteStreamOperator extends AbstractSqlStreamOperator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/algo/FilterKeysHashMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FilterKeysHashMap.java b/library/src/main/java/com/datatorrent/lib/algo/FilterKeysHashMap.java
index 16559a3..8d34519 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FilterKeysHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FilterKeysHashMap.java
@@ -52,7 +52,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
* </p>
*
* @displayName Filter Keyval Pairs By Key HashMap
- * @category Algorithmic
+ * @category Stream Manipulators
* @tags filter, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/algo/FirstMatchMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FirstMatchMap.java b/library/src/main/java/com/datatorrent/lib/algo/FirstMatchMap.java
index d2d97af..bc7ee66 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FirstMatchMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FirstMatchMap.java
@@ -56,7 +56,7 @@ import com.datatorrent.lib.util.BaseMatchOperator;
* </p>
*
* @displayName Emit First Match (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, numeric
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/algo/FirstTillMatch.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FirstTillMatch.java b/library/src/main/java/com/datatorrent/lib/algo/FirstTillMatch.java
index a0fcfad..13bec8c 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FirstTillMatch.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FirstTillMatch.java
@@ -54,7 +54,7 @@ import com.datatorrent.lib.util.BaseMatchOperator;
* </p>
*
* @displayName Emit Keyval Pairs Until Match (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, numeric
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java b/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
index aafaa61..5d04e80 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
@@ -58,7 +58,7 @@ import com.datatorrent.lib.util.UnifierHashMap;
* </p>
*
* @displayName Emit Matching Keval Pairs (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, numeric
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java b/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
index b5900f0..02959d2 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
@@ -47,7 +47,7 @@ import com.datatorrent.api.annotation.Stateless;
*
* @param <K>Type of Key objects</K>
* @displayName Unique Values Per Key
- * @category Algorithmic
+ * @category Stream Manipulators
* @tags count, key value
* @since 0.3.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
index 5496763..9bd71d1 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
@@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory;
* This operator accepts a list of Map<String,Object> objects, and serves the data under the {@link SnapshotSchema}.
* Each Map represents a row in the table, and the full list of maps represents a table.
* @displayName App Data Snapshot Map Server
- * @category App Data
- * @tags appdata, snapshot, map
+ * @category DT View Integration
+ * @tags app data, snapshot, map
*/
public class AppDataSnapshotServerMap extends AbstractAppDataSnapshotServer<Map<String, Object>>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
index 7f397ab..df8a6ea 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
@@ -30,7 +30,7 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils;
* This operator accepts a list of POJOs, and serves the data under the {@link SnapshotSchema}.
* Each POJO represents a row in the table, and the full list of POJOs represents a table.
* @displayName App Data Snapshot POJO Server
- * @category Output
+ * @category DT View Integration
* @tags app data, snapshot, pojo
*/
@Evolving
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
index 965ed4d..7fc846a 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
@@ -22,7 +22,7 @@ package com.datatorrent.lib.db;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Aggregate Transactionable Store Output
- * @category Store
+ * @category Output
* @tags transactional, output operator, key value
*
* @param <T> The tuple type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
index 5128bca..1608215 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
@@ -22,7 +22,7 @@ package com.datatorrent.lib.db;
* Subclasses should implement that method which stores the aggregate state of the operator in the store.
* <p></p>
* @displayName Abstract Aggregate Transactionable Store Output
- * @category Store
+ * @category Output
* @tags transactional, output operator
*
* @param <T> The tuple type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
index fb9f392..2f67ca4 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
@@ -24,7 +24,7 @@ import com.google.common.collect.Lists;
* All the writes to the store over an application window are sent in one batch.
* <p></p>
* @displayName Abstract Batch Transactionable Store Output
- * @category Store
+ * @category Output
* @tags transactional, output operator
*
* @param <T> The tuple type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
index 178dfb5..786ba4c 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
@@ -24,8 +24,8 @@ import java.util.*;
* The default behavior is to get all the values using the keys from the store for each window. Subclasses are free to override this behavior.
* </p>
* @displayName Abstract Key Value Store Input
- * @category Store
- * @tags input operator, key value
+ * @category Input
+ * @tags key value
*
* @param <T> The tuple type.
* @param <S> The store type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
index dfc8ed1..e13ec64 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
@@ -24,8 +24,8 @@ package com.datatorrent.lib.db;
* come and commit the transaction at end window.
* </p>
* @displayName Abstract Pass Through Transactionable Key Value Store Output
- * @category Store
- * @tags output operator, key value, transactional
+ * @category Outupt
+ * @tags key value, transactional
*
* @param <T> The tuple type
* @param <S> The store type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
index d7a933a..b0827dc 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
@@ -24,8 +24,8 @@ package com.datatorrent.lib.db;
* come and commit the transaction at end window.
* </p>
* @displayName Abstract Pass Through Transactionable Store Output
- * @category Store
- * @tags transactional, output operator
+ * @category Output
+ * @tags transactional
*
* @param <T> The tuple type
* @param <S> The store type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
index cfa8440..86844f4 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
@@ -26,8 +26,7 @@ import com.datatorrent.api.InputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Store Input
- * @category Store
- * @tags input operator
+ * @category Input
*
* @param <T> The tuple type
* @param <S> The store type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
index 291d780..18f5659 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
@@ -29,8 +29,7 @@ import com.datatorrent.api.annotation.InputPortFieldAnnotation;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Store Output
- * @category Store
- * @tags output operator
+ * @category Output
*
* @param <T> The tuple type
* @param <S> The store type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
index ee1a0c6..35997c6 100644
--- a/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
@@ -33,8 +33,8 @@ import com.datatorrent.api.annotation.InputPortFieldAnnotation;
* For non-idempotent operations (incrementing values in the store, etc).
* <p></p>
* @displayName Abstract Transactionable Store Output
- * @category Store
- * @tags transactional, output operator
+ * @category Output
+ * @tags transactional
*
* @param <T> The type of the tuple
* @param <S> The store type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java b/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
index 9e18fd8..9446267 100644
--- a/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
@@ -43,7 +43,7 @@ import com.datatorrent.lib.util.KeyValPair;
* </ul>
* </p>
* @displayName Abstract DB Lookup Cache Backed
- * @category Database
+ * @category Input
* @tags cache, key value
*
* @param <T> type of tuples
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
index eb4a1ea..61ad18b 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
@@ -28,8 +28,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* Subclasses should implement the method which provides the insertion command.
* <p></p>
* @displayName Abstract JDBC Non Transactionable Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags jdbc
*
* @param <T> The kind of tuples that are being processed
* @since 1.0.4
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
index 72255b7..0fcedd4 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
@@ -46,8 +46,8 @@ import com.datatorrent.lib.db.AbstractPassThruTransactionableStoreOutputOperator
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract JDBC Transactionable Output
- * @category Database
- * @tags output operator, transactional
+ * @category Output
+ * @tags transactional
*
* @param <T> type of tuple
* @since 0.9.4
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
index aeb3bf7..8f16f61 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
@@ -35,7 +35,7 @@ import com.datatorrent.lib.db.cache.AbstractDBLookupCacheBackedOperator;
* Subclasses should implement the methods which are required to insert and retrieve data from the database.
* <p></p>
* @displayName JDBC Lookup Cache Backed
- * @category Database
+ * @category Input
* @tags cache, key value
*
* @param <T> type of input tuples </T>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
index 4ca6b0d..6118f2b 100644
--- a/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
@@ -49,7 +49,7 @@ import com.datatorrent.lib.io.fs.AbstractFileInputOperator;
* @param <T> type of tuple.
* @displayName FTP Directory Input
* @category Input
- * @tags ftp, input operator
+ * @tags ftp
*
* @since 2.0.0
*/
@@ -170,6 +170,10 @@ public abstract class AbstractFTPInputOperator<T> extends AbstractFileInputOpera
/**
* An {@link AbstractFTPInputOperator} that splits file into lines and emits them.
+ *
+ * @displayName FTP String Input
+ * @category Input
+ * @tags ftp
*/
public static class FTPStringInputOperator extends AbstractFTPInputOperator<String>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
index f1e8ba5..8cdf004 100644
--- a/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
@@ -33,9 +33,9 @@ import com.datatorrent.lib.util.KeyValPair;
* Subclasses must implement the methods used to retrieve data from and put data into the store,
* they must also implement the methods which handle transactions.
* <p></p>
- * @displayName Abstract Keyval Store Input
- * @category Store
- * @tags key value, input operator
+ * @displayName Abstract Keyval Store Output
+ * @category Output
+ * @tags key value
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
index 4f80b3d..81fb076 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
@@ -32,8 +32,8 @@ import com.datatorrent.common.util.PubSubMessage;
* App Data dashboards and forward queries to App Data store operators.
*
* @displayName App Data Pub Sub Query
- * @category App Data
- * @tags input, appdata, query, dashboards
+ * @category DT View Integration
+ * @tags input, app data, query
*/
public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<String> implements AppData.ConnectionInfoProvider
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
index 5674d5c..12496a9 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
@@ -31,8 +31,8 @@ import com.datatorrent.common.util.PubSubMessage.PubSubMessageType;
* App Data dashboards produced by App Data store operators.
*
* @displayName App Data Pub Sub Result
- * @category App Data
- * @tags output, appdata, result, dashboards
+ * @category DT View Integration
+ * @tags output, app data, result
*/
@AppData.AppendQueryIdToTopic(value=true)
public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<String> implements AppData.ConnectionInfoProvider
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java b/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
index 6dd7dd9..44bf135 100644
--- a/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
+++ b/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
@@ -24,6 +24,9 @@ import com.datatorrent.netlet.util.Slice;
/**
* An {@link AbstractFSBlockReader} which emits fixed-size byte-arrays wrapped in {@link Slice}.<br/>
*
+ * @category Input
+ * @tags fs
+ *
* @since 2.1.0
*/
@StatsListener.DataQueueSize
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java b/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
index 0bab0af..ba84d44 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
@@ -48,8 +48,8 @@ import org.slf4j.LoggerFactory;
* <b>groupMap</b>: defines the mapping from the group ids to the names <br>
* </p>
* @displayName Apache Log Parse Map
- * @category Logs
- * @tags apache, regex
+ * @category Tuple Converters
+ * @tags apache, parse
*
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java b/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
index f925ad2..a75c018 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
@@ -49,8 +49,8 @@ import com.datatorrent.api.annotation.Stateless;
* <b>Properties</b>: none<br>
* </p>
* @displayName Apache Log Parse
- * @category Logs
- * @tags apache
+ * @category Tuple Converters
+ * @tags apache, parse
*
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java b/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
index 2f28e56..2ec7044 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
@@ -38,8 +38,8 @@ import java.util.regex.Pattern;
* More output ports in this operator.
* </p>
* @displayName Apache Virtual Log Parse
- * @category Logs
- * @tags apache
+ * @category Tuple Converters
+ * @tags apache, parse
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java b/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
index ae0eeaa..90bc843 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
@@ -30,8 +30,8 @@ import com.datatorrent.api.Operator;
* A Map from Strings to aggregated DimensionObjects is emitted by the unifier.
* <p></p>
* @displayName Dimension Aggregation Unifier
- * @category Logs
- * @tags aggregation, unifier
+ * @category Stats and Aggregations
+ * @tags aggregation, unifier, dimensions
*
* @since 0.9.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
index a43e461..1934e17 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
@@ -44,8 +44,8 @@ import java.util.HashMap;
* <br>
* </p>
* @displayName Filtered Line To Token ArrayList
- * @category Logs
- * @tags string
+ * @category Tuple Converters
+ * @tags filter, arraylist, string
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
index d367ab4..6fabe73 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
@@ -46,8 +46,8 @@ import java.util.HashMap;
* <br>
* </p>
* @displayName Filtered Line To Token HashMap
- * @category Logs
- * @tags string
+ * @category Tuple Converters
+ * @tags filter, hashmap, string
*
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
index 2f341ba..7bb43a1 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
@@ -43,8 +43,8 @@ import java.util.HashMap;
* </p>
*
* @displayName Filtered Line Tokenizer Key Value
- * @category Logs
- * @tags string, key value
+ * @category Tuple Converters
+ * @tags string, key value, string
*
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java b/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
index 68653e7..6d4efa4 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
@@ -47,8 +47,8 @@ import com.datatorrent.lib.util.UnifierArrayList;
* <b>splittokenby</b>: The characters used to split a token into key,val1,val2,.... If not specified the value is set to null. Default is "", i.e. tokens are not split<br>
* </p>
* @displayName Line To Token (ArrayList)
- * @category Logs
- * @tags string
+ * @category Tuple Converters
+ * @tags string, arraylist
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java b/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
index 30832b4..f5510b3 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
@@ -45,8 +45,8 @@ import com.datatorrent.lib.util.UnifierHashMap;
* </p>
*
* @displayName Line To Token (HashMap)
- * @category Logs
- * @tags string
+ * @category Tuple Converters
+ * @tags string, hashmap
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java b/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
index 12005ad..c5c554a 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
@@ -38,7 +38,7 @@ import com.datatorrent.lib.util.BaseLineTokenizer;
* <br>
* </p>
* @displayName Line Tokenizer
- * @category Logs
+ * @category Tuple Converters
* @tags string
*
* @since 0.3.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java b/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
index 0648855..6ef66a3 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
@@ -45,7 +45,7 @@ import java.util.HashMap;
* <br>
* </p>
* @displayName Line Tokenizer Key Value
- * @category Logs
+ * @category Tuple Converters
* @tags string, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java b/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
index 4db5476..ab7bbaf 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
@@ -38,7 +38,7 @@ import com.datatorrent.lib.util.KeyValPair;
* This class aggregates the value of given dimension across windows.
* <p></p>
* @displayName Multi Window Dimension Aggregation
- * @category Logs
+ * @category Stats and Aggregations
* @tags aggregation
*
* @since 0.3.4
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java b/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
index 33d71c8..a6556a5 100644
--- a/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* <b>regex</b>: defines the regex <br>
*
* @displayName Regex Match Map
- * @category Logs
+ * @category Tuple Converters
* @tags regex
*
* @since 1.0.5
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
index 4486de2..d5b96b7 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <b>Specific run time checks</b>: None<br>
* <br>
* @displayName Change Alert
- * @category Math
+ * @category Rules and Alerts
* @tags change, key value, numeric, percentage
* @since 0.3.3
*/
@@ -80,13 +80,13 @@ public class ChangeAlert<V extends Number> extends BaseNumberValueOperator<V>
baseValue = tval;
}
};
-
-
+
+
/**
* Output port which emits a key value pair.
*/
public final transient DefaultOutputPort<KeyValPair<V, Double>> alert = new DefaultOutputPort<KeyValPair<V, Double>>();
-
+
/**
* baseValue is a state full field. It is retained across windows
*/
@@ -96,7 +96,7 @@ public class ChangeAlert<V extends Number> extends BaseNumberValueOperator<V>
/**
* getter function for threshold value
- *
+ *
* @return threshold value
*/
@Min(1)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
index 896153d..e5a6e5f 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <b>inverse</b>: if set to true the key in the filter will block tuple<br>
* <b>filterBy</b>: List of keys to filter on<br>
* @displayName Change Alert Key Value
- * @category Math
+ * @category Rules and Alerts
* @tags change, key value, numeric, percentage
* @since 0.3.3
*/
@@ -93,7 +93,7 @@ public class ChangeAlertKeyVal<K, V extends Number> extends
val.setValue(tval);
}
};
-
+
/**
* Key,Percent Change output port.
*/
@@ -107,7 +107,7 @@ public class ChangeAlertKeyVal<K, V extends Number> extends
/**
* getter function for threshold value
- *
+ *
* @return threshold value
*/
@Min(1)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
index 24e1662..63f9680 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
@@ -43,7 +43,7 @@ import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
* <b>inverse</b>: if set to true the key in the filter will block tuple<br>
* <b>filterBy</b>: List of keys to filter on<br>
* @displayName Change Alert Map
- * @category Math
+ * @category Rules and Alerts
* @tags change, key value, numeric, percentage, map
* @since 0.3.2
*/
@@ -51,7 +51,7 @@ public class ChangeAlertMap<K, V extends Number> extends BaseNumberKeyValueOpera
{
/**
* Input data port that takes a map of <key,value>.
- */
+ */
public final transient DefaultInputPort<Map<K, V>> data = new DefaultInputPort<Map<K, V>>()
{
/**
@@ -89,7 +89,7 @@ public class ChangeAlertMap<K, V extends Number> extends BaseNumberKeyValueOpera
// Default "pass through" unifier works as tuple is emitted as pass through
/**
- * Output port which emits a hashmap of key, percentage change.
+ * Output port which emits a hashmap of key, percentage change.
*/
public final transient DefaultOutputPort<HashMap<K, HashMap<V,Double>>> alert = new DefaultOutputPort<HashMap<K, HashMap<V,Double>>>();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
index 0eb5d15..3bed755 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
@@ -33,9 +33,9 @@ import com.datatorrent.api.DefaultInputPort;
* <b>S</b> is the state object kept in the sliding window <br>
* <b>windowSize</b>: Number of streaming window in this sliding window<br>
* <br>
- *
+ *
* @displayName Abstract Sliding Window
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags sliding window, state
* @since 0.3.3
*/
@@ -54,14 +54,14 @@ public abstract class AbstractSlidingWindow<T, S> extends BaseOperator
};
protected ArrayList<S> states = null;
-
+
protected S lastExpiredWindowState = null;
-
+
protected int currentCursor = -1;
@Min(2)
int windowSize = 2;
-
+
/**
* getter function for n (number of previous window states
*
@@ -86,7 +86,7 @@ public abstract class AbstractSlidingWindow<T, S> extends BaseOperator
abstract protected void processDataTuple(T tuple);
/**
- * Implement this method to create the state object needs to be kept in the sliding window
+ * Implement this method to create the state object needs to be kept in the sliding window
*
* @return the state of current streaming window
*/
@@ -95,9 +95,9 @@ public abstract class AbstractSlidingWindow<T, S> extends BaseOperator
/**
* Get the Streaming window state in it's coming the order start from 0
*
- * @param i
- * 0 the state of the first coming streaming window
- * -1 the state of the last expired streaming window
+ * @param i
+ * 0 the state of the first coming streaming window
+ * -1 the state of the last expired streaming window
* @return State of the streaming window
* @throws ArrayIndexOutOfBoundsException if i >= sliding window size
*/
@@ -125,11 +125,11 @@ public abstract class AbstractSlidingWindow<T, S> extends BaseOperator
{
// move currentCursor 1 position
currentCursor = (currentCursor + 1) % windowSize;
- // expire the state at the first position which is the state of the streaming window moving out of the current application window
+ // expire the state at the first position which is the state of the streaming window moving out of the current application window
lastExpiredWindowState = states.get(currentCursor);
-
+
states.set(currentCursor, createWindowState());
-
+
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
index 9d1d9ae..9eb3c6e 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <b>windowSize i.e. N</b>: Number of windows to keep state on<br>
* <br>
* @displayName Abstract Sliding Window Key Value
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags sliding window, numeric, key value, average
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java b/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
index e6dd6ee..ead1cee 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
@@ -45,7 +45,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <br>
*
* @displayName Multi Window Range Key Value
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags key value, range, numeric
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java b/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
index 114c2fc..89448e9 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
@@ -43,7 +43,7 @@ import javax.validation.constraints.Min;
* window.<br>
* <br>
* @displayName Multi Window Sum Key Value
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags key value, sum, numeric
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java b/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
index 0c47781..2100a04 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
@@ -39,7 +39,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <b>windowSize</b>: Number of windows to keep state on<br>
* <br>
* @displayName Simple Moving Average
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags key value, numeric, average
* @since 0.3.3
*/
@@ -72,7 +72,7 @@ public class SimpleMovingAverage<K, V extends Number> extends
/**
* Create the list if key doesn't exist. Add value to buffer and increment
* counter.
- *
+ *
* @param tuple
*/
@Override
@@ -95,7 +95,7 @@ public class SimpleMovingAverage<K, V extends Number> extends
/**
* Calculate average and emit in appropriate port.
- *
+ *
* @param key
* @param obj
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java b/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
index 99451e3..5702b39 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
@@ -21,9 +21,9 @@ import org.apache.commons.lang.mutable.MutableInt;
/**
* Provides information needed to calculate simple moving average.
- *
+ *
* @displayName Simple Moving Average Object
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags average, sum, count
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
index e296205..84388e4 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
@@ -46,7 +46,7 @@ import com.google.common.base.Function;
* <p></p>
*
* @displayName Sorted Moving Window
- * @category Multi-Window
+ * @category Stats and Aggregations
* @tags sort, list, function, sliding window
* @since 0.9.2
*/
@@ -56,13 +56,13 @@ public class SortedMovingWindow<T, K> extends AbstractSlidingWindow<T, List<T>>
* Output port to emit sorted output.
*/
public transient DefaultOutputPort<T> outputPort = new DefaultOutputPort<T>();
-
+
/**
* Output port to emit error output.
*/
@OutputPortFieldAnnotation(error = true)
public transient DefaultOutputPort<T> errorOutput = new DefaultOutputPort<T>();
-
+
private Map<K, PriorityQueue<T>> sortedListInSlidingWin = new HashMap<K, PriorityQueue<T>>();
private List<T> tuplesInCurrentStreamWindow = new LinkedList<T>();
@@ -84,7 +84,7 @@ public class SortedMovingWindow<T, K> extends AbstractSlidingWindow<T, List<T>>
}
sortedList.add(tuple);
}
-
+
@Override
public List<T> createWindowState()
@@ -123,7 +123,7 @@ public class SortedMovingWindow<T, K> extends AbstractSlidingWindow<T, List<T>>
// If the expiring tuple is less than the first element of the sorted list. No more tuples to emit
break;
} else {
- // Emit the element in sorted list if it's less than the expiring tuple
+ // Emit the element in sorted list if it's less than the expiring tuple
outputPort.emit(minElemInSortedList);
// remove the element from the sorted list
iterator.remove();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java b/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
index c146d35..bc26dbd 100644
--- a/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
@@ -36,7 +36,7 @@ import com.datatorrent.api.annotation.OperatorAnnotation;
* <b>Partitions : No</b>, no will yield wrong results. <br>
* <br>+
* @displayName Median
- * @category Statistics
+ * @category Stats and Aggregations
* @tags median operator, number
* @since 0.3.4
*/
@@ -44,7 +44,7 @@ import com.datatorrent.api.annotation.OperatorAnnotation;
public class MedianOperator extends BaseOperator
{
private ArrayList<Double> values;
-
+
/**
* Input data port that takes a number.
*/
@@ -59,12 +59,12 @@ public class MedianOperator extends BaseOperator
values.add(tuple.doubleValue());
}
};
-
+
/**
* Output port that emits median of incoming data.
*/
public final transient DefaultOutputPort<Number> median = new DefaultOutputPort<Number>();
-
+
@Override
public void beginWindow(long arg0)
{
@@ -79,8 +79,8 @@ public class MedianOperator extends BaseOperator
median.emit(values.get(0));
return;
}
-
- // median value
+
+ // median value
Collections.sort(values);
int medianIndex = values.size() / 2;
if (values.size() %2 == 0) {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java b/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
index fcc8534..4b5136d 100644
--- a/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
@@ -36,7 +36,7 @@ import com.datatorrent.api.annotation.OperatorAnnotation;
* <b>Partitions : No</b>, no will yeild wrong results. <br>
* <br>
* @displayName Mode
- * @category Statistics
+ * @category Stats and Aggregations
* @tags numeric, integer, count
* @since 0.3.4
*/
@@ -66,12 +66,12 @@ public class ModeOperator<V extends Comparable<?>> extends BaseOperator
}
}
};
-
+
/**
* Output port that emits most frequent value in incoming data.
*/
public final transient DefaultOutputPort<V> mode = new DefaultOutputPort<V>();
-
+
/**
* Emit mode value.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java b/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
index f792c3a..6038a3a 100644
--- a/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
+++ b/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
@@ -37,15 +37,15 @@ import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
* <b>Partitions : No</b>, no will yield wrong results. <br>
* <br>
* @displayName Standard Deviation
- * @category Statistics
- * @tags numeric, math, calculation, sum, count
+ * @category Stats and Aggregations
+ * @tags numeric, math, calculation, sum, count
* @since 0.3.4
*/
@OperatorAnnotation(partitionable = false)
public class StandardDeviation extends BaseOperator
{
private ArrayList<Double> values = new ArrayList<Double>();
-
+
/**
* Input data port that takes in a number.
*/
@@ -60,18 +60,18 @@ public class StandardDeviation extends BaseOperator
values.add(tuple.doubleValue());
}
};
-
+
/**
* Variance output port.
*/
@OutputPortFieldAnnotation(optional=true)
public final transient DefaultOutputPort<Number> variance = new DefaultOutputPort<Number>();
-
+
/**
* Standard deviation output port.
*/
public final transient DefaultOutputPort<Number> standardDeviation = new DefaultOutputPort<Number>();
-
+
/**
* End window.
*/
@@ -80,15 +80,15 @@ public class StandardDeviation extends BaseOperator
{
// no values.
if (values.size() == 0) return;
-
+
// get mean first.
double mean = 0.0;
for (Double value : values) {
mean += value;
}
mean = mean/values.size();
-
- // get variance
+
+ // get variance
double outVal = 0.0;
for (Double value : values) {
outVal += (value-mean)*(value-mean);
@@ -97,10 +97,10 @@ public class StandardDeviation extends BaseOperator
if (variance.isConnected()) {
variance.emit(outVal);
}
-
+
// get standard deviation
standardDeviation.emit(Math.sqrt(outVal));
-
+
values = new ArrayList<Double>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java b/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
index 2e1d830..b1ff2e4 100644
--- a/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
@@ -36,7 +36,7 @@ import com.datatorrent.lib.util.BaseNumberValueOperator;
* <b>Partitions : No</b>, no will yeild wrong results. <br>
* <br>
* @displayName Weighted Mean
- * @category Statistics
+ * @category Stats and Aggregations
* @tags numeric, math, calculation, sum, count, mean operator, average
* @since 0.3.4
*/
@@ -45,13 +45,13 @@ public class WeightedMeanOperator<V extends Number> extends BaseNumberValueOper
{
// aggregate weighted sum
private double weightedSum;
-
+
// aggregate weighted count
private double weightedCount;
-
+
// current input weight
private double currentWeight;
-
+
/**
* Input data port that takes a number.
*/
@@ -67,7 +67,7 @@ public class WeightedMeanOperator<V extends Number> extends BaseNumberValueOper
weightedCount += currentWeight;
}
};
-
+
/**
* Input weight port that takes a number.
*/
@@ -82,14 +82,14 @@ public class WeightedMeanOperator<V extends Number> extends BaseNumberValueOper
if (tuple.doubleValue() != 0.0) currentWeight = tuple.doubleValue();
}
};
-
+
/**
* Output port that emits weighted mean.
*/
public final transient DefaultOutputPort<V> mean = new DefaultOutputPort<V>();
-
+
@Override
- public void setup(OperatorContext arg0)
+ public void setup(OperatorContext arg0)
{
currentWeight = 1.0;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java b/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
index b0eac35..e607110 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
@@ -26,9 +26,9 @@ import com.datatorrent.api.Operator;
import com.datatorrent.api.annotation.OperatorAnnotation;
/**
- *
- * A base implementation of an operator that aggregates tuples. Subclasses should provide the
- implementation to get a new collection of a given size.
+ *
+ * A base implementation of an operator that aggregates tuples. Subclasses should provide the
+ implementation to get a new collection of a given size.
* <p>
* If size of collection is 0 then all tuples till end window are aggregated, otherwise collection is emitted as
* soon as collection size reaches to given size. <br>
@@ -36,7 +36,7 @@ import com.datatorrent.api.annotation.OperatorAnnotation;
* <b>StateFull : Yes </b>, values are collected over application window. <br>
* <b>Partitions : No</b>, will yield wrong results.
* @displayName Abstract Aggregator
- * @category Stream
+ * @category Stream Manipulators
* @tags aggregate
* @param <T>
* Aggregate tuple type.
@@ -82,12 +82,12 @@ public abstract class AbstractAggregator<T> implements Operator
/**
* Set the size of the collection.
- *
+ *
* If set to zero, the collection collects all the tuples within a window and
* emits the collection as 1 output tuple at the end of the window. If set to
* positive value, it collects the collection as soon as the size of the
* collection reaches the size.
- *
+ *
* @param size
* the size to set
*/
@@ -98,7 +98,7 @@ public abstract class AbstractAggregator<T> implements Operator
/**
* Size of collection.
- *
+ *
* @return size of collection
*/
@Min(0)
@@ -109,7 +109,7 @@ public abstract class AbstractAggregator<T> implements Operator
/**
* Abstract method to get collection of given size.
- *
+ *
* @param size
* @return collection
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java b/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
index d9152c7..f3c5d55 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
@@ -20,7 +20,7 @@ import java.util.Collection;
/**
*
- * An implementation of AbstractAggregator that creates an ArrayList tuple from incoming tuples.
+ * An implementation of AbstractAggregator that creates an ArrayList tuple from incoming tuples.
* <p>
* The size of the ArrayList before it is emitted is determined by property \"size\". If size == 0
* then the ArrayList (if not empty) is emitted in the endWindow call. Is size is specified then the ArrayList is emitted as soon as the size is
@@ -35,7 +35,7 @@ import java.util.Collection;
* If 0, the ArrayList is emitted in endWindow call. Default value is 0, </br>
* <br>
* @displayName Array List Aggregator
- * @category Stream
+ * @category Stream Manipulators
* @tags list, aggregate, collection
* @param <T> Type of elements in the collection.<br>
* @since 0.3.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java b/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
index b0a5835..83605e8 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
@@ -22,7 +22,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
import java.util.ArrayList;
/**
- * An implementation of BaseKeyOperator that breaks up an ArrayList tuple into Objects.
+ * An implementation of BaseKeyOperator that breaks up an ArrayList tuple into Objects.
* <p>
* Takes in an ArrayList and emits each item in the array; mainly used for
* breaking up an ArrayList tuple into Objects. <br>
@@ -30,9 +30,9 @@ import java.util.ArrayList;
* <br>
* <b>Ports</b>:<br>
* <b>data</b>: expects ArrayList<K>br> <b>item</b>: emits K<br>
- *
+ *
* @displayName Array List To Item
- * @category Stream
+ * @category Stream Manipulators
* @tags arraylist, clone
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java b/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
index e137d0d..9e84204 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
@@ -40,7 +40,7 @@ import com.datatorrent.lib.util.KeyValPair;
* <b>Input(s) : </b> 5 max input ports, 3 are optional. <br>
* <br>
* @displayName Consolidator Key Value
- * @category Stream
+ * @category Stream Manipulators
* @tags arraylist, key value
* @since 0.3.3
*/
@@ -66,7 +66,7 @@ public class ConsolidatorKeyVal<K, V1, V2, V3, V4, V5> implements Operator
* <p>
* Class operates on <K,V> pair, stores value in given number position in
* list. <br>
- *
+ *
* @param <V>
* value type.
*/
@@ -80,7 +80,7 @@ public class ConsolidatorKeyVal<K, V1, V2, V3, V4, V5> implements Operator
/**
* Constructor
- *
+ *
* @param oper
* Connected operator.
* @param num
@@ -145,7 +145,7 @@ public class ConsolidatorKeyVal<K, V1, V2, V3, V4, V5> implements Operator
/**
* Get array list object for given key
- *
+ *
* @param k key
* @return array list for key.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/Counter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/Counter.java b/library/src/main/java/com/datatorrent/lib/stream/Counter.java
index dc2e5cd..c3ed4ef 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/Counter.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/Counter.java
@@ -33,7 +33,7 @@ import com.datatorrent.api.Operator.Unifier;
* <b>output</b>: emits Integer<br>
* <br>
* @displayName Counter
- * @category Stream
+ * @category Stream Manipulators
* @tags integer, object, count
* @since 0.3.3
*/
@@ -51,7 +51,7 @@ public class Counter implements Operator, Unifier<Integer>
}
};
-
+
/**
* Output port that takes emits count in each window.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNull.java b/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
index c98a5e3..b7f0c6d 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
@@ -20,7 +20,7 @@ import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.api.annotation.Stateless;
/**
- * An implementation of BaseOperator that terminates a stream and does not affect the tuple.
+ * An implementation of BaseOperator that terminates a stream and does not affect the tuple.
* <p>
* Useful if you want to have a stream for monitoring purpose etc. In future STRAM may simply support a
* virtual stream and make this operator redundant<br>
@@ -29,7 +29,7 @@ import com.datatorrent.api.annotation.Stateless;
* <b>data</b>: expects K<br>
* <br>
* @displayName Dev Null
- * @category Stream
+ * @category Stream Manipulators
* @tags debug, terminate
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java b/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
index 51215b3..94a8f20 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
@@ -24,7 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * An implementation of BaseOperator that is used for logging by counting the tuple and then drops it.
+ * An implementation of BaseOperator that is used for logging by counting the tuple and then drops it.
* <p>
* Increments a count and writes the net number (rate) to console. Useful to benchmark other
* modules.<br>
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* Results are written to the log<br>
* <br>
* @displayName Dev Null Counter
- * @category Stream
+ * @category Stream Manipulators
* @tags count
* @since 0.3.3
*/
@@ -52,7 +52,7 @@ public class DevNullCounter<K> extends BaseOperator
/**
* Process each tuple. Expects upstream node to compute number of tuples in
* that window and send it as an int<br>
- *
+ *
* @param tuple
*/
@Override
@@ -74,7 +74,7 @@ public class DevNullCounter<K> extends BaseOperator
/**
* getter function for debug state
- *
+ *
* @return debug state
*/
public boolean getDebug()
@@ -84,7 +84,7 @@ public class DevNullCounter<K> extends BaseOperator
/**
* setter function for debug state
- *
+ *
* @param i
* sets debug to i
*/
@@ -103,7 +103,7 @@ public class DevNullCounter<K> extends BaseOperator
/**
* Sets up all the config parameters. Assumes checking is done and has passed
- *
+ *
* @param context
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java b/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
index 4a5e3fc..7713fa0 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * An implementation of BaseKeyValueOperator that breaks a HashMap tuple into objects.
+ * An implementation of BaseKeyValueOperator that breaks a HashMap tuple into objects.
* <p>
* Takes a HashMap and emits its keys, keyvals, vals; used for breaking up a
* HashMap tuple into objects (keys, vals, or <key,val> pairs)
@@ -42,7 +42,7 @@ import java.util.Map;
* <b>val</b>: emits V<br>
* <br>
* @displayName Hash Map To Key Value Pair
- * @category Stream
+ * @category Tuple Converters
* @tags hashmap, key value
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java b/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
index edf3ea3..3f6106c 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
@@ -30,7 +30,7 @@ import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.netlet.util.DTThrowable;
/**
- * An implementation of BaseOperator that takes a json byte stream and emits a HashMap of key values.
+ * An implementation of BaseOperator that takes a json byte stream and emits a HashMap of key values.
* <p>
* This is a pass through operator<br>
* <br>
@@ -43,7 +43,7 @@ import com.datatorrent.netlet.util.DTThrowable;
*    eg: key: "agentinfo.os.name", value: "Ubuntu" <br>
* <br>
* @displayName JSON Byte Array
- * @category Stream
+ * @category Tuple Converters
* @tags json, byte array
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java b/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
index 2f9aec8..41a3997 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
@@ -23,7 +23,7 @@ import com.datatorrent.lib.util.KeyValPair;
import java.util.HashMap;
/**
- * An implementation of BaseKeyValueOperator that converts Key Value Pair to a HashMap tuple.
+ * An implementation of BaseKeyValueOperator that converts Key Value Pair to a HashMap tuple.
* <p>
* Takes a KeyValPair and emits a HashMap(1), Used for for converting KeyValPair
* to a HashMap(1) tuple
@@ -35,7 +35,7 @@ import java.util.HashMap;
* <b>map</b>: emits HashMap<K,V><br>
* <br>
* @displayName Key Value Pair To HashMap
- * @category Stream
+ * @category Tuple Converters
* @tags key value
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java b/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
index 24ca24b..2582cdf 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
/**
* <p>
- * An implementation of BaseKeyValueOperator that creates a HashMap tuple from incoming tuples.
+ * An implementation of BaseKeyValueOperator that creates a HashMap tuple from incoming tuples.
* <p>
* If keys[] are set, then each incoming tuple is the value of the key (in-order) till all keys get a value.
* Once all keys are assigned values, the tuple (HashMap) is emitted, the
@@ -40,7 +40,7 @@ import java.util.HashMap;
* <b>Properties</b>:<br>
* <b>keys[]</b>: Set of keys to insert in the output tuple</b>
* @displayName Round Robin HashMap
- * @category Stream
+ * @category Tuple Converters
* @tags key value, hashmap
* @since 0.3.3
*/
@@ -91,7 +91,7 @@ public class RoundRobinHashMap<K, V> extends BaseKeyValueOperator<K, V>
/**
* Keys for round robin asspociation, set by application.
- *
+ *
* @param keys
*/
public void setKeys(K[] keys)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java b/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
index 23e94fd..8a69a08 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
@@ -21,7 +21,7 @@ import com.datatorrent.api.annotation.Stateless;
import com.datatorrent.lib.util.BaseKeyOperator;
/**
- * An implementation of BaseKeyValueOperator that duplicates an input stream as is into two output streams.
+ * An implementation of BaseKeyValueOperator that duplicates an input stream as is into two output streams.
* <p>
* Duplication is needed to allow separation of listeners into two streams with different properties (for example
* inline vs in-rack)<p>
@@ -33,7 +33,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
* <b>out2</b>: emits <K><br>
* <br>
* @displayName Stream duplicator
- * @category Stream
+ * @category Stream Manipulators
* @tags duplicate
* @since 0.3.2
*/
@@ -60,7 +60,7 @@ public class StreamDuplicater<K> extends BaseKeyOperator<K>
* Output port 1 that emits duplicate of input stream.
*/
public final transient DefaultOutputPort<K> out1 = new DefaultOutputPort<K>();
-
+
/**
* Output port 2 that emits duplicate of input stream.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java b/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
index c7782f0..3c113bf 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
@@ -21,8 +21,8 @@ import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.api.annotation.Stateless;
/**
- * An implementation of BaseOperator that merges two streams with identical schema and emits the tuples to the output port in order.
- *
+ * An implementation of BaseOperator that merges two streams with identical schema and emits the tuples to the output port in order.
+ *
* <p>
* This is a pass through operator<br>
* <b>Ports</b>:<br>
@@ -31,7 +31,7 @@ import com.datatorrent.api.annotation.Stateless;
* <b>out</b>: emits K<br>
* <br>
* @displayName Stream Merger
- * @category Stream
+ * @category Stream Manipulators
* @tags merge
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/AbstractSqlStreamOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/AbstractSqlStreamOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/AbstractSqlStreamOperator.java
index 4a1d7de..860fb39 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/AbstractSqlStreamOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/AbstractSqlStreamOperator.java
@@ -25,13 +25,13 @@ import java.util.ArrayList;
import java.util.HashMap;
/**
- * A base implementation of a BaseOperator that is a sql stream operator. Subclasses should provide the
- implementation of how to process the tuples.
+ * A base implementation of a BaseOperator that is a sql stream operator. Subclasses should provide the
+ implementation of how to process the tuples.
* <p>
- * Abstract sql db input operator.
+ * Abstract sql db input operator.
* <p>
* @displayName Abstract Sql Stream
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql operator
* @since 0.3.2
*/
@@ -76,7 +76,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
protected String statement;
protected ArrayList<InputSchema> inputSchemas = new ArrayList<InputSchema>(5);
protected transient ArrayList<Object> bindings;
-
+
/**
* Input bindings port that takes an arraylist of objects.
*/
@@ -90,7 +90,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Input port in1 that takes a hashmap of <string,object>.
*/
@@ -103,7 +103,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Input port in2 that takes a hashmap of <string,object>.
*/
@@ -117,7 +117,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Input port in3 that takes a hashmap of <string,object>.
*/
@@ -131,7 +131,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Input port in4 that takes a hashmap of <string,object>.
*/
@@ -145,7 +145,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Input port in5 that takes a hashmap of <string,object>.
*/
@@ -159,7 +159,7 @@ public abstract class AbstractSqlStreamOperator extends BaseOperator
}
};
-
+
/**
* Output result port that emits a hashmap of <string,object>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/DeleteOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/DeleteOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/DeleteOperator.java
index e2cdcc3..8685d99 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/DeleteOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/DeleteOperator.java
@@ -41,7 +41,7 @@ import com.datatorrent.lib.streamquery.condition.Condition;
* <b> columns : </b> Column names/aggregate functions for select. <br>
* <br>
* @displayName Delete
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql delete operator
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/DerbySqlStreamOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/DerbySqlStreamOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/DerbySqlStreamOperator.java
index 6331a49..0087234 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/DerbySqlStreamOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/DerbySqlStreamOperator.java
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Map;
/**
- * An implementation of AbstractSqlStreamOperator that provides embedded derby sql input operator.
+ * An implementation of AbstractSqlStreamOperator that provides embedded derby sql input operator.
* <p>
* @displayName Derby Sql Stream
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql, in-memory, input operator
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/GroupByHavingOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/GroupByHavingOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/GroupByHavingOperator.java
index 586338a..f7fc27a 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/GroupByHavingOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/GroupByHavingOperator.java
@@ -55,7 +55,7 @@ import com.datatorrent.lib.streamquery.index.ColumnIndex;
* <b> havingConditions : </b> Having filter conditions for aggregate(s). <br>
* <br>
* @displayName GroupBy Having Operator
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql, groupby operator, condition, index
* @since 0.3.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/InnerJoinOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/InnerJoinOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/InnerJoinOperator.java
index 128bc12..15b6422 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/InnerJoinOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/InnerJoinOperator.java
@@ -47,7 +47,7 @@ import com.datatorrent.lib.streamquery.index.Index;
* <b> table2Columns : </b> Columns to be selected from table2. <br>
* <br>
* @displayName Inner join
- * @category Streamquery
+ * @category Stream Manipulators
* @tags sql, inner join operator
*
* @since 0.3.3
@@ -98,7 +98,7 @@ public class InnerJoinOperator implements Operator
}
}
};
-
+
/**
* Input port 2 that takes a map of <string,object>.
*/
@@ -115,13 +115,13 @@ public class InnerJoinOperator implements Operator
}
}
};
-
+
/**
* Output port that emits a map of <string,object>.
*/
- public final transient DefaultOutputPort<Map<String, Object>> outport =
+ public final transient DefaultOutputPort<Map<String, Object>> outport =
new DefaultOutputPort<Map<String, Object>>();
-
+
@Override
public void setup(OperatorContext arg0)
{
@@ -155,6 +155,7 @@ public class InnerJoinOperator implements Operator
}
/**
+ * Pick the supported condition. Currently only equal join is supported.
* @param set joinCondition
*/
public void setJoinCondition(Condition joinCondition)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/OrderByOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByOperator.java
index 791cac4..552f527 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByOperator.java
@@ -38,9 +38,9 @@ import com.datatorrent.api.Operator.Unifier;
* <b> outport : </b> Output hash map(row) port, emits HashMap<String,Object><br>
* <br>
* <b> Properties : </b> <br>
- * <b> oredrByRules : </b>List of order by rules for tuples.
+ * <b> orderByRules : </b>List of order by rules for tuples.
* @displayName OrderBy
- * @category Streamquery
+ * @category Stream Manipulators
* @tags orderby operator
* @since 0.3.5
*/
@@ -49,13 +49,13 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
/**
* Order by rules.
*/
- ArrayList<OrderByRule<?>> oredrByRules = new ArrayList<OrderByRule<?>>();
+ ArrayList<OrderByRule<?>> orderByRules = new ArrayList<OrderByRule<?>>();
/**
* Descending flag.
*/
private boolean isDescending;
-
+
/**
* collected rows.
*/
@@ -66,7 +66,7 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
*/
public void addOrderByRule(OrderByRule<?> rule)
{
- oredrByRules.add(rule);
+ orderByRules.add(rule);
}
/**
@@ -100,8 +100,8 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
@Override
public void endWindow()
{
- for (int i=0; i < oredrByRules.size(); i++) {
- rows = oredrByRules.get(i).sort(rows);
+ for (int i=0; i < orderByRules.size(); i++) {
+ rows = orderByRules.get(i).sort(rows);
}
if (isDescending) {
for (int i=0; i < rows.size(); i++) outport.emit(rows.get(i));
@@ -114,16 +114,16 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
public void setup(OperatorContext arg0)
{
// TODO Auto-generated method stub
-
+
}
@Override
public void teardown()
{
// TODO Auto-generated method stub
-
+
}
-
+
/**
* Input port that takes a map of <string,object>.
*/
@@ -134,7 +134,7 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
rows.add(tuple);
}
};
-
+
/**
* Output port that emits a map of <string,object>.
*/
@@ -143,11 +143,28 @@ public class OrderByOperator implements Operator, Unifier<Map<String, Object>>
@Override
public Unifier<Map<String, Object>> getUnifier() {
OrderByOperator unifier = new OrderByOperator();
- for (int i=0; i < oredrByRules.size(); i++) {
- unifier.addOrderByRule(oredrByRules.get(i));
+ for (int i=0; i < getOrderByRules().size(); i++) {
+ unifier.addOrderByRule(getOrderByRules().get(i));
}
unifier.setDescending(isDescending);
return unifier;
}
};
+
+ /**
+ * @return the orderByRules
+ */
+ public ArrayList<OrderByRule<?>> getOrderByRules()
+ {
+ return orderByRules;
+ }
+
+ /**
+ * The order by rules used to order incoming tuples.
+ * @param oredrByRules the orderByRules to set
+ */
+ public void setOrderByRules(ArrayList<OrderByRule<?>> oredrByRules)
+ {
+ this.orderByRules = oredrByRules;
+ }
}
[11/50] [abbrv] incubator-apex-malhar git commit: Improved
documentation for App Data Pub Sub operators
Posted by ch...@apache.org.
Improved documentation for App Data Pub Sub operators
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/6d7c4bc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/6d7c4bc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/6d7c4bc5
Branch: refs/heads/master
Commit: 6d7c4bc53df4567d0d534b8416f1f67cb8d065dd
Parents: d96c3d8
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Jul 28 14:16:26 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue Jul 28 15:32:32 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 5 +++--
.../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6d7c4bc5/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
index aa22d3f..4f80b3d 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
@@ -28,11 +28,12 @@ import com.datatorrent.common.experimental.AppData;
import com.datatorrent.common.util.PubSubMessage;
/**
- * This is an app data pub sub query operator.
+ * This is an App Data pub sub query operator. This operator is used to receive queries from
+ * App Data dashboards and forward queries to App Data store operators.
*
* @displayName App Data Pub Sub Query
* @category App Data
- * @tags input, appdata, query
+ * @tags input, appdata, query, dashboards
*/
public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<String> implements AppData.ConnectionInfoProvider
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6d7c4bc5/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
index 29069ba..5674d5c 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
@@ -27,11 +27,12 @@ import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.common.experimental.AppData;
import com.datatorrent.common.util.PubSubMessage.PubSubMessageType;
/**
- * This is an app data pub sub result operator.
+ * This is an app data pub sub result operator. This operator is used to send results to
+ * App Data dashboards produced by App Data store operators.
*
* @displayName App Data Pub Sub Result
* @category App Data
- * @tags output, appdata, result
+ * @tags output, appdata, result, dashboards
*/
@AppData.AppendQueryIdToTopic(value=true)
public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<String> implements AppData.ConnectionInfoProvider
[21/50] [abbrv] incubator-apex-malhar git commit: Reduced sliding
window count for TwitterDemo.
Posted by ch...@apache.org.
Reduced sliding window count for TwitterDemo.
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/27ede3b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/27ede3b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/27ede3b8
Branch: refs/heads/master
Commit: 27ede3b817accf0cc5473b08a0d126a19eeef317
Parents: 40d9312
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Thu Jul 30 15:11:55 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Thu Jul 30 20:07:05 2015 -0700
----------------------------------------------------------------------
demos/twitter/src/main/resources/META-INF/properties.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/27ede3b8/demos/twitter/src/main/resources/META-INF/properties.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/src/main/resources/META-INF/properties.xml b/demos/twitter/src/main/resources/META-INF/properties.xml
index ff95d24..53b7fb9 100644
--- a/demos/twitter/src/main/resources/META-INF/properties.xml
+++ b/demos/twitter/src/main/resources/META-INF/properties.xml
@@ -78,6 +78,10 @@
<name>dt.application.TwitterDemo.operator.QueryResult.numRetries</name>
<value>2147483647</value>
</property>
+ <property>
+ <name>dt.application.TwitterDemo.operator.UniqueURLCounter.attr.APPLICATION_WINDOW_COUNT</name>
+ <value>60</value>
+ </property>
<!-- TwitterTrendingDemo -->
[18/50] [abbrv] incubator-apex-malhar git commit: Preparing to
release v3.0.0-RC6
Posted by ch...@apache.org.
Preparing to release v3.0.0-RC6
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/ba8d6120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/ba8d6120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/ba8d6120
Branch: refs/heads/master
Commit: ba8d6120d55860b47ce76862d0facb0bd513309b
Parents: 4052aad
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Thu Jul 30 16:04:22 2015 +0530
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Thu Jul 30 16:04:22 2015 +0530
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 6 +++---
samples/pom.xml | 2 +-
21 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 4461231..7692194 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 0a52135..90a3c9c 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.0.0-RC5</datatorrent.version>
+ <datatorrent.version>3.0.0-RC6</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index e36c80f..52a68d6 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index cefb888..7c116c8 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index 8327d50..f634625 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 8e96961..68267ef 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 68a52ce..34ee1ff 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index e82a240..7c002fe 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 054dacb..7f8a5d8 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 8a2ac0f..5008c0f 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index 3c7b08e..b0971c1 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 29a549c..577cd8b 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 1030973..0b3b017 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.0.0-RC5</datatorrent.version>
+ <datatorrent.version>3.0.0-RC6</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 3fe19b9..19bcd66 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 593436d..c494d9a 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 9b89b9a..b0fc88f 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index a1fb7a4..ab5a393 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 5ca7698..9c5a304 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 99837c1..bad3d1a 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c31ed42..e5df36a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.0.0-RC5</dt.framework.version>
+ <dt.framework.version>3.0.0-RC6</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ba8d6120/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index cc359e1..cc2fb82 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC5</version>
+ <version>3.0.0-RC6</version>
</parent>
<artifactId>malhar-samples</artifactId>
[17/50] [abbrv] incubator-apex-malhar git commit: Preparing to
release v3.0.0-RC5
Posted by ch...@apache.org.
Preparing to release v3.0.0-RC5
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/4052aadf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/4052aadf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/4052aadf
Branch: refs/heads/master
Commit: 4052aadf073a4ec0dabd00d298680472c06e42d7
Parents: c2b5f7c
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Wed Jul 29 11:51:46 2015 +0530
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Wed Jul 29 11:51:46 2015 +0530
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 6 +++---
samples/pom.xml | 2 +-
21 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 46a61c2..4461231 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 8eb18ff..0a52135 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.0.0-RC4</datatorrent.version>
+ <datatorrent.version>3.0.0-RC5</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 514a8c6..e36c80f 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 3616f84..cefb888 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index f418f15..8327d50 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 371c008..8e96961 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 284f40c..68a52ce 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 3f53b1d..e82a240 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 8eb8d75..054dacb 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 08a15d1..8a2ac0f 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index b37b1fc..3c7b08e 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 1bec4f7..29a549c 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 64eebd6..1030973 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.0.0-RC4</datatorrent.version>
+ <datatorrent.version>3.0.0-RC5</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 0c15e90..3fe19b9 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 27aecd3..593436d 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index bec1eea..9b89b9a 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 61f3fbc..a1fb7a4 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index acbff7e..5ca7698 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 4e93399..99837c1 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ddc96a..c31ed42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.0.0-RC4</dt.framework.version>
+ <dt.framework.version>3.0.0-RC5</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4052aadf/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 27fbd0f..cc359e1 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC4</version>
+ <version>3.0.0-RC5</version>
</parent>
<artifactId>malhar-samples</artifactId>
[05/50] [abbrv] incubator-apex-malhar git commit: Restore dt-engine
as common test dependency.
Posted by ch...@apache.org.
Restore dt-engine as common test dependency.
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/54c67471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/54c67471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/54c67471
Branch: refs/heads/master
Commit: 54c67471f9f291d7c3eb4cb896451c984537dc9c
Parents: e1392b0
Author: thomas <th...@datatorrent.com>
Authored: Mon Jul 27 21:51:57 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Mon Jul 27 21:51:57 2015 -0700
----------------------------------------------------------------------
demos/echoserver/pom.xml | 9 ---------
demos/pi/pom.xml | 9 ---------
library/pom.xml | 6 ------
pom.xml | 10 ++++++++++
4 files changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54c67471/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index e606a07..371c008 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -15,14 +15,5 @@
<!-- change these to the appropriate values -->
<name>EchoServer Demo</name>
<description>A demo server that echos data sent by a network client back to it</description>
-
- <dependencies>
- <dependency>
- <groupId>com.datatorrent</groupId>
- <artifactId>dt-engine</artifactId>
- <version>${dt.framework.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54c67471/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 04bae00..1bec4f7 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -16,13 +16,4 @@
<version>3.0.0-RC4</version>
</parent>
- <dependencies>
- <dependency>
- <groupId>com.datatorrent</groupId>
- <artifactId>dt-engine</artifactId>
- <version>${dt.framework.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54c67471/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 257b17b..85940a1 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -169,12 +169,6 @@
<version>${dt.framework.version}</version>
</dependency>
<dependency>
- <groupId>com.datatorrent</groupId>
- <artifactId>dt-engine</artifactId>
- <version>${dt.framework.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<version>1.3.1b</version>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54c67471/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5ebff88..3c6f3c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,4 +52,14 @@
<module>samples</module>
<module>apps</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>dt-engine</artifactId>
+ <version>${dt.framework.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
[07/50] [abbrv] incubator-apex-malhar git commit: Mark POJO enabled
operators @Evolving
Posted by ch...@apache.org.
Mark POJO enabled operators @Evolving
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/fe2ba87d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/fe2ba87d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/fe2ba87d
Branch: refs/heads/master
Commit: fe2ba87db5536d5dd875697923b91cb28dbfd3a8
Parents: cecebb7
Author: thomas <th...@datatorrent.com>
Authored: Mon Jul 27 22:34:54 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Mon Jul 27 22:34:54 2015 -0700
----------------------------------------------------------------------
.../aerospike/AerospikePOJONonTransactionalPutOperator.java | 2 ++
.../aerospike/AerospikePOJOTransactionalPutOperator.java | 2 ++
.../contrib/cassandra/CassandraPOJOInputOperator.java | 3 ++-
.../contrib/cassandra/CassandraPOJOOutputOperator.java | 7 +++++--
.../contrib/couchbase/CouchBasePOJOInputOperator.java | 3 ++-
.../contrib/couchbase/CouchbasePOJOSetOperator.java | 2 ++
.../datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java | 3 ++-
.../contrib/couchdb/CouchDBPOJOOutputOperator.java | 3 +++
.../com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java | 3 ++-
.../com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java | 2 ++
.../contrib/memcache/MemcachePOJOOutputOperator.java | 3 +++
.../datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java | 5 +++++
.../datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java | 4 ++++
.../contrib/mongodb/MongoDBPOJOOutputOperator.java | 5 +++++
.../lib/appdata/snapshot/AppDataSnapshotServerPOJO.java | 4 +++-
.../com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java | 5 +++++
16 files changed, 49 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
index 4b0a1f3..e9ea915 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
@@ -23,6 +23,7 @@ import javax.validation.constraints.NotNull;
import com.aerospike.client.Bin;
import com.aerospike.client.Key;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +41,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @tags database, nosql, pojo, aerospike
* @since 2.1.0
*/
+@Evolving
public class AerospikePOJONonTransactionalPutOperator extends AbstractAerospikeNonTransactionalPutOperator<Object>
{
private static transient final Logger LOG
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
index 057d7b0..f2862bc 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
@@ -23,6 +23,7 @@ import javax.validation.constraints.NotNull;
import com.aerospike.client.Bin;
import com.aerospike.client.Key;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +41,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @tags data, nosql, pojo, aerospike
* @since 2.1.0
*/
+@Evolving
public class AerospikePOJOTransactionalPutOperator
extends AbstractAerospikeTransactionalPutOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
index 37c54d8..2ad85fe 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
@@ -25,12 +25,12 @@ import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Row;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.*;
-
import com.datatorrent.api.Context.OperatorContext;
/**
@@ -47,6 +47,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @category Input
* @tags database, nosql, pojo, cassandra
*/
+@Evolving
public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<Object>
{
@NotNull
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
index 2b9d612..61ef26c 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
@@ -16,8 +16,6 @@
package com.datatorrent.contrib.cassandra;
import com.datastax.driver.core.*;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Statement;
import com.datastax.driver.core.exceptions.DriverException;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.GetterBoolean;
@@ -26,9 +24,13 @@ import com.datatorrent.lib.util.PojoUtils.GetterFloat;
import com.datatorrent.lib.util.PojoUtils.GetterInt;
import com.datatorrent.lib.util.PojoUtils.GetterLong;
import com.datatorrent.lib.util.PojoUtils.Getter;
+
import java.math.BigDecimal;
import java.util.*;
+
import javax.validation.constraints.NotNull;
+
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +44,7 @@ import org.slf4j.LoggerFactory;
* @tags database, nosql, pojo, cassandra
* @since 2.1.0
*/
+@Evolving
public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionableOutputOperatorPS<Object>
{
private static final long serialVersionUID = 201506181024L;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
index 305546b..16c9246 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
@@ -23,10 +23,10 @@ import javax.validation.constraints.NotNull;
import com.couchbase.client.protocol.views.*;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.codehaus.jackson.map.ObjectMapper;
import com.datatorrent.lib.db.AbstractStoreInputOperator;
-
import com.datatorrent.api.Context.OperatorContext;
/**
@@ -47,6 +47,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @category Input
* @tags database, nosql, pojo, couchbase
*/
+@Evolving
public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Object, CouchBaseStore>
{
private transient Class<?> className = null;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
index 6809dd8..f21cd01 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
import javax.validation.constraints.NotNull;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +34,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @category Output
* @tags database, nosql, pojo, couchbase
*/
+@Evolving
public class CouchbasePOJOSetOperator extends AbstractCouchBaseSetOperator<Object>
{
private static final Logger logger = LoggerFactory.getLogger(CouchBaseStore.class);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
index c53b8ad..b944594 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.validation.constraints.NotNull;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.ektorp.ViewQuery;
@@ -28,7 +29,6 @@ import org.ektorp.ViewResult.Row;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.*;
-
import com.datatorrent.api.Context.OperatorContext;
/**
@@ -51,6 +51,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @category Input
* @tags database, nosql, pojo, couchdb
*/
+@Evolving
public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Object>
{
//List of expressions set by User. Example:setId(),setName(),Address
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
index f0c3e4c..2f47256 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
@@ -17,6 +17,8 @@ package com.datatorrent.contrib.couchdb;
import javax.validation.constraints.NotNull;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.Getter;
@@ -28,6 +30,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @tags database, nosql, pojo, couchdb
* @since 0.3.5
*/
+@Evolving
public class CouchDBPOJOOutputOperator extends AbstractCouchDBOutputOperator<Object>
{
private static final long serialVersionUID = 201506181121L;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
index f4696d5..9e5a46a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
@@ -3,6 +3,7 @@ package com.datatorrent.contrib.hbase;
import java.io.IOException;
import java.util.List;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.client.Result;
@@ -15,7 +16,6 @@ import com.datatorrent.lib.util.FieldValueGenerator.ValueConverter;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.Setter;
import com.datatorrent.lib.util.TableInfo;
-
import com.datatorrent.api.Context.OperatorContext;
/**
@@ -23,6 +23,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @category Input
* @tags database, nosql, pojo, hbase
*/
+@Evolving
public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
{
private TableInfo<HBaseFieldInfo> tableInfo;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
index 8055456..c2de8fe 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
@@ -17,6 +17,7 @@ package com.datatorrent.contrib.hbase;
import java.util.List;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.util.Bytes;
@@ -31,6 +32,7 @@ import com.datatorrent.lib.util.TableInfo;
* @category Output
* @tags database, nosql, pojo, hbase
*/
+@Evolving
public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object>
{
private static final long serialVersionUID = 3241368443399294019L;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
index 6e2c014..1514674 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
@@ -17,6 +17,8 @@ package com.datatorrent.contrib.memcache;
import java.util.List;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
import com.datatorrent.lib.util.FieldInfo;
import com.datatorrent.lib.util.FieldValueGenerator;
import com.datatorrent.lib.util.PojoUtils;
@@ -29,6 +31,7 @@ import com.datatorrent.lib.util.TableInfo;
* @category Output
* @tags pojo, memcache
*/
+@Evolving
public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< Object >
{
private static final long serialVersionUID = 5290158463990158290L;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
index 6022c3d..6fa8cf2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
@@ -24,14 +24,18 @@ import com.datatorrent.lib.util.PojoUtils.SetterFloat;
import com.datatorrent.lib.util.PojoUtils.SetterInt;
import com.datatorrent.lib.util.PojoUtils.SetterLong;
import com.datatorrent.lib.util.PojoUtils.SetterShort;
+
import java.math.BigDecimal;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,6 +53,7 @@ import org.slf4j.LoggerFactory;
* @category Input
* @tags database, sql, pojo, memsql
*/
+@Evolving
public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
{
@Min(1)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
index bba60f7..a3ab1f3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
@@ -28,7 +28,10 @@ import com.datatorrent.lib.util.PojoUtils.GetterShort;
import java.sql.*;
import java.util.ArrayList;
+
import javax.validation.constraints.NotNull;
+
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +45,7 @@ import org.slf4j.LoggerFactory;
* @tags database, sql, pojo, memsql
*
*/
+@Evolving
public class MemsqlPOJOOutputOperator extends AbstractMemsqlOutputOperator<Object>
{
private static final long serialVersionUID = 20150618346L;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
index 285ed90..fc56d73 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
@@ -18,11 +18,15 @@ package com.datatorrent.contrib.mongodb;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.Getter;
import com.mongodb.BasicDBObject;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+
import javax.validation.constraints.NotNull;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
/**
* Implementation of {@link MongoDBOutputOperator} that saves a POJO in the mongodb database. <br/>
* <p>
@@ -31,6 +35,7 @@ import javax.validation.constraints.NotNull;
* @tags database, nosql, pojo, mongodb
* @since 0.3.5
*/
+@Evolving
public class MongoDBPOJOOutputOperator extends MongoDBOutputOperator<Object>
{
private final transient ArrayList<Getter<Object, Object>> getterValues;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
index 0f87ec0..7f397ab 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
@@ -19,8 +19,9 @@ import java.util.Map;
import javax.validation.constraints.NotNull;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+import com.google.common.base.Preconditions;
import com.datatorrent.lib.appdata.gpo.GPOGetters;
import com.datatorrent.lib.appdata.gpo.GPOMutable;
import com.datatorrent.lib.appdata.gpo.GPOUtils;
@@ -32,6 +33,7 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils;
* @category Output
* @tags app data, snapshot, pojo
*/
+@Evolving
public class AppDataSnapshotServerPOJO extends AbstractAppDataSnapshotServer<Object>
{
/**
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fe2ba87d/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
index 4da989d..7451a50 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java
@@ -25,9 +25,13 @@ import com.datatorrent.lib.util.PojoUtils.GetterFloat;
import com.datatorrent.lib.util.PojoUtils.GetterInt;
import com.datatorrent.lib.util.PojoUtils.GetterLong;
import com.datatorrent.lib.util.PojoUtils.GetterShort;
+
import java.sql.*;
import java.util.ArrayList;
+
import javax.validation.constraints.NotNull;
+
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +45,7 @@ import org.slf4j.LoggerFactory;
* @tags database, sql, pojo, jdbc
* @since 2.1.0
*/
+@Evolving
public class JdbcPOJOOutputOperator extends AbstractJdbcTransactionableOutputOperator<Object>
{
@NotNull
[41/50] [abbrv] incubator-apex-malhar git commit: Merge branch
'ishark-fixVersionCompatibilityIssue' into v3.1.0
Posted by ch...@apache.org.
Merge branch 'ishark-fixVersionCompatibilityIssue' into v3.1.0
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/e0ee8ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/e0ee8ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/e0ee8ab6
Branch: refs/heads/master
Commit: e0ee8ab62b2a0d99dbc79bd4726dc33d3dfed96f
Parents: 0b31fee 731b8bb
Author: Chandni Singh <ch...@datatorrent.com>
Authored: Tue Aug 18 13:51:46 2015 -0700
Committer: Chandni Singh <ch...@datatorrent.com>
Committed: Tue Aug 18 13:51:46 2015 -0700
----------------------------------------------------------------------
.../contrib/redis/AbstractRedisInputOperator.java | 7 +++++--
.../contrib/redis/RedisKeyValueInputOperator.java | 9 +++++++++
.../contrib/redis/RedisMapAsValueInputOperator.java | 8 ++++++++
.../datatorrent/contrib/redis/RedisPOJOInputOperator.java | 7 +++++++
4 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[19/50] [abbrv] incubator-apex-malhar git commit: SPOI-5746 #resolve
Setting memory to 128m for Mobile demo
Posted by ch...@apache.org.
SPOI-5746 #resolve Setting memory to 128m for Mobile demo
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/d87dd508
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/d87dd508
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/d87dd508
Branch: refs/heads/master
Commit: d87dd5082b5f0086d9edc0bde70c32e4177ce4b0
Parents: ba8d612
Author: sashadt <sa...@datatorrent.com>
Authored: Thu Jul 30 18:56:53 2015 -0700
Committer: sashadt <sa...@datatorrent.com>
Committed: Thu Jul 30 18:56:53 2015 -0700
----------------------------------------------------------------------
demos/mobile/src/main/resources/META-INF/properties.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/d87dd508/demos/mobile/src/main/resources/META-INF/properties.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/src/main/resources/META-INF/properties.xml b/demos/mobile/src/main/resources/META-INF/properties.xml
index 3eab5eb..d0bcac4 100644
--- a/demos/mobile/src/main/resources/META-INF/properties.xml
+++ b/demos/mobile/src/main/resources/META-INF/properties.xml
@@ -49,7 +49,7 @@
</property>
<property>
<name>dt.application.MobileDemo.operator.*.attr.JVM_OPTIONS</name>
- <value>-Xmx128</value>
+ <value>-Xmx128m</value>
</property>
<property>
<name>dt.application.MobileDemo.operator.*.port.*.attr.BUFFER_MEMORY_MB</name>
[32/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1531 from chandnisingh/feature-bugFixes-3.1.0
Posted by ch...@apache.org.
Merge pull request #1531 from chandnisingh/feature-bugFixes-3.1.0
omitting type from FieldInfo
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/8e94665e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/8e94665e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/8e94665e
Branch: refs/heads/master
Commit: 8e94665e5430225a609b475e465830d8e19ea872
Parents: f40ba34 f6d85fe
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Mon Aug 10 14:13:26 2015 -0700
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Mon Aug 10 14:13:26 2015 -0700
----------------------------------------------------------------------
library/src/main/java/com/datatorrent/lib/util/FieldInfo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[33/50] [abbrv] incubator-apex-malhar git commit: MLHR-1734 #resolve
Added idempotency changes for RabbitMQ input and output operator
Posted by ch...@apache.org.
MLHR-1734 #resolve Added idempotency changes for RabbitMQ input and output operator
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/13a3fbea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/13a3fbea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/13a3fbea
Branch: refs/heads/master
Commit: 13a3fbea74b7deaf674c5f42dd945ebd01e17f65
Parents: 8e94665
Author: ishark <is...@datatorrent.com>
Authored: Mon Jun 29 16:14:14 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Mon Aug 10 19:00:55 2015 -0700
----------------------------------------------------------------------
contrib/pom.xml | 6 +
.../rabbitmq/AbstractRabbitMQInputOperator.java | 141 +++++++++++++++++--
.../AbstractRabbitMQOutputOperator.java | 65 ++++++++-
...bstractSinglePortRabbitMQOutputOperator.java | 5 +-
.../rabbitmq/RabbitMQInputOperatorTest.java | 86 ++++++++---
.../rabbitmq/RabbitMQOutputOperatorTest.java | 28 ++--
6 files changed, 283 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 9776e2f..76e8144 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -565,5 +565,11 @@
<version>${dt.framework.version}</version>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>dt-engine</artifactId>
+ <version>${dt.framework.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
index 06b3b88..e408f5e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
@@ -16,12 +16,22 @@
package com.datatorrent.contrib.rabbitmq;
import com.datatorrent.api.*;
-import com.datatorrent.api.InputOperator;
import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.lib.io.IdempotentStorageManager;
+import com.datatorrent.lib.util.KeyValPair;
+import com.datatorrent.netlet.util.DTThrowable;
import com.rabbitmq.client.*;
+
import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
+
import javax.validation.constraints.NotNull;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,9 +71,9 @@ import org.slf4j.LoggerFactory;
*
* @since 0.3.2
*/
-public abstract class AbstractRabbitMQInputOperator<T>
- implements InputOperator,
-Operator.ActivationListener<OperatorContext>
+public abstract class AbstractRabbitMQInputOperator<T> implements
+ InputOperator, Operator.ActivationListener<OperatorContext>,
+ Operator.CheckpointListener
{
private static final Logger logger = LoggerFactory.getLogger(AbstractRabbitMQInputOperator.class);
@NotNull
@@ -87,8 +97,23 @@ Operator.ActivationListener<OperatorContext>
protected transient Channel channel;
protected transient TracingConsumer tracingConsumer;
protected transient String cTag;
- protected transient ArrayBlockingQueue<byte[]> holdingBuffer;
+
+ protected transient ArrayBlockingQueue<KeyValPair<Long,byte[]>> holdingBuffer;
+ private IdempotentStorageManager idempotentStorageManager;
+ protected final transient Map<Long, byte[]> currentWindowRecoveryState;
+ private transient final Set<Long> pendingAck;
+ private transient final Set<Long> recoveredTags;
+ private transient long currentWindowId;
+ private transient int operatorContextId;
+
+ public AbstractRabbitMQInputOperator()
+ {
+ currentWindowRecoveryState = new HashMap<Long, byte[]>();
+ pendingAck = new HashSet<Long>();
+ recoveredTags = new HashSet<Long>();
+ }
+
/**
* define a consumer which can asynchronously receive data,
* and added to holdingBuffer
@@ -124,8 +149,19 @@ Operator.ActivationListener<OperatorContext>
@Override
public void handleDelivery(String consumer_Tag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException
{
- holdingBuffer.add(body);
-// logger.debug("Received Async message:" + new String(body)+" buffersize:"+holdingBuffer.size());
+ long tag = envelope.getDeliveryTag();
+ if(envelope.isRedeliver() && (recoveredTags.contains(tag) || pendingAck.contains(tag)))
+ {
+ if(recoveredTags.contains(tag)) {
+ pendingAck.add(tag);
+ }
+ return;
+ }
+
+ // Acknowledgements are sent at the end of the window after adding to idempotency manager
+ pendingAck.add(tag);
+ holdingBuffer.add(new KeyValPair<Long, byte[]>(tag, body));
+ logger.debug("Received Async message: {} buffersize: {} ", new String(body), holdingBuffer.size());
}
}
@@ -137,7 +173,9 @@ Operator.ActivationListener<OperatorContext>
ntuples = holdingBuffer.size();
}
for (int i = ntuples; i-- > 0;) {
- emitTuple(holdingBuffer.poll());
+ KeyValPair<Long, byte[]> message = holdingBuffer.poll();
+ currentWindowRecoveryState.put(message.getKey(), message.getValue());
+ emitTuple(message.getValue());
}
}
@@ -146,22 +184,72 @@ Operator.ActivationListener<OperatorContext>
@Override
public void beginWindow(long windowId)
{
+ currentWindowId = windowId;
+ if (windowId <= this.idempotentStorageManager.getLargestRecoveryWindow()) {
+ replay(windowId);
+ }
}
+ @SuppressWarnings("unchecked")
+ private void replay(long windowId) {
+ Map<Long, byte[]> recoveredData;
+ try {
+ recoveredData = (Map<Long, byte[]>) this.idempotentStorageManager.load(operatorContextId, windowId);
+ if (recoveredData == null) {
+ return;
+ }
+ for (Entry<Long, byte[]> recoveredEntry : recoveredData.entrySet()) {
+ recoveredTags.add(recoveredEntry.getKey());
+ emitTuple(recoveredEntry.getValue());
+ }
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+
+
@Override
public void endWindow()
{
+ //No more messages can be consumed now. so we will call emit tuples once more
+ //so that any pending messages can be emitted.
+ KeyValPair<Long, byte[]> message;
+ while ((message = holdingBuffer.poll()) != null) {
+ currentWindowRecoveryState.put(message.getKey(), message.getValue());
+ emitTuple(message.getValue());
+ }
+
+ try {
+ this.idempotentStorageManager.save(currentWindowRecoveryState, operatorContextId, currentWindowId);
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+
+ currentWindowRecoveryState.clear();
+
+ for (Long deliveryTag : pendingAck) {
+ try {
+ channel.basicAck(deliveryTag, false);
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+
+ pendingAck.clear();
}
@Override
public void setup(OperatorContext context)
{
- holdingBuffer = new ArrayBlockingQueue<byte[]>(bufferSize);
+ this.operatorContextId = context.getId();
+ holdingBuffer = new ArrayBlockingQueue<KeyValPair<Long, byte[]>>(bufferSize);
+ this.idempotentStorageManager.setup(context);
}
@Override
public void teardown()
{
+ this.idempotentStorageManager.teardown();
}
@Override
@@ -178,10 +266,12 @@ Operator.ActivationListener<OperatorContext>
channel = connection.createChannel();
channel.exchangeDeclare(exchange, exchangeType);
+ boolean resetQueueName = false;
if (queueName == null){
// unique queuename is generated
// used in case of fanout exchange
queueName = channel.queueDeclare().getQueue();
+ resetQueueName = true;
} else {
// user supplied name
// used in case of direct exchange
@@ -193,7 +283,11 @@ Operator.ActivationListener<OperatorContext>
// consumer = new QueueingConsumer(channel);
// channel.basicConsume(queueName, true, consumer);
tracingConsumer = new TracingConsumer(channel);
- cTag = channel.basicConsume(queueName, true, tracingConsumer);
+ cTag = channel.basicConsume(queueName, false, tracingConsumer);
+ if(resetQueueName)
+ {
+ queueName = null;
+ }
}
catch (IOException ex) {
throw new RuntimeException("Connection Failure", ex);
@@ -211,6 +305,23 @@ Operator.ActivationListener<OperatorContext>
logger.debug(ex.toString());
}
}
+
+ @Override
+ public void checkpointed(long windowId)
+ {
+ }
+
+ @Override
+ public void committed(long windowId)
+ {
+ try {
+ idempotentStorageManager.deleteUpTo(operatorContextId, windowId);
+ }
+ catch (IOException e) {
+ throw new RuntimeException("committing", e);
+ }
+ }
+
public void setTupleBlast(int i)
{
this.tuple_blast = i;
@@ -275,5 +386,15 @@ Operator.ActivationListener<OperatorContext>
{
this.routingKey = routingKey;
}
+
+ public IdempotentStorageManager getIdempotentStorageManager() {
+ return idempotentStorageManager;
+ }
+
+ public void setIdempotentStorageManager(IdempotentStorageManager idempotentStorageManager) {
+ this.idempotentStorageManager = idempotentStorageManager;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
index a78febb..cc6b7db 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
@@ -16,12 +16,16 @@
package com.datatorrent.contrib.rabbitmq;
import com.datatorrent.common.util.BaseOperator;
+import com.datatorrent.lib.io.IdempotentStorageManager;
+import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.api.Context.OperatorContext;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import com.rabbitmq.client.QueueingConsumer;
+
import java.io.IOException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,21 +70,70 @@ public class AbstractRabbitMQOutputOperator extends BaseOperator
transient Channel channel = null;
transient String exchange = "testEx";
transient String queueName="testQ";
+
+ private IdempotentStorageManager idempotentStorageManager;
+ private transient long currentWindowId;
+ private transient long largestRecoveryWindowId;
+ private transient int operatorContextId;
+ protected transient boolean skipProcessingTuple = false;
+ private transient OperatorContext context;
+
@Override
public void setup(OperatorContext context)
{
+ // Needed to setup idempotency storage manager in setter
+ this.context = context;
+ this.operatorContextId = context.getId();
+
try {
connFactory.setHost("localhost");
connection = connFactory.newConnection();
channel = connection.createChannel();
channel.exchangeDeclare(exchange, "fanout");
-// channel.queueDeclare(queueName, false, false, false, null);
+
+ this.idempotentStorageManager.setup(context);
+
}
catch (IOException ex) {
logger.debug(ex.toString());
+ DTThrowable.rethrow(ex);
+ }
+ }
+
+ @Override
+ public void beginWindow(long windowId)
+ {
+ currentWindowId = windowId;
+ largestRecoveryWindowId = idempotentStorageManager.getLargestRecoveryWindow();
+ if (windowId <= largestRecoveryWindowId) {
+ // Do not resend already sent tuples
+ skipProcessingTuple = true;
+ }
+ else
+ {
+ skipProcessingTuple = false;
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void endWindow()
+ {
+ if(currentWindowId < largestRecoveryWindowId)
+ {
+ // ignore
+ return;
+ }
+ try {
+ idempotentStorageManager.save("processedWindow", operatorContextId, currentWindowId);
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+
public void setQueueName(String queueName) {
this.queueName = queueName;
@@ -95,9 +148,19 @@ public class AbstractRabbitMQOutputOperator extends BaseOperator
try {
channel.close();
connection.close();
+ this.idempotentStorageManager.teardown();
}
catch (IOException ex) {
logger.debug(ex.toString());
}
}
+
+ public IdempotentStorageManager getIdempotentStorageManager() {
+ return idempotentStorageManager;
+ }
+
+ public void setIdempotentStorageManager(IdempotentStorageManager idempotentStorageManager) {
+ this.idempotentStorageManager = idempotentStorageManager;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
index c16f70f..8e6ff39 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
@@ -60,7 +60,10 @@ public abstract class AbstractSinglePortRabbitMQOutputOperator<T> extends Abstra
@Override
public void process(T tuple)
{
- processTuple(tuple); // This is an abstract call
+ if(!skipProcessingTuple)
+ {
+ processTuple(tuple); // This is an abstract call
+ }
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
index 041e362..a14f4e7 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
@@ -25,17 +25,21 @@ import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import com.rabbitmq.client.QueueingConsumer;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datatorrent.contrib.helper.CollectorModule;
import com.datatorrent.contrib.helper.MessageQueueTestHelper;
-
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.api.Attribute;
import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.LocalMode;
-
+import com.datatorrent.lib.helper.OperatorContextTestHelper;
+import com.datatorrent.lib.io.IdempotentStorageManager;
+import com.datatorrent.lib.testbench.CollectorTestSink;
import com.datatorrent.netlet.util.DTThrowable;
/**
@@ -44,7 +48,7 @@ import com.datatorrent.netlet.util.DTThrowable;
public class RabbitMQInputOperatorTest
{
private static Logger logger = LoggerFactory.getLogger(RabbitMQInputOperatorTest.class);
-
+
public static final class TestStringRabbitMQInputOperator extends AbstractSinglePortRabbitMQInputOperator<String>
{
@Override
@@ -75,7 +79,6 @@ public class RabbitMQInputOperatorTest
connection = connFactory.newConnection();
channel = connection.createChannel();
channel.exchangeDeclare(exchange, "fanout");
-// channel.queueDeclare(queueName, false, false, false, null);
}
public void setQueueName(String queueName)
@@ -86,9 +89,7 @@ public class RabbitMQInputOperatorTest
public void process(Object message) throws IOException
{
String msg = message.toString();
-// logger.debug("publish:" + msg);
channel.basicPublish(exchange, "", null, msg.getBytes());
-// channel.basicPublish("", queueName, null, msg.getBytes());
}
public void teardown() throws IOException
@@ -100,12 +101,11 @@ public class RabbitMQInputOperatorTest
public void generateMessages(int msgCount) throws InterruptedException, IOException
{
for (int i = 0; i < msgCount; i++) {
-
- ArrayList<HashMap<String, Integer>> dataMaps = MessageQueueTestHelper.getMessages();
- for(int j =0; j < dataMaps.size(); j++)
- {
- process(dataMaps.get(j));
- }
+
+ ArrayList<HashMap<String, Integer>> dataMaps = MessageQueueTestHelper.getMessages();
+ for (int j = 0; j < dataMaps.size(); j++) {
+ process(dataMaps.get(j));
+ }
}
}
@@ -124,6 +124,8 @@ public class RabbitMQInputOperatorTest
LocalMode lma = LocalMode.newInstance();
DAG dag = lma.getDAG();
RabbitMQInputOperator consumer = dag.addOperator("Consumer", RabbitMQInputOperator.class);
+ consumer.setIdempotentStorageManager(new IdempotentStorageManager.FSIdempotentStorageManager());
+
final CollectorModule<byte[]> collector = dag.addOperator("Collector", new CollectorModule<byte[]>());
consumer.setHost("localhost");
@@ -144,7 +146,7 @@ public class RabbitMQInputOperatorTest
public void run()
{
long startTms = System.currentTimeMillis();
- long timeout = 10000L;
+ long timeout = 100000L;
try {
while (!collector.inputPort.collections.containsKey("collector") && System.currentTimeMillis() - startTms < timeout) {
Thread.sleep(500);
@@ -153,16 +155,14 @@ public class RabbitMQInputOperatorTest
startTms = System.currentTimeMillis();
while (System.currentTimeMillis() - startTms < timeout) {
List<?> list = collector.inputPort.collections.get("collector");
-
+
if (list.size() < testNum * 3) {
Thread.sleep(10);
- }
- else {
+ } else {
break;
}
}
- }
- catch (IOException ex) {
+ } catch (IOException ex) {
logger.error(ex.getMessage(), ex);
DTThrowable.rethrow(ex);
} catch (InterruptedException ex) {
@@ -179,5 +179,53 @@ public class RabbitMQInputOperatorTest
logger.debug("collection size: {} {}", collector.inputPort.collections.size(), collector.inputPort.collections);
MessageQueueTestHelper.validateResults(testNum, collector.inputPort.collections);
- }
+ }
+
+ @Test
+ public void testRecoveryAndIdempotency() throws Exception
+ {
+ RabbitMQInputOperator operator = new RabbitMQInputOperator();
+ operator.setIdempotentStorageManager(new IdempotentStorageManager.FSIdempotentStorageManager());
+ operator.setHost("localhost");
+ operator.setExchange("testEx");
+ operator.setExchangeType("fanout");
+
+ Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap();
+ CollectorTestSink<Object> sink = new CollectorTestSink<Object>();
+
+ operator.outputPort.setSink(sink);
+ OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap);
+
+ operator.setup(context);
+ operator.activate(context);
+
+ final RabbitMQMessageGenerator publisher = new RabbitMQMessageGenerator();
+ publisher.setup();
+ publisher.generateMessages(5);
+
+ Thread.sleep(10000);
+
+ operator.beginWindow(1);
+ operator.emitTuples();
+ operator.endWindow();
+
+ operator.deactivate();
+ Assert.assertEquals("num of messages in window 1", 15, sink.collectedTuples.size());
+
+ // failure and then re-deployment of operator
+ sink.collectedTuples.clear();
+ operator.setup(context);
+ operator.activate(context);
+
+ Assert.assertEquals("largest recovery window", 1, operator.getIdempotentStorageManager().getLargestRecoveryWindow());
+ operator.beginWindow(1);
+ operator.endWindow();
+ Assert.assertEquals("num of messages in window 1", 15, sink.collectedTuples.size());
+ sink.collectedTuples.clear();
+
+ operator.deactivate();
+ operator.teardown();
+ operator.getIdempotentStorageManager().deleteUpTo(context.getId(), 1);
+ publisher.teardown();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/13a3fbea/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
index a170a0e..27213c3 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import org.slf4j.LoggerFactory;
import com.datatorrent.contrib.helper.SourceModule;
-
+import com.datatorrent.lib.io.IdempotentStorageManager;
import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.LocalMode;
@@ -45,7 +45,7 @@ public class RabbitMQOutputOperatorTest
public int count = 0;
private final String host = "localhost";
ConnectionFactory connFactory = new ConnectionFactory();
-// QueueingConsumer consumer = null;
+ // QueueingConsumer consumer = null;
Connection connection = null;
Channel channel = null;
TracingConsumer tracingConsumer = null;
@@ -64,8 +64,6 @@ public class RabbitMQOutputOperatorTest
queueName = channel.queueDeclare().getQueue();
channel.queueBind(queueName, exchange, "");
-// consumer = new QueueingConsumer(channel);
-// channel.basicConsume(queueName, true, consumer);
tracingConsumer = new TracingConsumer(channel);
cTag = channel.basicConsume(queueName, true, tracingConsumer);
}
@@ -125,7 +123,6 @@ public class RabbitMQOutputOperatorTest
}
}
-
@Test
public void testDag() throws InterruptedException, MalformedURLException, IOException, Exception
{
@@ -133,7 +130,7 @@ public class RabbitMQOutputOperatorTest
runTest(testNum);
logger.debug("end of test");
}
-
+
protected void runTest(int testNum) throws IOException
{
RabbitMQMessageReceiver receiver = new RabbitMQMessageReceiver();
@@ -144,23 +141,22 @@ public class RabbitMQOutputOperatorTest
SourceModule source = dag.addOperator("source", new SourceModule());
source.setTestNum(testNum);
RabbitMQOutputOperator collector = dag.addOperator("generator", new RabbitMQOutputOperator());
-
+ collector.setIdempotentStorageManager(new IdempotentStorageManager.FSIdempotentStorageManager());
+
collector.setExchange("testEx");
dag.addStream("Stream", source.outPort, collector.inputPort).setLocality(Locality.CONTAINER_LOCAL);
final LocalMode.Controller lc = lma.getController();
lc.setHeartbeatMonitoringEnabled(false);
lc.runAsync();
- try {
+ try {
Thread.sleep(1000);
long timeout = 10000L;
long startTms = System.currentTimeMillis();
- while((receiver.count < testNum * 3) && (System.currentTimeMillis() - startTms < timeout))
- {
+ while ((receiver.count < testNum * 3) && (System.currentTimeMillis() - startTms < timeout)) {
Thread.sleep(100);
- }
- }
- catch (InterruptedException ex) {
+ }
+ } catch (InterruptedException ex) {
Assert.fail(ex.getMessage());
} finally {
lc.shutdown();
@@ -170,11 +166,9 @@ public class RabbitMQOutputOperatorTest
for (Map.Entry<String, Integer> e : receiver.dataMap.entrySet()) {
if (e.getKey().equals("a")) {
Assert.assertEquals("emitted value for 'a' was ", new Integer(2), e.getValue());
- }
- else if (e.getKey().equals("b")) {
+ } else if (e.getKey().equals("b")) {
Assert.assertEquals("emitted value for 'b' was ", new Integer(20), e.getValue());
- }
- else if (e.getKey().equals("c")) {
+ } else if (e.getKey().equals("c")) {
Assert.assertEquals("emitted value for 'c' was ", new Integer(1000), e.getValue());
}
}
[06/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1507 from tweise/engine-test-dep
Posted by ch...@apache.org.
Merge pull request #1507 from tweise/engine-test-dep
Restore dt-engine as common test dependency.
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/cecebb7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/cecebb7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/cecebb7a
Branch: refs/heads/master
Commit: cecebb7a2e9eef91f76e6b37bf4aa0a3e3b3a09e
Parents: e1392b0 54c6747
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Jul 27 22:16:51 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Jul 27 22:16:51 2015 -0700
----------------------------------------------------------------------
demos/echoserver/pom.xml | 9 ---------
demos/pi/pom.xml | 9 ---------
library/pom.xml | 6 ------
pom.xml | 10 ++++++++++
4 files changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[12/50] [abbrv] incubator-apex-malhar git commit: Rename parent pom.
Posted by ch...@apache.org.
Rename parent pom.
Conflicts:
apps/pom.xml
contrib/pom.xml
demos/pom.xml
library/pom.xml
pom.xml
samples/pom.xml
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/c966479a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/c966479a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/c966479a
Branch: refs/heads/master
Commit: c966479a1abd79ea1af2d1b997f5d1307858c3c1
Parents: 6d7c4bc
Author: thomas <th...@datatorrent.com>
Authored: Tue Jul 28 15:52:13 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue Jul 28 16:21:19 2015 -0700
----------------------------------------------------------------------
apps/pom.xml | 2 +-
benchmark/pom.xml | 2 +-
contrib/pom.xml | 2 +-
demos/pom.xml | 2 +-
library/pom.xml | 2 +-
pom.xml | 2 +-
samples/pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 360cc23..8eb18ff 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.datatorrent</groupId>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 1df29e2..514a8c6 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
<version>3.0.0-RC4</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 4687627..3616f84 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.datatorrent</groupId>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index c73ad27..64eebd6 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.datatorrent</groupId>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index 85940a1..4e93399 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c6f3c1..1ddc96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<version>3.0.0-RC4</version>
</parent>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c966479a/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index fa6ab15..27fbd0f 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
- <artifactId>malhar-all</artifactId>
+ <artifactId>malhar</artifactId>
<version>3.0.0-RC4</version>
</parent>
[45/50] [abbrv] incubator-apex-malhar git commit: Merge branch
'ilooner_pull' into devel-3.1
Posted by ch...@apache.org.
Merge branch 'ilooner_pull' into devel-3.1
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/30ddf4cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/30ddf4cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/30ddf4cc
Branch: refs/heads/master
Commit: 30ddf4cc74fd6665394a026bd7f61cb8abff405d
Parents: c4a6d8d fb8e486
Author: David Yan <da...@datatorrent.com>
Authored: Fri Aug 28 19:54:02 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Fri Aug 28 19:54:02 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 6 +++---
.../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 6 +++---
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 2 +-
.../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[35/50] [abbrv] incubator-apex-malhar git commit: Merge branch
'ishark-rabbitMQ' into v3.1.0
Posted by ch...@apache.org.
Merge branch 'ishark-rabbitMQ' into v3.1.0
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/0b3bb88d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0b3bb88d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0b3bb88d
Branch: refs/heads/master
Commit: 0b3bb88d8ebd2e52d483f77f7951eb56767f32df
Parents: 8e94665 4dc4788
Author: Chandni Singh <ch...@datatorrent.com>
Authored: Wed Aug 12 21:08:44 2015 -0700
Committer: Chandni Singh <ch...@datatorrent.com>
Committed: Wed Aug 12 21:08:44 2015 -0700
----------------------------------------------------------------------
.../rabbitmq/AbstractRabbitMQInputOperator.java | 142 +++++++++++++++++--
.../AbstractRabbitMQOutputOperator.java | 65 ++++++++-
...bstractSinglePortRabbitMQOutputOperator.java | 5 +-
.../rabbitmq/RabbitMQInputOperatorTest.java | 86 ++++++++---
.../rabbitmq/RabbitMQOutputOperatorTest.java | 28 ++--
5 files changed, 278 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
[10/50] [abbrv] incubator-apex-malhar git commit: statement should be
transient
Posted by ch...@apache.org.
statement should be transient
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/d96c3d85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/d96c3d85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/d96c3d85
Branch: refs/heads/master
Commit: d96c3d85f54d8cad4722c96722b2f5380edd7e01
Parents: bd84a40
Author: Chandni Singh <ch...@datatorrent.com>
Authored: Tue Jul 28 15:25:53 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Tue Jul 28 15:30:19 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/d96c3d85/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
index 52679bf..a73f9e8 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
public abstract class AbstractJdbcInputOperator<T> extends AbstractStoreInputOperator<T, JdbcStore>
{
private static final Logger logger = LoggerFactory.getLogger(AbstractJdbcInputOperator.class);
- Statement queryStatement = null;
+ protected transient Statement queryStatement;
private transient int waitForDataTimeout;
/**
[16/50] [abbrv] incubator-apex-malhar git commit: MLHR-1740:Fix names
and description of properties in R operator
Posted by ch...@apache.org.
MLHR-1740:Fix names and description of properties in R operator
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/c2b5f7cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/c2b5f7cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/c2b5f7cf
Branch: refs/heads/master
Commit: c2b5f7cfbac7af8242ad41152f9731f691de5720
Parents: b7ba521
Author: Sandeep Deshmukh <sa...@datatorrent.com>
Authored: Wed Jun 17 18:07:06 2015 +0530
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Tue Jul 28 21:57:53 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/contrib/r/RMax.java | 3 +
.../java/com/datatorrent/contrib/r/RMin.java | 3 +
.../java/com/datatorrent/contrib/r/RScript.java | 144 +++++++++++++------
.../contrib/r/RStandardDeviation.java | 3 +
4 files changed, 107 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c2b5f7cf/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java b/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
index 5acaeed..181218d 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
@@ -45,6 +45,9 @@ import com.datatorrent.netlet.util.DTThrowable;
* <br>
* <br>
*
+ * @displayName R Max
+ * @category Scripting
+ * @tags script, r
* @since 2.1.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c2b5f7cf/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java b/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
index d25d491..ef408c1 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
@@ -45,6 +45,9 @@ import com.datatorrent.netlet.util.DTThrowable;
* <br>
* <br>
*
+ * @displayName R Min
+ * @category Scripting
+ * @tags script, r
* @since 2.1.0
**/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c2b5f7cf/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java b/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
index 66c4379..5fb1076 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
@@ -37,35 +37,46 @@ import com.datatorrent.netlet.util.DTThrowable;
* This operator enables a user to execute a R script on tuples for Map<String, Object>. The script should be in the
* form of a function. This function will then be called by the operator.
*
- * The user should - 1. set the name of the script file (which contains the script in the form of a function) 2. set the
- * function name. 3. set the name of the return variable 4. Make sure that the script file is available in the
- * classpath. 5. set the type of arguments being passed. This will be done in a Map. 6. Send the data in the form of a
- * tuple consisting of a key:value pair where, "key" represents the name of the argument "value" represents the actual
- * value of the argument. A map of all the arguments is created and passed as input. The result will be returned on one
- * of the output ports depending on the type of the return value.
+ * The user should <br>
+ * 1. set the name of the script file (which contains the script in the form of a function) <br>
+ * 2. set the function name <br>
+ * 3. set the name of the return variable <br>
+ * 4. Make sure that the script file is available in the classpath <br>
+ * 5. set the type of arguments being passed. This will be done in a Map <br>
+ * 6. Send the data in the form of a tuple consisting of a key:value pair where, "key" represents the name of the
+ * argument "value" represents the actual value of the argument. A map of all the arguments is created and passed as
+ * input. <br> <br>
+ *
+ * The result will be returned on one of the output ports depending on the type of the return value.
+ * <br> <br>
+ *
+ * <b> Sample Usage Code : </b> oper is an object of type RScript. Create it by passing <br> < name of the R script with
+ * path from classpath>, < name of the function to be invoked>, < name of the return variable>);
+ * <br> <br>
+ * Map<String, RScript.REXP_TYPE> argTypeMap = new HashMap<String, RScript.REXP_TYPE>(); <br>
+ * argTypeMap.put(< argument name>, RScript.< argument type in the form of REXP_TYPE>); <br>
+ * argTypeMap.put(< argument name>, RScript.< argument type in the form of REXP_TYPE>); <br>
+ * ...... <br>
*
- * <b> Sample Usage Code : </b> oper is an object of type RScript. Create it by passing - <name of the R script with
- * path from classpath>, <name of the function to be invoked>, <name of the return variable>);
+ * oper.setArgTypeMap(argTypeMap); <br>
*
- * Map<String, RScript.REXP_TYPE> argTypeMap = new HashMap<String, RScript.REXP_TYPE>(); argTypeMap.put(<argument name>,
- * RScript.<argument type in the form of REXP_TYPE>); argTypeMap.put(<argument name>, RScript.<argument type in the form
- * of REXP_TYPE>); ... ...
- *
- * oper.setArgTypeMap(argTypeMap);
- *
- * HashMap map = new HashMap();
- *
- * map.put("<argument name>", <argument value>); map.put("<argument name>", <argument value>); ... ...
+ * HashMap map = new HashMap(); <br>
*
+ * map.put("< argument name1>", < argument value1>); <br>
+ * map.put("< argument name2>", < argument value2>); <br>
+ * ... ...
+ * <br>
* Note that the number of arguments inserted into the map should be same in number and order as that mentioned in the
- * argument type map above it.
+ * argument type map above it. <br>
*
- * Pass this 'map' to the operator now.
+ * Pass this 'map' to the operator now. <br> <br>
*
* Currently, support has been added for only int, real, string and boolean type of values and the corresponding arrays
- * to be passed and returned from the R scripts.
- *
+ * to be passed and returned from the R scripts. <br>
*
+ * @displayName R Script
+ * @category Scripting
+ * @tags script, r
* @since 2.1.0
* */
@@ -75,16 +86,6 @@ public class RScript extends ScriptOperator
@SuppressWarnings("unused")
private static final long serialVersionUID = 201401161205L;
- public Map<String, REXP_TYPE> getArgTypeMap()
- {
- return argTypeMap;
- }
-
- public void setArgTypeMap(Map<String, REXP_TYPE> argTypeMap)
- {
- this.argTypeMap = argTypeMap;
- }
-
public enum REXP_TYPE {
REXP_INT(1), REXP_DOUBLE(2), REXP_STR(3), REXP_BOOL(6), REXP_ARRAY_INT(32), REXP_ARRAY_DOUBLE(33), REXP_ARRAY_STR(34), REXP_ARRAY_BOOL(36);
@@ -99,13 +100,20 @@ public class RScript extends ScriptOperator
@NotNull
private Map<String, REXP_TYPE> argTypeMap;
- // Name of the return variable
+ /**
+ * Name of the return variable in R script
+ */
private String returnVariable = "retVal";
- // Function name given to the script inside the script file.
+ /**
+ * Function name to be invoked in R script
+ */
@NotNull
private String functionName;
+ /**
+ * Path of the R script file
+ */
@NotNull
protected String scriptFilePath;
@@ -125,44 +133,88 @@ public class RScript extends ScriptOperator
this.setReturnVariable(returnVariable);
}
+ /**
+ * Returns mapping of argument name to argument type
+ * @return argTypeMap
+ * map of argument types
+ */
+ public Map<String, REXP_TYPE> getArgTypeMap()
+ {
+ return argTypeMap;
+ }
+
+ /**
+ * Set mapping of argument name to argument type
+ * @param argTypeMap
+ * map of argument types
+ */
+ public void setArgTypeMap(Map<String, REXP_TYPE> argTypeMap)
+ {
+ this.argTypeMap = argTypeMap;
+ }
+
+ /**
+ * Unused in this operator
+ * @return null
+ */
@Override
public Map<String, Object> getBindings()
{
- return null; // To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
- // Get the value of the name of the variable being returned
+ /**
+ * Get name of the return variable in R script
+ * @return returnVariable
+ */
public String getReturnVariable()
{
return returnVariable;
}
- // Set the name for the return variable
+ /**
+ * Set return variable name in R script
+ * @param returnVariable
+ */
public void setReturnVariable(String returnVariable)
{
this.returnVariable = returnVariable;
}
- // Get the value of the script file with path as specified.
- public String getScriptFilePath()
+ /**
+ * Get name of the function to be invoked in R script
+ * @return functionName
+ */
+ public String getFunctionName()
{
- return scriptFilePath;
+ return functionName;
}
- // Set the value of the script file which should be executed.
- public void setScriptFilePath(String scriptFilePath)
+ /**
+ * Set function to be invoked in R script
+ * @param functionName
+ */
+ public void setFunctionName(String functionName)
{
- this.scriptFilePath = scriptFilePath;
+ this.functionName = functionName;
}
- public String getFunctionName()
+ /**
+ * Get path of R script file
+ * @return scriptFilePath
+ */
+ public String getScriptFilePath()
{
- return functionName;
+ return scriptFilePath;
}
- public void setFunctionName(String functionName)
+ /**
+ * Set path of R script file
+ * @param scriptFilePath
+ */
+ public void setScriptFilePath(String scriptFilePath)
{
- this.functionName = functionName;
+ this.scriptFilePath = scriptFilePath;
}
// Output port on which an int type of value is returned.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c2b5f7cf/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java b/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
index 96fac0a..8b54c72 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
@@ -45,6 +45,9 @@ import com.datatorrent.netlet.util.DTThrowable;
* <b>Partitions : No</b>, no. <br>
* <br>
*
+ * @displayName R Standard Deviation
+ * @category Scripting
+ * @tags script, r
* @since 2.1.0
*/
[37/50] [abbrv] incubator-apex-malhar git commit: Removed checking
all the window ids in idempotency storage before replay
Posted by ch...@apache.org.
Removed checking all the window ids in idempotency storage before replay
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/ada42ab9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/ada42ab9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/ada42ab9
Branch: refs/heads/master
Commit: ada42ab9ba0fe17162a38162b6d889afc91e741c
Parents: a57a3d7
Author: ishark <is...@datatorrent.com>
Authored: Fri Aug 14 14:37:24 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Fri Aug 14 14:37:24 2015 -0700
----------------------------------------------------------------------
.../redis/AbstractRedisInputOperator.java | 23 ++++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ada42ab9/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
index 7f79bd0..260fbf6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
@@ -35,7 +35,8 @@ import com.datatorrent.lib.io.IdempotentStorageManager;
* @category Input
* @tags redis, key value
*
- * @param <T> The tuple type.
+ * @param <T>
+ * The tuple type.
* @since 0.9.3
*/
public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOperator<T, RedisStore> implements CheckpointListener
@@ -47,6 +48,7 @@ public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOp
private transient Integer backupOffset;
private int scanCount;
private transient boolean replay;
+ private transient boolean skipOffsetRecovery = true;
@NotNull
private IdempotentStorageManager idempotentStorageManager;
@@ -92,33 +94,27 @@ public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOp
private void replay(long windowId)
{
try {
- if (checkIfWindowExistsInIdempotencyManager(windowId - 1)) {
+ // For first recovered window, offset is already part of recovery state.
+ // So skip reading from idempotency manager
+ if (!skipOffsetRecovery) {
// Begin offset for this window is recovery offset stored for the last
// window
RecoveryState recoveryStateForLastWindow = (RecoveryState) getIdempotentStorageManager().load(context.getId(), windowId - 1);
recoveryState.scanOffsetAtBeginWindow = recoveryStateForLastWindow.scanOffsetAtBeginWindow;
}
-
+ skipOffsetRecovery = false;
RecoveryState recoveryStateForCurrentWindow = (RecoveryState) getIdempotentStorageManager().load(context.getId(), windowId);
recoveryState.numberOfScanCallsInWindow = recoveryStateForCurrentWindow.numberOfScanCallsInWindow;
if (recoveryState.scanOffsetAtBeginWindow != null) {
scanOffset = recoveryState.scanOffsetAtBeginWindow;
}
replay = true;
+
} catch (IOException e) {
DTThrowable.rethrow(e);
}
}
- private boolean checkIfWindowExistsInIdempotencyManager(long windowId) throws IOException
- {
- long[] windowsIds = getIdempotentStorageManager().getWindowIds(context.getId());
- if(windowsIds.length == 0 || windowId < windowsIds[0] || windowId > windowsIds[windowsIds.length - 1]) {
- return false;
- }
- return true ;
- }
-
private void scanKeysFromOffset()
{
if (!scanComplete) {
@@ -157,11 +153,14 @@ public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOp
scanComplete = false;
scanParameters = new ScanParams();
scanParameters.count(scanCount);
+
// For the 1st window after checkpoint, windowID - 1 would not have recovery
// offset stored in idempotentStorageManager
// But recoveryOffset is non-transient, so will be recovered with
// checkPointing
+ // Offset recovery from idempotency storage can be skipped in this case
scanOffset = recoveryState.scanOffsetAtBeginWindow;
+ skipOffsetRecovery = true;
}
@Override
[50/50] [abbrv] incubator-apex-malhar git commit: Bring to parity
with v3.1.0.
Posted by ch...@apache.org.
Bring to parity with v3.1.0.
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/0690700b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0690700b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0690700b
Branch: refs/heads/master
Commit: 0690700b3d52f539882b01b2350c7b6e8834b3ca
Parents: ff31e3c b812652
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Wed Sep 9 15:30:01 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Wed Sep 9 15:30:01 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 5 +-
apps/pom.xml | 4 +-
benchmark/pom.xml | 6 +-
.../UniqueValueCountBenchmarkApplication.java | 9 +-
.../RubyOperatorBenchmarkApplication.java | 2 +-
.../memsql/MemsqlInputBenchmarkTest.java | 2 +-
.../benchmark/memsql/MemsqlOutputBenchmark.java | 6 +-
contrib/pom.xml | 10 +-
.../contrib/hbase/HBaseFieldInfo.java | 4 +
.../contrib/hbase/HBasePOJOInputOperator.java | 1 +
.../rabbitmq/AbstractRabbitMQInputOperator.java | 142 +++++++++++-
.../AbstractRabbitMQOutputOperator.java | 65 +++++-
...bstractSinglePortRabbitMQOutputOperator.java | 5 +-
.../redis/AbstractRedisInputOperator.java | 226 +++++++++++++++++-
.../redis/RedisKeyValueInputOperator.java | 66 ++++++
.../redis/RedisMapAsValueInputOperator.java | 54 +++++
.../contrib/redis/RedisPOJOInputOperator.java | 211 +++++++++++++++++
.../contrib/redis/RedisPOJOOutputOperator.java | 156 +++++++++++++
.../datatorrent/contrib/redis/RedisStore.java | 27 +++
.../contrib/twitter/TwitterSampleInput.java | 32 +++
.../rabbitmq/RabbitMQInputOperatorTest.java | 86 +++++--
.../rabbitmq/RabbitMQOutputOperatorTest.java | 28 +--
.../contrib/redis/RedisInputOperatorTest.java | 193 ++++++++++++++++
.../contrib/redis/RedisPOJOOperatorTest.java | 230 +++++++++++++++++++
demos/distributedistinct/pom.xml | 4 +-
demos/echoserver/pom.xml | 4 +-
demos/frauddetect/pom.xml | 4 +-
demos/machinedata/pom.xml | 6 +-
demos/mobile/pom.xml | 4 +-
.../demos/mobile/ApplicationTest.java | 2 -
demos/mrmonitor/pom.xml | 4 +-
demos/mroperator/pom.xml | 4 +-
demos/pi/pom.xml | 4 +-
demos/pom.xml | 9 +-
demos/r/pom.xml | 4 +-
demos/twitter/pom.xml | 6 +-
.../demos/twitter/WindowedTopCounter.java | 5 +
demos/uniquecount/pom.xml | 4 +-
demos/wordcount/pom.xml | 4 +-
demos/yahoofinance/pom.xml | 4 +-
library/pom.xml | 2 +-
.../lib/appdata/gpo/SerdeFieldsDescriptor.java | 4 +
.../lib/appdata/gpo/SerdeListGPOMutable.java | 4 +
.../lib/appdata/gpo/SerdeListPrimitive.java | 4 +
.../lib/appdata/gpo/SerdeListString.java | 4 +
.../lib/appdata/gpo/SerdeObjectPayloadFix.java | 4 +
.../appdata/query/QueryManagerAsynchronous.java | 4 +
.../query/serde/SchemaQueryDeserializer.java | 5 +
.../lib/io/PubSubWebSocketAppDataQuery.java | 48 +++-
.../lib/io/PubSubWebSocketAppDataResult.java | 27 ++-
.../lib/io/SimpleSinglePortInputOperator.java | 3 +-
.../lib/io/WebSocketInputOperator.java | 5 +-
.../lib/io/WebSocketOutputOperator.java | 7 +-
.../datatorrent/lib/metric/AvgAggregator.java | 4 +
.../lib/metric/max/DoubleMaxAggregator.java | 4 +
.../lib/metric/max/FloatMaxAggregator.java | 4 +
.../lib/metric/max/IntMaxAggregator.java | 4 +
.../lib/metric/max/LongMaxAggregator.java | 4 +
.../lib/metric/min/DoubleMinAggregator.java | 4 +
.../lib/metric/min/FloatMinAggregator.java | 4 +
.../lib/metric/min/IntMinAggregator.java | 4 +
.../lib/metric/min/LongMinAggregator.java | 4 +
.../lib/multiwindow/SortedMovingWindow.java | 3 +-
.../com/datatorrent/lib/util/FieldInfo.java | 1 +
.../lib/io/HttpJsonChunksInputOperatorTest.java | 1 -
.../lib/io/HttpLinesInputOperatorTest.java | 1 -
.../io/PubSubWebSocketAppDataOperatorTest.java | 74 ++++++
.../lib/io/PubSubWebSocketAppDataQueryTest.java | 66 +++++-
.../io/PubSubWebSocketAppDataResultTest.java | 20 +-
.../lib/io/PubSubWebSocketOperatorTest.java | 2 -
pom.xml | 60 ++++-
samples/pom.xml | 2 +-
72 files changed, 1881 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
[08/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1508 from tweise/evolving
Posted by ch...@apache.org.
Merge pull request #1508 from tweise/evolving
Mark POJO enabled operators @Evolving
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/0588626f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0588626f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0588626f
Branch: refs/heads/master
Commit: 0588626fa1d323682b94bedb3aaf0de80e0e1894
Parents: cecebb7 fe2ba87
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Tue Jul 28 00:08:46 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Tue Jul 28 00:08:46 2015 -0700
----------------------------------------------------------------------
.../aerospike/AerospikePOJONonTransactionalPutOperator.java | 2 ++
.../aerospike/AerospikePOJOTransactionalPutOperator.java | 2 ++
.../contrib/cassandra/CassandraPOJOInputOperator.java | 3 ++-
.../contrib/cassandra/CassandraPOJOOutputOperator.java | 7 +++++--
.../contrib/couchbase/CouchBasePOJOInputOperator.java | 3 ++-
.../contrib/couchbase/CouchbasePOJOSetOperator.java | 2 ++
.../datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java | 3 ++-
.../contrib/couchdb/CouchDBPOJOOutputOperator.java | 3 +++
.../com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java | 3 ++-
.../com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java | 2 ++
.../contrib/memcache/MemcachePOJOOutputOperator.java | 3 +++
.../datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java | 5 +++++
.../datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java | 4 ++++
.../contrib/mongodb/MongoDBPOJOOutputOperator.java | 5 +++++
.../lib/appdata/snapshot/AppDataSnapshotServerPOJO.java | 4 +++-
.../com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java | 5 +++++
16 files changed, 49 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[15/50] [abbrv] incubator-apex-malhar git commit: Fix category, tags,
properties, and display names for app builder.
Posted by ch...@apache.org.
Fix category, tags, properties, and display names for app builder.
Conflicts:
library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
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/b7ba5212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/b7ba5212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/b7ba5212
Branch: refs/heads/master
Commit: b7ba52125a67eb0ece2dc5e55e8107db942f9106
Parents: c966479
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Jul 28 18:21:14 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Tue Jul 28 21:29:13 2015 -0700
----------------------------------------------------------------------
.../accumulo/AbstractAccumuloInputOperator.java | 8 ++--
.../AbstractAccumuloOutputOperator.java | 8 ++--
.../contrib/accumulo/AccumuloStore.java | 30 ++++++-------
.../contrib/accumulo/AccumuloWindowStore.java | 16 +++----
.../aerospike/AbstractAerospikeGetOperator.java | 6 +--
...actAerospikeNonTransactionalPutOperator.java | 8 ++--
...stractAerospikeTransactionalPutOperator.java | 6 +--
.../contrib/aerospike/AerospikeStore.java | 10 ++---
.../aerospike/AerospikeTransactionalStore.java | 8 ++--
.../contrib/apachelog/ApplicationLocalLog.java | 2 +-
.../apachelog/ApplicationLogGenerator.java | 2 +-
.../contrib/apachelog/GeoIPExtractor.java | 2 +-
.../contrib/apachelog/TimestampExtractor.java | 2 +-
.../contrib/apachelog/UserAgentExtractor.java | 4 +-
.../AbstractCassandraInputOperator.java | 4 +-
...tCassandraTransactionableOutputOperator.java | 4 +-
...assandraTransactionableOutputOperatorPS.java | 4 +-
.../contrib/cassandra/CassandraStore.java | 4 +-
.../cassandra/CassandraTransactionalStore.java | 8 ++--
.../couchdb/AbstractCouchDBInputOperator.java | 4 +-
.../couchdb/AbstractCouchDBOutputOperator.java | 2 +-
.../couchdb/AbstractMapBasedInputOperator.java | 2 +-
.../contrib/couchdb/CouchDbStore.java | 4 +-
.../AbstractElasticSearchInputOperator.java | 18 ++++----
.../AbstractElasticSearchOutputOperator.java | 47 ++++++++++----------
.../ElasticSearchPercolatorOperator.java | 10 +++--
.../AbstractHBaseAppendOutputOperator.java | 6 +--
.../hbase/AbstractHBasePutOutputOperator.java | 10 ++---
...AbstractHBaseWindowAppendOutputOperator.java | 6 +--
.../AbstractHBaseWindowPutOutputOperator.java | 4 +-
.../hbase/HBaseCsvMappingPutOperator.java | 6 +--
.../contrib/hbase/HBaseGetOperator.java | 4 +-
.../contrib/hbase/HBaseInputOperator.java | 4 +-
.../hbase/HBaseNameValueCsvPutOperator.java | 10 ++---
.../contrib/hbase/HBaseOperatorBase.java | 6 +--
.../contrib/hbase/HBaseScanOperator.java | 4 +-
.../datatorrent/contrib/hbase/HBaseStore.java | 36 +++++++--------
.../contrib/hbase/HBaseWindowStore.java | 10 ++---
.../contrib/hive/FSPojoToHiveOperator.java | 7 ++-
.../datatorrent/contrib/hive/HiveOperator.java | 3 ++
.../kinesis/KinesisByteArrayOutputOperator.java | 6 +--
.../kinesis/KinesisStringOutputOperator.java | 3 +-
.../memcache/AbstractMemcacheInputOperator.java | 4 +-
.../AbstractMemcacheOutputOperator.java | 4 +-
.../AbstractMemcacheInputOperator.java | 4 +-
.../AbstractMemcacheOutputOperator.java | 4 +-
.../mongodb/MongoDBArrayListOutputOperator.java | 4 +-
.../mongodb/MongoDBHashMapOutputOperator.java | 4 +-
.../contrib/mongodb/MongoDBInputOperator.java | 4 +-
.../contrib/mongodb/MongoDBOutputOperator.java | 4 +-
.../AbstractRedisAggregateOutputOperator.java | 4 +-
.../redis/AbstractRedisInputOperator.java | 4 +-
.../redis/RedisKeyValPairOutputOperator.java | 4 +-
.../contrib/redis/RedisMapOutputOperator.java | 4 +-
...NumberSummationKeyValPairOutputOperator.java | 4 +-
.../RedisNumberSummationMapOutputOperator.java | 4 +-
.../splunk/AbstractSplunkInputOperator.java | 4 +-
.../contrib/splunk/SplunkTcpOutputOperator.java | 4 +-
.../contrib/sqlite/SqliteStreamOperator.java | 4 +-
.../datatorrent/lib/algo/FilterKeysHashMap.java | 2 +-
.../com/datatorrent/lib/algo/FirstMatchMap.java | 2 +-
.../datatorrent/lib/algo/FirstTillMatch.java | 2 +-
.../java/com/datatorrent/lib/algo/MatchMap.java | 2 +-
.../datatorrent/lib/algo/UniqueValueCount.java | 2 +-
.../snapshot/AppDataSnapshotServerMap.java | 4 +-
.../snapshot/AppDataSnapshotServerPOJO.java | 2 +-
...nsactionableKeyValueStoreOutputOperator.java | 2 +-
...egateTransactionableStoreOutputOperator.java | 2 +-
...BatchTransactionableStoreOutputOperator.java | 2 +-
.../db/AbstractKeyValueStoreInputOperator.java | 4 +-
...nsactionableKeyValueStoreOutputOperator.java | 4 +-
...sThruTransactionableStoreOutputOperator.java | 4 +-
.../lib/db/AbstractStoreInputOperator.java | 3 +-
.../lib/db/AbstractStoreOutputOperator.java | 3 +-
...tractTransactionableStoreOutputOperator.java | 4 +-
.../AbstractDBLookupCacheBackedOperator.java | 2 +-
...actJdbcNonTransactionableOutputOperator.java | 4 +-
...stractJdbcTransactionableOutputOperator.java | 4 +-
.../db/jdbc/JDBCLookupCacheBackedOperator.java | 2 +-
.../lib/io/AbstractFTPInputOperator.java | 6 ++-
.../io/AbstractKeyValueStoreOutputOperator.java | 6 +--
.../lib/io/PubSubWebSocketAppDataQuery.java | 4 +-
.../lib/io/PubSubWebSocketAppDataResult.java | 4 +-
.../datatorrent/lib/io/block/FSSliceReader.java | 3 ++
.../logs/ApacheLogParseMapOutputOperator.java | 4 +-
.../lib/logs/ApacheLogParseOperator.java | 4 +-
.../lib/logs/ApacheVirtualLogParseOperator.java | 4 +-
.../lib/logs/DimensionAggregationUnifier.java | 4 +-
.../lib/logs/FilteredLineToTokenArrayList.java | 4 +-
.../lib/logs/FilteredLineToTokenHashMap.java | 4 +-
.../lib/logs/FilteredLineTokenizerKeyVal.java | 4 +-
.../lib/logs/LineToTokenArrayList.java | 4 +-
.../lib/logs/LineToTokenHashMap.java | 4 +-
.../com/datatorrent/lib/logs/LineTokenizer.java | 2 +-
.../lib/logs/LineTokenizerKeyVal.java | 2 +-
.../logs/MultiWindowDimensionAggregation.java | 2 +-
.../lib/logs/RegexMatchMapOperator.java | 2 +-
.../com/datatorrent/lib/math/ChangeAlert.java | 10 ++---
.../datatorrent/lib/math/ChangeAlertKeyVal.java | 6 +--
.../datatorrent/lib/math/ChangeAlertMap.java | 6 +--
.../lib/multiwindow/AbstractSlidingWindow.java | 24 +++++-----
.../AbstractSlidingWindowKeyVal.java | 2 +-
.../lib/multiwindow/MultiWindowRangeKeyVal.java | 2 +-
.../lib/multiwindow/MultiWindowSumKeyVal.java | 2 +-
.../lib/multiwindow/SimpleMovingAverage.java | 6 +--
.../multiwindow/SimpleMovingAverageObject.java | 4 +-
.../lib/multiwindow/SortedMovingWindow.java | 10 ++---
.../lib/statistics/MedianOperator.java | 12 ++---
.../lib/statistics/ModeOperator.java | 6 +--
.../lib/statistics/StandardDeviation.java | 22 ++++-----
.../lib/statistics/WeightedMeanOperator.java | 16 +++----
.../lib/stream/AbstractAggregator.java | 16 +++----
.../lib/stream/ArrayListAggregator.java | 4 +-
.../datatorrent/lib/stream/ArrayListToItem.java | 6 +--
.../lib/stream/ConsolidatorKeyVal.java | 8 ++--
.../com/datatorrent/lib/stream/Counter.java | 4 +-
.../com/datatorrent/lib/stream/DevNull.java | 4 +-
.../datatorrent/lib/stream/DevNullCounter.java | 12 ++---
.../lib/stream/HashMapToKeyValPair.java | 4 +-
.../lib/stream/JsonByteArrayOperator.java | 4 +-
.../lib/stream/KeyValPairToHashMap.java | 4 +-
.../lib/stream/RoundRobinHashMap.java | 6 +--
.../lib/stream/StreamDuplicater.java | 6 +--
.../datatorrent/lib/stream/StreamMerger.java | 6 +--
.../streamquery/AbstractSqlStreamOperator.java | 22 ++++-----
.../lib/streamquery/DeleteOperator.java | 2 +-
.../lib/streamquery/DerbySqlStreamOperator.java | 4 +-
.../lib/streamquery/GroupByHavingOperator.java | 2 +-
.../lib/streamquery/InnerJoinOperator.java | 11 ++---
.../lib/streamquery/OrderByOperator.java | 43 ++++++++++++------
.../lib/streamquery/OrderByRule.java | 2 +-
.../lib/streamquery/OuterJoinOperator.java | 2 +-
.../lib/streamquery/SelectFunctionOperator.java | 4 +-
.../lib/streamquery/SelectOperator.java | 2 +-
.../lib/streamquery/SelectTopOperator.java | 10 ++---
.../lib/streamquery/UpdateOperator.java | 16 +++----
.../streamquery/condition/BetweenCondition.java | 16 +++----
.../condition/CompoundCondition.java | 12 ++---
.../lib/streamquery/condition/Condition.java | 6 +--
.../condition/EqualValueCondition.java | 6 +--
.../condition/HavingCompareValue.java | 8 ++--
.../streamquery/condition/HavingCondition.java | 8 ++--
.../lib/streamquery/condition/InCondition.java | 14 +++---
.../condition/JoinColumnEqualCondition.java | 12 ++---
.../streamquery/condition/LikeCondition.java | 12 ++---
.../streamquery/function/AverageFunction.java | 6 +--
.../lib/streamquery/function/CountFunction.java | 4 +-
.../streamquery/function/FirstLastFunction.java | 6 +--
.../lib/streamquery/function/FunctionIndex.java | 20 ++++-----
.../streamquery/function/MaxMinFunction.java | 4 +-
.../lib/streamquery/function/SumFunction.java | 2 +-
.../lib/streamquery/index/BinaryExpression.java | 10 ++---
.../lib/streamquery/index/ColumnIndex.java | 4 +-
.../lib/streamquery/index/Index.java | 4 +-
.../lib/streamquery/index/MidIndex.java | 8 ++--
.../lib/streamquery/index/NegateExpression.java | 2 +-
.../lib/streamquery/index/RoundDoubleIndex.java | 4 +-
.../lib/streamquery/index/StringCaseIndex.java | 8 ++--
.../lib/streamquery/index/StringLenIndex.java | 4 +-
.../lib/streamquery/index/SumExpression.java | 4 +-
.../lib/streamquery/index/UnaryExpression.java | 8 ++--
.../lib/testbench/ArrayListTestSink.java | 4 +-
.../lib/testbench/CollectorTestSink.java | 4 +-
.../lib/testbench/CompareFilterTuples.java | 28 ++++++------
.../testbench/CountAndLastTupleTestSink.java | 4 +-
.../lib/testbench/CountOccurance.java | 10 ++---
.../lib/testbench/CountTestSink.java | 2 +-
.../lib/testbench/EventClassifier.java | 4 +-
.../EventClassifierNumberToHashDouble.java | 4 +-
.../lib/testbench/EventGenerator.java | 12 ++---
.../lib/testbench/EventIncrementer.java | 10 ++---
.../lib/testbench/FilterClassifier.java | 2 +-
.../lib/testbench/FilteredEventClassifier.java | 2 +-
.../datatorrent/lib/testbench/HashTestSink.java | 2 +-
.../lib/testbench/HttpStatusFilter.java | 2 +-
.../datatorrent/lib/testbench/KeyValSum.java | 2 +-
.../lib/testbench/RandomEventGenerator.java | 4 +-
.../lib/testbench/RandomWordGenerator.java | 2 +-
.../datatorrent/lib/testbench/RedisSumOper.java | 4 +-
.../lib/testbench/SeedEventClassifier.java | 2 +-
.../lib/testbench/SeedEventGenerator.java | 2 +-
.../datatorrent/lib/testbench/SumTestSink.java | 2 +-
.../lib/testbench/ThroughputCounter.java | 2 +-
.../lib/testbench/TopOccurrence.java | 6 +--
.../datatorrent/lib/util/BaseLineTokenizer.java | 2 +-
.../datatorrent/lib/util/BaseMatchOperator.java | 13 ++++++
.../lib/util/BaseNumberValueOperator.java | 12 ++++-
.../util/DimensionTimeBucketSumOperator.java | 2 +-
188 files changed, 632 insertions(+), 576 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
index 202bd98..8856ff1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
@@ -24,15 +24,15 @@ import org.apache.accumulo.core.data.Value;
import com.datatorrent.lib.db.AbstractStoreInputOperator;
/**
- * Base input adapter, which reads data from persistence database and writes into output port(s). Subclasses should provide the
- implementation of getting the tuples and scanner methods.
+ * Base input adapter, which reads data from persistence database and writes into output port(s). Subclasses should provide the
+ * implementation of getting the tuples and scanner methods.
*
* <p>
* This is an abstract class. Sub-classes need to implement {@link #getScanner()} and {@link #getTuple(Entry)}.
* </p>
* @displayName Abstract Accumulo Input
- * @category Store
- * @tags key value, input operator
+ * @category Input
+ * @tags key value, accumulo
* @since 1.0.4
*/
public abstract class AbstractAccumuloInputOperator<T> extends AbstractStoreInputOperator<T, AccumuloStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
index cee01cd..97e4192 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
@@ -47,8 +47,8 @@ import com.google.common.collect.Lists;
* duplicates limiting it to the tuples that were processed in the window when
* the operator shutdown.
* @displayName Abstract Accumulo Output
- * @category Store
- * @tags output operator
+ * @category Output
+ * @tags accumulo, key value
* @param <T>
* The tuple type
* @since 1.0.4
@@ -94,12 +94,12 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
tuples.clear();
}
/**
- *
+ *
* @param t
* @return Mutation
*/
public abstract Mutation operationMutation(T t);
-
+
@Override
public void setup(OperatorContext context)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
index afec90b..66a46b2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
@@ -34,11 +34,11 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.db.Connectable;
/**
- * A {@link Connectable} for accumulo that implements Connectable interface.
+ * A {@link Connectable} for accumulo that implements Connectable interface.
* <p>
* @displayName Accumulo Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags key value, accumulo
* @param <T>
* @since 1.0.4
*/
@@ -65,7 +65,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for Connector
- *
+ *
* @return Connector
*/
public Connector getConnector() {
@@ -74,7 +74,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for TableName
- *
+ *
* @return TableName
*/
public String getTableName() {
@@ -83,7 +83,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for TableName
- *
+ *
* @param tableName
*/
public void setTableName(String tableName) {
@@ -92,7 +92,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for zookeeper host address
- *
+ *
* @return ZookeeperHost
*/
public String getZookeeperHost() {
@@ -101,7 +101,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for zookeeper host address
- *
+ *
* @param zookeeperHost
*/
public void setZookeeperHost(String zookeeperHost) {
@@ -110,7 +110,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for instanceName
- *
+ *
* @return instanceName
*/
public String getInstanceName() {
@@ -119,7 +119,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for instanceName
- *
+ *
* @param instanceName
*/
public void setInstanceName(String instanceName) {
@@ -128,7 +128,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for userName
- *
+ *
* @param userName
*/
public void setUserName(String userName) {
@@ -137,7 +137,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for password
- *
+ *
* @param password
*/
public void setPassword(String password) {
@@ -145,7 +145,7 @@ public class AccumuloStore implements Connectable {
}
/**
* setter for memory limit
- *
+ *
* @param memoryLimit
*/
public void setMemoryLimit(long memoryLimit) {
@@ -153,7 +153,7 @@ public class AccumuloStore implements Connectable {
}
/**
* setter for number of writer threads
- *
+ *
* @param numThreads
*/
public void setNumThreads(int numThreads) {
@@ -162,7 +162,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for BatchWriter
- *
+ *
* @return BatchWriter
*/
public BatchWriter getBatchwriter() {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
index 475c044..1839072 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
@@ -38,16 +38,16 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.db.TransactionableStore;
/**
- * Provides transactional support by implementing TransactionableStore abstract methods.
- *
+ * Provides transactional support by implementing TransactionableStore abstract methods.
+ *
* <p>
* Not intended for true transactional
* properties. It does not guarantee exactly once property.It only skips tuple
* processed in previous windows
- *
+ *
* @displayName Accumulo Window Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags accumulo, key value
* @since 1.0.4
*/
public class AccumuloWindowStore extends AccumuloStore implements TransactionableStore {
@@ -154,7 +154,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
Mutation mutation = new Mutation(rowBytes);
mutation.put(columnFamilyBytes, lastWindowColumnBytes, WindowIdBytes);
try {
- batchwriter.addMutation(mutation);
+ batchwriter.addMutation(mutation);
batchwriter.flush();
} catch (MutationsRejectedException e) {
logger.error("error getting committed window id", e);
@@ -168,7 +168,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
}
- public static byte[] toBytes(long l)
+ public static byte[] toBytes(long l)
{
ByteArrayOutputStream baos=new ByteArrayOutputStream(Long.SIZE/8);
DataOutputStream dos=new DataOutputStream(baos);
@@ -176,7 +176,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
try {
dos.writeLong(l);
result=baos.toByteArray();
- dos.close();
+ dos.close();
} catch (IOException e) {
logger.error("error converting to byte array");
DTThrowable.rethrow(e);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
index bb1bb86..f5cfb8a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
@@ -27,13 +27,13 @@ import org.slf4j.LoggerFactory;
/**
* Base input adapter, which reads data from persistence database through its API and writes into output port(s).&nsbsp;
- * Subclasses should provide the implementation of getting the tuples and querying to retrieve data.
+ * Subclasses should provide the implementation of getting the tuples and querying to retrieve data.
* <p>
* This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(Record)}.
* </p>
* @displayName Abstract Aerospike Get
- * @category Database
- * @tags get, input operator
+ * @category Input
+ * @tags get
* @since 1.0.4
*/
public abstract class AbstractAerospikeGetOperator<T> extends AbstractStoreInputOperator<T, AerospikeStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
index 28f65f4..2d556eb 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
@@ -27,11 +27,11 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
/**
* <p>
- * Generic base output adaptor which writes tuples as they come without providing any transactional support. Subclasses should provide implementation for getting updated bins.
+ * Generic base output adaptor which writes tuples as they come without providing any transactional support. Subclasses should provide implementation for getting updated bins.
* </p>
* @displayName Abstract Aerospike Non Transactional Put
- * @category Database
- * @tags output operator, put, non transactional
+ * @category Output
+ * @tags put, non transactional
* @param <T> type of tuple
* @since 1.0.4
*/
@@ -46,7 +46,7 @@ public abstract class AbstractAerospikeNonTransactionalPutOperator<T> extends Ab
/**
* Any concrete class needs to implement this method which using the input tuple, adds the
* modified bins to bins list and returns the key for that updated record.
- *
+ *
* @param tuple Tuple coming in from input port
* @param bins list of bins that would be updated for this tuple
* @return key for the row to be updated in the database
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
index 3221cbf..d594e79 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
@@ -36,8 +36,8 @@ import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Aerospike Transactional Put
- * @category Database
- * @tags output operator, put, transactional
+ * @category Output
+ * @tags put, transactional
* @param <T>type of tuple
* @since 1.0.4
*/
@@ -53,7 +53,7 @@ public abstract class AbstractAerospikeTransactionalPutOperator<T> extends Abstr
/**
* Any concrete class needs to implement this method which using the input tuple, adds the
* modified bins to bins list and returns the key for that updated record.
- *
+ *
* @param tuple Tuple coming in from input port
* @param bins list of bins that would be updated for this tuple
* @return key for the row to be updated in the database
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
index cf0266a..7d37b6a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
@@ -24,10 +24,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A {@link Connectable} that uses aerospike to connect to stores and implements Connectable interface.
- *
+ * A {@link Connectable} that uses aerospike to connect to stores and implements Connectable interface.
+ *
* @displayName Aerospike Store
- * @category Database
+ * @category Output
* @tags store
* @since 1.0.4
*/
@@ -61,7 +61,7 @@ public class AerospikeStore implements Connectable {
/**
* Get the node.
- *
+ *
* @return The node
*/
@NotNull
@@ -80,7 +80,7 @@ public class AerospikeStore implements Connectable {
/**
* Get the client.
- *
+ *
* @return The client
*/
public AerospikeClient getClient() {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
index 4d1c2c6..0645856 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
@@ -29,9 +29,9 @@ import com.datatorrent.lib.db.TransactionableStore;
/**
* <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
- *
+ *
* @displayName Aerospike Transactional Store
- * @category Database
+ * @category Output
* @tags store, transactional
* @since 1.0.4
*/
@@ -170,10 +170,10 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
IndexTask task;
try {
- task = client.createIndex(null, namespace, metaSet,
+ task = client.createIndex(null, namespace, metaSet,
"operatorIdIndex", metaTableOperatorIdColumn, IndexType.NUMERIC);
task.waitTillComplete();
- task = client.createIndex(null, namespace, metaSet,
+ task = client.createIndex(null, namespace, metaSet,
"appIdIndex", metaTableAppIdColumn, IndexType.STRING);
task.waitTillComplete();
} catch (AerospikeException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
index b189b62..57dfb37 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration;
* An implementation of Streaming Application that reads from a local apache log file on the fly and dumps the parsed data to output.
* <p>
* @displayName Application Local Log
- * @category Database
+ * @category Output
* @tags reader, streaming
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
index 9133f2f..0fca7b3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.conf.Configuration;
*
* <p>
* @displayName Application Log Generator
- * @category Database
+ * @category Output
* @tags streaming
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
index 993a5d5..751c7b3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*
* com.maxmind.geoip.LookupService.class
* @displayName Geo IP Extractor
- * @category Database
+ * @category Output
* @tags extraction, geo
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
index 9095b57..11ded5a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* An implementation of InformationExtractor that extracts the time stamp in milliseconds from epoch from an arbitrary date string.
* <p>
* @displayName Timestamp Extractor
- * @category Database
+ * @category Output
* @tags timestamp, date, extraction
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
index f7a7d54..454c2d2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
@@ -29,7 +29,7 @@ import net.sf.uadetector.service.UADetectorServiceFactory;
import net.sf.uadetector.UserAgentStringParser;
/**
- * An implementation of Information Extractor that extracts the browser and the OS from a user-agent string.
+ * An implementation of Information Extractor that extracts the browser and the OS from a user-agent string.
* <p>
* The user of this extractor needs to include the jars which contain these classes in DAGContext.LIBRARY_JARS
*
@@ -37,7 +37,7 @@ import net.sf.uadetector.UserAgentStringParser;
* net.sf.uadetector.service.UADetectorServiceFactory.class
* net.sf.qualitycheck.Check.class
* @displayName User Agent Extractor
- * @category Database
+ * @category Output
* @tags cache, extraction
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
index ee2d155..0c14a0e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
@@ -36,8 +36,8 @@ import com.datatorrent.netlet.util.DTThrowable;
* </p>
* @param <T>
* @displayName Abstract Cassandra Input
- * @category Store
- * @tags input operator
+ * @category Input
+ * @tags cassandra
* @since 1.0.2
*/
public abstract class AbstractCassandraInputOperator<T> extends AbstractStoreInputOperator<T, CassandraStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
index c1861a4..299d8ad 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
@@ -40,8 +40,8 @@ import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Cassandra Transactionable Output
- * @category Store
- * @tags output operator, batch, transactionable
+ * @category Output
+ * @tags cassandra, batch, transactionable
* @param <T>type of tuple</T>
* @since 1.0.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
index 4b0242e..5587e66 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
@@ -41,8 +41,8 @@ import javax.annotation.Nonnull;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Cassandra Transactionable Output With Prepared Statement
- * @category Store
- * @tags output operator, batch, transactionable
+ * @category Output
+ * @tags cassandra, batch, transactionable
* @param <T>type of tuple</T>
* @since 1.0.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
index d2b874c..01aaa3b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
@@ -31,8 +31,8 @@ import com.datatorrent.lib.db.Connectable;
* A {@link Connectable} that uses cassandra to connect to stores and implements Connectable interface.
* <p>
* @displayName Cassandra Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags cassandra
* @since 1.0.2
*/
public class CassandraStore implements Connectable
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
index 2740704..afcc026 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
@@ -24,11 +24,11 @@ import com.datatorrent.lib.db.TransactionableStore;
/**
* <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
- *
+ *
* <p>
* @displayName Cassandra Transactional Store
- * @category Store
- * @tags store, transactional
+ * @category Output
+ * @tags cassandra, transactional
* @since 1.0.2
*/
public class CassandraTransactionalStore extends CassandraStore implements TransactionableStore {
@@ -137,7 +137,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
logger.debug(command);
lastWindowUpdateCommand = session.prepare(command);
- command = "DELETE FROM " + keyspace +"."+ metaTable + " where " + metaTableAppIdColumn + " = ? and " +
+ command = "DELETE FROM " + keyspace +"."+ metaTable + " where " + metaTableAppIdColumn + " = ? and " +
metaTableOperatorIdColumn + " = ?";
logger.debug(command);
lastWindowDeleteCommand = session.prepare(command);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
index 8ca2feb..d4ad85b6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
@@ -50,8 +50,8 @@ import com.datatorrent.api.Context;
* Also the {@link #getViewQuery()} method should return the same view stored in CouchDb every time.<br/>
* </p>
* @displayName Abstract CouchDB Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags couchdb
* @param <T> Type of tuples which are generated</T>
* @since 0.3.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
index 1e77b1e..7a59ec5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
@@ -24,7 +24,7 @@ import java.util.Map;
* An {@link AbstractStoreOutputOperator} saving tuples in the CouchDb.
* Sub-classes provide the implementation of parsing document id from the tuple and converting tuple to a map.
* @displayName Abstract CouchDB Output
- * @category Database
+ * @category Output
* @tags output operator
* @param <T> type of tuple </T>
* @since 0.3.5
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
index 27475fd..f07b1c9 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
@@ -29,7 +29,7 @@ import java.util.Map;
* It uses the emitTuples implementation of {@link AbstractCouchDBInputOperator} which emits the complete result
* of the ViewQuery every window cycle.
* @displayName Abstract Map Based Input
- * @category Database
+ * @category Input
* @tags input operator
* @since 0.3.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
index 6d54c02..1d98fc0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
@@ -36,8 +36,8 @@ import com.datatorrent.lib.db.Connectable;
* <p>
* Operates in At-most once recovery mode.
* @displayName CouchDb Store
- * @category Database
- * @tags store
+ * @category Output
+ * @tags couchdb
* @since 0.3.5
*/
public class CouchDbStore implements Connectable
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
index 3fb92a2..78af5ea 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
@@ -34,12 +34,12 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
* <br>
* Run time checks:<br>
* hostName port<br>
- *
+ *
* <b>Benchmarks</b>: <br>
- *
- * @displayName ElasticSearch input
- * @category Store
- * @tags input operator
+ *
+ * @displayName Elastic Search Input
+ * @category Input
+ * @tags elastic search
*
* @since 2.1.0
*/
@@ -49,7 +49,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Initializing transient fields such as ElasticSearchConnectable, SearchRequestBuilder
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
*/
@Override
@@ -61,7 +61,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Emit one tuple per {@code SearchHit} for given search query
- *
+ *
* @see com.datatorrent.api.InputOperator#emitTuples()
*/
@Override
@@ -78,7 +78,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Converts SearchHit to Tuple
- *
+ *
* @param hit
* @return tuple constructed from <code>hit</code>
*/
@@ -88,7 +88,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
* Set {@link SearchRequestBuilder} properties according to search query requirements. Properties which do not change
* for each window can be set in {@code setup()}. Properties which may change for each window should be set in this
* function
- *
+ *
* @return {@link SearchRequestBuilder}
*/
protected abstract SearchRequestBuilder getSearchRequestBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
index 640edaf..54a43af 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
@@ -30,8 +30,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
/**
* This is the base implementation for a non-transactional batch output operator for ElasticSearch.
- *
- *
+ *
+ *
* <br>
* Ports:<br>
* <b>Input</b>: Can have one input port <br>
@@ -39,7 +39,7 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* <br>
* Properties:<br>
* <b>batchSize</b>:size for each batch insert, default value is 1000<br>
- *
+ *
* Compile time checks:<br>
* None<br>
* <br>
@@ -47,13 +47,14 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* hostName<br>
* port<br>
* batchSize <br>
- *
+ *
* <b>Benchmarks</b>: <br>
* </p>
- *
- * @displayName ElasticSearch Output
- * @category Store
*
+ * @displayName Elastic Search Output
+ * @category Output
+ * @tags elastic search
+ *
* @since 2.1.0
*/
public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSearchConnectable> extends AbstractStoreOutputOperator<T, S>
@@ -65,7 +66,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Initialize transient fields such as {@code tupleBatch}
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreOutputOperator#setup(com.datatorrent.api.Context.OperatorContext)
*/
@Override
@@ -78,7 +79,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Adds tuple to the queue.
* Calls {@link #processBatch()} if queue is full
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreOutputOperator#processTuple(java.lang.Object)
*/
public void processTuple(T tuple)
@@ -116,11 +117,11 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
DTThrowable.rethrow(new Exception(bulkResponse.buildFailureMessage()));
}
}
-
+
/**
* Create {@link IndexRequestBuilder} for this tuple.
* It calls {@link #getId(T)}, {@link #getIndexName(T)}, {@link #getType(T)}.
- *
+ *
* @param tuple
* @return
*/
@@ -144,36 +145,36 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Determine id for the given tuple.<br>
* If tuples do not have any field mapping to unique id then this function may return null. In this case
- * ElasticSearch will add auto-generated _id field to the document.
+ * ElasticSearch will add auto-generated _id field to the document.
* ElasticSearch will treat every tuple as fresh record.
- * If user requires {@code ProcessingMode.EXACTLY_ONCE} support; then user must
+ * If user requires {@code ProcessingMode.EXACTLY_ONCE} support; then user must
* implement {@link #getId(Object)} and make sure that distinct value is returned for each record.
- *
+ *
* @param tuple
* @return
*/
protected abstract String getId(T tuple);
-
+
/**
* Decides indexName under which this tuple gets stored.
- * Depending on scenario, user may decide index all tuples under same indexName
+ * Depending on scenario, user may decide index all tuples under same indexName
* (In this case user can return constant value for indexName).
- * Or user may have custom logic for deriving indexName
+ * Or user may have custom logic for deriving indexName
* @param tuple
* @return
*/
protected abstract String getIndexName(T tuple);
-
+
/**
* Decides type for given tuple.
- * Depending on scenario, user may decide index all tuples under same type
+ * Depending on scenario, user may decide index all tuples under same type
* (In this case user can return constant value for type).
- * Or user may have custom logic for deriving type.
+ * Or user may have custom logic for deriving type.
* @param tuple
* @return
*/
protected abstract String getType(T tuple);
-
+
/**
* @return the batchSize
*/
@@ -181,7 +182,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
{
return batchSize;
}
-
+
/**
* @param batchSize the batchSize to set
*/
@@ -189,5 +190,5 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
{
this.batchSize = batchSize;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
index ca57271..11c7742 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
@@ -28,7 +28,9 @@ import com.datatorrent.netlet.util.DTThrowable;
/**
* Percolate operator for ElasticSearch
- *
+ *
+ * @category Output
+ * @tags elastic search
* @since 2.1.0
*/
public class ElasticSearchPercolatorOperator extends BaseOperator
@@ -36,7 +38,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
@NotNull
public String hostName;
public int port;
-
+
@NotNull
public String indexName;
@NotNull
@@ -49,7 +51,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
/*
* (non-Javadoc)
- *
+ *
* @see com.datatorrent.api.DefaultInputPort#process(java.lang.Object)
*/
@Override
@@ -70,7 +72,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
DTThrowable.rethrow(e);
}
}
-
+
/* (non-Javadoc)
* @see com.datatorrent.common.util.BaseOperator#teardown()
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
index 610766c..f8e3e5b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
@@ -38,8 +38,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* This class offers non-transactional append where the columns are append as
* the tuples come in without waiting for the end window
* @displayName Abstract HBase Append Output
- * @category Store
- * @tags output operator
+ * @category Output
+ * @tags hbase
* @param <T>
* The tuple type
* @since 1.0.2
@@ -69,7 +69,7 @@ extends AbstractStoreOutputOperator<T, HBaseStore> {
* Return the HBase Append metric to store the tuple. The implementor should
* return a HBase Append metric that specifies where and what to store for
* the tuple in the table.
- *
+ *
* @param t
* The tuple
* @return The HBase Append metric
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
index e98a64e..ee44d99 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
@@ -43,8 +43,8 @@ import com.datatorrent.netlet.util.DTThrowable;
* <br>
* This class offers non-transactional put where tuples are put as they come in.
* @displayName Abstract HBase Put Output
- * @category Store
- * @tags output operator, put
+ * @category Output
+ * @tags hbase, put
* @param <T>
* The tuple type
* @since 1.0.2
@@ -54,7 +54,7 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
public static final int DEFAULT_BATCH_SIZE = 1000;
private int batchSize = DEFAULT_BATCH_SIZE;
protected int unCommittedSize = 0;
-
+
public AbstractHBasePutOutputOperator() {
store = new HBaseStore();
}
@@ -98,7 +98,7 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
DTThrowable.rethrow(e);
}
}
-
+
public abstract Put operationPut(T t);
/**
@@ -118,5 +118,5 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
this.batchSize = batchSize;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
index c9f4217..ca7ff96 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
@@ -54,8 +54,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperato
* It supports atleast once and atmost once processing modes.
* Exactly once is not supported
* @displayName Abstract HBase Window Append Output
- * @category Store
- * @tags output operator, append, transactionable, batch
+ * @category Output
+ * @tags hbase, append, transactionable, batch
* @param <T>
* The tuple type
* @since 1.0.2
@@ -110,7 +110,7 @@ public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends Abstrac
* Return the HBase Append metric to store the tuple. The implementor should
* return a HBase Append metric that specifies where and what to store for
* the tuple in the table.
- *
+ *
* @param t
* The tuple
* @return The HBase Append metric
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
index f117168..5c6f6ce 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
@@ -54,8 +54,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperato
* It supports atleast once and atmost once processing modes.
* Exactly once is not supported
* @displayName Abstract HBase Window Put Output
- * @category Store
- * @tags output operator, put, transactionable, batch
+ * @category Output
+ * @tags hbase, put, transactionable, batch
* @param <T>
* The tuple type
* @since 1.0.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
index 48819b7..03ab6f2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
@@ -34,11 +34,11 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.util.ReusableStringReader;
/**
- * Takes a configuration string which tells us about the position of the row, or column. The incoming tuples are inserted accordingly.
+ * Takes a configuration string which tells us about the position of the row, or column. The incoming tuples are inserted accordingly.
* <p>
* @displayName HBase Csv Mapping Put
- * @category Store
- * @tags output operator, put, String
+ * @category Output
+ * @tags hbase, csv, put, String
* @since 1.0.4
*/
public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
index 795548e..68be0b1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
@@ -31,8 +31,8 @@ import org.apache.hadoop.hbase.client.Result;
*
* <br>
* @displayName HBase Get
- * @category Store
- * @tags input operator, get
+ * @category Input
+ * @tags hbase, get
* @param <T> The tuple type
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
index 3c25629..af179cf 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
@@ -25,8 +25,8 @@ import java.io.IOException;
* <p>
* <br>
* @displayName HBase Input
- * @category Store
- * @tags input operator
+ * @category Input
+ * @tags hbase
* @param <T> The tuple type
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
index 798a1ab..4165fb3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
@@ -39,14 +39,14 @@ import java.util.Map;
* are mapped to corresponding rows,column families and columns using a property
* file and inserted into hbase Example: input string will be of the form
* name="xyz", st="patrickhenry" ,ct="fremont", sa="california", the properties will contain
- * properties of form name=row, sa=address.street, ct=address.city, sa=address.state.
+ * properties of form name=row, sa=address.street, ct=address.city, sa=address.state.
* With the above mapping a row xyz is created. The value patrickhenry is inserted into
* columnfamily address and column street of row xyz. Other values are inserted
* similarly.
- *
+ *
* @displayName HBase Name Value Csv Put
- * @category Store
- * @tags output operator, put
+ * @category Output
+ * @tags csv, hbase, put
* @since 1.0.2
*/
public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
@@ -115,7 +115,7 @@ public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOp
} catch (IOException e) {
logger.error("Cannot read the property string", e);
DTThrowable.rethrow(e);
- }
+ }
for (String pair : csvLineList) {
String key = pair.substring(0, pair.indexOf('='));
String value = pair.substring(pair.indexOf('=') + 1);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
index 2dfdaf6..5634cc4 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
@@ -26,11 +26,11 @@ import org.apache.hadoop.hbase.client.HTable;
* <br>
* The HBase operators extend this class. The base class contains the HBase properties and also sets up
* the configuration to be used by the HBase operators.<br>
- *
+ *
* <br>
* @displayName HBase Operator Base
- * @category Store
- * @tags base, properties
+ * @category Output
+ * @tags hbase, base, properties
* @since 0.3.2
*/
public class HBaseOperatorBase
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
index c5647ab..b93ca19 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
@@ -33,8 +33,8 @@ import org.apache.hadoop.hbase.client.ResultScanner;
*
* <br>
* @displayName HBase Scan
- * @category Store
- * @tags scan, input operator
+ * @category Output
+ * @tags hbase, scan, input operator
* @since 0.3.2
*/
public abstract class HBaseScanOperator<T> extends HBaseInputOperator<T>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
index d06256f..85542d0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
@@ -27,23 +27,23 @@ import org.apache.hadoop.security.UserGroupInformation;
import com.datatorrent.lib.db.Connectable;
/**
- * A {@link Connectable} that uses HBase to connect to stores and implements Connectable interface.
+ * A {@link Connectable} that uses HBase to connect to stores and implements Connectable interface.
* <p>
* @displayName HBase Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags store, hbase
* @since 1.0.2
*/
public class HBaseStore implements Connectable {
public static final String USER_NAME_SPECIFIER = "%USER_NAME%";
-
+
private static final Logger logger = LoggerFactory.getLogger(HBaseStore.class);
-
+
private String zookeeperQuorum;
private int zookeeperClientPort;
protected String tableName;
-
+
protected String principal;
protected String keytabPath;
// Default interval 30 min
@@ -55,7 +55,7 @@ public class HBaseStore implements Connectable {
/**
* Get the zookeeper quorum location.
- *
+ *
* @return The zookeeper quorum location
*/
public String getZookeeperQuorum() {
@@ -64,7 +64,7 @@ public class HBaseStore implements Connectable {
/**
* Set the zookeeper quorum location.
- *
+ *
* @param zookeeperQuorum
* The zookeeper quorum location
*/
@@ -74,7 +74,7 @@ public class HBaseStore implements Connectable {
/**
* Get the zookeeper client port.
- *
+ *
* @return The zookeeper client port
*/
public int getZookeeperClientPort() {
@@ -83,7 +83,7 @@ public class HBaseStore implements Connectable {
/**
* Set the zookeeper client port.
- *
+ *
* @param zookeeperClientPort
* The zookeeper client port
*/
@@ -93,7 +93,7 @@ public class HBaseStore implements Connectable {
/**
* Get the HBase table name.
- *
+ *
* @return The HBase table name
*/
public String getTableName() {
@@ -102,7 +102,7 @@ public class HBaseStore implements Connectable {
/**
* Set the HBase table name.
- *
+ *
* @param tableName
* The HBase table name
*/
@@ -175,7 +175,7 @@ public class HBaseStore implements Connectable {
/**
* Get the HBase table .
- *
+ *
* @return The HBase table
* @omitFromUI
*/
@@ -183,10 +183,10 @@ public class HBaseStore implements Connectable {
return table;
}
-
+
/**
* Get the configuration.
- *
+ *
* @return The configuration
*/
public Configuration getConfiguration() {
@@ -195,7 +195,7 @@ public class HBaseStore implements Connectable {
/**
* Set the configuration.
- *
+ *
* @param configuration
* The configuration
*/
@@ -250,11 +250,11 @@ public class HBaseStore implements Connectable {
table.setAutoFlushTo(false);
}
-
+
private String evaluateProperty(String property) throws IOException
{
if (property.contains(USER_NAME_SPECIFIER)) {
- property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
+ property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
}
return property;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
index f9b436f..eeb9f5c 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
@@ -34,7 +34,7 @@ import java.io.InterruptedIOException;
* HBase in case the operator is restarted from an earlier checkpoint. It only tries to minimize the number of
* duplicates limiting it to the tuples that were processed in the window when the operator shutdown.
* @displayName HBase Window Store
- * @category Store
+ * @category Output
* @tags store, transactional
* @since 1.0.2
*/
@@ -66,7 +66,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Get the row name in the table.
- *
+ *
* @return The row name
*/
public String getRowName() {
@@ -75,7 +75,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Set the row name in the table.
- *
+ *
* @param rowName
* The row name
*/
@@ -86,7 +86,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Get the column family name in the table.
- *
+ *
* @return The column family name
*/
public String getColumnFamilyName() {
@@ -95,7 +95,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Set the column family name in the table.
- *
+ *
* @param columnFamilyName
* The column family name
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
index da67011..0fc891f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
@@ -28,10 +28,13 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.sql.Date;
-/*
+/**
* An Implementation of AbstractFSRollingOutputOperator which takes any POJO as input, serializes the POJO as Hive delimiter separated values
* which are written in text files to hdfs, and are inserted into hive on committed window callback.This operator can handle outputting to multiple files when the output file depends on the tuple.
- * @displayName: FSPojoToHiveOperator
+ *
+ * @displayName: FS To Hive Operator
+ * @category Output
+ * @tags fs, hive, database
*/
public class FSPojoToHiveOperator extends AbstractFSRollingOutputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
index 4322c5d..932541d 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
@@ -43,6 +43,9 @@ import org.apache.hadoop.fs.Path;
* This is a fault tolerant implementation of HiveOperator which assumes that load operation
* is an atomic operation in Hive.
*
+ * @category Output
+ * @tags database, sql, hive
+ *
* @since 2.1.0
*/
@OperatorAnnotation(checkpointableWithinAppWindow = false)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
index 347d3b1..4e937a1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
@@ -1,5 +1,5 @@
/**
- *
+ *
* Copyright (c) 2015 DataTorrent, Inc. ALL Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +20,9 @@ package com.datatorrent.contrib.kinesis;
import com.datatorrent.common.util.Pair;
/**
- *
+ *
* @displayName Kinesis Put Output
- * @category Database
+ * @category Output
* @tags Kinesis put, output operator, ByteArray
*/
public class KinesisByteArrayOutputOperator extends AbstractKinesisOutputOperator<byte[], Pair<String, byte[]>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
index 15620b4..1332fe6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
@@ -19,7 +19,8 @@ import com.datatorrent.common.util.Pair;
/**
* KinesisStringOutputOperator
- *
+ * @category Output
+ * @tags kinesis
* @since 2.0.0
*/
public class KinesisStringOutputOperator extends AbstractKinesisOutputOperator<String, String>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
index d4a8b5f..cb16f33 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Input
- * @category Store
- * @tags output operator, key value
+ * @category Input
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
index 588dfa2..8daa7df 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
index a5d7f79..6e3bd60 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Input
- * @category Store
- * @tags input operator, key value
+ * @category Input
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
index 56730c5..523b9af 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
index c0ed0b6..f8b6014 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
@@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Array List Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
index 928aaa2..4501dc2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
@@ -41,8 +41,8 @@ import java.util.*;
* <br>
* </p>
* @displayName MongoDB Hash Map Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
* @since 0.3.2
*/
public class MongoDBHashMapOutputOperator<T> extends MongoDBOutputOperator<HashMap<String, T>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
index c4a0b53..7427627 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
@@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags mongodb
* @since 0.3.2
*/
public abstract class MongoDBInputOperator<T> extends MongoDBConnectable implements InputOperator, ActivationListener<OperatorContext>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
index b2f074e..1dc13d2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
@@ -73,8 +73,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
* @since 0.3.2
*/
public abstract class MongoDBOutputOperator<T> extends MongoDBConnectable implements Operator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
index 18af9a0..040a83f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
@@ -21,8 +21,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableKeyValueStoreOutpu
* This is the base implementation of a Redis aggregate output operator.
* <p></p>
* @displayName Abstract Redis Aggregate Output
- * @category Store
- * @tags output operator, key value, aggregate
+ * @category Output
+ * @tags redis, key value, aggregate
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
index 901facb..ff7a9a5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
@@ -21,8 +21,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* This is the base implementation of a Redis input operator.
* <p></p>
* @displayName Abstract Redis Input
- * @category Store
- * @tags input operator, key value
+ * @category Input
+ * @tags redis, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
index c6c0dcc..9a345f8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
@@ -28,8 +28,8 @@ import java.util.Map;
* </p>
*
* @displayName Redis Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type.
* @param <V> The value type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
index 0ef55f1..84baab7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
@@ -27,8 +27,8 @@ import java.util.Map;
* </p>
*
* @displayName Redis Map Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type.
* @param <V> The value type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
index 6c9966e..643377e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
@@ -26,8 +26,8 @@ import java.util.Map;
* <p></p>
*
* @displayName Redis Number Summation Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type
* @param <V> The value type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
index 70b11d5..d26a026 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
@@ -24,8 +24,8 @@ import java.util.Map;
* Otherwise, it will increment the value as is.
* <p></p>
* @displayName Redis Number Summation Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type
* @param <V> The value type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
index 6e36422..5ba6d37 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
@@ -39,8 +39,8 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
* This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(String)}.
* </p>
* @displayName Abstract Splunk Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags splunk
*
* @since 1.0.4
*/
[02/50] [abbrv] incubator-apex-malhar git commit: Cleaned up
properties descriptions Renamed some properties Cleaned up categories Cleaned
up tags Renamed some classes to improve clarity
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
index 67a0591..5547d2b 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
@@ -32,11 +32,11 @@ import javax.validation.constraints.NotNull;
* <b>data</b>: expects String<br>
* </p>
* @displayName Base Line Tokenizer
- * @category Algorithmic
+ * @category Stream Manipulator
* @tags string
* @since 0.3.2
*/
-public class BaseLineTokenizer extends BaseOperator
+public abstract class BaseLineTokenizer extends BaseOperator
{
/**
* This is the input port, which receives strings.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
index 60f92a6..7887df9 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
@@ -52,14 +52,14 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
@Pattern(regexp = "lte|lt|eq|ne|gt|gte", message = "Value has to be one of lte, lt, eq, ne, gt, gte")
private double value = 0.0;
- public enum supported_type {
+ public enum ComparatorFunction {
LTE, LT, EQ, NEQ, GT, GTE
};
- supported_type type = supported_type.EQ;
+ ComparatorFunction comparator = ComparatorFunction.EQ;
/**
- * setter function for key
+ * The key from the input tuple whose value will be matched.
*
* @param key
*/
@@ -69,7 +69,7 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
}
/**
- * getter function for key
+ * Gets the key from the input tuple whose value will be matched.
*
* @return key
*/
@@ -80,7 +80,7 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
}
/**
- * setter function for value
+ * The threshold against which a comparison is done.
*
* @param value
*/
@@ -90,7 +90,7 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
}
/**
- * getter function for value
+ * Gets the threshold against which a comparison is done.
*
* @return value
*/
@@ -102,7 +102,7 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
public boolean compareValue(double value)
{
boolean ret;
- switch (type) {
+ switch (comparator) {
case LT:
ret = value < this.value;
break;
@@ -128,13 +128,13 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
return ret;
}
- public supported_type getType()
+ public ComparatorFunction getType()
{
- return type;
+ return comparator;
}
/**
- * Setter function for compare type. Allowed values are lte, lt, eq, ne, gt,
+ * Setter function for compare comparator. Allowed values are lte, lt, eq, ne, gt,
* gte
* <p>
* *
@@ -159,33 +159,51 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
}
}
+ /**
+ * Gets the comparator function used.
+ * @return The comparator function used.
+ */
+ public ComparatorFunction getComparator()
+ {
+ return comparator;
+ }
+
+ /**
+ * The comparator function used.
+ * @param comparator The comparator used.
+ */
+ public void setComparator(ComparatorFunction comparator)
+ {
+ this.comparator = comparator;
+ }
+
public void setTypeLT()
{
- type = supported_type.LT;
+ comparator = ComparatorFunction.LT;
}
public void setTypeLTE()
{
- type = supported_type.LTE;
+ comparator = ComparatorFunction.LTE;
}
public void setTypeEQ()
{
- type = supported_type.EQ;
+ comparator = ComparatorFunction.EQ;
}
public void setTypeNEQ()
{
- type = supported_type.NEQ;
+ comparator = ComparatorFunction.NEQ;
}
public void setTypeGT()
{
- type = supported_type.GT;
+ comparator = ComparatorFunction.GT;
}
public void setTypeGTE()
{
- type = supported_type.GTE;
+ comparator = ComparatorFunction.GTE;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java b/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
index 29d0ed2..67a08f5 100644
--- a/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
@@ -28,8 +28,8 @@ import com.datatorrent.api.Context.OperatorContext;
* This operator consumes tuples. If the tuples satisfy a specified Java Script filtering function, then they are emitted.
* <p></p>
* @displayName Java Script Filter
- * @category Algorithmic
- * @tags filter
+ * @category Rules and Alerts
+ * @tags filter, javascript
* @since 0.3.4
*/
public class JavaScriptFilterOperator extends FilterOperator
@@ -65,7 +65,7 @@ public class JavaScriptFilterOperator extends FilterOperator
* Enter the JavaScript to setup the environment.
* @param script
*/
-
+
public void setSetupScript(String script)
{
setupScript = script;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java b/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
index 030721b..97be408 100644
--- a/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
+++ b/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
@@ -25,7 +25,7 @@ import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
/**
*
- * Functional tests for {@link com.datatorrent.lib.algo.LeastFrequentKey}<p>
+ * Functional tests for {@link com.datatorrent.lib.algo.LeastFrequentValue}<p>
*
*/
public class LeastFrequentKeyTest
@@ -37,7 +37,7 @@ public class LeastFrequentKeyTest
@Test
public void testNodeProcessing() throws Exception
{
- LeastFrequentKey<String> oper = new LeastFrequentKey<String>();
+ LeastFrequentValue<String> oper = new LeastFrequentValue<String>();
CountAndLastTupleTestSink matchSink = new CountAndLastTupleTestSink();
CountAndLastTupleTestSink listSink = new CountAndLastTupleTestSink();
oper.least.setSink(matchSink);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java b/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
index a78fb90..9061f17 100644
--- a/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
+++ b/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
@@ -26,7 +26,7 @@ import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
/**
*
- * Functional tests for {@link com.datatorrent.lib.algo.MostFrequentKey}<p>
+ * Functional tests for {@link com.datatorrent.lib.algo.MostFrequentValue}<p>
*
*/
public class MostFrequentKeyTest
@@ -38,7 +38,7 @@ public class MostFrequentKeyTest
@Test
public void testNodeProcessing() throws Exception
{
- MostFrequentKey<String> oper = new MostFrequentKey<String>();
+ MostFrequentValue<String> oper = new MostFrequentValue<String>();
CountAndLastTupleTestSink matchSink = new CountAndLastTupleTestSink();
CountAndLastTupleTestSink listSink = new CountAndLastTupleTestSink();
oper.most.setSink(matchSink);
[40/50] [abbrv] incubator-apex-malhar git commit: Fix version
compatibility issue for Abstract redis store input operator. Reverted back to
original super class
Posted by ch...@apache.org.
Fix version compatibility issue for Abstract redis store input operator. Reverted back to original super class
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/731b8bbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/731b8bbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/731b8bbe
Branch: refs/heads/master
Commit: 731b8bbe3b09ac54a5c5a985e1e76667cc417002
Parents: 0b31fee
Author: ishark <is...@datatorrent.com>
Authored: Tue Aug 18 13:36:21 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Tue Aug 18 13:36:21 2015 -0700
----------------------------------------------------------------------
.../contrib/redis/AbstractRedisInputOperator.java | 7 +++++--
.../contrib/redis/RedisKeyValueInputOperator.java | 9 +++++++++
.../contrib/redis/RedisMapAsValueInputOperator.java | 8 ++++++++
.../datatorrent/contrib/redis/RedisPOJOInputOperator.java | 7 +++++++
4 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/731b8bbe/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
index 260fbf6..5e62dbb 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
@@ -19,13 +19,16 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
import javax.validation.constraints.NotNull;
+
import redis.clients.jedis.ScanParams;
import redis.clients.jedis.ScanResult;
+
import com.datatorrent.api.Operator.CheckpointListener;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
+import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
import com.datatorrent.lib.io.IdempotentStorageManager;
/**
@@ -39,7 +42,7 @@ import com.datatorrent.lib.io.IdempotentStorageManager;
* The tuple type.
* @since 0.9.3
*/
-public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOperator<T, RedisStore> implements CheckpointListener
+public abstract class AbstractRedisInputOperator<T> extends AbstractKeyValueStoreInputOperator<T, RedisStore> implements CheckpointListener
{
protected transient List<String> keys = new ArrayList<String>();
protected transient Integer scanOffset;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/731b8bbe/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
index 8f419bd..0d0efe8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
@@ -18,6 +18,8 @@ package com.datatorrent.contrib.redis;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+
import com.datatorrent.lib.util.KeyValPair;
/**
@@ -52,4 +54,11 @@ public class RedisKeyValueInputOperator extends AbstractRedisInputOperator<KeyVa
keysObjectList.clear();
}
}
+
+ @Override
+ public KeyValPair<String, String> convertToTuple(Map<Object, Object> o)
+ {
+ // Do nothing for the override, Scan already done in processTuples
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/731b8bbe/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
index 66ef582..a7f0cd2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
@@ -16,6 +16,7 @@
package com.datatorrent.contrib.redis;
import java.util.Map;
+
import com.datatorrent.lib.util.KeyValPair;
/**
@@ -42,4 +43,11 @@ public class RedisMapAsValueInputOperator extends AbstractRedisInputOperator<Key
}
keys.clear();
}
+
+ @Override
+ public KeyValPair<String, Map<String, String>> convertToTuple(Map<Object, Object> o)
+ {
+ // Do nothing for the override, Emit already handled in processTuples
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/731b8bbe/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
index 5a73e61..ac3f7fc 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
@@ -201,4 +201,11 @@ public class RedisPOJOInputOperator extends AbstractRedisInputOperator<KeyValPai
{
this.dataColumns = dataColumns;
}
+
+ @Override
+ public KeyValPair<String, Object> convertToTuple(Map<Object, Object> o)
+ {
+ // Do nothing for the override, Scan already done in processTuples
+ return null;
+ }
}
[03/50] [abbrv] incubator-apex-malhar git commit: Cleaned up
properties descriptions Renamed some properties Cleaned up categories Cleaned
up tags Renamed some classes to improve clarity
Posted by ch...@apache.org.
Cleaned up properties descriptions
Renamed some properties
Cleaned up categories
Cleaned up tags
Renamed some classes to improve clarity
Conflicts:
contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
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/dd15161d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/dd15161d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/dd15161d
Branch: refs/heads/master
Commit: dd15161de741bd1d2fbea50c972954fbbb098d24
Parents: 56de133
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Mon Jul 27 14:53:12 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Mon Jul 27 19:50:31 2015 -0700
----------------------------------------------------------------------
.../apachelog/ApacheLogInputGenerator.java | 5 +-
.../couchdb/CouchDBPOJOOutputOperator.java | 9 +-
.../couchdb/MapBasedCouchDbOutputOperator.java | 4 +-
.../contrib/memsql/MemsqlPOJOInputOperator.java | 85 +++++++----
.../datatorrent/contrib/ruby/RubyOperator.java | 4 +-
.../memsql/AbstractMemsqlInputOperatorTest.java | 4 +-
.../datatorrent/lib/algo/AllAfterMatchMap.java | 2 +-
.../com/datatorrent/lib/algo/BottomNMap.java | 7 +-
.../datatorrent/lib/algo/BottomNUniqueMap.java | 7 +-
.../lib/algo/CompareExceptCountMap.java | 4 +-
.../java/com/datatorrent/lib/algo/Distinct.java | 2 +-
.../com/datatorrent/lib/algo/DistinctMap.java | 4 +-
.../com/datatorrent/lib/algo/FilterKeyVals.java | 6 +-
.../com/datatorrent/lib/algo/FilterKeysMap.java | 24 +++-
.../com/datatorrent/lib/algo/FilterValues.java | 28 +++-
.../java/com/datatorrent/lib/algo/FirstN.java | 4 +-
.../com/datatorrent/lib/algo/InsertSort.java | 4 +-
.../datatorrent/lib/algo/InsertSortDesc.java | 4 +-
.../com/datatorrent/lib/algo/InvertIndex.java | 4 +-
.../datatorrent/lib/algo/InvertIndexArray.java | 4 +-
.../com/datatorrent/lib/algo/LastMatchMap.java | 4 +-
.../datatorrent/lib/algo/LeastFrequentKey.java | 137 ------------------
.../lib/algo/LeastFrequentKeyMap.java | 4 +-
.../lib/algo/LeastFrequentKeyValueMap.java | 4 +-
.../lib/algo/LeastFrequentValue.java | 137 ++++++++++++++++++
.../com/datatorrent/lib/algo/MatchAllMap.java | 2 +-
.../com/datatorrent/lib/algo/MatchAnyMap.java | 2 +-
.../java/com/datatorrent/lib/algo/MatchMap.java | 11 ++
.../datatorrent/lib/algo/MergeSortNumber.java | 2 +-
.../datatorrent/lib/algo/MostFrequentKey.java | 140 -------------------
.../lib/algo/MostFrequentKeyMap.java | 2 +-
.../lib/algo/MostFrequentKeyValueMap.java | 2 +-
.../datatorrent/lib/algo/MostFrequentValue.java | 140 +++++++++++++++++++
.../java/com/datatorrent/lib/algo/TopN.java | 4 +-
.../com/datatorrent/lib/algo/TopNUnique.java | 6 +-
.../com/datatorrent/lib/algo/UniqueCounter.java | 17 ++-
.../snapshot/AppDataSnapshotServerPOJO.java | 6 +-
.../ByteArrayToStringConverterOperator.java | 3 +
.../MapToKeyHashValuePairConverter.java | 34 ++---
.../converter/MapToKeyValuePairConverter.java | 17 +--
.../StringValueToNumberConverterForMap.java | 7 +-
.../lib/db/jdbc/AbstractJdbcInputOperator.java | 9 +-
.../lib/io/AbstractHttpInputOperator.java | 21 ++-
.../datatorrent/lib/io/HttpGetMapOperator.java | 2 +-
.../lib/io/HttpJsonChunksInputOperator.java | 2 +-
.../lib/io/HttpLinesInputOperator.java | 2 +-
.../lib/io/PubSubWebSocketInputOperator.java | 10 +-
.../lib/io/PubSubWebSocketOutputOperator.java | 12 +-
.../lib/io/SimpleSinglePortInputOperator.java | 3 +-
.../lib/io/WebSocketInputOperator.java | 4 +-
.../lib/io/WebSocketOutputOperator.java | 6 +-
.../com/datatorrent/lib/io/fs/FileSplitter.java | 17 ++-
.../lib/io/fs/TailFsInputOperator.java | 7 +-
.../lib/script/JavaScriptOperator.java | 2 +-
.../datatorrent/lib/util/BaseLineTokenizer.java | 4 +-
.../datatorrent/lib/util/BaseMatchOperator.java | 50 ++++---
.../lib/util/JavaScriptFilterOperator.java | 6 +-
.../lib/algo/LeastFrequentKeyTest.java | 4 +-
.../lib/algo/MostFrequentKeyTest.java | 4 +-
59 files changed, 596 insertions(+), 465 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
index ec1c807..6b3caea 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
@@ -29,7 +29,8 @@ import org.slf4j.LoggerFactory;
* An implementation of input operator and activation listener that simulates the apache logs.
* <p>
* @displayName Apache Log Input Generator
- * @tags input operator, log
+ * @category Test Bench
+ * @tags apache log, generator
* @since 0.9.4
*/
public class ApacheLogInputGenerator implements InputOperator, Operator.ActivationListener<OperatorContext>
@@ -340,7 +341,7 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
{
this.refererFile = refererFile;
}
-
+
/**
* Output port that emits a string into DAG.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
index afa500a..f0c3e4c 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
@@ -36,14 +36,19 @@ public class CouchDBPOJOOutputOperator extends AbstractCouchDBOutputOperator<Obj
@NotNull
private String expressionForDocId;
- /*
- * An Expression to extract value of document Id from input POJO.
+ /**
+ * Gets the getter expression for the document Id.
+ * @return The document Id.
*/
public String getExpressionForDocId()
{
return expressionForDocId;
}
+ /**
+ * An Expression to extract value of document Id from an input POJO.
+ * @param expressionForDocId The getter expression for the document Id.
+ */
public void setExpressionForDocId(String expressionForDocId)
{
this.expressionForDocId = expressionForDocId;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
index e8cf001..c2cfce1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
@@ -21,8 +21,8 @@ import java.util.Map;
* Implementation of {@link AbstractCouchDBOutputOperator} that saves a Map in the couch database. <br/>
* <p>
* @displayName Map Based CouchDb Output Operator
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags couchDb, database, nosql
* @since 0.3.5
*/
public class MapBasedCouchDbOutputOperator extends AbstractCouchDBOutputOperator<Map<Object, Object>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
index 64d0227..6022c3d 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
@@ -38,10 +38,11 @@ import org.slf4j.LoggerFactory;
/**
* <p>
* MemsqlPOJOInputOperator</p>
+ *
* A Generic implementation of AbstractMemsqlInputOperator which gets field values from memsql database columns and sets in a POJO.
* User should also provide a query to fetch the rows from database. This query is run continuously to fetch new data and
* hence should be parameterized. The parameters that can be used are %t for table name, %p for primary key, %s for start value
- * and %l for limit. The start value is continuously updated with the value of a primary key column of the last row from
+ * and %l for batchSize. The start value is continuously updated with the value of a primary key column of the last row from
* the result of the previous run of the query. The primary key column is also identified by the user using a property.
*
* @displayName Memsql Input Operator
@@ -51,7 +52,7 @@ import org.slf4j.LoggerFactory;
public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
{
@Min(1)
- private int limit = 10;
+ private int batchSize = 10;
@Min(0)
private Number startRow = 0;
@NotNull
@@ -77,60 +78,73 @@ public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
private transient Class<?> objectClass = null;
private transient Class<?> primaryKeyColumnType;
- /*
- * Set of columns specified by User in case POJO needs to contain fields specific to these columns only.
- * User should specify columns in same order as expressions for fields.
- */
public List<String> getColumns()
{
return columns;
}
+ /**
+ * The columns specified by user in case POJO needs to contain fields specific to these columns only.
+ * User should specify columns in same order as expressions for fields.
+ * @param columns The columns.
+ */
public void setColumns(List<String> columns)
{
this.columns = columns;
}
- /*
- * Primary Key Column of table.
- * Gets the primary key column of Memsql table.
+ /**
+ * Gets the primary key column of the input table.
+ * @return The primary key column of the input table.
*/
public String getPrimaryKeyColumn()
{
return primaryKeyColumn;
}
+ /**
+ * The primary key column of the input table.
+ * @param primaryKeyColumn The primary key column of the input table.
+ */
public void setPrimaryKeyColumn(String primaryKeyColumn)
{
this.primaryKeyColumn = primaryKeyColumn;
}
- /*
- * User has the option to specify the start row.
+ /**
+ * The row to start reading from the input table at.
+ * @return The row to start reading from the input table at.
*/
public Number getStartRow()
{
return startRow;
}
+ /**
+ * Sets the row to start reading form the input table at.
+ * @param startRow The row to start reading from the input table at.
+ */
public void setStartRow(Number startRow)
{
this.startRow = startRow;
}
- public void setLimit(int limit)
+ /**
+ * Sets the batch size.
+ * @param batchSize The batch size.
+ */
+ public void setBatchSize(int batchSize)
{
- this.limit = limit;
+ this.batchSize = batchSize;
}
- /*
+ /**
* Records are read in batches of this size.
- * Gets the batch size.
* @return batchsize
*/
- public int getLimit()
+ public int getBatchSize()
{
- return limit;
+ return batchSize;
}
/*
@@ -152,43 +166,56 @@ public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
this.outputClass = outputClass;
}
- /*
- * Parameterized query with parameters such as %t for table name , %p for primary key, %s for start value and %l for limit.
- * Example of retrieveQuery:
- * select * from %t where %p > %s limit %l;
+ /**
+ * Gets the query used to extract data from memsql.
+ * @return The query.
*/
public String getQuery()
{
return query;
}
+ /**
+ * Parameterized query with parameters such as %t for table name , %p for primary key, %s for start value and %l for batchSize.
+ * Example of retrieveQuery:
+ * select * from %t where %p > %s batchSize %l;
+ */
public void setQuery(String query)
{
this.query = query.replace("%t", tablename);
}
- /*
- * An ArrayList of Java expressions that will yield the memsql column value to be set in output object.
- * Each expression corresponds to one column in the Memsql table.
+ /**
+ * Gets the getter expressions for extracting data from POJOs.
+ * @return The getter expressions for extracting data from pojos.
*/
public List<String> getExpressions()
{
return expressions;
}
+ /**
+ * An ArrayList of Java expressions that will yield the memsql column value to be set in output object.
+ * Each expression corresponds to one column in the Memsql table.
+ */
public void setExpressions(List<String> expressions)
{
this.expressions = expressions;
}
- /*
- * Tablename in memsql.
+ /**
+ * Gets the name of the table that is read from memsql.
+ * @return The name of the table that is read from memsql.
*/
public String getTablename()
{
return tablename;
}
+ /**
+ * The table name in memsql to read data from.
+ * @param tablename The table name.
+ */
public void setTablename(String tablename)
{
this.tablename = tablename;
@@ -246,7 +273,7 @@ public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
query = query.replace("%p", primaryKeyColumn);
}
if (query.contains("%l")) {
- query = query.replace("%l", limit + "");
+ query = query.replace("%l", batchSize + "");
}
statement.close();
@@ -366,10 +393,10 @@ public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
return obj;
}
- /*
+ /**
* This method replaces the parameters in Query with actual values given by user.
* Example of retrieveQuery:
- * select * from %t where %p > %s limit %l;
+ * select * from %t where %p > %s batchSize %l;
*/
@Override
public String queryToRetrieveData()
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java b/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
index 35427e0..d4bc916 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
@@ -29,12 +29,12 @@ import com.datatorrent.lib.script.ScriptOperator;
* <p>
*
* WARNING: EXPERIMENTAL USE ONLY! This operator depends on jruby which has
- * a transitive dependency on an incompatible version of ASM that breaks
+ * a transitive dependency on an incompatible version of ASM that breaks
* webservice in stram.
*
* @displayName Ruby Operator
* @category Scripting
- * @tags script operator, map, string
+ * @tags script, map, string
* @since 1.0.4
*/
public class RubyOperator extends ScriptOperator {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
index abf2969..4cd92f6 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
@@ -181,7 +181,7 @@ public class AbstractMemsqlInputOperatorTest
OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap);
MemsqlPOJOInputOperator inputOperator = new MemsqlPOJOInputOperator();
createStore((MemsqlStore)inputOperator.getStore(), true);
- inputOperator.setLimit(10);
+ inputOperator.setBatchSize(10);
inputOperator.setTablename(FQ_TABLE);
inputOperator.setPrimaryKeyColumn(INDEX_COLUMN);
ArrayList<String> expressions = new ArrayList<String>();
@@ -222,7 +222,7 @@ public class AbstractMemsqlInputOperatorTest
inputOperator.setQuery("select * from " + FQ_TABLE + " where " + "%p " + ">= " + "%s" + " LIMIT " + "%l" +";");
inputOperator.setStartRow(1);
- inputOperator.setLimit(10);
+ inputOperator.setBatchSize(10);
inputOperator.setup(context);
inputOperator.beginWindow(0);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/AllAfterMatchMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/AllAfterMatchMap.java b/library/src/main/java/com/datatorrent/lib/algo/AllAfterMatchMap.java
index fb109b7..aedc1e2 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/AllAfterMatchMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/AllAfterMatchMap.java
@@ -61,7 +61,7 @@ import com.datatorrent.lib.util.BaseMatchOperator;
* </p>
*
* @displayName Emit All After Match (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, compare, numeric, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java b/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
index f442a19..e04bd6b 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
@@ -49,7 +49,7 @@ import com.datatorrent.lib.util.AbstractBaseNNonUniqueOperatorMap;
* </p>
*
* @displayName Bottom N
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags filter, rank, key value
*
* @since 0.3.3
@@ -91,9 +91,10 @@ public class BottomNMap<K, V> extends AbstractBaseNNonUniqueOperatorMap<K, V>
{
bottom.emit(tuple);
}
-
+
/**
- * @param val Bottom N values to be returned
+ * Bottom N values to be returned.
+ * @param val Bottom N values to be returned.
*/
@Override
public void setN(int val)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java b/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
index 96d45eb..bd8f1c0 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.util.AbstractBaseNUniqueOperatorMap;
* </p>
*
* @displayName Bottom N Unique Map
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags filter, rank, unique, key value
*
* @since 0.3.3
@@ -75,9 +75,10 @@ public class BottomNUniqueMap<K, V> extends AbstractBaseNUniqueOperatorMap<K, V>
{
bottom.emit(tuple);
}
-
+
/**
- * @param val Bottom N unique tuples
+ * Bottom N unique tuples.
+ * @param val Bottom N unique tuples.
*/
@Override
public void setN(int val)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java b/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
index 30e8159..a609b05 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
@@ -53,8 +53,8 @@ import com.datatorrent.lib.util.UnifierSumNumber;
* <br>
* </p>
*
- * @displayName Compare Match and No Match Count
- * @category Algorithmic
+ * @displayName Compare Match and No Match Count
+ * @category Rules and Alerts
* @tags count, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/Distinct.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/Distinct.java b/library/src/main/java/com/datatorrent/lib/algo/Distinct.java
index 35a7c88..34e2757 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/Distinct.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/Distinct.java
@@ -47,7 +47,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
* </p>
*
* @displayName Emit Distinct
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, unique
*
* @since 0.3.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/DistinctMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/DistinctMap.java b/library/src/main/java/com/datatorrent/lib/algo/DistinctMap.java
index 7629923..e7acc0f 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/DistinctMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/DistinctMap.java
@@ -44,8 +44,8 @@ import com.datatorrent.lib.util.UnifierHashMap;
* <br>
* </p>
*
- * @displayName Emit Distinct Keyval Pairs
- * @category Algorithmic
+ * @displayName Distinct Key Value Merge
+ * @category Stream Manipulators
* @tags filter, unique, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/FilterKeyVals.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FilterKeyVals.java b/library/src/main/java/com/datatorrent/lib/algo/FilterKeyVals.java
index 56c3306..f1319d1 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FilterKeyVals.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FilterKeyVals.java
@@ -57,7 +57,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
* </p>
*
* @displayName Filter Keyval Pairs
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value
*
* @since 0.3.2
@@ -102,7 +102,7 @@ public class FilterKeyVals<K,V> extends BaseKeyOperator<K>
private transient HashMap<K,V> entry = new HashMap<K,V>(1);
/**
- * getter function for parameter inverse
+ * Gets the inverse property.
* @return inverse
*/
public boolean getInverse() {
@@ -110,7 +110,7 @@ public class FilterKeyVals<K,V> extends BaseKeyOperator<K>
}
/**
- * True means match; False means unmatched
+ * If true then only matches are emitted. If false then only non matches are emitted.
* @param val
*/
public void setInverse(boolean val) {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/FilterKeysMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FilterKeysMap.java b/library/src/main/java/com/datatorrent/lib/algo/FilterKeysMap.java
index 7596f07..7cd0f1f 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FilterKeysMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FilterKeysMap.java
@@ -52,7 +52,7 @@ import com.datatorrent.lib.util.UnifierHashMap;
* </p>
*
* @displayName Filter Keyval Pairs By Key Generic
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value
*
* @since 0.3.2
@@ -113,7 +113,7 @@ public class FilterKeysMap<K,V> extends BaseKeyOperator<K>
};
/**
- * getter function for parameter inverse
+ * If true then only matches are emitted. If false then only non matches are emitted.
* @return inverse
*/
public boolean getInverse() {
@@ -122,7 +122,7 @@ public class FilterKeysMap<K,V> extends BaseKeyOperator<K>
/**
- * True means match; False means unmatched
+ * Sets the inverse property. If true then only matches are emitted. If false then only non matches are emitted.
* @param val
*/
public void setInverse(boolean val) {
@@ -150,6 +150,24 @@ public class FilterKeysMap<K,V> extends BaseKeyOperator<K>
}
}
+ /**
+ * The keys to filter. The values in the map should be null.
+ * @param keys
+ */
+ public void setKeys(HashMap<K, V> keys)
+ {
+ this.keys = keys;
+ }
+
+ /**
+ * Gets the keys to filter.
+ * @return Returns a map containing the keys.
+ */
+ public HashMap<K, V> getKeys()
+ {
+ return keys;
+ }
+
/*
* Clears the filter list
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java b/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
index 738d9a5..a8d96eb 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
@@ -48,7 +48,7 @@ import com.datatorrent.api.annotation.Stateless;
* </p>
*
* @displayName Filter Values
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter
*
* @since 0.3.2
@@ -58,7 +58,7 @@ import com.datatorrent.api.annotation.Stateless;
public class FilterValues<T> extends BaseOperator
{
/**
- * The input port on which tuples are recieved.
+ * The input port on which tuples are received.
*/
public final transient DefaultInputPort<T> data = new DefaultInputPort<T>()
{
@@ -86,8 +86,7 @@ public class FilterValues<T> extends BaseOperator
boolean inverse = false;
/**
- * getter function for parameter inverse
- *
+ * Gets the inverse property.
* @return inverse
*/
public boolean getInverse()
@@ -96,7 +95,7 @@ public class FilterValues<T> extends BaseOperator
}
/**
- * True means match; False means unmatched
+ * If true then only matches are emitted. If false then only non matches are emitted.
* @param val
*/
public void setInverse(boolean val)
@@ -131,6 +130,25 @@ public class FilterValues<T> extends BaseOperator
}
/**
+ * Gets the values to be filtered.
+ * @return The values to be filtered.
+ */
+ public HashMap<T, Object> getValues()
+ {
+ return values;
+ }
+
+ /**
+ * A map containing the values to be filtered. The values are set to be the keys in the map, and the
+ * values are set to be null.
+ * @param values The values to be filtered.
+ */
+ public void setValues(HashMap<T, Object> values)
+ {
+ this.values = values;
+ }
+
+ /**
* Clears the filter
*/
public void clearValues()
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/FirstN.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FirstN.java b/library/src/main/java/com/datatorrent/lib/algo/FirstN.java
index 8677017..b0a502e 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/FirstN.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/FirstN.java
@@ -50,7 +50,7 @@ import com.datatorrent.lib.util.AbstractBaseNOperatorMap;
* </p>
*
* @displayName First N Keyval Pairs Matching Key
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value
*
* @since 0.3.2
@@ -96,7 +96,7 @@ public class FirstN<K,V> extends AbstractBaseNOperatorMap<K, V>
{
keycount.clear();
}
-
+
/**
* First N number of KeyValue pairs for each Key.
* @param val
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java b/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
index aa306cd..9a84098 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
@@ -45,8 +45,8 @@ import com.datatorrent.lib.util.AbstractBaseSortOperator;
* </p>
*
* @displayName Sort Ascending
- * @category Algorithmic
- * @tags rank
+ * @category Stream Manipulators
+ * @tags rank, sort
*
* @since 0.3.3
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/InsertSortDesc.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/InsertSortDesc.java b/library/src/main/java/com/datatorrent/lib/algo/InsertSortDesc.java
index ff908f3..cf8fc53 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/InsertSortDesc.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/InsertSortDesc.java
@@ -47,8 +47,8 @@ import java.util.PriorityQueue;
* <br>
* </p>
* @displayName Sort Descending
- * @category Algorithmic
- * @tags rank
+ * @category Stream Manipulators
+ * @tags rank, sort
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/InvertIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/InvertIndex.java b/library/src/main/java/com/datatorrent/lib/algo/InvertIndex.java
index 46bd87c..dbf542f 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/InvertIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/InvertIndex.java
@@ -45,8 +45,8 @@ import com.datatorrent.lib.util.BaseKeyValueOperator;
* <br>
* </p>
*
- * @displayName Invert Keyval Pairs
- * @category Algorithmic
+ * @displayName Invert Key Value Pairs
+ * @category Stream Manipulators
* @tags key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/InvertIndexArray.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/InvertIndexArray.java b/library/src/main/java/com/datatorrent/lib/algo/InvertIndexArray.java
index 6e3ec0b..cb6fa23 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/InvertIndexArray.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/InvertIndexArray.java
@@ -44,8 +44,8 @@ import com.datatorrent.lib.util.BaseKeyValueOperator;
* <br>
* </p>
*
- * @displayName Invert Keyval Pairs (Array)
- * @category Algorithmic
+ * @displayName Invert Key Value Pairs (Array)
+ * @category Stream Manipulators
* @tags key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/LastMatchMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LastMatchMap.java b/library/src/main/java/com/datatorrent/lib/algo/LastMatchMap.java
index dbe2045..4031697 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/LastMatchMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/LastMatchMap.java
@@ -26,7 +26,7 @@ import com.datatorrent.lib.util.BaseMatchOperator;
/**
* This operator filters the incoming stream of key value pairs by obtaining the values corresponding to a specified key,
- * and comparing those values to a specified number. The last key value pair, in each window, to satisfy the comparison is emitted.
+ * and comparing those values to a specified value. The last key value pair, in each window, to satisfy the comparison is emitted.
* <p>
* A compare function is operated on a tuple value sub-classed from Number based on the property "key", "value", and "cmp". Every tuple
* is checked and the last one that passes the condition is send during end of window on port "last". The comparison is done by getting double
@@ -55,7 +55,7 @@ import com.datatorrent.lib.util.BaseMatchOperator;
* </p>
*
* @displayName Emit Last Match (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, numeric
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKey.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKey.java b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKey.java
deleted file mode 100644
index 3dfa68c..0000000
--- a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKey.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (C) 2015 DataTorrent, Inc.
- *
- * Licensed 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.
- */
-package com.datatorrent.lib.algo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OperatorAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
-
-import com.datatorrent.lib.util.AbstractBaseFrequentKey;
-
-/**
- * This operator filters the incoming stream of values by emitting the value or values (if there is a tie)
- * that occurred the fewest number of times within each window to the output port "list".
- * One of the values is emitted to the output port "least" at the end of each window.
- * <p>
- * Occurrences of each tuple is counted and at the end of window any of the least frequent tuple is emitted on output port 'least'
- * All keys with same least frequency value least are emitted on output port 'list'.<br>
- * This module is an end of window module<br>
- * In case of a tie any of the least key would be emitted. The list port would however have all the tied keys
- * <br>
- * <b>StateFull : Yes, </b> tuple are compared across application window(s). <br>
- * <b>Partitions : Yes, </b> least keys are unified on output port. <br>
- * <br>
- * <b>Ports</b>:<br>
- * <b>data</b>: expects K<br>
- * <b>least</b>: emits HashMap<K,Integer>(1), Where K is the least occurring key in the window.
- * In case of tie any of the least key would be emitted<br>
- * <b>list</b>: emits ArrayList<HashMap<K,Integer>(1)>, Where the list includes all the keys that are least frequent<br>
- * <br>
- * </p>
- *
- * @displayName Emit Least Frequent Value
- * @category Algorithmic
- * @tags filter, count
- *
- * @since 0.3.3
- */
-
-@OperatorAnnotation(partitionable = true)
-public class LeastFrequentKey<K> extends AbstractBaseFrequentKey<K>
-{
- /**
- * The input port on which tuples are received.
- */
- public final transient DefaultInputPort<K> data = new DefaultInputPort<K>()
- {
- /**
- * Calls super.processTuple(tuple)
- */
- @Override
- public void process(K tuple)
- {
- processTuple(tuple);
- }
- };
-
- /**
- * The output port on which one of the tuples,
- * which occurred the least number of times,
- * is emitted.
- */
- @OutputPortFieldAnnotation(optional=true)
- public final transient DefaultOutputPort<HashMap<K, Integer>> least = new DefaultOutputPort<HashMap<K, Integer>>()
- {
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- public Unifier<HashMap<K, Integer>> getUnifier()
- {
- return new LeastFrequentKeyUnifier<K>();
- }
- };
-
- /**
- * The output port on which all the tuples,
- * which occurred the least number of times,
- * is emitted.
- */
- @OutputPortFieldAnnotation(optional=true)
- public final transient DefaultOutputPort<ArrayList<HashMap<K, Integer>>> list = new DefaultOutputPort<ArrayList<HashMap<K, Integer>>>()
- {
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- public Unifier<ArrayList<HashMap<K, Integer>>> getUnifier()
- {
- return new LeastFrequentKeyArrayUnifier<K>();
- }
- };
-
- /**
- * Emits tuple on port "least"
- * @param tuple
- */
- @Override
- public void emitTuple(HashMap<K, Integer> tuple)
- {
- least.emit(tuple);
- }
-
- /**
- * returns val1 < val2
- * @param val1
- * @param val2
- * @return val1 < val2
- */
- @Override
- public boolean compareCount(int val1, int val2)
- {
- return val1 < val2;
- }
-
- /**
- * Emits tuple on port "list"
- * @param tlist
- */
- @Override
- public void emitList(ArrayList<HashMap<K, Integer>> tlist)
- {
- list.emit(tlist);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyMap.java b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyMap.java
index 0290d26..36e8e8e 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyMap.java
@@ -48,8 +48,8 @@ import com.datatorrent.lib.util.UnifierHashMapFrequent;
* <br>
* </p>
*
- * @displayName Emit Least Frequent Key
- * @category Algorithmic
+ * @displayName Emit Least Frequent Tuple Key
+ * @category Rules and Alerts
* @tags filter, key value, count
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyValueMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyValueMap.java b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyValueMap.java
index f8550ee..895c8df 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyValueMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyValueMap.java
@@ -66,8 +66,8 @@ import com.datatorrent.lib.util.AbstractBaseFrequentKeyValueMap;
* <br>
* </p>
*
- * @displayName Emit Lest Frequent Keyval Pair
- * @category Algorithmic
+ * @displayName Emit Least Frequent Keyval Pair
+ * @category Rules and Alerts
* @tags filter, key value, count
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java
new file mode 100644
index 0000000..af68ead
--- /dev/null
+++ b/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.lib.algo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import com.datatorrent.api.DefaultInputPort;
+import com.datatorrent.api.DefaultOutputPort;
+import com.datatorrent.api.annotation.OperatorAnnotation;
+import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
+
+import com.datatorrent.lib.util.AbstractBaseFrequentKey;
+
+/**
+ * This operator filters the incoming stream of values by emitting the value or values (if there is a tie)
+ * that occurred the fewest number of times within each window to the output port "list".
+ * One of the values is emitted to the output port "least" at the end of each window.
+ * <p>
+ * Occurrences of each tuple is counted and at the end of window any of the least frequent tuple is emitted on output port 'least'
+ * All keys with same least frequency value least are emitted on output port 'list'.<br>
+ * This module is an end of window module<br>
+ * In case of a tie any of the least key would be emitted. The list port would however have all the tied keys
+ * <br>
+ * <b>StateFull : Yes, </b> tuple are compared across application window(s). <br>
+ * <b>Partitions : Yes, </b> least keys are unified on output port. <br>
+ * <br>
+ * <b>Ports</b>:<br>
+ * <b>data</b>: expects K<br>
+ * <b>least</b>: emits HashMap<K,Integer>(1), Where K is the least occurring key in the window.
+ * In case of tie any of the least key would be emitted<br>
+ * <b>list</b>: emits ArrayList<HashMap<K,Integer>(1)>, Where the list includes all the keys that are least frequent<br>
+ * <br>
+ * </p>
+ *
+ * @displayName Emit Least Frequent Value
+ * @category Rules and Alerts
+ * @tags filter, count
+ *
+ * @since 0.3.3
+ */
+
+@OperatorAnnotation(partitionable = true)
+public class LeastFrequentValue<K> extends AbstractBaseFrequentKey<K>
+{
+ /**
+ * The input port on which tuples are received.
+ */
+ public final transient DefaultInputPort<K> data = new DefaultInputPort<K>()
+ {
+ /**
+ * Calls super.processTuple(tuple)
+ */
+ @Override
+ public void process(K tuple)
+ {
+ processTuple(tuple);
+ }
+ };
+
+ /**
+ * The output port on which one of the tuples,
+ * which occurred the least number of times,
+ * is emitted.
+ */
+ @OutputPortFieldAnnotation(optional=true)
+ public final transient DefaultOutputPort<HashMap<K, Integer>> least = new DefaultOutputPort<HashMap<K, Integer>>()
+ {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ public Unifier<HashMap<K, Integer>> getUnifier()
+ {
+ return new LeastFrequentKeyUnifier<K>();
+ }
+ };
+
+ /**
+ * The output port on which all the tuples,
+ * which occurred the least number of times,
+ * is emitted.
+ */
+ @OutputPortFieldAnnotation(optional=true)
+ public final transient DefaultOutputPort<ArrayList<HashMap<K, Integer>>> list = new DefaultOutputPort<ArrayList<HashMap<K, Integer>>>()
+ {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ public Unifier<ArrayList<HashMap<K, Integer>>> getUnifier()
+ {
+ return new LeastFrequentKeyArrayUnifier<K>();
+ }
+ };
+
+ /**
+ * Emits tuple on port "least"
+ * @param tuple
+ */
+ @Override
+ public void emitTuple(HashMap<K, Integer> tuple)
+ {
+ least.emit(tuple);
+ }
+
+ /**
+ * returns val1 < val2
+ * @param val1
+ * @param val2
+ * @return val1 < val2
+ */
+ @Override
+ public boolean compareCount(int val1, int val2)
+ {
+ return val1 < val2;
+ }
+
+ /**
+ * Emits tuple on port "list"
+ * @param tlist
+ */
+ @Override
+ public void emitList(ArrayList<HashMap<K, Integer>> tlist)
+ {
+ list.emit(tlist);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java b/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
index 0780419..6fdbb6a 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
@@ -57,7 +57,7 @@ import com.datatorrent.lib.util.UnifierBooleanAnd;
* </p>
*
* @displayName Emit All Matching Values (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java b/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
index edccb83..1da1e7b 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
@@ -59,7 +59,7 @@ import com.datatorrent.lib.util.UnifierBooleanOr;
* </p>
*
* @displayName Emit Boolean For Match (Number)
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java b/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
index dd2ff17..aafaa61 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
@@ -122,4 +122,15 @@ public class MatchMap<K,V extends Number> extends BaseMatchOperator<K, V>
public void tupleNotMatched(Map<K, V> tuple)
{
}
+
+
+ /**
+ * The key in the input tuple whose value will be used for comparison.
+ * @param key The key in the input tuple whose value will be used for comparison.
+ */
+ @Override
+ public void setKey(K key)
+ {
+ super.setKey(key);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java b/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
index 8237fa6..83d52dd 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
* 2. getUnifierInstance : Get unifier operator instance for output port, (must return self instance).
* </p>
* @displayName Merge Sorted Lists (Number)
- * @category Algorithmic
+ * @category Stream Manipulators
* @tags rank, numeric
*
* @since 0.3.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKey.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKey.java b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKey.java
deleted file mode 100644
index 6d6510a..0000000
--- a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKey.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright (C) 2015 DataTorrent, Inc.
- *
- * Licensed 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.
- */
-package com.datatorrent.lib.algo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OperatorAnnotation;
-
-import com.datatorrent.lib.util.AbstractBaseFrequentKey;
-import com.datatorrent.lib.util.UnifierArrayHashMapFrequent;
-import com.datatorrent.lib.util.UnifierHashMapFrequent;
-
-/**
- * This operator filters the incoming stream of values by emitting the value or values (if there is a tie)
- * that occurred the largest number of times within each window to the output port "list".
- * One of the values is emitted to the output port "least" at the end of each window.
- * <p>
- * Occurrences of each tuple is counted and at the end of window any of the most frequent tuple is emitted on output port least and all least frequent
- * tuples on output port list
- * </p>
- * <p>
- * This module is an end of window module<br>
- * In case of a tie any of the least key would be emitted. The list port would however have all the tied keys
- * <br>
- * <b>StateFull : Yes</b>, Values are compared all over application window can be > 1. <br>
- * <b>Partitions : Yes</b>, Result is unified on output port. <br>
- * <br>
- * <b>Ports</b>:<br>
- * <b>data</b>: expects K<br>
- * <b>most</b>: emits HashMap<K,Integer>(1), Where K is the least occurring key in the window. In case of tie any of the least key would be emitted<br>
- * <b>list</b>: emits ArrayList<HashMap<K,Integer>(1)>, Where the list includes all the keys that are least frequent<br>
- * <br>
- * <b>Properties</b>: None<br>
- * <br>
- * <b>Compile time checks</b>: None<br>
- * <b>Specific run time checks</b>: None<br>
- * <br>
- * </p>
- * @displayName Emit Most Frequent Value
- * @category Algorithmic
- * @tags filter, count
- *
- * @since 0.3.2
- */
-
-@OperatorAnnotation(partitionable = true)
-public class MostFrequentKey<K> extends AbstractBaseFrequentKey<K>
-{
- /**
- * The input port which receives incoming tuples.
- */
- public final transient DefaultInputPort<K> data = new DefaultInputPort<K>()
- {
- /**
- * Calls super.processTuple(tuple)
- */
- @Override
- public void process(K tuple)
- {
- processTuple(tuple);
- }
- };
- /**
- * The output port on which all the tuples,
- * which occurred the most number of times,
- * is emitted.
- */
- public final transient DefaultOutputPort<HashMap<K, Integer>> most = new DefaultOutputPort<HashMap<K, Integer>>()
- {
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- public Unifier<HashMap<K, Integer>> getUnifier()
- {
- UnifierHashMapFrequent ret = new UnifierHashMapFrequent<K>();
- ret.setLeast(false);
- return ret;
- }
- };
-
-
- public final transient DefaultOutputPort<ArrayList<HashMap<K, Integer>>> list = new DefaultOutputPort<ArrayList<HashMap<K, Integer>>>()
- {
- @SuppressWarnings({"rawtypes", "ConstantConditions"})
- @Override
- public Unifier<ArrayList<HashMap<K, Integer>>> getUnifier()
- {
- Unifier<ArrayList<HashMap<K, Integer>>> ret = new UnifierArrayHashMapFrequent<K>();
- ((UnifierHashMapFrequent) ret).setLeast(false);
- return ret;
- }
- };
-
- /**
- * Emits tuple on port "most"
- * @param tuple
- */
- @Override
- public void emitTuple(HashMap<K, Integer> tuple)
- {
- most.emit(tuple);
- }
-
- /**
- * Emits tuple on port "list"
- * @param tlist
- */
- @Override
- public void emitList(ArrayList<HashMap<K, Integer>> tlist)
- {
- list.emit(tlist);
- }
-
- /**
- * returns val1 < val2
- * @param val1
- * @param val2
- * @return val1 > val2
- */
- @Override
- public boolean compareCount(int val1, int val2)
- {
- return val1 > val2;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyMap.java b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyMap.java
index cbd62e5..b51d255 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyMap.java
@@ -49,7 +49,7 @@ import com.datatorrent.lib.util.UnifierHashMapFrequent;
* </p>
*
* @displayName Emit Most Frequent Key
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, count
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyValueMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyValueMap.java b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyValueMap.java
index 0d1827e..582aca0 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyValueMap.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentKeyValueMap.java
@@ -69,7 +69,7 @@ import com.datatorrent.lib.util.AbstractBaseFrequentKeyValueMap;
* </p>
*
* @displayName Emit Most Frequent Keyval Pair
- * @category Algorithmic
+ * @category Rules and Alerts
* @tags filter, key value, count
*
* @since 0.3.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java
new file mode 100644
index 0000000..93ad026
--- /dev/null
+++ b/library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.lib.algo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import com.datatorrent.api.DefaultInputPort;
+import com.datatorrent.api.DefaultOutputPort;
+import com.datatorrent.api.annotation.OperatorAnnotation;
+
+import com.datatorrent.lib.util.AbstractBaseFrequentKey;
+import com.datatorrent.lib.util.UnifierArrayHashMapFrequent;
+import com.datatorrent.lib.util.UnifierHashMapFrequent;
+
+/**
+ * This operator filters the incoming stream of values by emitting the value or values (if there is a tie)
+ * that occurred the largest number of times within each window to the output port "list".
+ * One of the values is emitted to the output port "least" at the end of each window.
+ * <p>
+ * Occurrences of each tuple is counted and at the end of window any of the most frequent tuple is emitted on output port least and all least frequent
+ * tuples on output port list
+ * </p>
+ * <p>
+ * This module is an end of window module<br>
+ * In case of a tie any of the least key would be emitted. The list port would however have all the tied keys
+ * <br>
+ * <b>StateFull : Yes</b>, Values are compared all over application window can be > 1. <br>
+ * <b>Partitions : Yes</b>, Result is unified on output port. <br>
+ * <br>
+ * <b>Ports</b>:<br>
+ * <b>data</b>: expects K<br>
+ * <b>most</b>: emits HashMap<K,Integer>(1), Where K is the least occurring key in the window. In case of tie any of the least key would be emitted<br>
+ * <b>list</b>: emits ArrayList<HashMap<K,Integer>(1)>, Where the list includes all the keys that are least frequent<br>
+ * <br>
+ * <b>Properties</b>: None<br>
+ * <br>
+ * <b>Compile time checks</b>: None<br>
+ * <b>Specific run time checks</b>: None<br>
+ * <br>
+ * </p>
+ * @displayName Emit Most Frequent Value
+ * @category Rules and Alerts
+ * @tags filter, count
+ *
+ * @since 0.3.2
+ */
+
+@OperatorAnnotation(partitionable = true)
+public class MostFrequentValue<K> extends AbstractBaseFrequentKey<K>
+{
+ /**
+ * The input port which receives incoming tuples.
+ */
+ public final transient DefaultInputPort<K> data = new DefaultInputPort<K>()
+ {
+ /**
+ * Calls super.processTuple(tuple)
+ */
+ @Override
+ public void process(K tuple)
+ {
+ processTuple(tuple);
+ }
+ };
+ /**
+ * The output port on which all the tuples,
+ * which occurred the most number of times,
+ * is emitted.
+ */
+ public final transient DefaultOutputPort<HashMap<K, Integer>> most = new DefaultOutputPort<HashMap<K, Integer>>()
+ {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ public Unifier<HashMap<K, Integer>> getUnifier()
+ {
+ UnifierHashMapFrequent ret = new UnifierHashMapFrequent<K>();
+ ret.setLeast(false);
+ return ret;
+ }
+ };
+
+
+ public final transient DefaultOutputPort<ArrayList<HashMap<K, Integer>>> list = new DefaultOutputPort<ArrayList<HashMap<K, Integer>>>()
+ {
+ @SuppressWarnings({"rawtypes", "ConstantConditions"})
+ @Override
+ public Unifier<ArrayList<HashMap<K, Integer>>> getUnifier()
+ {
+ Unifier<ArrayList<HashMap<K, Integer>>> ret = new UnifierArrayHashMapFrequent<K>();
+ ((UnifierHashMapFrequent) ret).setLeast(false);
+ return ret;
+ }
+ };
+
+ /**
+ * Emits tuple on port "most"
+ * @param tuple
+ */
+ @Override
+ public void emitTuple(HashMap<K, Integer> tuple)
+ {
+ most.emit(tuple);
+ }
+
+ /**
+ * Emits tuple on port "list"
+ * @param tlist
+ */
+ @Override
+ public void emitList(ArrayList<HashMap<K, Integer>> tlist)
+ {
+ list.emit(tlist);
+ }
+
+ /**
+ * returns val1 < val2
+ * @param val1
+ * @param val2
+ * @return val1 > val2
+ */
+ @Override
+ public boolean compareCount(int val1, int val2)
+ {
+ return val1 > val2;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/TopN.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/TopN.java b/library/src/main/java/com/datatorrent/lib/algo/TopN.java
index a0cd903..5ec8dfe 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/TopN.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/TopN.java
@@ -48,7 +48,7 @@ import com.datatorrent.lib.util.AbstractBaseNNonUniqueOperatorMap;
* </p>
*
* @displayName Top N Values Per Key
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags filter, rank
*
* @since 0.3.3
@@ -101,7 +101,7 @@ public class TopN<K, V> extends AbstractBaseNNonUniqueOperatorMap<K,V> implement
}
}
}
-
+
/**
* Top N tuples per key
* @param val
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java b/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
index 10a53d3..4ccef65 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
@@ -24,7 +24,7 @@ import com.datatorrent.api.annotation.OperatorAnnotation;
import com.datatorrent.lib.util.AbstractBaseNUniqueOperatorMap;
/**
- * This operator orders tuples per key and emits the top N unique tuples per key at the end of the window.
+ * This operator orders tuples per key and emits the top N unique values per key at the end of the window.
* <p>
* Orders tuples per key and emits top N unique tuples per key on end of window.
* </p>
@@ -47,7 +47,7 @@ import com.datatorrent.lib.util.AbstractBaseNUniqueOperatorMap;
* </p>
*
* @displayName Top N Unique Values Per Key
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags filter, rank
*
* @since 0.3.2
@@ -80,7 +80,7 @@ public class TopNUnique<K, V> extends AbstractBaseNUniqueOperatorMap<K, V>
{
top.emit(tuple);
}
-
+
/**
* Top N unique tuples per key
* @param val
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java b/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
index 66fbeb5..460cf4e 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
@@ -27,7 +27,7 @@ import com.datatorrent.lib.util.BaseUniqueKeyCounter;
import com.datatorrent.lib.util.UnifierHashMapSumKeys;
/**
- * This operator counts the number of times a key exists in a window. A map from keys to counts is emitted at the end of each window.
+ * This operator counts the number of times a tuple exists in a window. A map from tuples to counts is emitted at the end of each window.
* <p>
* Counts the number of times a key exists in a window; Count is emitted at end of window in a single HashMap.
* </p>
@@ -44,8 +44,8 @@ import com.datatorrent.lib.util.UnifierHashMapSumKeys;
* <br>
* </p>
*
- * @displayName Count Unique Keys
- * @category Algorithmic
+ * @displayName Count Unique Tuples
+ * @category Stats and Aggregations
* @tags count
*
* @since 0.3.2
@@ -108,10 +108,21 @@ public class UniqueCounter<K> extends BaseUniqueKeyCounter<K>
}
}
+ /**
+ * Gets the cumulative mode.
+ * @return The cumulative mode.
+ */
public boolean isCumulative() {
return cumulative;
}
+ /**
+ * If enabled then the unique keys is counted and maintained in memory for the life of the operator. If not enabled
+ * keys are counted a per window bases.<br/>
+ * <b>Note:</b> If cumulative mode is enabled and the operator receives many unique keys, then this operator
+ * could eventually run out of memory.
+ * @param cumulative
+ */
public void setCumulative(boolean cumulative) {
this.cumulative = cumulative;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
index bfd578a..0f87ec0 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
@@ -28,9 +28,9 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils;
/**
* This operator accepts a list of POJOs, and serves the data under the {@link SnapshotSchema}.
* Each POJO represents a row in the table, and the full list of POJOs represents a table.
- * @displayName App Data Snapshot Server
- * @category App Data
- * @tags appdata, snapshot, pojo
+ * @displayName App Data Snapshot POJO Server
+ * @category Output
+ * @tags app data, snapshot, pojo
*/
public class AppDataSnapshotServerPOJO extends AbstractAppDataSnapshotServer<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java b/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
index 84651c3..da29ce5 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
@@ -23,6 +23,9 @@ import java.nio.charset.Charset;
/**
* This operator converts Byte Array to String. User gets the option of providing character Encoding.
*
+ * @category Tuple Converters
+ * @tags byte, string
+ *
* @since 2.1.0
*/
public class ByteArrayToStringConverterOperator extends BaseOperator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
index bda4743..95b6016 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
@@ -13,24 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
-* Copyright (c) 2015 DataTorrent, Inc. ALL Rights Reserved.
-*
-* Licensed 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.
-*/
package com.datatorrent.lib.converter;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -38,15 +22,15 @@ import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.lib.util.KeyHashValPair;
-import com.datatorrent.lib.util.KeyValPair;
/**
- *
- * This operator outputs key value pair for each entry in input Map
- *
+ *
+ * This operator outputs key value pair for each entry in input Map
+ *
* @displayName Map to key-value pair converter
- * @category Converter
- *
+ * @category Tuple Converters
+ * @tags key value
+ *
*/
public class MapToKeyHashValuePairConverter<K, V> extends BaseOperator {
@@ -57,11 +41,11 @@ public class MapToKeyHashValuePairConverter<K, V> extends BaseOperator {
{
@Override
public void process(Map<K, V> tuple)
- {
+ {
for(Entry<K, V> entry:tuple.entrySet())
{
- output.emit(new KeyHashValPair<K, V>(entry.getKey(), entry.getValue()));
- }
+ output.emit(new KeyHashValPair<K, V>(entry.getKey(), entry.getValue()));
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
index 034a706..94f5fbd 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
@@ -25,12 +25,13 @@ import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.api.DefaultOutputPort;
/**
- *
- * This operator outputs key value pair for each entry in input Map
- *
+ *
+ * This operator outputs key value pair for each entry in input Map
+ *
* @displayName Map to key-value pair converter
- * @category Converter
- *
+ * @category Tuple Converters
+ * @tags key value
+ *
*/
public class MapToKeyValuePairConverter<K, V> extends BaseOperator {
@@ -41,11 +42,11 @@ public class MapToKeyValuePairConverter<K, V> extends BaseOperator {
{
@Override
public void process(Map<K, V> tuple)
- {
+ {
for(Entry<K, V> entry:tuple.entrySet())
{
- output.emit(new KeyValPair<K, V>(entry.getKey(), entry.getValue()));
- }
+ output.emit(new KeyValPair<K, V>(entry.getKey(), entry.getValue()));
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java b/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
index 17a38bb..a5ca699 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
@@ -24,12 +24,13 @@ import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.api.DefaultOutputPort;
/**
- *
+ *
* This operator converts Map<K, String> to Map<K, Number> for numeric string values
*
* @displayName String to Number value converter for Map
- * @category Converter
- *
+ * @category Tuple Converters
+ * @tags string
+ *
*/
public class StringValueToNumberConverterForMap<K> extends BaseOperator {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
index e01d72e..1ab63d0 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
@@ -36,8 +36,8 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
* This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(ResultSet)}.
* </p>
* @displayName Abstract JDBC Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags database, sql
*
* @param <T> The tuple type
* @since 0.9.4
@@ -65,11 +65,6 @@ public abstract class AbstractJdbcInputOperator<T> extends AbstractStoreInputOpe
public abstract String queryToRetrieveData();
/**
- * The output port that will emit tuples read from the database.
- */
- public final transient DefaultOutputPort<T> outputPort = new DefaultOutputPort<T>();
-
- /**
* This executes the query to retrieve result from database.
* It then converts each row into tuple and emit that into output port.
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
index 08e8afa..619ce5f 100644
--- a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
@@ -56,14 +56,27 @@ public abstract class AbstractHttpInputOperator<T> extends SimpleSinglePortInput
* The URL of the web service resource for the POST request.
*/
@NotNull
- private URI resourceUrl;
+ private URI url;
private Map<String, String> headers = new HashMap<String, String>();
private transient Client wsClient;
private transient WebResource resource;
+ /**
+ * The url to read from.
+ * @param u The url to read from.
+ */
public void setUrl(URI u)
{
- resourceUrl = u;
+ url = u;
+ }
+
+ /**
+ * Sets the url to read from.
+ * @return The url to read from.
+ */
+ public URI getUrl()
+ {
+ return url;
}
public void setHeader(String key, String value)
@@ -77,8 +90,8 @@ public abstract class AbstractHttpInputOperator<T> extends SimpleSinglePortInput
wsClient = Client.create();
wsClient.setFollowRedirects(true);
wsClient.setReadTimeout(readTimeoutMillis);
- resource = wsClient.resource(resourceUrl.toString()); // side step "not absolute URL" after serialization
- LOG.info("URL: {}", resourceUrl);
+ resource = wsClient.resource(url.toString()); // side step "not absolute URL" after serialization
+ LOG.info("URL: {}", url);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java b/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
index 253e58c..8c54ec0 100644
--- a/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
@@ -29,7 +29,7 @@ import com.sun.jersey.api.client.WebResource;
* </p>
* @displayName HTTP GET Map
* @category Input
- * @tags http, input operator
+ * @tags http
*
* @param <K> Type of key in input map tuple
* @param <V> Type of value in input map tuple
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
index 1750811..bc6dc5c 100644
--- a/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* </p>
* @displayName HTTP JSON Chunks Input
* @category Input
- * @tags http, input operator
+ * @tags http
*
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
index 3997d22..6258c07 100644
--- a/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
@@ -26,7 +26,7 @@ import java.io.InputStreamReader;
* <p></p>
* @displayName HTTP Lines Input
* @category Input
- * @tags http, input operator
+ * @tags http
*
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
index fffdcee..b7417dd 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
@@ -32,7 +32,7 @@ import com.datatorrent.common.util.PubSubWebSocketClient;
* <p></p>
* @displayName Pub Sub Web Socket Input
* @category Input
- * @tags http, input operator
+ * @tags http, websocket
*
* @since 0.3.2
*/
@@ -47,11 +47,19 @@ public class PubSubWebSocketInputOperator<T> extends WebSocketInputOperator<T>
this.codec = new PubSubMessageCodec<Object>(mapper);
}
+ /**
+ * The pub sub topic to subscribe to.
+ * @param topic The pub sub topic to subscribe to.
+ */
public void setTopic(String topic)
{
this.topic = topic;
}
+ /**
+ * Gets pub sub topic to subscribe to.
+ * @return The pub sub topic to subscribe to.
+ */
@NotNull
public String getTopic()
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
index 47a4966..ef9a113 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
@@ -26,8 +26,8 @@ import com.datatorrent.common.util.PubSubWebSocketClient;
* This operator writes maps as JSON objects to the given URL.
* <p></p>
* @displayName Pub Sub Web Socket Output
- * @category Input
- * @tags http, input operator
+ * @category Output
+ * @tags http
*
* @param <T>
* @since 0.3.2
@@ -37,11 +37,19 @@ public class PubSubWebSocketOutputOperator<T> extends WebSocketOutputOperator<T>
private String topic = null;
private transient PubSubMessageCodec<Object> codec = new PubSubMessageCodec<Object>(mapper);
+ /**
+ * The pub sub topic to subscribe to.
+ * @param topic The pub sub topic to subscribe to.
+ */
public void setTopic(String topic)
{
this.topic = topic;
}
+ /**
+ * Gets the pub sub topic to subscribe to.
+ * @return The pub sub topic to subscribe to.
+ */
@NotNull
public String getTopic()
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
index 4e6d465..07bcaf5 100644
--- a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
@@ -32,11 +32,10 @@ import com.datatorrent.common.util.BaseOperator;
* </p>
* @displayName Asynchronous Input Processing
* @category Input
- * @tags input operator
*
* @since 0.3.2
*/
-public class SimpleSinglePortInputOperator<T> extends BaseOperator implements InputOperator, Operator.ActivationListener<OperatorContext>
+public abstract class SimpleSinglePortInputOperator<T> extends BaseOperator implements InputOperator, Operator.ActivationListener<OperatorContext>
{
private transient Thread ioThread;
private transient boolean isActive = false;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index cc3e874..dabcacb 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* <p></p>
* @displayName JSON Map Input
* @category Input
- * @tags http, input operator
+ * @tags http, websocket
*
* @since 0.3.2
*/
@@ -93,7 +93,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
}
/**
- * Sets the IO Thread multiplier for AsyncWebSocket connection
+ * The number of threads to use for the websocket connection.
*
* @param ioThreadMultiplier
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index 1a23ebb..a92f8b3 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -40,8 +40,8 @@ import com.datatorrent.api.DefaultInputPort;
* Reads via WebSocket from given URL as input stream. Incoming data is interpreted as JSONObject and converted to {@link java.util.Map}.
* <p></p>
* @displayName JSON Map Output
- * @category Input
- * @tags http, input operator
+ * @category Output
+ * @tags http, websocket
*
* @param <T> tuple type
* @since 0.3.2
@@ -111,7 +111,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator
}
/**
- * Sets the IO Thread multiplier for AsyncWebSocket connection
+ * The number of threads to use for the websocket connection.
*
* @param ioThreadMultiplier
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java b/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
index 13b4bdf..58554c3 100644
--- a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
+++ b/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
@@ -63,7 +63,7 @@ import com.datatorrent.lib.io.block.BlockMetadata.FileBlockMetadata;
*
* @displayName File Splitter
* @category Input
- * @tags file, input operator
+ * @tags file
* @since 2.0.0
*/
@OperatorAnnotation(checkpointableWithinAppWindow = false)
@@ -835,6 +835,8 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
+ * Gets the regular expression for file names to split.
+ *
* @return regular expression
*/
public String getFilePatternRegularExp()
@@ -843,7 +845,7 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
- * Sets the regular expression for files.
+ * Only files with names matching the given java regular expression are split.
*
* @param filePatternRegexp regular expression
*/
@@ -853,7 +855,8 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
- * Sets the files to be scanned.
+ * A comma separated list of directories to scan. If the path is not fully qualified the default
+ * file system is used. A fully qualified path can be provided to scan directories in other filesystems.
*
* @param files files
*/
@@ -863,6 +866,8 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
+ * Gets the files to be scanned.
+ *
* @return files to be scanned.
*/
public String getFiles()
@@ -871,7 +876,7 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
- * Sets whether scan will be recursive.
+ * True if recursive; false otherwise.
*
* @param recursive true if recursive; false otherwise.
*/
@@ -881,6 +886,8 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
+ * Sets whether scan will be recursive.
+ *
* @return true if recursive; false otherwise.
*/
public boolean isRecursive()
@@ -899,7 +906,7 @@ public class FileSplitter implements InputOperator, Operator.CheckpointListener
}
/**
- * Returns the value of trigger.
+ * The trigger which will initiate scan.
*
* @return trigger
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
index 721411b..4a0defa 100644
--- a/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
@@ -45,7 +45,7 @@ import com.datatorrent.api.Operator.ActivationListener;
* </p>
* @displayName Tail Input
* @category Input
- * @tags local fs, file, input operator
+ * @tags local fs, file
* @since 0.9.4
*/
public class TailFsInputOperator implements InputOperator, ActivationListener<OperatorContext>
@@ -123,6 +123,7 @@ public class TailFsInputOperator implements InputOperator, ActivationListener<Op
}
/**
+ * Gets whether to tail from the end of the file.
* @return the end
*/
public boolean isEnd()
@@ -131,8 +132,8 @@ public class TailFsInputOperator implements InputOperator, ActivationListener<Op
}
/**
- * @param end
- * the end to set
+ * Whether to tail from the end or start of file.
+ * @param end The end to set.
*/
public void setEnd(boolean end)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/dd15161d/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java b/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
index 8dca272..486ba60 100644
--- a/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
@@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory;
*
* @displayName Java Script
* @category Scripting
- * @tags script operator, map, string
+ * @tags script, map, string
* @since 0.3.2
*/
public class JavaScriptOperator extends ScriptOperator
[24/50] [abbrv] incubator-apex-malhar git commit: get ready for v3.1.0
Posted by ch...@apache.org.
get ready for v3.1.0
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/93ce29c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/93ce29c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/93ce29c0
Branch: refs/heads/master
Commit: 93ce29c093dc4f394c1e1cf4bfef858195395560
Parents: c32c97c
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 3 14:01:42 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 3 14:01:42 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 2 +-
contrib/pom.xml | 2 +-
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 2 +-
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 2 +-
samples/pom.xml | 2 +-
19 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index bb52554..7321baa 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 065a9cc..e816985 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index bb48f5d..9776e2f 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index a2ae056..ad20744 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 29be702..13c9fcd 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index f46ba0e..1f3f075 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 039b29d..cd55a7b 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index cdf6543..181343a 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index b4fbfda..4e09392 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 8a81970..5719b2c 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 0601366..64c6c4a 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-demos</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 8832de8..42c203c 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index d4afef9..c55ee79 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 3d8b554..8b7d3fc 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 5a956c5..779b4f7 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 47ebf8a..3b4db0c 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index a07e072..77b8506 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffd5cc6..81a699b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/93ce29c0/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 10a623b..7e8b274 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>malhar-samples</artifactId>
[27/50] [abbrv] incubator-apex-malhar git commit: Fix project version.
Posted by ch...@apache.org.
Fix project version.
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/0a4250e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0a4250e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0a4250e0
Branch: refs/heads/master
Commit: 0a4250e0bda347562784d54f7c1b6add0685ac37
Parents: a980e06
Author: thomas <th...@datatorrent.com>
Authored: Tue Aug 4 21:26:40 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Tue Aug 4 21:26:40 2015 -0700
----------------------------------------------------------------------
benchmark/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0a4250e0/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index fa6a975..0d07203 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>com.datatorrent</groupId>
[36/50] [abbrv] incubator-apex-malhar git commit: MLHR-1748 #resolve
Created concrete input and output operators for Redis Store Added test cases
for the same.
Posted by ch...@apache.org.
MLHR-1748 #resolve Created concrete input and output operators for Redis Store
Added test cases for the same.
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/a57a3d75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a57a3d75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a57a3d75
Branch: refs/heads/master
Commit: a57a3d756bafc1269c827a71d4fea549abdf65dd
Parents: f40ba34
Author: ishark <is...@datatorrent.com>
Authored: Mon Jun 29 15:52:25 2015 -0700
Committer: ishark <is...@datatorrent.com>
Committed: Fri Aug 14 12:07:36 2015 -0700
----------------------------------------------------------------------
contrib/pom.xml | 8 +-
.../redis/AbstractRedisInputOperator.java | 224 +++++++++++++++++-
.../redis/RedisKeyValueInputOperator.java | 55 +++++
.../redis/RedisMapAsValueInputOperator.java | 45 ++++
.../contrib/redis/RedisPOJOInputOperator.java | 204 ++++++++++++++++
.../contrib/redis/RedisPOJOOutputOperator.java | 155 +++++++++++++
.../datatorrent/contrib/redis/RedisStore.java | 27 +++
.../contrib/redis/RedisInputOperatorTest.java | 193 ++++++++++++++++
.../contrib/redis/RedisPOJOOperatorTest.java | 230 +++++++++++++++++++
demos/machinedata/pom.xml | 2 +-
10 files changed, 1138 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 9776e2f..50d7234 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -181,6 +181,12 @@
<dependencies>
<dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>2.7.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.10</artifactId>
<version>0.8.1.1</version>
@@ -382,7 +388,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>2.2.1</version>
+ <version>2.5.1</version>
<optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
index ff7a9a5..7f79bd0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
@@ -15,11 +15,22 @@
*/
package com.datatorrent.contrib.redis;
-import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+import redis.clients.jedis.ScanParams;
+import redis.clients.jedis.ScanResult;
+import com.datatorrent.api.Operator.CheckpointListener;
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.netlet.util.DTThrowable;
+import com.datatorrent.lib.db.AbstractStoreInputOperator;
+import com.datatorrent.lib.io.IdempotentStorageManager;
/**
* This is the base implementation of a Redis input operator.
- * <p></p>
+ *
* @displayName Abstract Redis Input
* @category Input
* @tags redis, key value
@@ -27,6 +38,213 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* @param <T> The tuple type.
* @since 0.9.3
*/
-public abstract class AbstractRedisInputOperator<T> extends AbstractKeyValueStoreInputOperator<T, RedisStore>
+public abstract class AbstractRedisInputOperator<T> extends AbstractStoreInputOperator<T, RedisStore> implements CheckpointListener
{
+ protected transient List<String> keys = new ArrayList<String>();
+ protected transient Integer scanOffset;
+ protected transient ScanParams scanParameters;
+ private transient boolean scanComplete;
+ private transient Integer backupOffset;
+ private int scanCount;
+ private transient boolean replay;
+
+ @NotNull
+ private IdempotentStorageManager idempotentStorageManager;
+
+ private transient OperatorContext context;
+ private transient long currentWindowId;
+ private transient Integer sleepTimeMillis;
+ private transient Integer scanCallsInCurrentWindow;
+ private RecoveryState recoveryState;
+
+ /*
+ * Recovery State contains last offset processed in window and number of times
+ * ScanKeys was invoked in window We need to capture to capture number of
+ * calls to ScanKeys because, last offset returned by scanKeys call is not
+ * always monotonically increasing. Storing offset and number of times scan
+ * was done for each window, guarantees idempotency for each window
+ */
+ public static class RecoveryState implements Serializable
+ {
+ public Integer scanOffsetAtBeginWindow, numberOfScanCallsInWindow;
+ }
+
+ public AbstractRedisInputOperator()
+ {
+ scanCount = 100;
+ recoveryState = new RecoveryState();
+ recoveryState.scanOffsetAtBeginWindow = 0;
+ recoveryState.numberOfScanCallsInWindow = 0;
+ setIdempotentStorageManager(new IdempotentStorageManager.NoopIdempotentStorageManager());
+ }
+
+ @Override
+ public void beginWindow(long windowId)
+ {
+ currentWindowId = windowId;
+ scanCallsInCurrentWindow = 0;
+ replay = false;
+ if (currentWindowId <= getIdempotentStorageManager().getLargestRecoveryWindow()) {
+ replay(windowId);
+ }
+ }
+
+ private void replay(long windowId)
+ {
+ try {
+ if (checkIfWindowExistsInIdempotencyManager(windowId - 1)) {
+ // Begin offset for this window is recovery offset stored for the last
+ // window
+ RecoveryState recoveryStateForLastWindow = (RecoveryState) getIdempotentStorageManager().load(context.getId(), windowId - 1);
+ recoveryState.scanOffsetAtBeginWindow = recoveryStateForLastWindow.scanOffsetAtBeginWindow;
+ }
+
+ RecoveryState recoveryStateForCurrentWindow = (RecoveryState) getIdempotentStorageManager().load(context.getId(), windowId);
+ recoveryState.numberOfScanCallsInWindow = recoveryStateForCurrentWindow.numberOfScanCallsInWindow;
+ if (recoveryState.scanOffsetAtBeginWindow != null) {
+ scanOffset = recoveryState.scanOffsetAtBeginWindow;
+ }
+ replay = true;
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+
+ private boolean checkIfWindowExistsInIdempotencyManager(long windowId) throws IOException
+ {
+ long[] windowsIds = getIdempotentStorageManager().getWindowIds(context.getId());
+ if(windowsIds.length == 0 || windowId < windowsIds[0] || windowId > windowsIds[windowsIds.length - 1]) {
+ return false;
+ }
+ return true ;
+ }
+
+ private void scanKeysFromOffset()
+ {
+ if (!scanComplete) {
+ if (replay && scanCallsInCurrentWindow >= recoveryState.numberOfScanCallsInWindow) {
+ try {
+ Thread.sleep(sleepTimeMillis);
+ } catch (InterruptedException e) {
+ DTThrowable.rethrow(e);
+ }
+ return;
+ }
+
+ ScanResult<String> result = store.ScanKeys(scanOffset, scanParameters);
+ backupOffset = scanOffset;
+ scanOffset = Integer.parseInt(result.getStringCursor());
+ if (scanOffset == 0) {
+ // Redis store returns 0 after all data is read
+ scanComplete = true;
+
+ // point scanOffset to the end in this case for reading any new tuples
+ scanOffset = backupOffset + result.getResult().size();
+ }
+ keys = result.getResult();
+ }
+ scanCallsInCurrentWindow++;
+ }
+
+ @Override
+ public void setup(OperatorContext context)
+ {
+ super.setup(context);
+ sleepTimeMillis = context.getValue(context.SPIN_MILLIS);
+ getIdempotentStorageManager().setup(context);
+ this.context = context;
+ scanOffset = 0;
+ scanComplete = false;
+ scanParameters = new ScanParams();
+ scanParameters.count(scanCount);
+ // For the 1st window after checkpoint, windowID - 1 would not have recovery
+ // offset stored in idempotentStorageManager
+ // But recoveryOffset is non-transient, so will be recovered with
+ // checkPointing
+ scanOffset = recoveryState.scanOffsetAtBeginWindow;
+ }
+
+ @Override
+ public void endWindow()
+ {
+ while (replay && scanCallsInCurrentWindow < recoveryState.numberOfScanCallsInWindow) {
+ // If less keys got scanned in this window, scan till recovery offset
+ scanKeysFromOffset();
+ processTuples();
+ }
+ super.endWindow();
+ recoveryState.scanOffsetAtBeginWindow = scanOffset;
+ recoveryState.numberOfScanCallsInWindow = scanCallsInCurrentWindow;
+
+ if (currentWindowId > getIdempotentStorageManager().getLargestRecoveryWindow()) {
+ try {
+ getIdempotentStorageManager().save(recoveryState, context.getId(), currentWindowId);
+ } catch (IOException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+ }
+
+ @Override
+ public void teardown()
+ {
+ super.teardown();
+ getIdempotentStorageManager().teardown();
+ }
+
+ /*
+ * get number of keys to read for each redis key scan
+ */
+ public int getScanCount()
+ {
+ return scanCount;
+ }
+
+ /*
+ * set number of keys to read for each redis key scan
+ */
+ public void setScanCount(int scanCount)
+ {
+ this.scanCount = scanCount;
+ }
+
+ @Override
+ public void emitTuples()
+ {
+ scanKeysFromOffset();
+ processTuples();
+ }
+
+ abstract public void processTuples();
+
+ @Override
+ public void checkpointed(long windowId)
+ {
+ }
+
+ @Override
+ public void committed(long windowId)
+ {
+ try {
+ getIdempotentStorageManager().deleteUpTo(context.getId(), windowId);
+ } catch (IOException e) {
+ throw new RuntimeException("committing", e);
+ }
+ }
+
+ /*
+ * get Idempotent Storage manager instance
+ */
+ public IdempotentStorageManager getIdempotentStorageManager()
+ {
+ return idempotentStorageManager;
+ }
+
+ /*
+ * set Idempotent storage manager instance
+ */
+ public void setIdempotentStorageManager(IdempotentStorageManager idempotentStorageManager)
+ {
+ this.idempotentStorageManager = idempotentStorageManager;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
new file mode 100644
index 0000000..8f419bd
--- /dev/null
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+
+package com.datatorrent.contrib.redis;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.datatorrent.lib.util.KeyValPair;
+
+/**
+ * This is the an implementation of a Redis input operator for fetching
+ * Key-Value pair stored in Redis. It takes in keys to fetch and emits
+ * corresponding <Key, Value> Pair. Value data type is String in this case.
+ *
+ * @displayName Redis Input Operator for Key Value pair
+ * @category Store
+ * @tags input operator, key value
+ *
+ */
+public class RedisKeyValueInputOperator extends AbstractRedisInputOperator<KeyValPair<String, String>>
+{
+ private List<Object> keysObjectList = new ArrayList<Object>();
+
+ @Override
+ public void processTuples()
+ {
+ keysObjectList = new ArrayList<Object>(keys);
+ if (keysObjectList.size() > 0) {
+
+ List<Object> allValues = store.getAll(keysObjectList);
+ for (int i = 0; i < allValues.size() && i < keys.size(); i++) {
+ if (allValues.get(i) == null) {
+ outputPort.emit(new KeyValPair<String, String>(keys.get(i), null));
+ } else {
+ outputPort.emit(new KeyValPair<String, String>(keys.get(i), allValues.get(i).toString()));
+ }
+ }
+ keys.clear();
+ keysObjectList.clear();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
new file mode 100644
index 0000000..66ef582
--- /dev/null
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.contrib.redis;
+
+import java.util.Map;
+import com.datatorrent.lib.util.KeyValPair;
+
+/**
+ * This is the an implementation of a Redis input operator It takes in keys to
+ * fetch and emits Values stored as Maps in Redis i.e. when value datatype in
+ * Redis is HashMap
+ *
+ * @displayName Redis Input Operator for Map
+ * @category Store
+ * @tags input operator, key value
+ *
+ */
+
+public class RedisMapAsValueInputOperator extends AbstractRedisInputOperator<KeyValPair<String, Map<String, String>>>
+{
+ @Override
+ public void processTuples()
+ {
+ for (String key : keys) {
+ if (store.getType(key).equals("hash")) {
+ Map<String, String> mapValue = store.getMap(key);
+ outputPort.emit(new KeyValPair<String, Map<String, String>>(key, mapValue));
+ }
+ }
+ keys.clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
new file mode 100644
index 0000000..5a73e61
--- /dev/null
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
@@ -0,0 +1,204 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.contrib.redis;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.lib.util.FieldInfo;
+import com.datatorrent.lib.util.FieldInfo.SupportType;
+import com.datatorrent.lib.util.KeyValPair;
+import com.datatorrent.lib.util.PojoUtils;
+import com.datatorrent.lib.util.PojoUtils.Setter;
+import com.datatorrent.lib.util.PojoUtils.SetterBoolean;
+import com.datatorrent.lib.util.PojoUtils.SetterDouble;
+import com.datatorrent.lib.util.PojoUtils.SetterFloat;
+import com.datatorrent.lib.util.PojoUtils.SetterInt;
+import com.datatorrent.lib.util.PojoUtils.SetterLong;
+import com.datatorrent.lib.util.PojoUtils.SetterShort;
+import com.datatorrent.netlet.util.DTThrowable;
+
+/**
+ * This is a Redis input operator, which scans all keys in Redis store It
+ * converts Value stored as map to Plain Old Java Object. It outputs
+ * KeyValuePair with POJO as value
+ * <p>
+ * This output adapter Reads from RedisStore stored as <Key, Map> It outputs a
+ * Key value pair <key, POJO> as tuples.
+ * </p>
+ *
+ * @displayName Redis POJO Input Operator
+ * @category Store
+ * @tags output operator, key value
+ *
+ */
+@Evolving
+public class RedisPOJOInputOperator extends AbstractRedisInputOperator<KeyValPair<String, Object>>
+{
+ protected final Map<String, Object> map = new HashMap<String, Object>();
+ private ArrayList<FieldInfo> dataColumns;
+ private transient ArrayList<Object> setters;
+ private boolean isFirstTuple = true;
+ private String outputClass;
+ private Class<?> objectClass;
+
+ public RedisPOJOInputOperator()
+ {
+ super();
+ setters = new ArrayList<Object>();
+ }
+
+ @SuppressWarnings("unchecked")
+ private Object convertMapToObject(Map<String, String> tuple)
+ {
+ try {
+ Object mappedObject = objectClass.newInstance();
+ for (int i = 0; i < dataColumns.size(); i++) {
+ final SupportType type = dataColumns.get(i).getType();
+ final String columnName = dataColumns.get(i).getColumnName();
+
+ if (i < setters.size()) {
+ String value = tuple.get(columnName);
+ switch (type) {
+ case STRING:
+ ((Setter<Object, String>) setters.get(i)).set(mappedObject, value);
+ break;
+ case BOOLEAN:
+ ((SetterBoolean) setters.get(i)).set(mappedObject, Boolean.parseBoolean(value));
+ break;
+ case SHORT:
+ ((SetterShort) setters.get(i)).set(mappedObject, Short.parseShort(value));
+ break;
+ case INTEGER:
+ ((SetterInt) setters.get(i)).set(mappedObject, Integer.parseInt(value));
+ break;
+ case LONG:
+ ((SetterLong) setters.get(i)).set(mappedObject, Long.parseLong(value));
+ break;
+ case FLOAT:
+ ((SetterFloat) setters.get(i)).set(mappedObject, Float.parseFloat(value));
+ break;
+ case DOUBLE:
+ ((SetterDouble) setters.get(i)).set(mappedObject, Double.parseDouble(value));
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ return mappedObject;
+ } catch (Exception e) {
+ DTThrowable.wrapIfChecked(e);
+ }
+ return null;
+ }
+
+ @Override
+ public void setup(OperatorContext context)
+ {
+ super.setup(context);
+ }
+
+ public void processFirstTuple(Map<String, String> value) throws ClassNotFoundException
+ {
+ objectClass = Class.forName(getOutputClass());
+
+ final int size = dataColumns.size();
+ for (int i = 0; i < size; i++) {
+ final SupportType type = dataColumns.get(i).getType();
+ final String getterExpression = dataColumns.get(i).getPojoFieldExpression();
+ final Object setter;
+ switch (type) {
+ case STRING:
+ setter = PojoUtils.createSetter(objectClass, getterExpression, String.class);
+ break;
+ case BOOLEAN:
+ setter = PojoUtils.createSetterBoolean(objectClass, getterExpression);
+ break;
+ case SHORT:
+ setter = PojoUtils.createSetterShort(objectClass, getterExpression);
+ break;
+ case INTEGER:
+ setter = PojoUtils.createSetterInt(objectClass, getterExpression);
+ break;
+ case LONG:
+ setter = PojoUtils.createSetterLong(objectClass, getterExpression);
+ break;
+ case FLOAT:
+ setter = PojoUtils.createSetterFloat(objectClass, getterExpression);
+ break;
+ case DOUBLE:
+ setter = PojoUtils.createSetterDouble(objectClass, getterExpression);
+ break;
+ default:
+ setter = PojoUtils.createSetter(objectClass, getterExpression, Object.class);
+ break;
+ }
+ setters.add(setter);
+ }
+ }
+
+ @Override
+ public void processTuples()
+ {
+ for (String key : keys) {
+ if (store.getType(key).equals("hash")) {
+ Map<String, String> mapValue = store.getMap(key);
+ if (isFirstTuple) {
+ try {
+ processFirstTuple(mapValue);
+ } catch (ClassNotFoundException e) {
+ DTThrowable.rethrow(e);
+ }
+ }
+ isFirstTuple = false;
+ outputPort.emit(new KeyValPair<String, Object>(key, convertMapToObject(mapValue)));
+ }
+ }
+ keys.clear();
+ }
+
+ /*
+ * Output class type
+ */
+ public String getOutputClass()
+ {
+ return outputClass;
+ }
+
+ public void setOutputClass(String outputClass)
+ {
+ this.outputClass = outputClass;
+ }
+
+ /*
+ * An arraylist of data column names to be set in Redis store as a Map. Gets
+ * column names, column expressions and column data types
+ */
+ public ArrayList<FieldInfo> getDataColumns()
+ {
+ return dataColumns;
+ }
+
+ public void setDataColumns(ArrayList<FieldInfo> dataColumns)
+ {
+ this.dataColumns = dataColumns;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
new file mode 100644
index 0000000..8966248
--- /dev/null
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
@@ -0,0 +1,155 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.contrib.redis;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.datatorrent.lib.util.FieldInfo;
+import com.datatorrent.lib.util.FieldInfo.SupportType;
+import com.datatorrent.lib.util.KeyValPair;
+import com.datatorrent.lib.util.PojoUtils;
+import com.datatorrent.lib.util.PojoUtils.Getter;
+
+/**
+ * This is a Redis output operator, which takes a Key and corresponding Plain
+ * Old Java Object as input. And writes a Map out to Redis based on Expressions
+ * provided.
+ * <p>
+ * This output adapter takes a Key value pair <key, POJO> as tuples and just
+ * writes to the redis store with the key and the value is a Map containing
+ * object attributes as <keys,value> Note: Redis output operator should never
+ * use the passthrough method because it begins a transaction at beginWindow and
+ * commits a transaction at endWindow, and a transaction in Redis blocks all
+ * other clients.
+ * </p>
+ *
+ * @displayName Redis POJO Output Operator
+ * @category Store
+ * @tags output operator, key value
+ *
+ */
+public class RedisPOJOOutputOperator extends AbstractRedisAggregateOutputOperator<KeyValPair<String, Object>>
+{
+ protected final Map<String, Object> map = new HashMap<String, Object>();
+ private ArrayList<FieldInfo> dataColumns;
+ private transient ArrayList<Object> getters;
+ private boolean isFirstTuple = true;
+
+ public RedisPOJOOutputOperator()
+ {
+ super();
+ getters = new ArrayList<Object>();
+ }
+
+ @Override
+ public void storeAggregate()
+ {
+ for (Entry<String, Object> entry : map.entrySet()) {
+
+ Map<String, String> mapObject = convertObjectToMap(entry.getValue());
+ store.put(entry.getKey(), mapObject);
+ }
+ }
+
+ private Map<String, String> convertObjectToMap(Object tuple)
+ {
+
+ Map<String, String> mappedObject = new HashMap<String, String>();
+ for (int i = 0; i < dataColumns.size(); i++) {
+ final SupportType type = dataColumns.get(i).getType();
+ final String columnName = dataColumns.get(i).getColumnName();
+
+ if (i < getters.size()) {
+ Getter<Object, Object> obj = (Getter<Object, Object>) (getters.get(i));
+
+ Object value = obj.get(tuple);
+ mappedObject.put(columnName, value.toString());
+ }
+ }
+
+ return mappedObject;
+ }
+
+ public void processFirstTuple(KeyValPair<String, Object> tuple)
+ {
+ // Create getters using first value entry in map
+ // Entry<String, Object> entry= tuple.entrySet().iterator().next();
+ Object value = tuple.getValue();
+
+ final Class<?> fqcn = value.getClass();
+ final int size = dataColumns.size();
+ for (int i = 0; i < size; i++) {
+ final SupportType type = dataColumns.get(i).getType();
+ final String getterExpression = dataColumns.get(i).getPojoFieldExpression();
+ final Object getter;
+ switch (type) {
+ case STRING:
+ getter = PojoUtils.createGetter(fqcn, getterExpression, String.class);
+ break;
+ case BOOLEAN:
+ getter = PojoUtils.createGetterBoolean(fqcn, getterExpression);
+ break;
+ case SHORT:
+ getter = PojoUtils.createGetterShort(fqcn, getterExpression);
+ break;
+ case INTEGER:
+ getter = PojoUtils.createGetter(fqcn, getterExpression, type.getJavaType());
+ break;
+ case LONG:
+ getter = PojoUtils.createGetterLong(fqcn, getterExpression);
+ break;
+ case FLOAT:
+ getter = PojoUtils.createGetterFloat(fqcn, getterExpression);
+ break;
+ case DOUBLE:
+ getter = PojoUtils.createGetterDouble(fqcn, getterExpression);
+ break;
+ default:
+ getter = PojoUtils.createGetter(fqcn, getterExpression, Object.class);
+ break;
+ }
+ getters.add(getter);
+ }
+ }
+
+ @Override
+ public void processTuple(KeyValPair<String, Object> tuple)
+ {
+ if (isFirstTuple) {
+ processFirstTuple(tuple);
+ }
+
+ isFirstTuple = false;
+ map.put(tuple.getKey(), tuple.getValue());
+ }
+
+ /*
+ * An arraylist of data column names to be set in Redis store as a Map. Gets
+ * column names, column expressions and column data types
+ */
+ public ArrayList<FieldInfo> getDataColumns()
+ {
+ return dataColumns;
+ }
+
+ public void setDataColumns(ArrayList<FieldInfo> dataColumns)
+ {
+ this.dataColumns = dataColumns;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
index ea8e26b..2acc1d5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
@@ -23,6 +23,8 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.Jedis;
+import redis.clients.jedis.ScanParams;
+import redis.clients.jedis.ScanResult;
import redis.clients.jedis.Transaction;
import com.datatorrent.lib.db.TransactionableKeyValueStore;
@@ -181,6 +183,26 @@ public class RedisStore implements TransactionableKeyValueStore
return jedis.get(key.toString());
}
+ public String getType(String key)
+ {
+ return jedis.type(key);
+ }
+
+ /**
+ * Gets the stored Map for given the key, when the value data type is a map, stored with hmset
+ *
+ * @param key
+ * @return hashmap stored for the key.
+ */
+ public Map<String, String> getMap(Object key)
+ {
+ if (isInTransaction()) {
+ throw new RuntimeException("Cannot call get when in redis transaction");
+ }
+ return jedis.hgetAll(key.toString());
+ }
+
+
/**
* Gets all the values given the keys.
* Note that it does NOT work with hash values or list values
@@ -255,6 +277,11 @@ public class RedisStore implements TransactionableKeyValueStore
}
}
+ public ScanResult<String> ScanKeys(Integer offset, ScanParams params)
+ {
+ return jedis.scan(offset.toString(), params);
+ }
+
/**
* Calls hincrbyfloat on the redis store.
*
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java
new file mode 100644
index 0000000..08fb294
--- /dev/null
+++ b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java
@@ -0,0 +1,193 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+
+package com.datatorrent.contrib.redis;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import redis.clients.jedis.ScanParams;
+
+import com.datatorrent.api.Attribute;
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.api.DAG;
+import com.datatorrent.api.DefaultInputPort;
+import com.datatorrent.api.LocalMode;
+import com.datatorrent.common.util.BaseOperator;
+import com.datatorrent.lib.helper.OperatorContextTestHelper;
+import com.datatorrent.lib.io.IdempotentStorageManager;
+import com.datatorrent.lib.testbench.CollectorTestSink;
+import com.datatorrent.lib.util.KeyValPair;
+
+public class RedisInputOperatorTest
+{
+ private RedisStore operatorStore;
+ private RedisStore testStore;
+
+ public static class CollectorModule extends BaseOperator
+ {
+ volatile static List<KeyValPair<String, String>> resultMap = new ArrayList<KeyValPair<String, String>>();
+ static long resultCount = 0;
+
+ public final transient DefaultInputPort<KeyValPair<String, String>> inputPort = new DefaultInputPort<KeyValPair<String, String>>()
+ {
+ @Override
+ public void process(KeyValPair<String, String> tuple)
+ {
+ resultMap.add(tuple);
+ resultCount++;
+ }
+ };
+ }
+
+ @Test
+ public void testIntputOperator() throws IOException
+ {
+ this.operatorStore = new RedisStore();
+ this.testStore = new RedisStore();
+
+ testStore.connect();
+ ScanParams params = new ScanParams();
+ params.count(1);
+
+ testStore.put("test_abc", "789");
+ testStore.put("test_def", "456");
+ testStore.put("test_ghi", "123");
+
+ try {
+ LocalMode lma = LocalMode.newInstance();
+ DAG dag = lma.getDAG();
+
+ RedisKeyValueInputOperator inputOperator = dag.addOperator("input", new RedisKeyValueInputOperator());
+ final CollectorModule collector = dag.addOperator("collector", new CollectorModule());
+
+ inputOperator.setStore(operatorStore);
+ dag.addStream("stream", inputOperator.outputPort, collector.inputPort);
+ final LocalMode.Controller lc = lma.getController();
+
+ new Thread("LocalClusterController")
+ {
+ @Override
+ public void run()
+ {
+ long startTms = System.currentTimeMillis();
+ long timeout = 50000L;
+ try {
+ Thread.sleep(1000);
+ while (System.currentTimeMillis() - startTms < timeout) {
+ if (CollectorModule.resultMap.size() < 3) {
+ Thread.sleep(10);
+ } else {
+ break;
+ }
+ }
+ } catch (InterruptedException ex) {
+ }
+ lc.shutdown();
+ }
+ }.start();
+
+ lc.run();
+
+ Assert.assertTrue(CollectorModule.resultMap.contains(new KeyValPair<String, String>("test_abc", "789")));
+ Assert.assertTrue(CollectorModule.resultMap.contains(new KeyValPair<String, String>("test_def", "456")));
+ Assert.assertTrue(CollectorModule.resultMap.contains(new KeyValPair<String, String>("test_ghi", "123")));
+ } finally {
+ for (KeyValPair<String, String> entry : CollectorModule.resultMap) {
+ testStore.remove(entry.getKey());
+ }
+ testStore.disconnect();
+ }
+ }
+
+ @Test
+ public void testRecoveryAndIdempotency() throws Exception
+ {
+ this.operatorStore = new RedisStore();
+ this.testStore = new RedisStore();
+
+ testStore.connect();
+ ScanParams params = new ScanParams();
+ params.count(1);
+
+ testStore.put("test_abc", "789");
+ testStore.put("test_def", "456");
+ testStore.put("test_ghi", "123");
+
+ RedisKeyValueInputOperator operator = new RedisKeyValueInputOperator();
+ operator.setIdempotentStorageManager(new IdempotentStorageManager.FSIdempotentStorageManager());
+
+ operator.setStore(operatorStore);
+ operator.setScanCount(1);
+ Attribute.AttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap();
+ CollectorTestSink<Object> sink = new CollectorTestSink<Object>();
+
+ operator.outputPort.setSink(sink);
+ OperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(1, attributeMap);
+
+ try {
+ operator.setup(context);
+ operator.beginWindow(1);
+ operator.emitTuples();
+ operator.endWindow();
+
+ int numberOfMessagesInWindow1 = sink.collectedTuples.size();
+ sink.collectedTuples.clear();
+
+ operator.beginWindow(2);
+ operator.emitTuples();
+ operator.endWindow();
+ int numberOfMessagesInWindow2 = sink.collectedTuples.size();
+ sink.collectedTuples.clear();
+
+ // failure and then re-deployment of operator
+ // Re-instantiating to reset values
+ operator = new RedisKeyValueInputOperator();
+ operator.setIdempotentStorageManager(new IdempotentStorageManager.FSIdempotentStorageManager());
+ operator.setStore(operatorStore);
+ operator.setScanCount(1);
+ operator.outputPort.setSink(sink);
+ operator.setup(context);
+
+ Assert.assertEquals("largest recovery window", 2, operator.getIdempotentStorageManager().getLargestRecoveryWindow());
+
+ operator.beginWindow(1);
+ operator.emitTuples();
+ operator.emitTuples();
+ operator.endWindow();
+
+ Assert.assertEquals("num of messages in window 1", numberOfMessagesInWindow1, sink.collectedTuples.size());
+
+ sink.collectedTuples.clear();
+ operator.beginWindow(2);
+ operator.emitTuples();
+ operator.endWindow();
+ Assert.assertEquals("num of messages in window 2",numberOfMessagesInWindow2, sink.collectedTuples.size());
+ } finally {
+ for (Object e : sink.collectedTuples) {
+ KeyValPair<String, String> entry = (KeyValPair<String, String>) e;
+ testStore.remove(entry.getKey());
+ }
+ sink.collectedTuples.clear();
+ operator.getIdempotentStorageManager().deleteUpTo(context.getId(), 5);
+ operator.teardown();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java
new file mode 100644
index 0000000..7792b5a
--- /dev/null
+++ b/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java
@@ -0,0 +1,230 @@
+/**
+ * Copyright (C) 2015 DataTorrent, Inc.
+ *
+ * Licensed 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.
+ */
+package com.datatorrent.contrib.redis;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import redis.clients.jedis.ScanParams;
+
+import com.datatorrent.api.DAG;
+import com.datatorrent.api.DefaultInputPort;
+import com.datatorrent.api.LocalMode;
+import com.datatorrent.common.util.BaseOperator;
+import com.datatorrent.contrib.redis.RedisInputOperatorTest.CollectorModule;
+import com.datatorrent.lib.helper.OperatorContextTestHelper;
+import com.datatorrent.lib.util.FieldInfo;
+import com.datatorrent.lib.util.FieldInfo.SupportType;
+import com.datatorrent.lib.util.KeyValPair;
+
+public class RedisPOJOOperatorTest
+{
+ private RedisStore operatorStore;
+ private RedisStore testStore;
+
+ public static class TestClass
+ {
+ private Integer intValue;
+ private String stringValue;
+
+ public TestClass()
+ {
+ }
+
+ public TestClass(int v1, String v2)
+ {
+ intValue = v1;
+ stringValue = v2;
+ }
+
+ public Integer getIntValue()
+ {
+ return intValue;
+ }
+
+ public void setIntValue(int intValue)
+ {
+ this.intValue = intValue;
+ }
+
+ public String getStringValue()
+ {
+ return stringValue;
+ }
+
+ public void setStringValue(String stringValue)
+ {
+ this.stringValue = stringValue;
+ }
+ }
+
+ @Test
+ public void testOutputOperator() throws IOException
+ {
+ this.operatorStore = new RedisStore();
+
+ operatorStore.connect();
+ String appId = "test_appid";
+ int operatorId = 0;
+
+ operatorStore.removeCommittedWindowId(appId, operatorId);
+ operatorStore.disconnect();
+
+ RedisPOJOOutputOperator outputOperator = new RedisPOJOOutputOperator();
+
+ ArrayList<FieldInfo> fields = new ArrayList<FieldInfo>();
+
+ fields.add(new FieldInfo("column1", "intValue", SupportType.INTEGER));
+ fields.add(new FieldInfo("column2", "getStringValue()", SupportType.STRING));
+
+ outputOperator.setDataColumns(fields);
+
+ try {
+ com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributes = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
+ attributes.put(DAG.APPLICATION_ID, appId);
+
+ outputOperator.setStore(operatorStore);
+ outputOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(operatorId, attributes));
+ outputOperator.beginWindow(101);
+
+ KeyValPair<String, Object> keyVal = new KeyValPair<String, Object>("test_abc1", new TestClass(1, "abc"));
+
+ outputOperator.input.process(keyVal);
+
+ outputOperator.endWindow();
+
+ outputOperator.teardown();
+
+ operatorStore.connect();
+
+ Map<String, String> out = operatorStore.getMap("test_abc1");
+ Assert.assertEquals("1", out.get("column1"));
+ Assert.assertEquals("abc", out.get("column2"));
+ } finally {
+ operatorStore.remove("test_abc1");
+ operatorStore.disconnect();
+ }
+ }
+
+ public static class ObjectCollectorModule extends BaseOperator
+ {
+ volatile static Map<String, Object> resultMap = new HashMap<String, Object>();
+ static long resultCount = 0;
+
+ public final transient DefaultInputPort<KeyValPair<String, Object>> inputPort = new DefaultInputPort<KeyValPair<String, Object>>()
+ {
+ @Override
+ public void process(KeyValPair<String, Object> tuple)
+ {
+ resultMap.put(tuple.getKey(), tuple.getValue());
+ resultCount++;
+ }
+ };
+ }
+
+ @Test
+ public void testInputOperator() throws IOException
+ {
+ @SuppressWarnings("unused")
+ Class<?> clazz = org.codehaus.janino.CompilerFactory.class;
+
+ this.operatorStore = new RedisStore();
+ this.testStore = new RedisStore();
+
+ testStore.connect();
+ ScanParams params = new ScanParams();
+ params.count(100);
+
+ Map<String, String> value = new HashMap<String, String>();
+ value.put("Column1", "abc");
+ value.put("Column2", "1");
+
+ Map<String, String> value1 = new HashMap<String, String>();
+ value1.put("Column1", "def");
+ value1.put("Column2", "2");
+
+ Map<String, String> value2 = new HashMap<String, String>();
+ value2.put("Column1", "ghi");
+ value2.put("Column2", "3");
+
+ testStore.put("test_abc_in", value);
+ testStore.put("test_def_in", value1);
+ testStore.put("test_ghi_in", value2);
+
+ try {
+ LocalMode lma = LocalMode.newInstance();
+ DAG dag = lma.getDAG();
+
+ RedisPOJOInputOperator inputOperator = dag.addOperator("input", new RedisPOJOInputOperator());
+ final ObjectCollectorModule collector = dag.addOperator("collector", new ObjectCollectorModule());
+
+ ArrayList<FieldInfo> fields = new ArrayList<FieldInfo>();
+
+ fields.add(new FieldInfo("Column1", "stringValue", SupportType.STRING));
+ fields.add(new FieldInfo("Column2", "intValue", SupportType.INTEGER));
+
+ inputOperator.setDataColumns(fields);
+ inputOperator.setOutputClass(TestClass.class.getName());
+
+ inputOperator.setStore(operatorStore);
+ dag.addStream("stream", inputOperator.outputPort, collector.inputPort);
+ final LocalMode.Controller lc = lma.getController();
+
+ new Thread("LocalClusterController")
+ {
+ @Override
+ public void run()
+ {
+ long startTms = System.currentTimeMillis();
+ long timeout = 10000L;
+ try {
+ Thread.sleep(1000);
+ while (System.currentTimeMillis() - startTms < timeout) {
+ if (ObjectCollectorModule.resultMap.size() < 3) {
+ Thread.sleep(10);
+ } else {
+ break;
+ }
+ }
+ } catch (InterruptedException ex) {
+ }
+ lc.shutdown();
+ }
+ }.start();
+
+ lc.run();
+
+ Assert.assertTrue(ObjectCollectorModule.resultMap.containsKey("test_abc_in"));
+ Assert.assertTrue(ObjectCollectorModule.resultMap.containsKey("test_def_in"));
+ Assert.assertTrue(ObjectCollectorModule.resultMap.containsKey("test_ghi_in"));
+
+ TestClass a = (TestClass) ObjectCollectorModule.resultMap.get("test_abc_in");
+ Assert.assertNotNull(a);
+ Assert.assertEquals("abc", a.stringValue);
+ Assert.assertEquals("1", a.intValue.toString());
+ } finally {
+ for (KeyValPair<String, String> entry : CollectorModule.resultMap) {
+ testStore.remove(entry.getKey());
+ }
+ testStore.disconnect();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a57a3d75/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 1f3f075..3498d0d 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>2.2.1</version>
+ <version>2.5.1</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
[26/50] [abbrv] incubator-apex-malhar git commit: MLHR-1796 -
#resolve Fixed compilation errors in benchmark application.
Posted by ch...@apache.org.
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);
[22/50] [abbrv] incubator-apex-malhar git commit: Marked @since 3.0.0
tags
Posted by ch...@apache.org.
Marked @since 3.0.0 tags
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/ff4bd7e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/ff4bd7e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/ff4bd7e6
Branch: refs/heads/master
Commit: ff4bd7e677cfc81869b228057a5e47b7da8ade8d
Parents: 27ede3b
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Sat Aug 1 02:05:30 2015 -0700
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Sat Aug 1 02:05:30 2015 -0700
----------------------------------------------------------------------
.../datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java | 1 +
.../datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java | 1 +
.../datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java | 1 +
.../com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java | 1 +
.../java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java | 1 +
.../java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java | 1 +
.../contrib/kinesis/KinesisByteArrayOutputOperator.java | 1 +
.../datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java | 1 +
.../com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java | 1 +
.../com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java | 1 +
.../com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java | 1 +
.../java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java | 1 +
.../java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java | 1 +
library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java | 3 ++-
.../lib/appdata/datastructs/CacheLRUSynchronousFlush.java | 1 +
.../com/datatorrent/lib/appdata/datastructs/DimensionalTable.java | 1 +
.../lib/appdata/datastructs/NOPCacheFlushListener.java | 1 +
.../java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java | 1 +
library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java | 1 +
.../lib/appdata/query/AbstractWindowEndQueueManager.java | 1 +
.../lib/appdata/query/AppDataWindowEndQueueManager.java | 1 +
.../main/java/com/datatorrent/lib/appdata/query/QueryBundle.java | 1 +
.../java/com/datatorrent/lib/appdata/query/QueryExecutor.java | 1 +
.../datatorrent/lib/appdata/query/QueryManagerSynchronous.java | 1 +
.../main/java/com/datatorrent/lib/appdata/query/QueueList.java | 1 +
.../main/java/com/datatorrent/lib/appdata/query/QueueManager.java | 1 +
.../com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java | 1 +
.../com/datatorrent/lib/appdata/query/SimpleQueueManager.java | 1 +
.../com/datatorrent/lib/appdata/query/WindowEndQueueManager.java | 1 +
.../lib/appdata/query/serde/CustomMessageDeserializer.java | 1 +
.../lib/appdata/query/serde/CustomMessageSerializer.java | 1 +
.../lib/appdata/query/serde/CustomMessageValidator.java | 1 +
.../lib/appdata/query/serde/DataQuerySnapshotDeserializer.java | 1 +
.../lib/appdata/query/serde/DataQuerySnapshotValidator.java | 1 +
.../lib/appdata/query/serde/DataResultSnapshotSerializer.java | 1 +
.../lib/appdata/query/serde/MessageDeserializerFactory.java | 1 +
.../lib/appdata/query/serde/MessageDeserializerInfo.java | 1 +
.../lib/appdata/query/serde/MessageSerializerFactory.java | 1 +
.../lib/appdata/query/serde/MessageSerializerInfo.java | 1 +
.../java/com/datatorrent/lib/appdata/query/serde/MessageType.java | 1 +
.../datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java | 1 +
.../lib/appdata/query/serde/SimpleDataDeserializer.java | 1 +
.../datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java | 1 +
.../datatorrent/lib/appdata/query/serde/SimpleDataValidator.java | 1 +
.../com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java | 1 +
.../com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java | 1 +
.../com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java | 1 +
.../main/java/com/datatorrent/lib/appdata/schemas/JSONType.java | 1 +
.../main/java/com/datatorrent/lib/appdata/schemas/Message.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/Query.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/Result.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java | 1 +
.../datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java | 1 +
.../com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/SchemaResult.java | 1 +
.../datatorrent/lib/appdata/schemas/SchemaResultSerializer.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java | 1 +
.../java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java | 1 +
.../main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java | 1 +
.../src/main/java/com/datatorrent/lib/appdata/schemas/Type.java | 1 +
.../lib/appdata/snapshot/AbstractAppDataSnapshotServer.java | 1 +
.../lib/appdata/snapshot/AppDataSnapshotServerMap.java | 1 +
.../lib/appdata/snapshot/AppDataSnapshotServerPOJO.java | 1 +
.../datatorrent/lib/converter/MapToKeyHashValuePairConverter.java | 1 +
.../com/datatorrent/lib/converter/MapToKeyValuePairConverter.java | 1 +
.../lib/converter/StringValueToNumberConverterForMap.java | 1 +
.../java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 1 +
.../java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 1 +
.../java/com/datatorrent/lib/io/WebSocketServerInputOperator.java | 3 ++-
library/src/main/java/com/datatorrent/lib/util/FieldInfo.java | 3 ++-
.../main/java/com/datatorrent/lib/util/FieldValueGenerator.java | 3 ++-
library/src/main/java/com/datatorrent/lib/util/TableInfo.java | 3 ++-
81 files changed, 86 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
index 2ad85fe..9d8e356 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
@@ -46,6 +46,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @displayName Cassandra Input Operator
* @category Input
* @tags database, nosql, pojo, cassandra
+ * @since 3.0.0
*/
@Evolving
public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
index 16c9246..3c1dc4f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
@@ -46,6 +46,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @displayName Couchbase Input Operator
* @category Input
* @tags database, nosql, pojo, couchbase
+ * @since 3.0.0
*/
@Evolving
public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Object, CouchBaseStore>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
index f21cd01..ef203cc 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
@@ -33,6 +33,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @displayName Couchbase Output Operator
* @category Output
* @tags database, nosql, pojo, couchbase
+ * @since 3.0.0
*/
@Evolving
public class CouchbasePOJOSetOperator extends AbstractCouchBaseSetOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
index b944594..d399179 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
@@ -50,6 +50,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @displayName CouchDb Input Operator
* @category Input
* @tags database, nosql, pojo, couchdb
+ * @since 3.0.0
*/
@Evolving
public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
index c2de8fe..3df4ef5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
@@ -31,6 +31,7 @@ import com.datatorrent.lib.util.TableInfo;
* @displayName HBase Output Operator
* @category Output
* @tags database, nosql, pojo, hbase
+ * @since 3.0.0
*/
@Evolving
public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
index 0fc891f..ca19da5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
@@ -35,6 +35,7 @@ import java.sql.Date;
* @displayName: FS To Hive Operator
* @category Output
* @tags fs, hive, database
+ * @since 3.0.0
*/
public class FSPojoToHiveOperator extends AbstractFSRollingOutputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
index 4e937a1..99c6f68 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
@@ -24,6 +24,7 @@ import com.datatorrent.common.util.Pair;
* @displayName Kinesis Put Output
* @category Output
* @tags Kinesis put, output operator, ByteArray
+ * @since 3.0.0
*/
public class KinesisByteArrayOutputOperator extends AbstractKinesisOutputOperator<byte[], Pair<String, byte[]>>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
index 1514674..dca1543 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
@@ -30,6 +30,7 @@ import com.datatorrent.lib.util.TableInfo;
* @displayName Memcache Output Operator
* @category Output
* @tags pojo, memcache
+ * @since 3.0.0
*/
@Evolving
public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< Object >
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
index 6fa8cf2..83d8115 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
* @displayName Memsql Input Operator
* @category Input
* @tags database, sql, pojo, memsql
+ * @since 3.0.0
*/
@Evolving
public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
index cf788f4..93bab0e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
@@ -23,6 +23,7 @@ package com.datatorrent.contrib.rabbitmq;
* @category Messaging
* @tags input operator, string
*
+ * @since 3.0.0
*/
public class RabbitMQInputOperator extends AbstractSinglePortRabbitMQInputOperator<byte[]>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
index 098cc85..d0761a5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
@@ -30,6 +30,7 @@ import com.datatorrent.netlet.util.DTThrowable;
* @category Messaging
* @tags input operator, string
*
+ * @since 3.0.0
*/
public class RabbitMQOutputOperator extends AbstractSinglePortRabbitMQOutputOperator<byte[]>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
index 54ac915..ded1d69 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
@@ -23,6 +23,7 @@ package com.datatorrent.contrib.zmq;
* @category Messaging
* @tags input operator, string
*
+ * @since 3.0.0
*/
public class ZeroMQInputOperator extends AbstractSinglePortZeroMQInputOperator<byte[]>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
index b8e2491..4fa0804 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
@@ -23,6 +23,7 @@ package com.datatorrent.contrib.zmq;
* @category Messaging
* @tags input operator, string
*
+ * @since 3.0.0
*/
public class ZeroMQOutputOperator extends AbstractSinglePortZeroMQOutputOperator<byte[]>{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java b/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
index 3a469a6..49089e6 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
@@ -19,7 +19,8 @@ public class QueueUtils
{
/**
* This class should not be instantiated.
- */
+ * @since 3.0.0
+ */
private QueueUtils()
{
//Do nothing
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
index ce36514..750f0e0 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
@@ -31,6 +31,7 @@ import com.google.common.collect.Sets;
* This is an LRU cache.
* @param <KEY> The type of keys in the cache.
* @param <VALUE> The type of values in the cache.
+ * @since 3.0.0
*/
public class CacheLRUSynchronousFlush<KEY, VALUE>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
index ee6008b..1d4398f 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
@@ -81,6 +81,7 @@ import org.slf4j.LoggerFactory;
* is a matching key, otherwise nothing is returned.
*
* @param <DATA> The type of the data payload.
+ * @since 3.0.0
*/
public class DimensionalTable<DATA>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
index 4dcf940..fae3fa2 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
@@ -21,6 +21,7 @@ import com.datatorrent.lib.appdata.datastructs.CacheLRUSynchronousFlush.CacheFlu
* This is a listener which is called by {@link CacheLRUSynchronousFlush} when the cache is flushed.
* @param <KEY> The type of keys in the cache.
* @param <VALUE> The type of values in the cache.
+ * @since 3.0.0
*/
public class NOPCacheFlushListener<KEY, VALUE> implements CacheFlushListener<KEY, VALUE>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
index ec693fb..40960f2 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
/**
* This is a helper class which stores primitive bytes in an array list. This is useful
* for serialization and deserialization.
+ * @since 3.0.0
*/
public class GPOByteArrayList extends ByteArrayList
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
index 5a15308..dfb9690 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
@@ -28,6 +28,7 @@ import com.datatorrent.lib.util.PojoUtils.GetterShort;
/**
* This is a helper class which is intended to be used for operators
* which need to take POJOs as input and convert them into GPOMutable objects.
+ * @since 3.0.0
*/
public class GPOGetters {
/**
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
index 3220b10..ba8bc3c 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
@@ -30,6 +30,7 @@ import com.datatorrent.lib.appdata.schemas.Type;
* Each field has a primitive value stored in a primitive array and a name.
* Fields of a particular primitive type are stored in the same array. The order of fields
* in the array is the same as the lexicographic ordering of the field names.
+ * @since 3.0.0
*/
public class GPOMutable implements Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
index b519a10..1bdd7c2 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
@@ -35,6 +35,7 @@ import static com.datatorrent.lib.appdata.gpo.GPOUtils.*;
/**
* This is a helper class that reduces the need for switch statements in may utility method in {@link GPOUtils}.
+ * @since 3.0.0
*/
abstract class GPOType
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
index 341f39c..23220a9 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
@@ -51,6 +51,7 @@ import com.datatorrent.lib.util.PojoUtils.GetterShort;
/**
* This class holds utility methods for serializing and deserializing {@link GPOMutable} objects to/from bytes and JSON.
* There are also utility methods for converting POJOs into GPOMutable objects.
+ * @since 3.0.0
*/
public class GPOUtils
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
index 57e5c77..3d1b0c7 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang3.mutable.MutableInt;
* <p>
* <b>Note: All the methods in this interface must be thread safe.</b>
* </p>
+ * @since 3.0.0
*/
public interface Serde
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
index 11a8236..8b6301e 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
@@ -42,6 +42,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @param <QUERY_TYPE> The type of the query.
* @param <META_QUERY> The type of any metadata associated with the query.
* @param <QUEUE_CONTEXT> The type of the context used to manage the queueing of the query.
+ * @since 3.0.0
*/
public abstract class AbstractWindowEndQueueManager<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT> implements QueueManager<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
index e31786e..1197d90 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
@@ -29,6 +29,7 @@ import com.datatorrent.lib.appdata.schemas.Query;
* the same query id as an existing query in the queue, the existing query is replaced with the new query.
* @param <QUERY> The type of queries kept in the queue.
* @param <META_QUERY> The type of query meta data kept in the queue.
+ * @since 3.0.0
*/
public class AppDataWindowEndQueueManager<QUERY extends Query, META_QUERY> extends WindowEndQueueManager<QUERY, META_QUERY>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
index 942e65d..8799320 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
@@ -21,6 +21,7 @@ package com.datatorrent.lib.appdata.query;
* @param <QUERY_TYPE> The type of the query.
* @param <META_QUERY> The type of any meta data to be included with the query.
* @param <QUEUE_CONTEXT> The context associated with the query when it was enqueued.
+ * @since 3.0.0
*/
public class QueryBundle<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
index 0455bf4..ebdc108 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
@@ -22,6 +22,7 @@ package com.datatorrent.lib.appdata.query;
* @param <META_QUERY> The type of any additional meta data associated with the query when it was enqueued.
* @param <QUEUE_CONTEXT> The type of the queue context of the query.
* @param <RESULT> The type of the query's result.
+ * @since 3.0.0
*/
public interface QueryExecutor<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT, RESULT>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
index c6775a1..73e2bcf 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
@@ -32,6 +32,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @param <META_QUERY> The type of any query meta data.
* @param <QUEUE_CONTEXT> The type of any context information used by the queue.
* @param <RESULT> The type of the result returned by the {@link QueryExecutor}.
+ * @since 3.0.0
*/
public class QueryManagerSynchronous<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT, RESULT> implements Component<OperatorContext>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
index 4d73b28..31d60ac 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
@@ -20,6 +20,7 @@ import com.google.common.base.Preconditions;
/**
* This is a doubly linked list to be used for queueing queries.
* @param <T> The type of the data used for queueing
+ * @since 3.0.0
*/
public class QueueList<T>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
index 45287b8..5bd6741 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
@@ -26,6 +26,7 @@ import com.datatorrent.api.Context.OperatorContext;
* which a query is queued that is known when the query is queued. This queue context information could
* be updated by the queue manager throughout the lifetime of the query to control things like how long
* the query has been queued for.
+ * @since 3.0.0
*/
public interface QueueManager<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT> extends Component<OperatorContext>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
index 5469d04..16a528b 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
@@ -26,6 +26,7 @@ import com.datatorrent.lib.appdata.query.QueueList.QueueListNode;
* queue context is true, then the query is remove, if the queue context is false, then the query stays in the queue.
* @param <QUERY_TYPE> The type of the queries that are enqueued in the queue.
* @param <META_QUERY> The type of any meta data associated with the queries.
+ * @since 3.0.0
*/
public class SimpleDoneQueueManager<QUERY_TYPE, META_QUERY> extends
AbstractWindowEndQueueManager<QUERY_TYPE, META_QUERY, MutableBoolean>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
index 8c6da10..b1af15e 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
@@ -28,6 +28,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @param <QUERY_TYPE> The type of the query to be enqueued in the queue.
* @param <META_QUERY> The type of the meta data to be enqueued with the query.
* @param <QUEUE_CONTEXT> The type of the queue context data.
+ * @since 3.0.0
*/
public class SimpleQueueManager<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT>
implements QueueManager<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java b/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
index 52c1a37..9bcaec4 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
@@ -24,6 +24,7 @@ import com.datatorrent.lib.appdata.query.QueueList.QueueListNode;
* a query's countdown reaches 0 it is removed from the queue.
* @param <QUERY_TYPE> The type of queries to be queued.
* @param <META_QUERY> The type of metadata to be associated with queued queries.
+ * @since 3.0.0
*/
public class WindowEndQueueManager<QUERY_TYPE, META_QUERY> extends AbstractWindowEndQueueManager<QUERY_TYPE, META_QUERY, MutableLong>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
index a98ff85..7284aaf 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
@@ -22,6 +22,7 @@ import com.datatorrent.lib.appdata.schemas.Message;
/**
* This is an interface for a message deserializer. Classes implementing this interface should have a public
* no-arg constructor.
+ * @since 3.0.0
*/
public interface CustomMessageDeserializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
index d8996bf..7a191ab 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
@@ -21,6 +21,7 @@ import com.datatorrent.lib.appdata.schemas.ResultFormatter;
/**
* This interface defines a Message serializer, which will be used to convert a result to JSON. Classes
* implementing this interface should have a public no-arg constructor.
+ * @since 3.0.0
*/
public interface CustomMessageSerializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
index efb3ed1..b0d4759 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
@@ -20,6 +20,7 @@ import com.datatorrent.lib.appdata.schemas.Message;
/**
* This interface defines a validator which validates the state of deserialized messages. Classes
* implementing this interface should have a public no-arg constructor.
+ * @since 3.0.0
*/
public interface CustomMessageValidator
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
index 9aec9b5..bdc761f 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
@@ -36,6 +36,7 @@ import com.datatorrent.lib.appdata.schemas.SchemaUtils;
/**
* This class is a deserializer for {@link DataQuerySnapshot} objects.
+ * @since 3.0.0
*/
public class DataQuerySnapshotDeserializer implements CustomMessageDeserializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
index 6891b1a..d13dcc4 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
@@ -27,6 +27,7 @@ import com.datatorrent.lib.appdata.schemas.SnapshotSchema;
/**
* This class is a validator for {@link DataQuerySnapshot} objects.
+ * @since 3.0.0
*/
public class DataQuerySnapshotValidator implements CustomMessageValidator
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
index 08d90de..204ebd3 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
@@ -30,6 +30,7 @@ import com.datatorrent.lib.appdata.schemas.ResultFormatter;
/**
* This class is used to serialize {@link DataResultSnapshot} objects.
+ * @since 3.0.0
*/
public class DataResultSnapshotSerializer implements CustomMessageSerializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
index cd12377..4686648 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
@@ -50,6 +50,7 @@ import com.datatorrent.lib.appdata.schemas.Message;
* }
* </code>
* </pre>
+ * @since 3.0.0
*/
public class MessageDeserializerFactory
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
index bf4a4f2..60e9cc3 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
/**
* This annotation is placed on a {@link Message} class and is used to specify the deserializer for that class.
+ * @since 3.0.0
*/
@Documented
@Target(ElementType.TYPE)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
index aca10c3..893e84d 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
@@ -56,6 +56,7 @@ import com.datatorrent.lib.appdata.schemas.ResultFormatter;
* }
* </code>
* </pre>
+ * @since 3.0.0
*/
public class MessageSerializerFactory
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
index 6a15f15..e4a125d 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
/**
* This annotation is used to specify a serializer for a {@link Message} class.
+ * @since 3.0.0
*/
@Documented
@Target(ElementType.TYPE)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
index d1c6df1..c7a8299 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
/**
* This is the annotation that specifies message types and should be placed on a {@link Message} class.
+ * @since 3.0.0
*/
@Documented
@Target(ElementType.TYPE)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
index 3b482a6..ac80a91 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Target;
/**
* This annotation specifies the validator used for a Message and should be placed on the {@link Message}
* class.
+ * @since 3.0.0
*/
@Documented
@Target(ElementType.TYPE)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
index c5510de..88feeb2 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
@@ -25,6 +25,7 @@ import com.datatorrent.lib.appdata.schemas.Message;
/**
* This is a simple Message deserializer which deserializes messages using Jackson.
+ * @since 3.0.0
*/
public class SimpleDataDeserializer implements CustomMessageDeserializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
index 3d2ba6b..b92e145 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
@@ -24,6 +24,7 @@ import com.datatorrent.lib.appdata.schemas.ResultFormatter;
/**
* This is a simple message serializer, which serializes messages using Jackson.
+ * @since 3.0.0
*/
public class SimpleDataSerializer implements CustomMessageSerializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
index ff457ea..e789999 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
@@ -23,6 +23,7 @@ import com.datatorrent.lib.appdata.schemas.Message;
/**
* This is a Message validator which validates deserialized Messages using java validation.
+ * @since 3.0.0
*/
public class SimpleDataValidator implements CustomMessageValidator
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
index 43b17ae..0943172 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
@@ -27,6 +27,7 @@ import com.datatorrent.lib.appdata.query.serde.MessageValidatorInfo;
/**
* This object represents queries issued against the {@link SnapshotSchema}.
+ * @since 3.0.0
*/
@MessageType(type=DataQuerySnapshot.TYPE)
@MessageDeserializerInfo(clazz=DataQuerySnapshotDeserializer.class)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
index 1af0f44..1cb0258 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
@@ -26,6 +26,7 @@ import com.datatorrent.lib.appdata.query.serde.MessageType;
/**
* This class represents the result sent in response to a {@link DataQuerySnapshot}.
+ * @since 3.0.0
*/
@MessageType(type=DataResultSnapshot.TYPE)
@MessageSerializerInfo(clazz=DataResultSnapshotSerializer.class)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
index 5e9982a..b78331d 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
* This is a somewhat vacuous class for managing field names for AppData schemas and queries.
* Its function is to maintain a set of field names with no null values. It also maintains a list
* of field names to increase iteration speed.
+ * @since 3.0.0
*/
public class Fields implements Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
index 2e4e29e..850e131 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
@@ -41,6 +41,7 @@ import com.datatorrent.lib.appdata.gpo.SerdeObjectPayloadFix;
* to map field names to values in order to respond to queries, it also serves as a schema which is
* used in the serialization of {@link GPOMutable} objects in order to ensure consistent serialization
* and deserialization of data.
+ * @since 3.0.0
*/
public class FieldsDescriptor implements Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
index f5e613b..62d0d32 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
@@ -17,6 +17,7 @@ package com.datatorrent.lib.appdata.schemas;
/**
* This is an enum type which contains entries for each unique JSONType.
+ * @since 3.0.0
*/
public enum JSONType
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
index fcde2ba..e489c82 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
@@ -32,6 +32,7 @@ import com.google.common.base.Preconditions;
* <br/>
* As can be seen above, the common element of an AppData message is a message type, which is what
* this class encapsulates.
+ * @since 3.0.0
*/
public abstract class Message
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
index 7e18e8a..9914767 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
@@ -33,6 +33,7 @@ import com.google.common.base.Preconditions;
* </ul>
*
* This base class holds the basic setters and getters for manipulating and storing these query properies.
+ * @since 3.0.0
*/
public abstract class QRBase extends Message
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
index 1d5f73c..917a29e 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Maps;
/**
* This is a base class which represents the basic functionality of all AppData queries.
+ * @since 3.0.0
*/
public abstract class Query extends QRBase
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
index 4e5901f..7b96d9b 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
@@ -20,6 +20,7 @@ import com.google.common.base.Preconditions;
/**
* This class holds some boilerplate for setting and getting queries from result objects. All
* query result objects should extend this class.
+ * @since 3.0.0
*/
public abstract class Result extends QRBase
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
index 6c58d62..b2ec5eb 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
@@ -30,6 +30,7 @@ import java.text.DecimalFormat;
* formatted a certain way and all float fields could potentially be formatted in another way. In the
* future the result formatter will support formatting data uniquely for each individual field.
* </p>
+ * @since 3.0.0
*/
public class ResultFormatter implements Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
index aaa6982..f5af058 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
@@ -19,6 +19,7 @@ import java.util.Map;
/**
* This interface represents schemas such as: {@link DimensionalSchema} and {@link SnapShotSchema}.
+ * @since 3.0.0
*/
public interface Schema
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
index d3c7d29..f0c6f82 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
@@ -28,6 +28,7 @@ import com.datatorrent.lib.appdata.query.serde.SimpleDataValidator;
/**
* This class represents a schema query.
+ * @since 3.0.0
*/
@MessageType(type=SchemaQuery.TYPE)
@MessageDeserializerInfo(clazz=SchemaQueryDeserializer.class)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
index 567b75c..7947300 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
@@ -21,6 +21,7 @@ import java.util.Map;
* This interface describes a SchemaRegistry. A schema registry is used to store and look up
* schemas for App Data enabled operators which serve data from multiple schemas. {@link SchemaRegistry}s
* are primarily used to create responses to {@link SchemaQuery}s.
+ * @since 3.0.0
*/
public interface SchemaRegistry
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
index 969a84f..9833e94 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
@@ -25,6 +25,7 @@ import com.datatorrent.lib.appdata.datastructs.DimensionalTable;
/**
* This class is a schema registry which can hold multiple schemas. It is intended to be
* used in operators that serve multiple schemas.
+ * @since 3.0.0
*/
public class SchemaRegistryMultiple implements SchemaRegistry, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
index 233d6fd..4cb2567 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
/**
* This schema registry holds a single schema. It is intended to be used in operators
* which serve a single schema.
+ * @since 3.0.0
*/
public class SchemaRegistrySingle implements SchemaRegistry, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
index b92a818..cbd52c9 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
@@ -25,6 +25,7 @@ import com.datatorrent.lib.appdata.query.serde.MessageType;
/**
* This class represents a schema result, which will be serialized into JSON and sent
* as a result to a {@link SchemaQuery}.
+ * @since 3.0.0
*/
@MessageType(type=SchemaResult.TYPE)
@MessageSerializerInfo(clazz=SchemaResultSerializer.class)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
index 0bd1f24..5b1c937 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
@@ -25,6 +25,7 @@ import com.datatorrent.lib.appdata.query.serde.CustomMessageSerializer;
/**
* This is the serializer class for {@link SchemaResult} objects.
+ * @since 3.0.0
*/
public class SchemaResultSerializer implements CustomMessageSerializer
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
index 6ac3883..dbd276c 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
@@ -38,6 +38,7 @@ import org.apache.commons.io.IOUtils;
/**
* This class holds utility methods for processing JSON.
+ * @since 3.0.0
*/
public class SchemaUtils
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
index 05a52c7..9df0e22 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
@@ -42,6 +42,7 @@ import com.datatorrent.netlet.util.DTThrowable;
* <br/>
* As can be seen above, the snapshot schema defines the name of each field which is served as well as
* its type.
+ * @since 3.0.0
*/
public class SnapshotSchema implements Schema
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
index 881f5fa..f2d2501 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
@@ -42,6 +42,7 @@ import com.google.common.collect.Maps;
* <li>q - quarter</li>
* <li>y - year</li>
* </ul>
+ * @since 3.0.0
*/
public enum TimeBucket
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
index 67ea27d..00d7743 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Maps;
/**
* This enum is used to represent data types throughout AppData Framework.
+ * @since 3.0.0
*/
public enum Type implements Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
index e43a83e..d0241d2 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
@@ -52,6 +52,7 @@ import com.datatorrent.common.experimental.AppData;
* Additionally the list of input objects then need to be converted into {@link GPOMutable} objects
* via an implementation of the {@link #convert} convert method.
* @param <INPUT_EVENT> The type of the input events that the operator accepts.
+ * @since 3.0.0
*/
public abstract class AbstractAppDataSnapshotServer<INPUT_EVENT> implements Operator
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
index 9bd71d1..dab2ca3 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
* @displayName App Data Snapshot Map Server
* @category DT View Integration
* @tags app data, snapshot, map
+ * @since 3.0.0
*/
public class AppDataSnapshotServerMap extends AbstractAppDataSnapshotServer<Map<String, Object>>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
index df8a6ea..6b8b515 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
@@ -32,6 +32,7 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils;
* @displayName App Data Snapshot POJO Server
* @category DT View Integration
* @tags app data, snapshot, pojo
+ * @since 3.0.0
*/
@Evolving
public class AppDataSnapshotServerPOJO extends AbstractAppDataSnapshotServer<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
index 95b6016..362fd12 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
@@ -31,6 +31,7 @@ import com.datatorrent.lib.util.KeyHashValPair;
* @category Tuple Converters
* @tags key value
*
+ * @since 3.0.0
*/
public class MapToKeyHashValuePairConverter<K, V> extends BaseOperator {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
index 94f5fbd..34cad3b 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
@@ -32,6 +32,7 @@ import com.datatorrent.api.DefaultOutputPort;
* @category Tuple Converters
* @tags key value
*
+ * @since 3.0.0
*/
public class MapToKeyValuePairConverter<K, V> extends BaseOperator {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java b/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
index a5ca699..0897c1d 100644
--- a/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
+++ b/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
@@ -31,6 +31,7 @@ import com.datatorrent.api.DefaultOutputPort;
* @category Tuple Converters
* @tags string
*
+ * @since 3.0.0
*/
public class StringValueToNumberConverterForMap<K> extends BaseOperator {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
index 81fb076..f2b1fdb 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
@@ -34,6 +34,7 @@ import com.datatorrent.common.util.PubSubMessage;
* @displayName App Data Pub Sub Query
* @category DT View Integration
* @tags input, app data, query
+ * @since 3.0.0
*/
public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<String> implements AppData.ConnectionInfoProvider
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
index 12496a9..3401233 100644
--- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
+++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
@@ -33,6 +33,7 @@ import com.datatorrent.common.util.PubSubMessage.PubSubMessageType;
* @displayName App Data Pub Sub Result
* @category DT View Integration
* @tags output, app data, result
+ * @since 3.0.0
*/
@AppData.AppendQueryIdToTopic(value=true)
public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator<String> implements AppData.ConnectionInfoProvider
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
index f2aa0af..e50582d 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
@@ -87,7 +87,8 @@ public abstract class WebSocketServerInputOperator implements InputOperator
/**
* @return the port
- */
+ * @since 3.0.0
+ */
public int getPort()
{
return port;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
index 48a0c07..a4e4923 100644
--- a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
@@ -43,7 +43,8 @@ public class FieldInfo
/**
* the column name which keep this field.
- */
+ * @since 3.0.0
+ */
public String getColumnName()
{
return columnName;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java b/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
index b0cf405..26c48d8 100644
--- a/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
@@ -70,7 +70,8 @@ public class FieldValueGenerator<T extends FieldInfo>
* @param obj
* @param fieldValueHandler
* @return
- */
+ * @since 3.0.0
+ */
@SuppressWarnings({"rawtypes", "unchecked"})
public void handleFieldsValue(Object obj, FieldValueHandler fieldValueHandler)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ff4bd7e6/library/src/main/java/com/datatorrent/lib/util/TableInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/TableInfo.java b/library/src/main/java/com/datatorrent/lib/util/TableInfo.java
index dac9adf..7b6729f 100644
--- a/library/src/main/java/com/datatorrent/lib/util/TableInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/util/TableInfo.java
@@ -30,7 +30,8 @@ public class TableInfo< T extends FieldInfo >
/**
* expression for Row or Id
- */
+ * @since 3.0.0
+ */
public String getRowOrIdExpression()
{
return rowOrIdExpression;
[39/50] [abbrv] incubator-apex-malhar git commit: Merge pull request
#1533 from 243826/semantic-versioning-minor
Posted by ch...@apache.org.
Merge pull request #1533 from 243826/semantic-versioning-minor
enable server plugin
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/0b31fee5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0b31fee5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0b31fee5
Branch: refs/heads/master
Commit: 0b31fee52afdbe11f6100b3881481b1962bb164c
Parents: 717168b 2e5813d
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 17 17:42:10 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 17 17:42:10 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 1 +
demos/pom.xml | 1 +
pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0b31fee5/demos/pom.xml
----------------------------------------------------------------------
[04/50] [abbrv] incubator-apex-malhar git commit: Made Sampler
operator simpler to use.
Posted by ch...@apache.org.
Made Sampler operator simpler to use.
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/e1392b05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/e1392b05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/e1392b05
Branch: refs/heads/master
Commit: e1392b0540a4c29ffeee1c16f8e6b7478adf94da
Parents: dd15161
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Mon Jul 27 12:53:58 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Mon Jul 27 20:23:38 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/lib/algo/Sampler.java | 56 +++++++-------------
.../com/datatorrent/lib/algo/SamplerTest.java | 3 +-
2 files changed, 19 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/e1392b05/library/src/main/java/com/datatorrent/lib/algo/Sampler.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/algo/Sampler.java b/library/src/main/java/com/datatorrent/lib/algo/Sampler.java
index b91f6b6..8eb7103 100644
--- a/library/src/main/java/com/datatorrent/lib/algo/Sampler.java
+++ b/library/src/main/java/com/datatorrent/lib/algo/Sampler.java
@@ -17,6 +17,7 @@ package com.datatorrent.lib.algo;
import java.util.Random;
+import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import com.datatorrent.api.DefaultInputPort;
@@ -55,7 +56,7 @@ import com.datatorrent.lib.util.BaseKeyOperator;
* </p>
*
* @displayName Sampler
- * @category Algorithmic
+ * @category Stats and Aggregations
* @tags filter
*
* @since 0.3.2
@@ -70,13 +71,13 @@ public class Sampler<K> extends BaseKeyOperator<K>
public final transient DefaultInputPort<K> data = new DefaultInputPort<K>()
{
/**
- * Emits the tuple as per probability of passrate out of totalrate
+ * Emits tuples at a rate corresponding to the given samplingPercentage.
*/
@Override
public void process(K tuple)
{
- int fval = random.nextInt(totalrate);
- if (fval >= passrate) {
+ double val = random.nextDouble();
+ if (val > samplingPercentage) {
return;
}
sample.emit(cloneKey(tuple));
@@ -88,49 +89,28 @@ public class Sampler<K> extends BaseKeyOperator<K>
*/
public final transient DefaultOutputPort<K> sample = new DefaultOutputPort<K>();
- @Min(1)
- int passrate = 1;
- @Min(1)
- int totalrate = 100;
- private transient Random random = new Random();
-
- /**
- * getter function for pass rate
- * @return passrate
- */
- @Min(1)
- public int getPassrate()
- {
- return passrate;
- }
+ @Min(0)
+ @Max(1)
+ private double samplingPercentage = 1.0;
- /**
- * getter function for total rate
- * @return totalrate
- */
- @Min(1)
- public int getTotalrate()
- {
- return totalrate;
- }
+ private transient Random random = new Random();
/**
- * Sets pass rate
- *
- * @param val passrate is set to val
+ * Gets the samplingPercentage.
+ * @return the samplingPercentage
*/
- public void setPassrate(int val)
+ public double getSamplingPercentage()
{
- passrate = val;
+ return samplingPercentage;
}
/**
- * Sets total rate
- *
- * @param val total rate is set to val
+ * The percentage of tuples to allow to pass through this operator. This percentage should be
+ * a number between 0 and 1 inclusive.
+ * @param samplingPercentage the samplingPercentage to set
*/
- public void setTotalrate(int val)
+ public void setSamplingPercentage(double samplingPercentage)
{
- totalrate = val;
+ this.samplingPercentage = samplingPercentage;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/e1392b05/library/src/test/java/com/datatorrent/lib/algo/SamplerTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/algo/SamplerTest.java b/library/src/test/java/com/datatorrent/lib/algo/SamplerTest.java
index ed21339..5a8c71a 100644
--- a/library/src/test/java/com/datatorrent/lib/algo/SamplerTest.java
+++ b/library/src/test/java/com/datatorrent/lib/algo/SamplerTest.java
@@ -38,8 +38,7 @@ public class SamplerTest
Sampler<String> oper = new Sampler<String>();
CountTestSink sink = new CountTestSink<String>();
oper.sample.setSink(sink);
- oper.setPassrate(10);
- oper.setTotalrate(100);
+ oper.setSamplingPercentage(.1);
String tuple = "a";
[48/50] [abbrv] incubator-apex-malhar git commit: Added missing
@since tags for new release
Posted by ch...@apache.org.
Added missing @since tags for new release
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/48d12cb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/48d12cb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/48d12cb4
Branch: refs/heads/master
Commit: 48d12cb426a7bcf5795036a24a57a3a6b3689eea
Parents: 8df703a
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Tue Sep 1 04:16:21 2015 -0700
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Tue Sep 1 04:16:21 2015 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java | 4 ++++
.../com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java | 1 +
.../datatorrent/contrib/redis/RedisKeyValueInputOperator.java | 2 ++
.../datatorrent/contrib/redis/RedisMapAsValueInputOperator.java | 1 +
.../com/datatorrent/contrib/redis/RedisPOJOInputOperator.java | 2 +-
.../com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java | 1 +
.../com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java | 4 ++++
.../com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java | 4 ++++
.../com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java | 4 ++++
.../java/com/datatorrent/lib/appdata/gpo/SerdeListString.java | 4 ++++
.../com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java | 4 ++++
.../datatorrent/lib/appdata/query/QueryManagerAsynchronous.java | 4 ++++
.../lib/appdata/query/serde/SchemaQueryDeserializer.java | 5 +++++
.../src/main/java/com/datatorrent/lib/metric/AvgAggregator.java | 4 ++++
.../com/datatorrent/lib/metric/max/DoubleMaxAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/max/IntMaxAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/max/LongMaxAggregator.java | 4 ++++
.../com/datatorrent/lib/metric/min/DoubleMinAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/min/FloatMinAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/min/IntMinAggregator.java | 4 ++++
.../java/com/datatorrent/lib/metric/min/LongMinAggregator.java | 4 ++++
22 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
index 614dffe..1cfcd98 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
@@ -19,6 +19,10 @@ import org.apache.hadoop.hbase.util.Bytes;
import com.datatorrent.lib.util.FieldInfo;
+/**
+ * @since 3.1.0
+ */
+
public class HBaseFieldInfo extends FieldInfo
{
private String familyName;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
index 9e5a46a..222f33a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
@@ -22,6 +22,7 @@ import com.datatorrent.api.Context.OperatorContext;
* @displayName HBase Input Operator
* @category Input
* @tags database, nosql, pojo, hbase
+ * @since 3.1.0
*/
@Evolving
public class HBasePOJOInputOperator extends HBaseInputOperator<Object>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
index 0d0efe8..bffdf69 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
@@ -31,7 +31,9 @@ import com.datatorrent.lib.util.KeyValPair;
* @category Store
* @tags input operator, key value
*
+ * @since 3.1.0
*/
+
public class RedisKeyValueInputOperator extends AbstractRedisInputOperator<KeyValPair<String, String>>
{
private List<Object> keysObjectList = new ArrayList<Object>();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
index a7f0cd2..087f856 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
@@ -27,6 +27,7 @@ import com.datatorrent.lib.util.KeyValPair;
* @displayName Redis Input Operator for Map
* @category Store
* @tags input operator, key value
+ * @since 3.1.0
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
index ac3f7fc..20b464b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
@@ -47,7 +47,7 @@ import com.datatorrent.netlet.util.DTThrowable;
* @displayName Redis POJO Input Operator
* @category Store
* @tags output operator, key value
- *
+ * @since 3.1.0
*/
@Evolving
public class RedisPOJOInputOperator extends AbstractRedisInputOperator<KeyValPair<String, Object>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
index 8966248..43309e7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
@@ -42,6 +42,7 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
* @displayName Redis POJO Output Operator
* @category Store
* @tags output operator, key value
+ * @since 3.1.0
*
*/
public class RedisPOJOOutputOperator extends AbstractRedisAggregateOutputOperator<KeyValPair<String, Object>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
index 50c5ff3..12fe837 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
@@ -24,6 +24,10 @@ import org.apache.commons.lang3.mutable.MutableInt;
import com.datatorrent.lib.appdata.schemas.FieldsDescriptor;
import com.datatorrent.lib.appdata.schemas.Type;
+/**
+ * @since 3.1.0
+ */
+
public class SerdeFieldsDescriptor implements Serde
{
public static final SerdeFieldsDescriptor INSTANCE = new SerdeFieldsDescriptor();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
index eafda27..4b1ea3b 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
@@ -24,6 +24,10 @@ import org.apache.commons.lang3.mutable.MutableInt;
import com.datatorrent.lib.appdata.schemas.FieldsDescriptor;
+/**
+ * @since 3.1.0
+ */
+
public class SerdeListGPOMutable implements Serde
{
public static final SerdeListGPOMutable INSTANCE = new SerdeListGPOMutable();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
index 8a58565..5e21d6b 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
@@ -23,6 +23,10 @@ import org.apache.commons.lang3.mutable.MutableInt;
import com.datatorrent.lib.appdata.schemas.Type;
+/**
+ * @since 3.1.0
+ */
+
public class SerdeListPrimitive implements Serde
{
public static final SerdeListPrimitive INSTANCE = new SerdeListPrimitive();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
index 519fbc2..4eedfc6 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
@@ -24,6 +24,10 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.mutable.MutableInt;
+/**
+ * @since 3.1.0
+ */
+
public class SerdeListString implements Serde
{
public static final SerdeListString INSTANCE = new SerdeListString();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
index 42952f4..4a97e8c 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
@@ -15,6 +15,10 @@
*/
package com.datatorrent.lib.appdata.gpo;
+/**
+ * @since 3.1.0
+ */
+
public interface SerdeObjectPayloadFix
{
public void fix(Object[] objects);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
index cd54656..c6b9a5f 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
@@ -39,6 +39,10 @@ import com.datatorrent.api.Operator.IdleTimeHandler;
import com.datatorrent.common.util.NameableThreadFactory;
+/**
+ * @since 3.1.0
+ */
+
public class QueryManagerAsynchronous<QUERY_TYPE, META_QUERY, QUEUE_CONTEXT, RESULT extends Result> implements Component<OperatorContext>, IdleTimeHandler
{
private DefaultOutputPort<String> resultPort = null;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
index a83d43f..467f362 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
@@ -28,6 +28,11 @@ import com.datatorrent.lib.appdata.schemas.Query;
import com.datatorrent.lib.appdata.schemas.SchemaQuery;
import com.datatorrent.lib.appdata.schemas.SchemaUtils;
+/**
+ * @since 3.1.0
+ */
+
+
public class SchemaQueryDeserializer implements CustomMessageDeserializer
{
@Override
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
index 99ef037..e764064 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("avg")
public class AvgAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
index c1734f4..b74a4ef 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("max")
public class DoubleMaxAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
index 1c07e9f..499ca7e 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("max")
public class FloatMaxAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
index 3fa13be..b36bc6e 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("max")
public class IntMaxAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
index 4d47abf..5cd5ae3 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("max")
public class LongMaxAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
index b6ee3ab..9ad5c8f 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("min")
public class DoubleMinAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
index 445d54b..9330720 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("min")
public class FloatMinAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
index db4f45f..f285754 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("min")
public class IntMinAggregator implements SingleMetricAggregator, Serializable
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/48d12cb4/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java b/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
index 16656d5..386151d 100644
--- a/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
+++ b/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
@@ -22,6 +22,10 @@ import com.datatorrent.api.annotation.Name;
import com.datatorrent.common.metric.SingleMetricAggregator;
+/**
+ * @since 3.1.0
+ */
+
@Name("min")
public class LongMinAggregator implements SingleMetricAggregator, Serializable
{
[49/50] [abbrv] incubator-apex-malhar git commit: Preparing for
Release 3.1.0
Posted by ch...@apache.org.
Preparing for Release 3.1.0
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/b8126529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/b8126529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/b8126529
Branch: refs/heads/master
Commit: b812652999ccaf514ad109630f5411ca8931861a
Parents: 48d12cb
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Tue Sep 1 04:18:48 2015 -0700
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Tue Sep 1 04:18:48 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 10 +++++-----
samples/pom.xml | 2 +-
21 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 09df741..3d0ccb2 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 61adc07..a341ec7 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.1.0-RC2</datatorrent.version>
+ <datatorrent.version>3.1.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index b7f9843..c6067fb 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index ceed7f2..0111018 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index 13a6502..dc8521e 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 326069d..d9b7c6f 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 9c40b35..6eaf185 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 739df85..5910bef 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 50ff7ed..473d407 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 533263f..3effd78 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index 7b579e2..a600b49 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index caf7e71..65179fe 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 38fbd6e..1297938 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.1.0-RC2</datatorrent.version>
+ <datatorrent.version>3.1.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<semver.plugin.skip>true</semver.plugin.skip>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index e7cd886..8b54abc 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 2d676d0..62dc0e2 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 1660d18..c1f07ca 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index a22ba26..843baf5 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 88dd6f2..bfb8494 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index fcaa8de..f25b3eb 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45d3692..7e5166c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -31,14 +31,14 @@
</repositories>
<prerequisites>
- <maven>3.1.0-RC2</maven>
+ <maven>3.1.0</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.1.0-RC2</dt.framework.version>
+ <dt.framework.version>3.1.0</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>${project.artifactId}</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</dependency>
</oldVersion>
<newVersion>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b8126529/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index c16c240..96dace5 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.1.0-RC2</version>
+ <version>3.1.0</version>
</parent>
<artifactId>malhar-samples</artifactId>
[46/50] [abbrv] incubator-apex-malhar git commit: Merge branch
'devel-3.1' of https://git-wip-us.apache.org/repos/asf/incubator-apex-malhar
into devel-3.1
Posted by ch...@apache.org.
Merge branch 'devel-3.1' of https://git-wip-us.apache.org/repos/asf/incubator-apex-malhar into devel-3.1
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/9df821f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/9df821f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/9df821f8
Branch: refs/heads/master
Commit: 9df821f879161cce27ac8a825078fb8dc4942ef0
Parents: 4645e84 30ddf4c
Author: thomas <th...@datatorrent.com>
Authored: Sat Aug 29 15:59:44 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Sat Aug 29 15:59:44 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 6 +++---
.../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 6 +++---
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 2 +-
.../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[30/50] [abbrv] incubator-apex-malhar git commit: omitting type from
FieldInfo
Posted by ch...@apache.org.
omitting type from FieldInfo
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/f6d85fea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/f6d85fea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/f6d85fea
Branch: refs/heads/master
Commit: f6d85feaf573f682c7f1670904c9d7c073b50b37
Parents: f40ba34
Author: Chandni Singh <ch...@datatorrent.com>
Authored: Fri Aug 7 14:54:25 2015 -0700
Committer: Chandni Singh <ch...@datatorrent.com>
Committed: Fri Aug 7 17:09:20 2015 -0700
----------------------------------------------------------------------
library/src/main/java/com/datatorrent/lib/util/FieldInfo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f6d85fea/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
index a4e4923..5b41ace 100644
--- a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
@@ -100,6 +100,7 @@ public class FieldInfo
/**
* the Java type of the column
+ * @omitFromUI
*/
public void setType(SupportType type)
{
[23/50] [abbrv] incubator-apex-malhar git commit: Preparing to
release v3.0.0
Posted by ch...@apache.org.
Preparing to release v3.0.0
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/c32c97c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/c32c97c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/c32c97c5
Branch: refs/heads/master
Commit: c32c97c535afd7b21421d3832383a825b2299e04
Parents: ff4bd7e
Author: DataTorrent CI <je...@datatorrent.com>
Authored: Sat Aug 1 02:13:32 2015 -0700
Committer: DataTorrent CI <je...@datatorrent.com>
Committed: Sat Aug 1 02:13:32 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 4 ++--
benchmark/pom.xml | 6 +++---
contrib/pom.xml | 2 +-
demos/distributedistinct/pom.xml | 4 ++--
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 4 ++--
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 6 +++---
samples/pom.xml | 2 +-
21 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 7692194..bb52554 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 90a3c9c..065a9cc 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar-apps</artifactId>
@@ -18,7 +18,7 @@
<properties>
<!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.0.0-RC6</datatorrent.version>
+ <datatorrent.version>3.0.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 52a68d6..fa6a975 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>malhar</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<groupId>com.datatorrent</groupId>
@@ -501,13 +501,13 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-engine</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-api</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 7c116c8..bb48f5d 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/distributedistinct/pom.xml
----------------------------------------------------------------------
diff --git a/demos/distributedistinct/pom.xml b/demos/distributedistinct/pom.xml
index f634625..068aea7 100644
--- a/demos/distributedistinct/pom.xml
+++ b/demos/distributedistinct/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>distributedistinct</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index 68267ef..a2ae056 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 34ee1ff..29be702 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index 7c002fe..f46ba0e 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 7f8a5d8..039b29d 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index 5008c0f..cdf6543 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index b0971c1..b4fbfda 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 577cd8b..8a81970 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 0b3b017..0601366 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar-demos</artifactId>
@@ -28,7 +28,7 @@
</modules>
<properties>
- <datatorrent.version>3.0.0-RC6</datatorrent.version>
+ <datatorrent.version>3.0.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 19bcd66..8832de8 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index c494d9a..d4afef9 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index b0fc88f..3d8b554 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index ab5a393..5a956c5 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 9c5a304..47ebf8a 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index bad3d1a..a07e072 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e5df36a..ffd5cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>malhar-inc</netbeans.hint.license>
<maven.deploy.skip>false</maven.deploy.skip>
- <dt.framework.version>3.0.0-RC6</dt.framework.version>
+ <dt.framework.version>3.0.0</dt.framework.version>
<!-- the following properties match the properties defined in core/pom.xml -->
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/c32c97c5/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index cc2fb82..10a623b 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0-RC6</version>
+ <version>3.0.0</version>
</parent>
<artifactId>malhar-samples</artifactId>