You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/07/29 11:13:53 UTC
[cassandra] branch cassandra-4.0 updated (7e2a965 -> bc51c57)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 7e2a965 Merge branch 'cassandra-3.11' into cassandra-4.0
new 69b653a Remove mutation data from error log message
new 01add65 Merge branch 'cassandra-3.0' into cassandra-3.11
new bc51c57 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bc51c57b0d63e3ad136cdede7c1b335224ae66c5
Merge: 7e2a965 01add65
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Thu Jul 29 12:06:17 2021 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 3facd42,c3a8ada..70f169d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,7 -8,15 +9,8 @@@ Merged from 3.11
* Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
* Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
* Read only the required SSTables for single partition queries (CASSANDRA-16737)
- * Fix LeveledCompactionStrategy compacts last level throw an ArrayIndexOutOfBoundsException (CASSANDRA-15669)
- * Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing nodetool (CASSANDRA-16199)
- * Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634)
- * Ignore stale acks received in the shadow round (CASSANDRA-16588)
- * Add autocomplete and error messages for provide_overlapping_tombstones (CASSANDRA-16350)
- * Add StorageServiceMBean.getKeyspaceReplicationInfo(keyspaceName) (CASSANDRA-16447)
- * Make sure sstables with moved starts are removed correctly in LeveledGenerations (CASSANDRA-16552)
- * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
Merged from 3.0:
++ * Remove mutation data from error log message (CASSANDRA-16817)
* Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-16557)
* Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, removing lib/ directory from version control (CASSANDRA-16557)
* Don't allow seeds to replace without using unsafe (CASSANDRA-14463)
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 72801a9,9c74040..2f6ad38
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -999,7 -915,8 +999,8 @@@ public class StorageProxy implements St
}
catch (Exception exc)
{
- logger.error("Error applying local view update to keyspace {}: {}", mutation.getKeyspaceName(), mutation);
+ logger.error("Error applying local view update: Mutation (keyspace {}, tables {}, partition key {})",
- mutation.getKeyspaceName(), mutation.getColumnFamilyIds(), mutation.key());
++ mutation.getKeyspaceName(), mutation.getTableIds(), mutation.key());
throw exc;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org