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/09/20 07:50:07 UTC
[cassandra] branch trunk updated (7c3935c -> e603418)
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 7c3935c Merge branch 'cassandra-4.0' into trunk
new 8f4ae7d Improve MV TTL error message
new e98be8e Merge branch 'cassandra-3.11' into cassandra-4.0
new e603418 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:
.../cassandra/cql3/statements/schema/AlterViewStatement.java | 5 +++--
test/unit/org/apache/cassandra/cql3/ViewTimesTest.java | 11 ++++++++++-
2 files changed, 13 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 e60341823dee2f4ed394b5649c40fc5a1b5854c7
Merge: 7c3935c e98be8e
Author: Bereng <be...@gmail.com>
AuthorDate: Mon Sep 20 09:46:52 2021 +0200
Merge branch 'cassandra-4.0' into trunk
.../cassandra/cql3/statements/schema/AlterViewStatement.java | 5 +++--
test/unit/org/apache/cassandra/cql3/ViewTimesTest.java | 11 ++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --cc test/unit/org/apache/cassandra/cql3/ViewTimesTest.java
index 4fee422,14d7566..8d5e453
--- a/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ViewTimesTest.java
@@@ -285,12 -287,15 +287,15 @@@ public class ViewTimesTest extends View
"c int, " +
"val int) WITH default_time_to_live = 60");
+ createView("mv_ttl2", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
+
+ execute("USE " + keyspace());
+ executeNet("USE " + keyspace());
+
- createView("mv_ttl2", "CREATE MATERIALIZED VIEW %s AS SELECT * FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (k,c)");
-
// Must NOT include "default_time_to_live" on alter Materialized View
try
{
- executeNet("ALTER MATERIALIZED VIEW %s WITH default_time_to_live = 30");
- executeNet("ALTER MATERIALIZED VIEW " + keyspace()+ ".mv_ttl2 WITH default_time_to_live = 30");
++ executeNet("ALTER MATERIALIZED VIEW " + keyspace() + ".mv_ttl2 WITH default_time_to_live = 30");
Assert.fail("Should fail if TTL is provided while altering materialized view");
}
catch (Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org