You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2016/10/20 04:00:05 UTC

[1/6] cassandra git commit: Explicitly set locale for string validation

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 55568c17d -> c9ca441bd
  refs/heads/cassandra-3.X 7886bd38a -> 6130d4b2c
  refs/heads/trunk 2d559fda5 -> e6e82a79a


Explicitly set locale for string validation

Patch by Amit Deshpande; Reviewed by Jeff Jirsa for CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b356409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b356409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b356409

Branch: refs/heads/cassandra-3.X
Commit: 9b356409572298373558fe5cc0e249f63c0d3a93
Parents: 55568c1
Author: Amit Deshpande <Am...@capitalone.com>
Authored: Wed Oct 19 15:16:54 2016 -0500
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:41:38 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 3 ++-
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 2 +-
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 31e96b9..933ee61 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
  * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
  * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
  * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
+ * Explicitly set locale for string comparisons (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543)
 Merged from 2.2:
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
  * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index cdd93a9..d2a0d86 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -125,7 +125,7 @@ class CqlRecordWriter extends RecordWriter<Map<String, ByteBuffer>, List<ByteBuf
             partitionKeyColumns = tableMetadata.getPartitionKey();
 
             String cqlQuery = CqlConfigHelper.getOutputCql(conf).trim();
-            if (cqlQuery.toLowerCase().startsWith("insert"))
+            if (cqlQuery.toLowerCase(Locale.ENGLISH).startsWith("insert"))
                 throw new UnsupportedOperationException("INSERT with CqlRecordWriter is not supported, please use UPDATE/DELETE statement");
             cql = appendKeyWhereClauses(cqlQuery);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375..a10a1d3 100644
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.schema;
 
 import java.text.DecimalFormat;
 import java.util.concurrent.TimeUnit;
+import java.util.Locale;
 
 import com.google.common.base.Objects;
 
