Reverted cassandra-topology.properties and GuardrailAllowUncompressedTablesTest

Author: Claudenw

test/conf/cassandra-topology.properties

@@ -1,2 +1,45 @@
-127.0.0.1\:7012=DC1:RAC1
-127.0.0.99\:7012=OTHER_DC1:OTHER_RAC1
+# 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.
+
+# Cassandra Node IP=Data Center:Rack
+192.168.1.100=DC1:RAC1
+192.168.2.200=DC2:RAC2
+
+10.0.0.10=DC1:RAC1
+10.0.0.11=DC1:RAC1
+10.0.0.12=DC1:RAC2
+
+10.20.114.10=DC2:RAC1
+10.20.114.11=DC2:RAC1
+
+10.21.119.13=DC3:RAC1
+10.21.119.10=DC3:RAC1
+
+10.0.0.13=DC1:RAC2
+10.21.119.14=DC3:RAC2
+10.20.114.15=DC2:RAC2
+
+127.0.0.1=DC1:RAC1
+127.0.0.2=DC1:RAC2
+127.0.0.3=DC1:RAC3
+127.0.0.4=DC2:RAC4
+127.0.0.5=DC2:RAC5
+127.0.0.6=DC3:RAC6
+127.0.0.7=DC3:RAC7
+127.0.0.8=DC3:RAC8
+
+# default for unknown nodes
+default=DC1:r1

test/unit/org/apache/cassandra/db/guardrails/GuardrailAllowUncompressedTablesTest.java

@@ -52,7 +52,7 @@ public void createFailure() throws Throwable
     {
         setGuardrail(false);
         String table = createTableName();
-        assertFails(String.format("CREATE TABLE %s.%s (k int primary key, v int) WITH compression={'enabled':false}", KEYSPACE, table), "Uncompressed table is not allowed");
+        assertFails(String.format("CREATE TABLE %s.%s (k int primary key, v int) WITH compression={'enabled': false}", KEYSPACE, table), "Uncompressed table is not allowed");
     }
 
     @Test
@@ -61,7 +61,7 @@ public void alterSuccess()
         setGuardrail(true);
         String table = createTableName();
         schemaChange(String.format("CREATE TABLE %s.%s (k int primary key, v int)", KEYSPACE, table));
-        schemaChange(String.format("ALTER TABLE %s.%s WITH compression = { 'enabled': false }", KEYSPACE, table));
+        schemaChange(String.format("ALTER TABLE %s.%s WITH compression = {'enabled': false}", KEYSPACE, table));
         TableMetadata tmd = Schema.instance.getTableMetadata(KEYSPACE, table);
         Assert.assertFalse(tmd.params.compression.isEnabled());
     }
@@ -72,6 +72,6 @@ public void alterFailure() throws Throwable
         setGuardrail(false);
         String table = createTableName();
         schemaChange(String.format("CREATE TABLE %s.%s (k int primary key, v int)", KEYSPACE, table));
-        assertFails(String.format("ALTER TABLE %s.%s WITH compression = { 'enabled': false }", KEYSPACE, table), "Uncompressed table is not allowed");
+        assertFails(String.format("ALTER TABLE %s.%s WITH compression = {'enabled': false}", KEYSPACE, table), "Uncompressed table is not allowed");
     }
 }