cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [10/12] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 12 Sep 2013 11:41:24 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bde2454
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bde2454
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bde2454

Branch: refs/heads/cassandra-2.0
Commit: 7bde2454daff05a603973767fd92c531e245b404
Parents: 69c9e03 394b35e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 12 13:41:01 2013 +0200
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 12 13:41:01 2013 +0200

----------------------------------------------------------------------
 .../org/apache/cassandra/cql3/UntypedResultSet.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bde2454/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/UntypedResultSet.java
index 3ef5c95,b77e727..da76f2b
--- a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
@@@ -77,15 -77,12 +77,17 @@@ public class UntypedResultSet implement
  
      public static class Row
      {
-         Map<String, ByteBuffer> data = new HashMap<String, ByteBuffer>();
+         final Map<String, ByteBuffer> data = new HashMap<String, ByteBuffer>();
+         final List<ColumnSpecification> columns;
  
 +        public Row(Map<String, ByteBuffer> data)
 +        {
 +            this.data.putAll(data);
 +        }
 +
          public Row(List<ColumnSpecification> names, List<ByteBuffer> columns)
          {
+             this.columns = names;
              for (int i = 0; i < names.size(); i++)
                  data.put(names.get(i).toString(), columns.get(i));
          }


Mime
View raw message