cassandra git commit: Add a virtual table to expose all running sstable tasks [Forced Update!]
Repository: cassandra
Updated Branches:
refs/heads/trunk 2a2ee0063 -> 4413fdbd3 (forced update)
Add a virtual table to expose all running sstable tasks
patch by Chris Lohfink; reviewed by Aleksey Yeschenko for
CASSANDRA-14457
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4413fdbd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4413fdbd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4413fdbd
Branch: refs/heads/trunk
Commit: 4413fdbd3e9350c5f5dac5ef4dc517fd9b5064ad
Parents: 0f79427
Author: Chris Lohfink
Authored: Sat May 19 01:27:28 2018 -0500
Committer: Aleksey Yeshchenko
Committed: Tue Jun 5 15:36:59 2018 +0100
--
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionInfo.java | 51 +--
.../db/compaction/CompactionManager.java| 13 +++-
.../cassandra/db/virtual/SSTableTasksTable.java | 69
.../db/virtual/SystemViewsKeyspace.java | 2 +-
.../tools/nodetool/CompactionStats.java | 14 ++--
6 files changed, 121 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4413fdbd/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 86842d0..351ae37 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
* Let nodetool import take a list of directories (CASSANDRA-14442)
* Avoid unneeded memory allocations / cpu for disabled log levels
(CASSANDRA-14488)
* Implement virtual keyspace interface (CASSANDRA-7622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4413fdbd/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index ccdfeb4..99df259 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.UUID;
import org.apache.cassandra.schema.TableMetadata;
@@ -28,6 +29,16 @@ import org.apache.cassandra.schema.TableMetadata;
public final class CompactionInfo implements Serializable
{
private static final long serialVersionUID = 3695381572726744816L;
+
+public static final String ID = "id";
+public static final String KEYSPACE = "keyspace";
+public static final String COLUMNFAMILY = "columnfamily";
+public static final String COMPLETED = "completed";
+public static final String TOTAL = "total";
+public static final String TASK_TYPE = "taskType";
+public static final String UNIT = "unit";
+public static final String COMPACTION_ID = "compactionId";
+
private final TableMetadata metadata;
private final OperationType tasktype;
private final long completed;
@@ -84,19 +95,14 @@ public final class CompactionInfo implements Serializable
return new CompactionInfo(metadata, tasktype, complete, total, unit,
compactionId);
}
-public UUID getId()
-{
-return metadata != null ? metadata.id.asUUID() : null;
-}
-
-public String getKeyspace()
+public Optional getKeyspace()
{
-return metadata != null ? metadata.keyspace : null;
+return Optional.ofNullable(metadata != null ? metadata.keyspace :
null);
}
-public String getColumnFamily()
+public Optional getTable()
{
-return metadata != null ? metadata.name : null;
+return Optional.ofNullable(metadata != null ? metadata.name : null);
}
public TableMetadata getTableMetadata()
@@ -119,19 +125,24 @@ public final class CompactionInfo implements Serializable
return tasktype;
}
-public UUID compactionId()
+public UUID getTaskId()
{
return compactionId;
}
+public Unit getUnit()
+{
+return unit;
+}
+
public String toString()
{
StringBuilder buff = new StringBuilder();
buff.append(getTaskType());
if (metadata != null)
{
-buff.append('@').append(getId()).append('(');
-buff.append(getKeyspace()).append(",
").append(getColumnFamily()).append(", ");
+buff.append('@').append(metadata.id).append('(');
+buff.append(metadata.keyspace).append(",
").append(metadata.name).append(", ");
}
else
{
@@ -144,14 +155,14 @@
cassandra git commit: Add a virtual table to expose all running sstable tasks [Forced Update!]
Repository: cassandra
Updated Branches:
refs/heads/trunk 899f7c419 -> 2a2ee0063 (forced update)
Add a virtual table to expose all running sstable tasks
patch by Chris Lohfink; reviewed by Aleksey Yeschenko for
CASSANDRA-14457
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a2ee006
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a2ee006
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a2ee006
Branch: refs/heads/trunk
Commit: 2a2ee006302a086ff054eac52161209a3118bb7c
Parents: 0f79427
Author: Chris Lohfink
Authored: Sat May 19 01:27:28 2018 -0500
Committer: Aleksey Yeshchenko
Committed: Tue Jun 5 15:22:34 2018 +0100
--
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionInfo.java | 51 +--
.../db/compaction/CompactionManager.java| 13 +++-
.../cassandra/db/virtual/SSTableTasksTable.java | 69
.../db/virtual/SystemViewsKeyspace.java | 2 +-
.../tools/nodetool/CompactionStats.java | 14 ++--
6 files changed, 121 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a2ee006/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 86842d0..351ae37 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
* Let nodetool import take a list of directories (CASSANDRA-14442)
* Avoid unneeded memory allocations / cpu for disabled log levels
(CASSANDRA-14488)
* Implement virtual keyspace interface (CASSANDRA-7622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a2ee006/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index ccdfeb4..99df259 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.UUID;
import org.apache.cassandra.schema.TableMetadata;
@@ -28,6 +29,16 @@ import org.apache.cassandra.schema.TableMetadata;
public final class CompactionInfo implements Serializable
{
private static final long serialVersionUID = 3695381572726744816L;
+
+public static final String ID = "id";
+public static final String KEYSPACE = "keyspace";
+public static final String COLUMNFAMILY = "columnfamily";
+public static final String COMPLETED = "completed";
+public static final String TOTAL = "total";
+public static final String TASK_TYPE = "taskType";
+public static final String UNIT = "unit";
+public static final String COMPACTION_ID = "compactionId";
+
private final TableMetadata metadata;
private final OperationType tasktype;
private final long completed;
@@ -84,19 +95,14 @@ public final class CompactionInfo implements Serializable
return new CompactionInfo(metadata, tasktype, complete, total, unit,
compactionId);
}
-public UUID getId()
-{
-return metadata != null ? metadata.id.asUUID() : null;
-}
-
-public String getKeyspace()
+public Optional getKeyspace()
{
-return metadata != null ? metadata.keyspace : null;
+return Optional.ofNullable(metadata != null ? metadata.keyspace :
null);
}
-public String getColumnFamily()
+public Optional getTable()
{
-return metadata != null ? metadata.name : null;
+return Optional.ofNullable(metadata != null ? metadata.name : null);
}
public TableMetadata getTableMetadata()
@@ -119,19 +125,24 @@ public final class CompactionInfo implements Serializable
return tasktype;
}
-public UUID compactionId()
+public UUID getTaskId()
{
return compactionId;
}
+public Unit getUnit()
+{
+return unit;
+}
+
public String toString()
{
StringBuilder buff = new StringBuilder();
buff.append(getTaskType());
if (metadata != null)
{
-buff.append('@').append(getId()).append('(');
-buff.append(getKeyspace()).append(",
").append(getColumnFamily()).append(", ");
+buff.append('@').append(metadata.id).append('(');
+buff.append(metadata.keyspace).append(",
").append(metadata.name).append(", ");
}
else
{
@@ -144,14 +155,14 @@
