adelapena commented on code in PR #2110: URL: https://github.com/apache/cassandra/pull/2110#discussion_r1101446397
########## test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeColumnMaskingTest.java: ########## @@ -0,0 +1,113 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.cassandra.distributed.upgrade; + +import org.junit.Test; + +import org.apache.cassandra.distributed.UpgradeableCluster; +import org.apache.cassandra.distributed.api.ICoordinator; +import org.assertj.core.api.Assertions; + +import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL; +import static org.apache.cassandra.distributed.api.Feature.GOSSIP; +import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows; +import static org.apache.cassandra.distributed.shared.AssertUtils.row; + +/** + * Tests that dynamic data masking (DDM) functions can be attached to table columns during a rolling upgrade involving + * nodes that don't include DDM. + */ +public class MixedModeColumnMaskingTest extends UpgradeTestBase +{ + @Test + public void testColumnMasking() throws Throwable + { + new TestCase() + .nodes(2) + .nodesToUpgrade(1, 2) + .upgradesToCurrentFrom(v30) + .withConfig(config -> config.with(GOSSIP)) + .setup(cluster -> { + cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (k int PRIMARY KEY, v int)")); + cluster.coordinator(1).execute(withKeyspace("INSERT INTO %s.t(k, v) VALUES (0, 7)"), ALL); + }) + .runAfterNodeUpgrade((cluster, node) -> { + if (node == 1) + { + ICoordinator coordinator = cluster.coordinator(1); + + // create table with masked column + assertFails(coordinator, + "CREATE TABLE %s.t1 (k int PRIMARY KEY, v int MASKED WITH DEFAULT)", + "Cannot create a table with data masking functions during rolling upgrade"); + + // mask existing column + assertFails(coordinator, + "ALTER TABLE %s.t ALTER v MASKED WITH DEFAULT", + "Cannot add masking function to column during rolling upgrade"); + assertColumnValue(cluster, "t", "v", 7); + + // unmask existing column + assertFails(coordinator, + "ALTER TABLE %s.t ALTER v DROP MASKED", + "Cannot remove masking function from column during rolling upgrade"); + assertColumnValue(cluster, "t", "v", 7); + + // add new masked column + assertFails(coordinator, + "ALTER TABLE %s.t ADD v2 int MASKED WITH DEFAULT", + "Cannot add column with masking function during rolling upgrade"); + assertColumnValue(cluster, "t", "v", 7); + } + }).runAfterClusterUpgrade(cluster -> { + + // create table with masked column + cluster.schemaChange(withKeyspace("CREATE TABLE %s.t2 (k int PRIMARY KEY, v int MASKED WITH DEFAULT)")); + cluster.coordinator(1).execute(withKeyspace("INSERT INTO %s.t2(k, v) VALUES (0, 7)"), ALL); + assertColumnValue(cluster, "t2", "v", 0); + + // mask existing column Review Comment: It is. Or, more exactly, the block of code immediately below it is swapped with the next block of code :) The intention is first masking an unmasked column, then unmasking it. Fixed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
