This is an automated email from the ASF dual-hosted git repository.
konstantinov pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from df24dacc0c Merge branch 'cassandra-5.0' into trunk
add ae82efc013 Add LittleEndianMemoryUtil and NativeEndianMemoryUtil,
switch memtable-related off-heap objects and Memory to use them and have Little
Endian now. Add BE offsets detection on Summary loading. Add test SSTables in
an old format with BE offsets in Summary component to LegacySSTableTest.
new a93f0819e3 Merge branch 'cassandra-5.0' into trunk
The 1 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 +
.../org/apache/cassandra/db/NativeClustering.java | 25 +--
.../apache/cassandra/db/NativeDecoratedKey.java | 9 +-
.../org/apache/cassandra/db/rows/NativeCell.java | 33 ++--
.../io/sstable/indexsummary/IndexSummary.java | 12 ++
src/java/org/apache/cassandra/io/util/Memory.java | 144 ++------------
.../utils/memory/LittleEndianMemoryUtil.java | 146 ++++++++++++++
.../apache/cassandra/utils/memory/MemoryUtil.java | 173 +----------------
.../utils/memory/NativeEndianMemoryUtil.java | 214 +++++++++++++++++++++
.../da-500-bti-CompressionInfo.db | Bin 0 -> 207 bytes
.../da-500-bti-Data.db | Bin 0 -> 8602 bytes
.../da-500-bti-Digest.crc32 | 1 +
.../da-500-bti-Filter.db | Bin
.../da-500-bti-Partitions.db | Bin
.../da-500-bti-Rows.db | Bin 0 -> 508 bytes
.../da-500-bti-Statistics.db | Bin 7312 -> 7312 bytes
.../da-500-bti-TOC.txt | 0
.../ma-306-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../ma-306-big-Data.db | Bin 0 -> 5221 bytes
.../ma-306-big-Digest.crc32 | 1 +
.../ma-306-big-Filter.db | Bin
.../ma-306-big-Index.db} | Bin 157553 -> 157553 bytes
.../ma-306-big-Statistics.db | Bin 7046 -> 7046 bytes
.../ma-306-big-Summary.db | Bin 0 -> 47 bytes
.../ma-306-big-TOC.txt | 10 +-
.../mb-307-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../mb-307-big-Data.db | Bin 0 -> 5232 bytes
.../mb-307-big-Digest.crc32 | 1 +
.../mb-307-big-Filter.db | Bin
.../mb-307-big-Index.db} | Bin 157553 -> 157553 bytes
.../mb-307-big-Statistics.db | Bin 7058 -> 7058 bytes
.../mb-307-big-Summary.db | Bin 0 -> 47 bytes
.../mb-307-big-TOC.txt | 10 +-
.../mc-3113-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../mc-3113-big-Data.db | Bin 0 -> 5215 bytes
.../mc-3113-big-Digest.crc32 | 1 +
.../mc-3113-big-Filter.db | Bin
.../mc-3113-big-Index.db} | Bin 157553 -> 157553 bytes
.../mc-3113-big-Statistics.db} | Bin 7095 -> 7070 bytes
.../mc-3113-big-Summary.db | Bin 0 -> 47 bytes
.../mc-3113-big-TOC.txt | 8 +-
.../md-31110-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../md-31110-big-Data.db | Bin 0 -> 5206 bytes
.../md-31110-big-Digest.crc32 | 1 +
.../md-31110-big-Filter.db | Bin
.../md-31110-big-Index.db} | Bin 157553 -> 157553 bytes
.../md-31110-big-Statistics.db | Bin 7134 -> 7134 bytes
.../md-31110-big-Summary.db | Bin 0 -> 47 bytes
.../md-31110-big-TOC.txt | 8 +-
.../me-31111-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../me-31111-big-Data.db | Bin 0 -> 5207 bytes
.../me-31111-big-Digest.crc32 | 1 +
.../me-31111-big-Filter.db | Bin
.../me-31111-big-Index.db} | Bin 157553 -> 157553 bytes
.../me-31111-big-Statistics.db | Bin 7151 -> 7151 bytes
.../me-31111-big-Summary.db | Bin 0 -> 47 bytes
.../me-31111-big-TOC.txt | 10 +-
.../na-40-big-CompressionInfo.db | Bin 0 -> 207 bytes
.../na-40-big-Data.db | Bin 0 -> 8587 bytes
.../na-40-big-Digest.crc32 | 1 +
.../na-40-big-Filter.db} | Bin
.../na-40-big-Index.db} | Bin
.../na-40-big-Statistics.db} | Bin 7177 -> 7160 bytes
.../na-40-big-Summary.db | Bin 0 -> 47 bytes
.../na-40-big-TOC.txt} | 8 +-
.../nb-400-big-CompressionInfo.db | Bin 0 -> 207 bytes
.../nb-400-big-Data.db | Bin 0 -> 8620 bytes
.../nb-400-big-Digest.crc32 | 1 +
.../nb-400-big-Filter.db | Bin
.../nb-400-big-Index.db | Bin 157553 -> 157553 bytes
.../nb-400-big-Statistics.db | Bin 7177 -> 7177 bytes
.../nb-400-big-Summary.db | Bin 0 -> 47 bytes
.../nb-400-big-TOC.txt | 10 +-
.../oa-500-big-CompressionInfo.db | Bin 0 -> 207 bytes
.../oa-500-big-Data.db | Bin 0 -> 8513 bytes
.../oa-500-big-Digest.crc32 | 1 +
.../oa-500-big-Filter.db | Bin
.../oa-500-big-Index.db | Bin 157498 -> 157498 bytes
.../oa-500-big-Statistics.db | Bin 7312 -> 7312 bytes
.../oa-500-big-Summary.db | Bin 0 -> 47 bytes
.../oa-500-big-TOC.txt | 0
.../db/compaction/CompactionsCQLTest.java | 2 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 79 +++++---
.../utils/memory/LittleEndianMemoryUtilTest.java | 148 ++++++++++++++
.../utils/memory/NativeEndianMemoryUtilTest.java | 148 ++++++++++++++
85 files changed, 812 insertions(+), 395 deletions(-)
create mode 100644
src/java/org/apache/cassandra/utils/memory/LittleEndianMemoryUtil.java
create mode 100644
src/java/org/apache/cassandra/utils/memory/NativeEndianMemoryUtil.java
create mode 100644
test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_be_index_summary/da-500-bti-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_be_index_summary/da-500-bti-Data.db
create mode 100644
test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_be_index_summary/da-500-bti-Digest.crc32
copy test/data/legacy-sstables/da/legacy_tables/{legacy_da_clust =>
legacy_da_clust_be_index_summary}/da-500-bti-Filter.db (100%)
copy test/data/legacy-sstables/da/legacy_tables/{legacy_da_clust =>
legacy_da_clust_be_index_summary}/da-500-bti-Partitions.db (100%)
create mode 100644
test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_be_index_summary/da-500-bti-Rows.db
copy test/data/legacy-sstables/da/legacy_tables/{legacy_da_clust =>
legacy_da_clust_be_index_summary}/da-500-bti-Statistics.db (95%)
copy test/data/legacy-sstables/da/legacy_tables/{legacy_da_clust =>
legacy_da_clust_be_index_summary}/da-500-bti-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_be_index_summary/ma-306-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_be_index_summary/ma-306-big-Data.db
create mode 100644
test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_be_index_summary/ma-306-big-Digest.crc32
copy test/data/legacy-sstables/ma/legacy_tables/{legacy_ma_clust =>
legacy_ma_clust_be_index_summary}/ma-306-big-Filter.db (100%)
copy
test/data/legacy-sstables/{me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
=> ma/legacy_tables/legacy_ma_clust_be_index_summary/ma-306-big-Index.db} (99%)
copy test/data/legacy-sstables/ma/legacy_tables/{legacy_ma_clust_compact =>
legacy_ma_clust_be_index_summary}/ma-306-big-Statistics.db (97%)
create mode 100644
test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_be_index_summary/ma-306-big-Summary.db
copy test/data/legacy-sstables/ma/legacy_tables/{legacy_ma_clust_counter =>
legacy_ma_clust_be_index_summary}/ma-306-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_be_index_summary/mb-307-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_be_index_summary/mb-307-big-Data.db
create mode 100644
test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_be_index_summary/mb-307-big-Digest.crc32
copy test/data/legacy-sstables/mb/legacy_tables/{legacy_mb_clust =>
legacy_mb_clust_be_index_summary}/mb-307-big-Filter.db (100%)
copy
test/data/legacy-sstables/{me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
=> mb/legacy_tables/legacy_mb_clust_be_index_summary/mb-307-big-Index.db} (99%)
copy test/data/legacy-sstables/mb/legacy_tables/{legacy_mb_clust_compact =>
legacy_mb_clust_be_index_summary}/mb-307-big-Statistics.db (96%)
create mode 100644
test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_be_index_summary/mb-307-big-Summary.db
copy test/data/legacy-sstables/mb/legacy_tables/{legacy_mb_clust =>
legacy_mb_clust_be_index_summary}/mb-307-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-Data.db
create mode 100644
test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-Digest.crc32
copy test/data/legacy-sstables/mc/legacy_tables/{legacy_mc_clust =>
legacy_mc_clust_be_index_summary}/mc-3113-big-Filter.db (100%)
copy
test/data/legacy-sstables/{me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
=> mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-Index.db}
(99%)
copy
test/data/legacy-sstables/{na/legacy_tables/legacy_na_clust_compact/na-400-big-Statistics.db
=>
mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-Statistics.db}
(90%)
create mode 100644
test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_be_index_summary/mc-3113-big-Summary.db
copy test/data/legacy-sstables/mc/legacy_tables/{legacy_mc_clust =>
legacy_mc_clust_be_index_summary}/mc-3113-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_be_index_summary/md-31110-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_be_index_summary/md-31110-big-Data.db
create mode 100644
test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_be_index_summary/md-31110-big-Digest.crc32
copy test/data/legacy-sstables/md/legacy_tables/{legacy_md_clust =>
legacy_md_clust_be_index_summary}/md-31110-big-Filter.db (100%)
copy
test/data/legacy-sstables/{me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
=> md/legacy_tables/legacy_md_clust_be_index_summary/md-31110-big-Index.db}
(99%)
copy test/data/legacy-sstables/md/legacy_tables/{legacy_md_clust =>
legacy_md_clust_be_index_summary}/md-31110-big-Statistics.db (95%)
create mode 100644
test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_be_index_summary/md-31110-big-Summary.db
copy test/data/legacy-sstables/md/legacy_tables/{legacy_md_clust =>
legacy_md_clust_be_index_summary}/md-31110-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_be_index_summary/me-31111-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_be_index_summary/me-31111-big-Data.db
create mode 100644
test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_be_index_summary/me-31111-big-Digest.crc32
copy test/data/legacy-sstables/me/legacy_tables/{legacy_me_clust =>
legacy_me_clust_be_index_summary}/me-31111-big-Filter.db (100%)
copy
test/data/legacy-sstables/{na/legacy_tables/legacy_na_clust_compact/na-400-big-Index.db
=> me/legacy_tables/legacy_me_clust_be_index_summary/me-31111-big-Index.db}
(99%)
copy test/data/legacy-sstables/me/legacy_tables/{legacy_me_clust =>
legacy_me_clust_be_index_summary}/me-31111-big-Statistics.db (95%)
create mode 100644
test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_be_index_summary/me-31111-big-Summary.db
copy test/data/legacy-sstables/me/legacy_tables/{legacy_me_clust =>
legacy_me_clust_be_index_summary}/me-31111-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Data.db
create mode 100644
test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Digest.crc32
copy
test/data/legacy-sstables/{da/legacy_tables/legacy_da_clust/da-500-bti-Filter.db
=> na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Filter.db}
(100%)
copy
test/data/legacy-sstables/{md/legacy_tables/legacy_md_clust_compact/md-31110-big-Index.db
=> na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Index.db} (100%)
copy
test/data/legacy-sstables/{nb/legacy_tables/legacy_nb_clust/nb-400-big-Statistics.db
=> na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Statistics.db}
(93%)
create mode 100644
test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-Summary.db
copy
test/data/legacy-sstables/{ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-TOC.txt
=> na/legacy_tables/legacy_na_clust_be_index_summary/na-40-big-TOC.txt} (100%)
create mode 100644
test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_be_index_summary/nb-400-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_be_index_summary/nb-400-big-Data.db
create mode 100644
test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_be_index_summary/nb-400-big-Digest.crc32
copy test/data/legacy-sstables/nb/legacy_tables/{legacy_nb_clust =>
legacy_nb_clust_be_index_summary}/nb-400-big-Filter.db (100%)
copy test/data/legacy-sstables/nb/legacy_tables/{legacy_nb_clust =>
legacy_nb_clust_be_index_summary}/nb-400-big-Index.db (99%)
copy test/data/legacy-sstables/nb/legacy_tables/{legacy_nb_clust =>
legacy_nb_clust_be_index_summary}/nb-400-big-Statistics.db (95%)
create mode 100644
test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_be_index_summary/nb-400-big-Summary.db
copy test/data/legacy-sstables/nb/legacy_tables/{legacy_nb_clust =>
legacy_nb_clust_be_index_summary}/nb-400-big-TOC.txt (100%)
create mode 100644
test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_be_index_summary/oa-500-big-CompressionInfo.db
create mode 100644
test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_be_index_summary/oa-500-big-Data.db
create mode 100644
test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_be_index_summary/oa-500-big-Digest.crc32
copy test/data/legacy-sstables/oa/legacy_tables/{legacy_oa_clust =>
legacy_oa_clust_be_index_summary}/oa-500-big-Filter.db (100%)
copy test/data/legacy-sstables/oa/legacy_tables/{legacy_oa_clust =>
legacy_oa_clust_be_index_summary}/oa-500-big-Index.db (99%)
copy test/data/legacy-sstables/oa/legacy_tables/{legacy_oa_clust =>
legacy_oa_clust_be_index_summary}/oa-500-big-Statistics.db (95%)
create mode 100644
test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_be_index_summary/oa-500-big-Summary.db
copy test/data/legacy-sstables/oa/legacy_tables/{legacy_oa_clust =>
legacy_oa_clust_be_index_summary}/oa-500-big-TOC.txt (100%)
create mode 100644
test/unit/org/apache/cassandra/utils/memory/LittleEndianMemoryUtilTest.java
create mode 100644
test/unit/org/apache/cassandra/utils/memory/NativeEndianMemoryUtilTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
