Repository: incubator-apex-malhar Updated Branches: refs/heads/master fd5daef2f -> a029c5f48
APEXMALHAR-1982: CassandraInputOperator query setter fails with null pointer exception 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/562bbf82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/562bbf82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/562bbf82 Branch: refs/heads/master Commit: 562bbf8209727e6d17a4bb5d0df75731a0c68d6b Parents: 9e77ef7 Author: Priyanka Gugale <[email protected]> Authored: Fri Jan 22 15:46:44 2016 +0530 Committer: Priyanka Gugale <[email protected]> Committed: Fri Jan 22 15:46:44 2016 +0530 ---------------------------------------------------------------------- .../contrib/cassandra/CassandraPOJOInputOperator.java | 5 ++++- .../datatorrent/contrib/cassandra/CassandraOperatorTest.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/562bbf82/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 8ebe7a2..9f2a08c 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java @@ -143,7 +143,7 @@ public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<O public void setQuery(String query) { - this.query = query.replace("%t", tablename); + this.query = query; } /** @@ -195,6 +195,9 @@ public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<O ColumnDefinitions rsMetaData = rs.getColumnDefinitions(); primaryKeyColumnType = rsMetaData.getType(primaryKeyColumn); + if (query.contains("%t")) { + query = query.replace("%t", tablename); + } if (query.contains("%p")) { query = query.replace("%p", primaryKeyColumn); } http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/562bbf82/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java ---------------------------------------------------------------------- diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java index 3718b35..68a1e5c 100644 --- a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java +++ b/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java @@ -293,8 +293,8 @@ public class CassandraOperatorTest TestInputOperator inputOperator = new TestInputOperator(); inputOperator.setStore(store); - inputOperator.setTablename(TABLE_NAME_INPUT); inputOperator.setQuery(query1); + inputOperator.setTablename(TABLE_NAME_INPUT); inputOperator.setPrimaryKeyColumn("id"); List<FieldInfo> fieldInfos = Lists.newArrayList();
