Merge branch 'cassandra-3.11' into trunk

CHANGES.txt

@@ -1,4 +1,5 @@
 4.0-beta4
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
  * DROP COMPACT STORAGE should invalidate prepared statements still using CompactTableMetadata (CASSANDRA-16361)
  * Update default num_tokens to 16 and allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
  * Remove use of String.intern() (CASSANDRA-15810)

src/java/org/apache/cassandra/serializers/DecimalSerializer.java

@@ -64,7 +64,7 @@ public class DecimalSerializer extends TypeSerializer<BigDecimal>
 
     public String toString(BigDecimal value)
     {
-        return value == null ? "" : value.toPlainString();
+        return value == null ? "" : value.toString();
     }
 
     public Class<BigDecimal> getType()

test/unit/org/apache/cassandra/serializers/DecimalSerializerTest.java

@@ -0,0 +1,51 @@
+/**
+ * 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.serializers;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+
+public class DecimalSerializerTest
+{
+    @Test
+    public void testDecimalScaleStringify()
+    {
+        BigDecimal d = new BigDecimal("1");
+        assertEquals("1", DecimalSerializer.instance.toString(d));
+
+        d = new BigDecimal("-1");
+        assertEquals("-1", DecimalSerializer.instance.toString(d));
+
+        int scale = Integer.MAX_VALUE - 100;
+        d = new BigDecimal("1e" + scale);
+        assertEquals("1E+" + scale, DecimalSerializer.instance.toString(d));
+
+        d = new BigDecimal("-1e" + scale);
+        assertEquals("-1E+" + scale, DecimalSerializer.instance.toString(d));
+
+        d = new BigDecimal("1e-" + scale);
+        assertEquals("1E-" + scale, DecimalSerializer.instance.toString(d));
+
+        d = new BigDecimal("-1e-" + scale);
+        assertEquals("-1E-" + scale, DecimalSerializer.instance.toString(d));
+    }
+}