Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d5b0b45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d5b0b45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d5b0b45 Branch: refs/heads/trunk Commit: 6d5b0b45ad86be7568ab15dc61c75fa50143082a Parents: 7954965 049a965 Author: Tyler Hobbs <[email protected]> Authored: Thu May 7 10:32:26 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu May 7 10:32:26 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/db/PagedRangeCommand.java | 7 +++++++ src/java/org/apache/cassandra/db/RangeSliceCommand.java | 7 +++++++ src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java | 7 +++++++ src/java/org/apache/cassandra/db/SliceFromReadCommand.java | 7 +++++++ 5 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5b0b45/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5b0b45/src/java/org/apache/cassandra/db/PagedRangeCommand.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/PagedRangeCommand.java index ab988f1,70325a8..402e711 --- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java +++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java @@@ -159,10 -158,16 +159,17 @@@ public class PagedRangeCommand extends String columnFamily = in.readUTF(); long timestamp = in.readLong(); - AbstractBounds<RowPosition> keyRange = AbstractBounds.serializer.deserialize(in, version).toRowBounds(); + AbstractBounds<RowPosition> keyRange = + AbstractBounds.rowPositionSerializer.deserialize(in, MessagingService.globalPartitioner(), version); CFMetaData metadata = Schema.instance.getCFMetaData(keyspace, columnFamily); + if (metadata == null) + { + String message = String.format("Got paged range command for nonexistent table %s.%s. If the table was just " + + "created, this is likely due to the schema not being fully propagated. Please wait for schema " + + "agreement on table creation." , keyspace, columnFamily); + throw new UnknownColumnFamilyException(message, null); + } SliceQueryFilter predicate = metadata.comparator.sliceQueryFilterSerializer().deserialize(in, version); http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5b0b45/src/java/org/apache/cassandra/db/RangeSliceCommand.java ----------------------------------------------------------------------
