You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by di...@apache.org on 2018/03/20 22:16:02 UTC
[1/3] cassandra git commit: use zero as default score in
DynamicEndpointSnitch
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 cccaf7ca2 -> 15bd10afb
refs/heads/cassandra-3.11 656cca778 -> 29d6237a0
refs/heads/trunk c09e298a4 -> f109f200a
use zero as default score in DynamicEndpointSnitch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f109f200
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f109f200
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f109f200
Branch: refs/heads/trunk
Commit: f109f200a3a7f6002d7e1f6cc67e9ef5bf5cb2df
Parents: c09e298
Author: Dikang Gu <di...@gmail.com>
Authored: Wed Feb 21 15:48:11 2018 -0800
Committer: Dikang Gu <di...@gmail.com>
Committed: Tue Mar 20 15:08:36 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 2 +-
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fbcc1bb..c092a9f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
* Handle static and partition deletion properly on ThrottledUnfilteredIterator (CASSANDRA-14315)
* NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
* Add ability to specify driver name and version (CASSANDRA-14275)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index b9c9ba0..9ea7e05 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -235,7 +235,7 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
{
Double score = scores.get(inet);
if (score == null)
- continue;
+ score = 0.0;
subsnitchOrderedScores.add(score);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f109f200/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index bf1e4c2..202d7f1 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -100,7 +100,7 @@ public class DynamicEndpointSnitchTest
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
setScores(dsnitch, 20, hosts, 10, 10, 10);
- order = Arrays.asList(host1, host2, host3, host4);
+ order = Arrays.asList(host4, host1, host2, host3);
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Use zero as default score in
DynamicEndpointSnitch
Posted by di...@apache.org.
Use zero as default score in DynamicEndpointSnitch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29d6237a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d6237a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29d6237a
Branch: refs/heads/cassandra-3.11
Commit: 29d6237a00b577400c4b4a63989d41f1baa2aa60
Parents: 656cca7
Author: Dikang Gu <di...@gmail.com>
Authored: Thu Feb 22 14:35:20 2018 -0800
Committer: Dikang Gu <di...@gmail.com>
Committed: Tue Mar 20 15:10:06 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 2 +-
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d6237a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bae967f..27a25cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.3
+ * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
* SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
* Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
* RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d6237a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 42fc26c..dce25ee 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -234,7 +234,7 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
{
Double score = scores.get(inet);
if (score == null)
- continue;
+ score = 0.0;
subsnitchOrderedScores.add(score);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d6237a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 8a59a4a..051d2c2 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -101,7 +101,7 @@ public class DynamicEndpointSnitchTest
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
setScores(dsnitch, 20, hosts, 10, 10, 10);
- order = Arrays.asList(host1, host2, host3, host4);
+ order = Arrays.asList(host4, host1, host2, host3);
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: use zero as default score in
DynamicEndpointSnitch
Posted by di...@apache.org.
use zero as default score in DynamicEndpointSnitch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15bd10af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15bd10af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15bd10af
Branch: refs/heads/cassandra-3.0
Commit: 15bd10afbfc5eda024e7048438b00bfc81a9e3ea
Parents: cccaf7c
Author: Dikang Gu <di...@gmail.com>
Authored: Wed Feb 21 15:48:11 2018 -0800
Committer: Dikang Gu <di...@gmail.com>
Committed: Tue Mar 20 15:09:32 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 2 +-
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15bd10af/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6099b01..b967580 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.17
+ * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
* Respect max hint window when hinting for LWT (CASSANDRA-14215)
* Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
* Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15bd10af/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 8c255f5..5356e8c 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -186,7 +186,7 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
{
Double score = scores.get(inet);
if (score == null)
- continue;
+ score = 0.0;
subsnitchOrderedScores.add(score);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15bd10af/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index af7dc17..866cd82 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -92,7 +92,7 @@ public class DynamicEndpointSnitchTest
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
setScores(dsnitch, 20, hosts, 10, 10, 10);
- order = Arrays.asList(host1, host2, host3, host4);
+ order = Arrays.asList(host4, host1, host2, host3);
assertEquals(order, dsnitch.getSortedListByProximity(self, Arrays.asList(host1, host2, host3, host4)));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org