You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/08/08 20:02:29 UTC
[01/10] git commit: Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Updated Branches:
refs/heads/cassandra-1.2 23d7bd857 -> ccb32a8c8
refs/heads/cassandra-2.0 c52613124 -> 988aa3163
refs/heads/cassandra-2.0.0 f30629b83 -> 8ee09f7ab
refs/heads/trunk 93f838d18 -> ac6245364
Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccb32a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb32a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb32a8c
Branch: refs/heads/cassandra-1.2
Commit: ccb32a8c8d6bd5d25ad6db172f7cd6ead00fdfaa
Parents: 23d7bd8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 12:58:58 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 12:58:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb32a8c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 54f8abd..588777b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1654,12 +1654,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return Long.parseLong(pieces[2]);
else
return 0L;
- } else
+ }
+ else
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
+ return Long.parseLong(pieces[2]);
}
}
[08/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0.0' 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/988aa316
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/988aa316
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/988aa316
Branch: refs/heads/trunk
Commit: 988aa31631f59f2949cde68e4ffd9ddbe24fabe3
Parents: c526131 8ee09f7
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:01:51 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:01:51 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0.0' 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/988aa316
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/988aa316
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/988aa316
Branch: refs/heads/cassandra-2.0
Commit: 988aa31631f59f2949cde68e4ffd9ddbe24fabe3
Parents: c526131 8ee09f7
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:01:51 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:01:51 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
[04/10] git commit: Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Posted by br...@apache.org.
Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccb32a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb32a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb32a8c
Branch: refs/heads/trunk
Commit: ccb32a8c8d6bd5d25ad6db172f7cd6ead00fdfaa
Parents: 23d7bd8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 12:58:58 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 12:58:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb32a8c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 54f8abd..588777b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1654,12 +1654,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return Long.parseLong(pieces[2]);
else
return 0L;
- } else
+ }
+ else
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
+ return Long.parseLong(pieces[2]);
}
}
[03/10] git commit: Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Posted by br...@apache.org.
Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccb32a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb32a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb32a8c
Branch: refs/heads/cassandra-2.0
Commit: ccb32a8c8d6bd5d25ad6db172f7cd6ead00fdfaa
Parents: 23d7bd8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 12:58:58 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 12:58:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb32a8c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 54f8abd..588777b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1654,12 +1654,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return Long.parseLong(pieces[2]);
else
return 0L;
- } else
+ }
+ else
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
+ return Long.parseLong(pieces[2]);
}
}
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ee09f7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ee09f7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ee09f7a
Branch: refs/heads/trunk
Commit: 8ee09f7ab37bfd1cd8c3a09c8e0844d1fa6dfca2
Parents: f30629b ccb32a8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:01:40 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:01:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ee09f7a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 58a0634,588777b..a23db0c
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1587,12 -1646,19 +1587,9 @@@ public class StorageService extends Not
}
}
- protected long extractExpireTime(String[] pieces, int version)
+ protected long extractExpireTime(String[] pieces)
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
- if (version < MessagingService.VERSION_12)
- {
- if (pieces.length >= 3)
- return Long.parseLong(pieces[2]);
- else
- return 0L;
- }
- else
- {
- return Long.parseLong(pieces[2]);
- }
++ return Long.parseLong(pieces[2]);
}
/**
[02/10] git commit: Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Posted by br...@apache.org.
Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccb32a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb32a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb32a8c
Branch: refs/heads/cassandra-2.0.0
Commit: ccb32a8c8d6bd5d25ad6db172f7cd6ead00fdfaa
Parents: 23d7bd8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 12:58:58 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 12:58:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb32a8c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 54f8abd..588777b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1654,12 +1654,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return Long.parseLong(pieces[2]);
else
return 0L;
- } else
+ }
+ else
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
+ return Long.parseLong(pieces[2]);
}
}
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ee09f7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ee09f7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ee09f7a
Branch: refs/heads/cassandra-2.0
Commit: 8ee09f7ab37bfd1cd8c3a09c8e0844d1fa6dfca2
Parents: f30629b ccb32a8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:01:40 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:01:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ee09f7a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 58a0634,588777b..a23db0c
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1587,12 -1646,19 +1587,9 @@@ public class StorageService extends Not
}
}
- protected long extractExpireTime(String[] pieces, int version)
+ protected long extractExpireTime(String[] pieces)
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
- if (version < MessagingService.VERSION_12)
- {
- if (pieces.length >= 3)
- return Long.parseLong(pieces[2]);
- else
- return 0L;
- }
- else
- {
- return Long.parseLong(pieces[2]);
- }
++ return Long.parseLong(pieces[2]);
}
/**
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ee09f7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ee09f7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ee09f7a
Branch: refs/heads/cassandra-2.0.0
Commit: 8ee09f7ab37bfd1cd8c3a09c8e0844d1fa6dfca2
Parents: f30629b ccb32a8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:01:40 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:01:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ee09f7a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 58a0634,588777b..a23db0c
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1587,12 -1646,19 +1587,9 @@@ public class StorageService extends Not
}
}
- protected long extractExpireTime(String[] pieces, int version)
+ protected long extractExpireTime(String[] pieces)
{
- if (VersionedValue.STATUS_LEFT.equals(pieces[0]))
- return Long.parseLong(pieces[1]);
- else
- return Long.parseLong(pieces[2]);
- if (version < MessagingService.VERSION_12)
- {
- if (pieces.length >= 3)
- return Long.parseLong(pieces[2]);
- else
- return 0L;
- }
- else
- {
- return Long.parseLong(pieces[2]);
- }
++ return Long.parseLong(pieces[2]);
}
/**
[10/10] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/ac624536
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac624536
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac624536
Branch: refs/heads/trunk
Commit: ac62453649e1b47ec5a8c8d0a13687c9d7d2c481
Parents: 93f838d 988aa31
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 13:02:01 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 13:02:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------