You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/18 14:30:18 UTC
[1/4] git commit: Fix typo
Updated Branches:
refs/heads/trunk 08eb9c8f5 -> 7d03e28b5
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc9b3a77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9b3a77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9b3a77
Branch: refs/heads/trunk
Commit: fc9b3a77bb3821033d7701dd2e2c693abbf322bb
Parents: 07b4878
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 18 14:27:18 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 18 14:27:18 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9b3a77/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index d7a4e8e..81f6c8a 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -209,7 +209,7 @@ public interface CQL3Type
return "set<" + ((SetType)type).elements.asCQL3Type() + ">";
case MAP:
MapType mt = (MapType)type;
- return "set<" + mt.keys.asCQL3Type() + ", " + mt.values.asCQL3Type() + ">";
+ return "map<" + mt.keys.asCQL3Type() + ", " + mt.values.asCQL3Type() + ">";
}
throw new AssertionError();
}
[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
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/a7b32deb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7b32deb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7b32deb
Branch: refs/heads/trunk
Commit: a7b32deb9583817b7972711cc33884d86fd52397
Parents: b38bec7 fc9b3a7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 18 14:29:53 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 18 14:29:53 2013 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b32deb/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------
[2/4] git commit: Paging filter empty rows too aggressively
Posted by sl...@apache.org.
Paging filter empty rows too aggressively
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6040
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b38bec79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b38bec79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b38bec79
Branch: refs/heads/trunk
Commit: b38bec79cf9b9221c7db0b5602ce57c382ff1852
Parents: e638ace
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 15:36:13 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 18 14:28:53 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/pager/AbstractQueryPager.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b38bec79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0142c53..5a2dc7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@
* Fix NPE in sstablesplit (CASSANDRA-6027)
* Migrate pre-2.0 key/value/column aliases to system.schema_columns
(CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
Merged from 1.2:
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b38bec79/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 8d2e726..62cd454 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -116,7 +116,7 @@ abstract class AbstractQueryPager implements QueryPager
List<Row> newResult = new ArrayList<Row>(result.size() - 1);
for (Row row2 : result)
{
- if (row.cf == null || row.cf.getColumnCount() == 0)
+ if (row2.cf == null || row2.cf.getColumnCount() == 0)
continue;
newResult.add(row2);
[4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d03e28b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d03e28b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d03e28b
Branch: refs/heads/trunk
Commit: 7d03e28b5cd08fb35482f42322556084441be41d
Parents: 08eb9c8 a7b32de
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 18 14:30:13 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 18 14:30:13 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
.../org/apache/cassandra/service/pager/AbstractQueryPager.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d03e28b/CHANGES.txt
----------------------------------------------------------------------