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/08/24 17:17:07 UTC
[cassandra] branch cassandra-3.11 updated (c562f1e -> 0c38f9d)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from c562f1e validate SASI tokenizer options before adding index to schema
new c76ff1b Fix secondary indexes on primary key columns skipping some writes
new 0c38f9d Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 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 +
.../cassandra/index/internal/CassandraIndex.java | 5 +-
.../validation/entities/SecondaryIndexTest.java | 141 ++++++++++++++++++++-
3 files changed, 139 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
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.0' into cassandra-3.11
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0c38f9dfb8d66d2de2cbde2aadbd03105f411a0d
Merge: c562f1e c76ff1b
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Aug 24 18:06:04 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../cassandra/index/internal/CassandraIndex.java | 5 +-
.../validation/entities/SecondaryIndexTest.java | 141 ++++++++++++++++++++-
3 files changed, 139 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index 2f3543f,9089836..9b6a6dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
-3.0.26:
+3.11.12
+ * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
+ * Fix ant-junit dependency issue (CASSANDRA-16827)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
+ * Avoid sending CDC column if not enabled (CASSANDRA-16770)
+Merged from 3.0:
+ * Fix secondary indexes on primary key columns skipping some writes (CASSANDRA-16868)
* Fix incorrect error message in LegacyLayout (CASSANDRA-15136)
* Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
* Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
diff --cc src/java/org/apache/cassandra/index/internal/CassandraIndex.java
index e23882f,de3a974..27b60e5
--- a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
+++ b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
@@@ -505,13 -514,10 +505,10 @@@ public abstract class CassandraIndex im
if (cell.isLive(nowInSec))
{
if (cellTimestamp > timestamp)
- {
timestamp = cellTimestamp;
- ttl = cell.ttl();
- }
}
}
- return LivenessInfo.create(baseCfs.metadata, timestamp, ttl, nowInSec);
+ return LivenessInfo.create(timestamp, ttl, nowInSec);
}
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org