You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/23 17:28:50 UTC
[1/5] git commit: Add isDense to CFMetaData#hashCode()
Repository: cassandra
Updated Branches:
refs/heads/trunk 3ca9576c9 -> 3aa721577
Add isDense to CFMetaData#hashCode()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/618441b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/618441b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/618441b9
Branch: refs/heads/trunk
Commit: 618441b9776bf1da3dcda76ce20dd04734dfab59
Parents: a5617d6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:26:10 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:26:10 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/618441b9/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 07c696f..eaec9c3 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -860,6 +860,7 @@ public final class CFMetaData
.append(populateIoCacheOnFlush)
.append(droppedColumns)
.append(triggers)
+ .append(isDense)
.toHashCode();
}
[3/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de4ee0bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de4ee0bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de4ee0bb
Branch: refs/heads/trunk
Commit: de4ee0bbbf451e656cbe6a45e716f33d8bed3aa1
Parents: dac984f baae9b6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:27:04 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:27:04 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[2/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baae9b6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baae9b6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baae9b6c
Branch: refs/heads/trunk
Commit: baae9b6c1239a89829feaac1a428f4629d0032b9
Parents: 508db1e 618441b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:26:34 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:26:34 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/baae9b6c/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 70cd648,eaec9c3..aa8bc57
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -945,11 -855,12 +945,12 @@@ public final class CFMetaDat
.append(memtableFlushPeriod)
.append(caching)
.append(defaultTimeToLive)
- .append(indexInterval)
+ .append(minIndexInterval)
+ .append(maxIndexInterval)
.append(speculativeRetry)
- .append(populateIoCacheOnFlush)
.append(droppedColumns)
.append(triggers)
+ .append(isDense)
.toHashCode();
}
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
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/3aa72157
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3aa72157
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3aa72157
Branch: refs/heads/trunk
Commit: 3aa721577986e44950533cf1024bab17251b0ae4
Parents: 3ca9576 c489a4e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:28:39 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:28:39 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa72157/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
[4/5] git commit: Nicer CFMetaData#toString() output
Posted by al...@apache.org.
Nicer CFMetaData#toString() output
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c489a4e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c489a4e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c489a4e3
Branch: refs/heads/trunk
Commit: c489a4e37aeb46be7b91f740c22cb4d6feac57f5
Parents: de4ee0b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:28:05 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:28:05 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c489a4e3/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index aa8bc57..a35357a 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -2252,7 +2252,7 @@ public final class CFMetaData
.append("keyValidator", keyValidator)
.append("minCompactionThreshold", minCompactionThreshold)
.append("maxCompactionThreshold", maxCompactionThreshold)
- .append("columnMetadata", columnMetadata)
+ .append("columnMetadata", columnMetadata.values())
.append("compactionStrategyClass", compactionStrategyClass)
.append("compactionStrategyOptions", compactionStrategyOptions)
.append("compressionParameters", compressionParameters.asThriftOptions())
@@ -2264,7 +2264,7 @@ public final class CFMetaData
.append("maxIndexInterval", maxIndexInterval)
.append("speculativeRetry", speculativeRetry)
.append("droppedColumns", droppedColumns)
- .append("triggers", triggers)
+ .append("triggers", triggers.values())
.append("isDense", isDense)
.toString();
}