You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2021/08/19 05:43:34 UTC
[cassandra] branch trunk updated (304deea -> 0581820)
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 304deea Merge branch cassandra-4.0 into trunk
new 23b61a5 Prevent broken concurrent schema pulls
new f80b177 Merge branch 'cassandra-3.11' into cassandra-4.0
new 0581820 Merge branch 'cassandra-4.0' into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 4 +---
.../org/apache/cassandra/schema/SchemaKeyspaceTest.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 058182025931e6b508d70fa9cfd294c7c860b185
Merge: 304deea f80b177
Author: Bereng <be...@gmail.com>
AuthorDate: Thu Aug 19 07:38:41 2021 +0200
Merge branch 'cassandra-4.0' into trunk
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 4 +---
.../org/apache/cassandra/schema/SchemaKeyspaceTest.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --cc test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
index bf62203,c0c56aa..44fb2c0
--- a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java
@@@ -61,6 -63,17 +63,17 @@@ public class SchemaKeyspaceTes
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
}
+ /** See CASSANDRA-16856. Make sure schema pulls are synchronized to prevent concurrent schema pull/writes
- *
- * @throws Exception
- */
- @Test
- public void testSchemaPullSynchoricity() throws Exception
- {
- Method method = SchemaKeyspace.class.getDeclaredMethod("convertSchemaToMutations");
- assertTrue(Modifier.isSynchronized(method.getModifiers()));
- }
++ *
++ * @throws Exception
++ */
++ @Test
++ public void testSchemaPullSynchoricity() throws Exception
++ {
++ Method method = SchemaKeyspace.class.getDeclaredMethod("convertSchemaToMutations");
++ assertTrue(Modifier.isSynchronized(method.getModifiers()));
++ }
+
@Test
public void testConversionsInverses() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org