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 <berenguerbl...@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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to