release: prepare for 3.1.4

Cassandra 3.0 version of the JMX added a parameter that allows accepting
the parameter as hex.

This breaks the current implementation with a NoSuchMethodException.

This patch adds the missing implementation.

For a full support, a follow up patch in Scylla is needed, but for the
current functionality it would work.

After this patch usage example:

nodetool getsstables keyspace1 standard1 39303138374b4d343830

Fixes #78

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
(cherry picked from commit ff0723abc6)

SCYLLA-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PRODUCT=scylla
-VERSION=666.development
+VERSION=3.1.4
 
 if test -f version
 then

src/main/java/com/scylladb/jmx/api/APIClient.java

@@ -152,7 +152,11 @@ public class APIClient {
             get(path, queryParams).delete();
             return;
         }
-        get(path).delete();
+        Response response = get(path).delete();
+        if (response.getStatus() != Response.Status.OK.getStatusCode()) {
+            throw getException("Scylla API server HTTP delete to URL '" + path + "' failed",
+                    response.readEntity(String.class));
+        }
     }
 
     public void delete(String path) {

src/main/java/com/scylladb/jmx/utils/APIMBeanServer.java

@@ -36,6 +36,7 @@ import org.apache.cassandra.metrics.StreamingMetrics;
 import com.scylladb.jmx.api.APIClient;
 import com.sun.jmx.mbeanserver.JmxMBeanServer;
 
+@SuppressWarnings("restriction")
 public class APIMBeanServer implements MBeanServer {
     @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(APIMBeanServer.class.getName());
@@ -284,7 +285,7 @@ public class APIMBeanServer implements MBeanServer {
         return server.getClassLoaderRepository();
     }
 
-    static final Pattern tables = Pattern.compile("^(ColumnFamil(ies|y)|(Index)?Tables?)$");
+    static final Pattern tables = Pattern.compile("^\\*?((Index)?ColumnFamil(ies|y)|(Index)?(Table(s)?)?)$");
 
     private boolean checkRegistrations(ObjectName name) {
         if (name != null && server.isRegistered(name)) {

src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java

@@ -136,7 +136,7 @@ public class ColumnFamilyStore extends MetricsMBean implements ColumnFamilyStore
             }
         } catch (InterruptedException | ExecutionException e) {
             futureTableSamperResult = null;
-            throw new RuntimeException("Failed getting table statistics");
+            throw new RuntimeException("Failed getting table statistics", e);
         }
     }
 
@@ -368,6 +368,23 @@ public class ColumnFamilyStore extends MetricsMBean implements ColumnFamilyStore
         return client.getListStrValue("column_family/sstables/by_key/" + getCFName(), queryParams);
     }
 
+    /**
+     * Returns a list of filenames that contain the given key on this node
+     * @param key
+     * @param hexFormat if key is in hex string format
+     * @return list of filenames containing the key
+     */
+    @Override
+    public List<String> getSSTablesForKey(String key, boolean hexFormat)
+    {
+        log(" getSSTablesForKey(String key)");
+        MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
+        queryParams.add("key", key);
+        if (hexFormat) {
+            queryParams.add("format", "hex");
+        }
+        return client.getListStrValue("column_family/sstables/by_key/" + getCFName(), queryParams);
+    }
     /**
      * Scan through Keyspace/ColumnFamily's data directory determine which
      * SSTables should be loaded and load them
@@ -519,8 +536,8 @@ public class ColumnFamilyStore extends MetricsMBean implements ColumnFamilyStore
         JsonArray counters = tableSamplerResult.getJsonArray((samplerType.equalsIgnoreCase("reads")) ? "read" : "write");
         long size = 0;
         if (counters != null) {
-            size = counters.size();
-            for (int i = 0; i < counters.size(); i++) {
+            size = (count > counters.size()) ? counters.size() : count;
+            for (int i = 0; i < size; i++) {
                 JsonObject counter = counters.getJsonObject(i);
                 result.put(new CompositeDataSupport(COUNTER_COMPOSITE_TYPE, COUNTER_NAMES,
                         new Object[] { counter.getString("partition"), // raw

src/main/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java

@@ -141,6 +141,14 @@ public interface ColumnFamilyStoreMBean {
      */
     public List<String> getSSTablesForKey(String key);
 
+    /**
+     * Returns a list of filenames that contain the given key on this node
+     * @param key
+     * @param hexFormat if key is in hex string format
+     * @return list of filenames containing the key
+     */
+    public List<String> getSSTablesForKey(String key, boolean hexFormat);
+
     /**
      * Scan through Keyspace/ColumnFamily's data directory determine which
      * SSTables should be loaded and load them