You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/06/13 09:26:14 UTC
[1/3] cassandra git commit: Replace string comparison with
regex/number checks in MessagingService test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 6220108e6 -> d8fb9349d
refs/heads/trunk afd68abe6 -> 09c837f75
Replace string comparison with regex/number checks in MessagingService test
Patch by Alex Petrov; reviewed by Michael Kjellman for CASSANDRA-13216.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8fb9349
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8fb9349
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8fb9349
Branch: refs/heads/cassandra-3.11
Commit: d8fb9349df818659c54d57b2d2c95ebbd0405d49
Parents: 6220108
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 29 14:30:16 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Tue Jun 13 11:22:32 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/net/MessagingServiceTest.java | 18 ++++++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8fb9349/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f285ff0..1058c9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Replace string comparison with regex/number checks in MessagingService test (CASSANDRA-13216)
* Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
* Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
* Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8fb9349/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
index c1dcfc5..e7d90c4 100644
--- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
+++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
@@ -32,6 +32,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import java.util.regex.*;
+import java.util.regex.Matcher;
import com.google.common.collect.Iterables;
import com.codahale.metrics.Timer;
@@ -83,7 +85,13 @@ public class MessagingServiceTest
List<String> logs = messagingService.getDroppedMessagesLogs();
assertEquals(1, logs.size());
- assertEquals("READ messages were dropped in last 5000 ms: 2500 internal and 2500 cross node. Mean internal dropped latency: 2730 ms and Mean cross-node dropped latency: 2731 ms", logs.get(0));
+ Pattern regexp = Pattern.compile("READ messages were dropped in last 5000 ms: (\\d+) internal and (\\d+) cross node. Mean internal dropped latency: (\\d+) ms and Mean cross-node dropped latency: (\\d+) ms");
+ Matcher matcher = regexp.matcher(logs.get(0));
+ assertTrue(matcher.find());
+ assertEquals(2500, Integer.parseInt(matcher.group(1)));
+ assertEquals(2500, Integer.parseInt(matcher.group(2)));
+ assertTrue(Integer.parseInt(matcher.group(3)) > 0);
+ assertTrue(Integer.parseInt(matcher.group(4)) > 0);
assertEquals(5000, (int) messagingService.getDroppedMessages().get(verb.toString()));
logs = messagingService.getDroppedMessagesLogs();
@@ -93,7 +101,13 @@ public class MessagingServiceTest
messagingService.incrementDroppedMessages(verb, i, i % 2 == 0);
logs = messagingService.getDroppedMessagesLogs();
- assertEquals("READ messages were dropped in last 5000 ms: 1250 internal and 1250 cross node. Mean internal dropped latency: 2277 ms and Mean cross-node dropped latency: 2278 ms", logs.get(0));
+ assertEquals(1, logs.size());
+ matcher = regexp.matcher(logs.get(0));
+ assertTrue(matcher.find());
+ assertEquals(1250, Integer.parseInt(matcher.group(1)));
+ assertEquals(1250, Integer.parseInt(matcher.group(2)));
+ assertTrue(Integer.parseInt(matcher.group(3)) > 0);
+ assertTrue(Integer.parseInt(matcher.group(4)) > 0);
assertEquals(7500, (int) messagingService.getDroppedMessages().get(verb.toString()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by if...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09c837f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09c837f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09c837f7
Branch: refs/heads/trunk
Commit: 09c837f75b5814fc92d3d1576f698537ef28ee2c
Parents: afd68ab d8fb934
Author: Alex Petrov <ol...@gmail.com>
Authored: Tue Jun 13 11:25:37 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Tue Jun 13 11:25:37 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/net/MessagingServiceTest.java | 18 ++++++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09c837f7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9430e2d,1058c9c..f8b8a77
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,5 +1,83 @@@
+4.0
+ * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
+ * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
+ * Fix Randomness of stress values (CASSANDRA-12744)
+ * Allow selecting Map values and Set elements (CASSANDRA-7396)
+ * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
+ * Update repairTime for keyspaces on completion (CASSANDRA-13539)
+ * Add configurable upper bound for validation executor threads (CASSANDRA-13521)
+ * Bring back maxHintTTL propery (CASSANDRA-12982)
+ * Add testing guidelines (CASSANDRA-13497)
+ * Add more repair metrics (CASSANDRA-13531)
+ * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650)
+ * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367)
+ * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
+ * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
+ * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
+ * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421)
+ * Improve incremental repair logging (CASSANDRA-13468)
+ * Start compaction when incremental repair finishes (CASSANDRA-13454)
+ * Add repair streaming preview (CASSANDRA-13257)
+ * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
+ * Change protocol to allow sending key space independent of query string (CASSANDRA-10145)
+ * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
+ * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354)
+ * Skip building views during base table streams on range movements (CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers (CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
+
+
3.11.0
+ * Replace string comparison with regex/number checks in MessagingService test (CASSANDRA-13216)
* Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
* Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
* Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09c837f7/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: Replace string comparison with
regex/number checks in MessagingService test
Posted by if...@apache.org.
Replace string comparison with regex/number checks in MessagingService test
Patch by Alex Petrov; reviewed by Michael Kjellman for CASSANDRA-13216.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8fb9349
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8fb9349
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8fb9349
Branch: refs/heads/trunk
Commit: d8fb9349df818659c54d57b2d2c95ebbd0405d49
Parents: 6220108
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 29 14:30:16 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Tue Jun 13 11:22:32 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/net/MessagingServiceTest.java | 18 ++++++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8fb9349/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f285ff0..1058c9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Replace string comparison with regex/number checks in MessagingService test (CASSANDRA-13216)
* Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
* Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
* Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8fb9349/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
index c1dcfc5..e7d90c4 100644
--- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
+++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
@@ -32,6 +32,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import java.util.regex.*;
+import java.util.regex.Matcher;
import com.google.common.collect.Iterables;
import com.codahale.metrics.Timer;
@@ -83,7 +85,13 @@ public class MessagingServiceTest
List<String> logs = messagingService.getDroppedMessagesLogs();
assertEquals(1, logs.size());
- assertEquals("READ messages were dropped in last 5000 ms: 2500 internal and 2500 cross node. Mean internal dropped latency: 2730 ms and Mean cross-node dropped latency: 2731 ms", logs.get(0));
+ Pattern regexp = Pattern.compile("READ messages were dropped in last 5000 ms: (\\d+) internal and (\\d+) cross node. Mean internal dropped latency: (\\d+) ms and Mean cross-node dropped latency: (\\d+) ms");
+ Matcher matcher = regexp.matcher(logs.get(0));
+ assertTrue(matcher.find());
+ assertEquals(2500, Integer.parseInt(matcher.group(1)));
+ assertEquals(2500, Integer.parseInt(matcher.group(2)));
+ assertTrue(Integer.parseInt(matcher.group(3)) > 0);
+ assertTrue(Integer.parseInt(matcher.group(4)) > 0);
assertEquals(5000, (int) messagingService.getDroppedMessages().get(verb.toString()));
logs = messagingService.getDroppedMessagesLogs();
@@ -93,7 +101,13 @@ public class MessagingServiceTest
messagingService.incrementDroppedMessages(verb, i, i % 2 == 0);
logs = messagingService.getDroppedMessagesLogs();
- assertEquals("READ messages were dropped in last 5000 ms: 1250 internal and 1250 cross node. Mean internal dropped latency: 2277 ms and Mean cross-node dropped latency: 2278 ms", logs.get(0));
+ assertEquals(1, logs.size());
+ matcher = regexp.matcher(logs.get(0));
+ assertTrue(matcher.find());
+ assertEquals(1250, Integer.parseInt(matcher.group(1)));
+ assertEquals(1250, Integer.parseInt(matcher.group(2)));
+ assertTrue(Integer.parseInt(matcher.group(3)) > 0);
+ assertTrue(Integer.parseInt(matcher.group(4)) > 0);
assertEquals(7500, (int) messagingService.getDroppedMessages().get(verb.toString()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org