Skip to content

Commit 06f7f5e

Browse files
Merge branch 'cassandra-5.0' into trunk
2 parents e57fdf1 + c5d6a36 commit 06f7f5e

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
5.1
2+
* Expose StorageService.dropPreparedStatements via JMX (CASSANDRA-20870)
23
* Expose Metric for Prepared Statement Cache Size (in bytes) (CASSANDRA-20864)
34
* Add support for BEGIN TRANSACTION to allow mutations that touch multiple partitions (CASSANDRA-20857)
45
* AutoRepair: Safeguard Full repair against disk protection(CASSANDRA-20045)

src/java/org/apache/cassandra/service/StorageService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2756,6 +2756,12 @@ public List<Pair<String, String>> getPreparedStatements()
27562756
return statements;
27572757
}
27582758

2759+
@Override
2760+
public void dropPreparedStatements(boolean memoryOnly)
2761+
{
2762+
QueryProcessor.instance.clearPreparedStatements(memoryOnly);
2763+
}
2764+
27592765
public void forceKeyspaceCompaction(boolean splitOutput, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
27602766
{
27612767
for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false, keyspaceName, tableNames))

src/java/org/apache/cassandra/service/StorageServiceMBean.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,9 @@ public void enableAuditLog(String loggerName, String includedKeyspaces, String e
13751375
void setPaxosRepairRaceWait(boolean paxosRepairCoordinatorWait);
13761376

13771377
boolean getPaxosRepairRaceWait();
1378+
1379+
public void dropPreparedStatements(boolean memoryOnly);
1380+
13781381
// Comma delimited list of "nodeId=dc:rack" or "endpoint=dc:rack"
13791382
void alterTopology(String updates);
13801383
/** Gets the names of all tables for the given keyspace */

0 commit comments

Comments
 (0)