Skip to content

Commit 2275cd8

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@31cb6c5
[Dev] Remove the `CompressionValidity::NO_VALIDITY_REQUIRED` from `Dictionary` (duckdb/duckdb#15636)
1 parent f817e40 commit 2275cd8

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

src/duckdb/src/function/table/version/pragma_version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "4-dev4486"
2+
#define DUCKDB_PATCH_VERSION "4-dev4489"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 1
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.1.4-dev4486"
11+
#define DUCKDB_VERSION "v1.1.4-dev4489"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "ea53cb71c7"
14+
#define DUCKDB_SOURCE_ID "31cb6c5582"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/storage/compression/dictionary/decompression.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,15 @@ void CompressedStringScanState::Initialize(ColumnSegment &segment, bool initiali
4343
block_size = segment.GetBlockManager().GetBlockSize();
4444

4545
dict = DictionaryCompression::GetDictionary(segment, *handle);
46+
dictionary = make_buffer<Vector>(segment.type, index_buffer_count);
47+
dictionary_size = index_buffer_count;
4648

4749
if (!initialize_dictionary) {
4850
// Used by fetch, as fetch will never produce a DictionaryVector
4951
return;
5052
}
5153

52-
dictionary = make_buffer<Vector>(segment.type, index_buffer_count);
53-
dictionary_size = index_buffer_count;
5454
auto dict_child_data = FlatVector::GetData<string_t>(*(dictionary));
55-
auto &validity = FlatVector::Validity(*dictionary);
56-
D_ASSERT(index_buffer_count >= 1);
57-
validity.SetInvalid(0);
5855
for (uint32_t i = 0; i < index_buffer_count; i++) {
5956
// NOTE: the passing of dict_child_vector, will not be used, its for big strings
6057
uint16_t str_len = GetStringLength(i);
@@ -64,7 +61,6 @@ void CompressedStringScanState::Initialize(ColumnSegment &segment, bool initiali
6461

6562
void CompressedStringScanState::ScanToFlatVector(Vector &result, idx_t result_offset, idx_t start, idx_t scan_count) {
6663
auto result_data = FlatVector::GetData<string_t>(result);
67-
auto &validity = FlatVector::Validity(result);
6864

6965
// Handling non-bitpacking-group-aligned start values;
7066
idx_t start_offset = start % BitpackingPrimitives::BITPACKING_ALGORITHM_GROUP_SIZE;
@@ -86,9 +82,6 @@ void CompressedStringScanState::ScanToFlatVector(Vector &result, idx_t result_of
8682
for (idx_t i = 0; i < scan_count; i++) {
8783
// Lookup dict offset in index buffer
8884
auto string_number = sel_vec->get_index(i + start_offset);
89-
if (string_number == 0) {
90-
validity.SetInvalid(result_offset + i);
91-
}
9285
auto dict_offset = index_buffer_ptr[string_number];
9386
auto str_len = GetStringLength(UnsafeNumericCast<sel_t>(string_number));
9487
result_data[result_offset + i] = FetchStringFromDict(UnsafeNumericCast<int32_t>(dict_offset), str_len);

src/duckdb/src/storage/compression/dictionary_compression.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,14 @@ void DictionaryCompressionStorage::StringFetchRow(ColumnSegment &segment, Column
157157
// Get Function
158158
//===--------------------------------------------------------------------===//
159159
CompressionFunction DictionaryCompressionFun::GetFunction(PhysicalType data_type) {
160-
auto res = CompressionFunction(
160+
return CompressionFunction(
161161
CompressionType::COMPRESSION_DICTIONARY, data_type, DictionaryCompressionStorage ::StringInitAnalyze,
162162
DictionaryCompressionStorage::StringAnalyze, DictionaryCompressionStorage::StringFinalAnalyze,
163163
DictionaryCompressionStorage::InitCompression, DictionaryCompressionStorage::Compress,
164164
DictionaryCompressionStorage::FinalizeCompress, DictionaryCompressionStorage::StringInitScan,
165165
DictionaryCompressionStorage::StringScan, DictionaryCompressionStorage::StringScanPartial<false>,
166166
DictionaryCompressionStorage::StringFetchRow, UncompressedFunctions::EmptySkip,
167167
UncompressedStringStorage::StringInitSegment);
168-
res.validity = CompressionValidity::NO_VALIDITY_REQUIRED;
169-
return res;
170168
}
171169

172170
bool DictionaryCompressionFun::TypeIsSupported(const PhysicalType physical_type) {

0 commit comments

Comments
 (0)