cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7202eff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7202eff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7202eff Branch: refs/heads/trunk Commit: a7202effa7067604ef23eae441caa8b9480a63f4 Parents: 7a39421 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 31 18:22:49 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 31 18:22:49 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java | 2 +- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7202eff/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java index db77c9e..c6eb46d 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java @@ -674,7 +674,7 @@ public class CqlPagingRecordReader extends RecordReader<Map<String, ByteBuffer>, for (String key : keys) partitionBoundColumns.add(new BoundColumn(key)); - if (partitionBoundColumns.size() == 0) + if (partitionBoundColumns.isEmpty()) { retrieveKeysForThriftTables(); return; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7202eff/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java index 76d419e..3d03486 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java @@ -340,7 +340,7 @@ final class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String, logger.debug("partition keys: " + keyString); List<String> keys = FBUtilities.fromJsonList(keyString); - if (keys.size() == 0) + if (keys.isEmpty()) { retrieveKeysForThriftTables(client); return; @@ -385,6 +385,7 @@ final class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String, } } } + private AbstractType<?> parseType(String type) throws ConfigurationException { try
