Skip to content

Commit 699ecbd

Browse files
duckdblabs-botgithub-actions[bot]
authored andcommitted
Update vendored DuckDB sources to 036b9bc3f9
1 parent c508883 commit 699ecbd

File tree

6 files changed

+316
-122
lines changed

6 files changed

+316
-122
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 "0-dev3480"
2+
#define DUCKDB_PATCH_VERSION "0-dev3486"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.0-dev3480"
11+
#define DUCKDB_VERSION "v1.4.0-dev3486"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "ecde6b6514"
14+
#define DUCKDB_SOURCE_ID "036b9bc3f9"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/storage/table/row_group.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ class RowGroup : public SegmentBase<RowGroup> {
204204
ColumnData &GetColumn(const StorageIndex &c);
205205
idx_t GetColumnCount() const;
206206
vector<shared_ptr<ColumnData>> &GetColumns();
207+
ColumnData &GetRowIdColumnData();
208+
void SetCount(idx_t count);
207209

208210
template <TableScanType TYPE>
209211
void TemplatedScan(TransactionData transaction, CollectionScanState &state, DataChunk &result);
@@ -221,6 +223,8 @@ class RowGroup : public SegmentBase<RowGroup> {
221223
vector<idx_t> extra_metadata_blocks;
222224
atomic<bool> deletes_is_loaded;
223225
atomic<idx_t> allocation_size;
226+
unique_ptr<ColumnData> row_id_column_data;
227+
atomic<bool> row_id_is_loaded;
224228
};
225229

226230
} // namespace duckdb
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
//===----------------------------------------------------------------------===//
2+
// DuckDB
3+
//
4+
// duckdb/storage/table/row_id_column_data.hpp
5+
//
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#pragma once
10+
11+
#include "duckdb/storage/table/column_data.hpp"
12+
13+
namespace duckdb {
14+
15+
class RowIdColumnData : public ColumnData {
16+
public:
17+
RowIdColumnData(BlockManager &block_manager, DataTableInfo &info, idx_t start_row);
18+
19+
public:
20+
void InitializePrefetch(PrefetchState &prefetch_state, ColumnScanState &scan_state, idx_t rows) override;
21+
void InitializeScan(ColumnScanState &state) override;
22+
void InitializeScanWithOffset(ColumnScanState &state, idx_t row_idx) override;
23+
24+
idx_t Scan(TransactionData transaction, idx_t vector_index, ColumnScanState &state, Vector &result,
25+
idx_t scan_count) override;
26+
idx_t ScanCommitted(idx_t vector_index, ColumnScanState &state, Vector &result, bool allow_updates,
27+
idx_t scan_count) override;
28+
void ScanCommittedRange(idx_t row_group_start, idx_t offset_in_row_group, idx_t count, Vector &result) override;
29+
idx_t ScanCount(ColumnScanState &state, Vector &result, idx_t count, idx_t result_offset = 0) override;
30+
31+
void Filter(TransactionData transaction, idx_t vector_index, ColumnScanState &state, Vector &result,
32+
SelectionVector &sel, idx_t &count, const TableFilter &filter, TableFilterState &filter_state) override;
33+
void Select(TransactionData transaction, idx_t vector_index, ColumnScanState &state, Vector &result,
34+
SelectionVector &sel, idx_t count) override;
35+
void SelectCommitted(idx_t vector_index, ColumnScanState &state, Vector &result, SelectionVector &sel, idx_t count,
36+
bool allow_updates) override;
37+
38+
idx_t Fetch(ColumnScanState &state, row_t row_id, Vector &result) override;
39+
void FetchRow(TransactionData transaction, ColumnFetchState &state, row_t row_id, Vector &result,
40+
idx_t result_idx) override;
41+
42+
void Skip(ColumnScanState &state, idx_t count = STANDARD_VECTOR_SIZE) override;
43+
44+
FilterPropagateResult CheckZonemap(ColumnScanState &state, TableFilter &filter) override;
45+
46+
void InitializeAppend(ColumnAppendState &state) override;
47+
void Append(BaseStatistics &stats, ColumnAppendState &state, Vector &vector, idx_t count) override;
48+
void AppendData(BaseStatistics &stats, ColumnAppendState &state, UnifiedVectorFormat &vdata, idx_t count) override;
49+
void RevertAppend(row_t start_row) override;
50+
51+
void Update(TransactionData transaction, idx_t column_index, Vector &update_vector, row_t *row_ids,
52+
idx_t update_count) override;
53+
void UpdateColumn(TransactionData transaction, const vector<column_t> &column_path, Vector &update_vector,
54+
row_t *row_ids, idx_t update_count, idx_t depth) override;
55+
56+
void CommitDropColumn() override;
57+
58+
unique_ptr<ColumnCheckpointState> CreateCheckpointState(RowGroup &row_group,
59+
PartialBlockManager &partial_block_manager) override;
60+
unique_ptr<ColumnCheckpointState> Checkpoint(RowGroup &row_group, ColumnCheckpointInfo &info) override;
61+
62+
void CheckpointScan(ColumnSegment &segment, ColumnScanState &state, idx_t row_group_start, idx_t count,
63+
Vector &scan_vector) override;
64+
65+
bool IsPersistent() override;
66+
};
67+
68+
} // namespace duckdb

0 commit comments

Comments
 (0)