@@ -88,7 +89,7 @@ public final class SpeculativeRetryParam
 
     public static SpeculativeRetryParam fromString(String value)
     {
-        if (value.toLowerCase().endsWith("ms"))
+        if (value.toLowerCase(Locale.ENGLISH).endsWith("ms"))
         {
             try
             {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftConversion.java b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 3443b6e..8dab090 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@ -194,7 +194,7 @@ public class ThriftConversion
     private static boolean isSuper(String thriftColumnType)
     throws org.apache.cassandra.exceptions.InvalidRequestException
     {
-        switch (thriftColumnType.toLowerCase())
+        switch (thriftColumnType.toLowerCase(Locale.ENGLISH))
         {
             case "standard": return false;
             case "super": return true;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
index 7dba97b..486e3f1 100644
--- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
+++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
+import java.util.Locale;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -499,7 +500,7 @@ public class CoalescingStrategies
                                                     String displayName)
     {
         String classname = null;
-        String strategyCleaned = strategy.trim().toUpperCase();
+        String strategyCleaned = strategy.trim().toUpperCase(Locale.ENGLISH);
         switch(strategyCleaned)
         {
         case "MOVINGAVERAGE":


[2/6] cassandra git commit: Explicitly set locale for string validation

Posted by jj...@apache.org.
Explicitly set locale for string validation

Patch by Amit Deshpande; Reviewed by Jeff Jirsa for CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b356409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b356409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b356409

Branch: refs/heads/trunk
Commit: 9b356409572298373558fe5cc0e249f63c0d3a93
Parents: 55568c1
Author: Amit Deshpande <Am...@capitalone.com>
Authored: Wed Oct 19 15:16:54 2016 -0500
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:41:38 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 3 ++-
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 2 +-
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 31e96b9..933ee61 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
  * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
  * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
  * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
+ * Explicitly set locale for string comparisons (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543)
 Merged from 2.2:
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
  * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index cdd93a9..d2a0d86 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -125,7 +125,7 @@ class CqlRecordWriter extends RecordWriter<Map<String, ByteBuffer>, List<ByteBuf
             partitionKeyColumns = tableMetadata.getPartitionKey();
 
             String cqlQuery = CqlConfigHelper.getOutputCql(conf).trim();
-            if (cqlQuery.toLowerCase().startsWith("insert"))
+            if (cqlQuery.toLowerCase(Locale.ENGLISH).startsWith("insert"))
                 throw new UnsupportedOperationException("INSERT with CqlRecordWriter is not supported, please use UPDATE/DELETE statement");
             cql = appendKeyWhereClauses(cqlQuery);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375..a10a1d3 100644
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.schema;
 
 import java.text.DecimalFormat;
 import java.util.concurrent.TimeUnit;
+import java.util.Locale;
 
 import com.google.common.base.Objects;
 
@@ -88,7 +89,7 @@ public final class SpeculativeRetryParam
 
     public static SpeculativeRetryParam fromString(String value)
     {
-        if (value.toLowerCase().endsWith("ms"))
+        if (value.toLowerCase(Locale.ENGLISH).endsWith("ms"))
         {
             try
             {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftConversion.java b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 3443b6e..8dab090 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@ -194,7 +194,7 @@ public class ThriftConversion
     private static boolean isSuper(String thriftColumnType)
     throws org.apache.cassandra.exceptions.InvalidRequestException
     {
-        switch (thriftColumnType.toLowerCase())
+        switch (thriftColumnType.toLowerCase(Locale.ENGLISH))
         {
             case "standard": return false;
             case "super": return true;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b356409/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
index 7dba97b..486e3f1 100644
--- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
+++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
+import java.util.Locale;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -499,7 +500,7 @@ public class CoalescingStrategies
                                                     String displayName)
     {
         String classname = null;
-        String strategyCleaned = strategy.trim().toUpperCase();
+        String strategyCleaned = strategy.trim().toUpperCase(Locale.ENGLISH);
         switch(strategyCleaned)
         {
         case "MOVINGAVERAGE":


[6/6] cassandra git commit: Explicitly set locale for string validation

Posted by jj...@apache.org.
Explicitly set locale for string validation

Patch by Amit Deshpande; Reviewed by Jeff Jirsa for CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9ca441b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9ca441b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9ca441b

Branch: refs/heads/cassandra-3.0
Commit: c9ca441bde92f7497e85eba2f69e2b70dc9bcf25
Parents: 55568c1
Author: Amit Deshpande <Am...@capitalone.com>
Authored: Wed Oct 19 15:16:54 2016 -0500
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:54:08 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 5 +++--
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 4 ++--
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ca441b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 31e96b9..749a3b0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
  * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
  * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
  * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
+ * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 Merged from 2.2:
  * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
  * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ca441b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index cdd93a9..d2a0d86 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -125,7 +125,7 @@ class CqlRecordWriter extends RecordWriter<Map<String, ByteBuffer>, List<ByteBuf
             partitionKeyColumns = tableMetadata.getPartitionKey();
 
             String cqlQuery = CqlConfigHelper.getOutputCql(conf).trim();
-            if (cqlQuery.toLowerCase().startsWith("insert"))
+            if (cqlQuery.toLowerCase(Locale.ENGLISH).startsWith("insert"))
                 throw new UnsupportedOperationException("INSERT with CqlRecordWriter is not supported, please use UPDATE/DELETE statement");
             cql = appendKeyWhereClauses(cqlQuery);
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ca441b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375..43447f0 100644
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.schema;
 
 import java.text.DecimalFormat;
 import java.util.concurrent.TimeUnit;
+import java.util.Locale;
 
 import com.google.common.base.Objects;
 
@@ -88,7 +89,7 @@ public final class SpeculativeRetryParam
 
     public static SpeculativeRetryParam fromString(String value)
     {
-        if (value.toLowerCase().endsWith("ms"))
+        if (value.toLowerCase(Locale.ENGLISH).endsWith("ms"))
         {
             try
             {
@@ -100,7 +101,7 @@ public final class SpeculativeRetryParam
             }
         }
 
-        if (value.toUpperCase().endsWith(Kind.PERCENTILE.toString()))
+        if (value.toUpperCase(Locale.ENGLISH).endsWith(Kind.PERCENTILE.toString()))
         {
             double threshold;
             try

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ca441b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftConversion.java b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 3443b6e..bccfd8a 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@ -194,7 +194,7 @@ public class ThriftConversion
     private static boolean isSuper(String thriftColumnType)
     throws org.apache.cassandra.exceptions.InvalidRequestException
     {
-        switch (thriftColumnType.toLowerCase())
+        switch (thriftColumnType.toLowerCase(Locale.ENGLISH))
         {
             case "standard": return false;
             case "super": return true;
@@ -676,7 +676,7 @@ public class ThriftConversion
 
     private static CachingParams cachingFromTrhfit(String caching)
     {
-        switch (caching.toUpperCase())
+        switch (caching.toUpperCase(Locale.ENGLISH))
         {
             case "ALL":
                 return CachingParams.CACHE_EVERYTHING;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ca441b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
index 7dba97b..486e3f1 100644
--- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
+++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
+import java.util.Locale;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -499,7 +500,7 @@ public class CoalescingStrategies
                                                     String displayName)
     {
         String classname = null;
-        String strategyCleaned = strategy.trim().toUpperCase();
+        String strategyCleaned = strategy.trim().toUpperCase(Locale.ENGLISH);
         switch(strategyCleaned)
         {
         case "MOVINGAVERAGE":


[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by jj...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6130d4b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6130d4b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6130d4b2

Branch: refs/heads/cassandra-3.X
Commit: 6130d4b2c5b62039745f3f05f99aae0c6c6bb714
Parents: 7886bd3 9b35640
Author: Jeff Jirsa <je...@crowdstrike.com>
Authored: Wed Oct 19 20:43:26 2016 -0700
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:50:54 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 5 +++--
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 4 ++--
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6130d4b2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30caf4f,933ee61..cdb2d1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,22 -17,10 +105,23 @@@ Merged from 3.0
   * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
   * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060)
   * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
 - * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor LegacyLayout.decodeBound (CASSANDRA-12423)
 + * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190)
   * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
 - * Explicitly set locale for string comparisons (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543)
++ * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
   * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6130d4b2/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375,a10a1d3..43447f0
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@@ -100,7 -101,7 +101,7 @@@ public final class SpeculativeRetryPara
              }
          }
  
--        if (value.toUpperCase().endsWith(Kind.PERCENTILE.toString()))
++        if (value.toUpperCase(Locale.ENGLISH).endsWith(Kind.PERCENTILE.toString()))
          {
              double threshold;
              try

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6130d4b2/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 35adddf,8dab090..0c5c4be
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@@ -675,7 -676,7 +675,7 @@@ public class ThriftConversio
  
      private static CachingParams cachingFromTrhfit(String caching)
      {
--        switch (caching.toUpperCase())
++        switch (caching.toUpperCase(Locale.ENGLISH))
          {
              case "ALL":
                  return CachingParams.CACHE_EVERYTHING;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6130d4b2/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------


[3/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by jj...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/085564e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/085564e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/085564e5

Branch: refs/heads/trunk
Commit: 085564e5c777e1a6f6e903d2890f24c6c9b7d6a3
Parents: 7886bd3 9b35640
Author: Jeff Jirsa <je...@crowdstrike.com>
Authored: Wed Oct 19 20:43:26 2016 -0700
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:44:38 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 3 ++-
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 2 +-
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/085564e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30caf4f,933ee61..cdb2d1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,22 -17,10 +105,23 @@@ Merged from 3.0
   * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
   * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060)
   * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
 - * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor LegacyLayout.decodeBound (CASSANDRA-12423)
 + * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190)
   * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
 - * Explicitly set locale for string comparisons (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543)
++ * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
   * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
   * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/085564e5/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/085564e5/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------


[5/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

Posted by jj...@apache.org.
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6e82a79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6e82a79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6e82a79

Branch: refs/heads/trunk
Commit: e6e82a79a98951041b94df915b3d09a89d189720
Parents: 2d559fd 085564e
Author: Jeff Jirsa <je...@crowdstrike.com>
Authored: Wed Oct 19 20:44:48 2016 -0700
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Wed Oct 19 20:51:29 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java  | 2 +-
 src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java | 5 +++--
 src/java/org/apache/cassandra/thrift/ThriftConversion.java      | 4 ++--
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java   | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6e82a79/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6e82a79/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
index 58c6375,a10a1d3..43447f0
--- a/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
+++ b/src/java/org/apache/cassandra/schema/SpeculativeRetryParam.java
@@@ -100,7 -101,7 +101,7 @@@ public final class SpeculativeRetryPara
              }
          }
  
--        if (value.toUpperCase().endsWith(Kind.PERCENTILE.toString()))
++        if (value.toUpperCase(Locale.ENGLISH).endsWith(Kind.PERCENTILE.toString()))
          {
              double threshold;
              try

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6e82a79/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/ThriftConversion.java
index 35adddf,55a28ee..0c5c4be
--- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java
@@@ -675,7 -675,7 +675,7 @@@ public class ThriftConversio
  
      private static CachingParams cachingFromTrhfit(String caching)
      {
--        switch (caching.toUpperCase())
++        switch (caching.toUpperCase(Locale.ENGLISH))
          {
              case "ALL":
                  return CachingParams.CACHE_EVERYTHING;