duckdb 0.3.2-dev741.0 → 0.3.2-dev772.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/duckdb.cpp +11 -7
- package/src/duckdb.hpp +2 -2
- package/src/parquet-amalgamation.cpp +35574 -34863
- package/src/parquet-amalgamation.hpp +118 -0
package/package.json
CHANGED
package/src/duckdb.cpp
CHANGED
|
@@ -33840,13 +33840,14 @@ void ValidityMask::Slice(const ValidityMask &other, idx_t offset) {
|
|
|
33840
33840
|
Initialize(other);
|
|
33841
33841
|
return;
|
|
33842
33842
|
}
|
|
33843
|
-
|
|
33843
|
+
ValidityMask new_mask(STANDARD_VECTOR_SIZE);
|
|
33844
33844
|
|
|
33845
33845
|
// FIXME THIS NEEDS FIXING!
|
|
33846
33846
|
#if 1
|
|
33847
33847
|
for (idx_t i = offset; i < STANDARD_VECTOR_SIZE; i++) {
|
|
33848
|
-
Set(i - offset, other.RowIsValid(i));
|
|
33848
|
+
new_mask.Set(i - offset, other.RowIsValid(i));
|
|
33849
33849
|
}
|
|
33850
|
+
Initialize(new_mask);
|
|
33850
33851
|
#else
|
|
33851
33852
|
// first shift the "whole" units
|
|
33852
33853
|
idx_t entire_units = offset / BITS_PER_VALUE;
|
|
@@ -33854,7 +33855,7 @@ void ValidityMask::Slice(const ValidityMask &other, idx_t offset) {
|
|
|
33854
33855
|
if (entire_units > 0) {
|
|
33855
33856
|
idx_t validity_idx;
|
|
33856
33857
|
for (validity_idx = 0; validity_idx + entire_units < STANDARD_ENTRY_COUNT; validity_idx++) {
|
|
33857
|
-
validity_mask[validity_idx] = other.validity_mask[validity_idx + entire_units];
|
|
33858
|
+
new_mask.validity_mask[validity_idx] = other.validity_mask[validity_idx + entire_units];
|
|
33858
33859
|
}
|
|
33859
33860
|
}
|
|
33860
33861
|
// now we shift the remaining sub units
|
|
@@ -33869,15 +33870,17 @@ void ValidityMask::Slice(const ValidityMask &other, idx_t offset) {
|
|
|
33869
33870
|
if (sub_units > 0) {
|
|
33870
33871
|
idx_t validity_idx;
|
|
33871
33872
|
for (validity_idx = 0; validity_idx + 1 < STANDARD_ENTRY_COUNT; validity_idx++) {
|
|
33872
|
-
validity_mask[validity_idx] =
|
|
33873
|
-
|
|
33873
|
+
new_mask.validity_mask[validity_idx] =
|
|
33874
|
+
(other.validity_mask[validity_idx] >> sub_units) |
|
|
33875
|
+
(other.validity_mask[validity_idx + 1] << (BITS_PER_VALUE - sub_units));
|
|
33874
33876
|
}
|
|
33875
|
-
validity_mask[validity_idx] >>= sub_units;
|
|
33877
|
+
new_mask.validity_mask[validity_idx] >>= sub_units;
|
|
33876
33878
|
}
|
|
33877
33879
|
#ifdef DEBUG
|
|
33878
33880
|
for (idx_t i = offset; i < STANDARD_VECTOR_SIZE; i++) {
|
|
33879
|
-
D_ASSERT(RowIsValid(i - offset) == other.RowIsValid(i));
|
|
33881
|
+
D_ASSERT(new_mask.RowIsValid(i - offset) == other.RowIsValid(i));
|
|
33880
33882
|
}
|
|
33883
|
+
Initialize(new_mask);
|
|
33881
33884
|
#endif
|
|
33882
33885
|
#endif
|
|
33883
33886
|
}
|
|
@@ -153713,6 +153716,7 @@ void __fastpack64(const uint64_t *__restrict in, uint32_t *__restrict out);
|
|
|
153713
153716
|
// LICENSE_CHANGE_END
|
|
153714
153717
|
|
|
153715
153718
|
|
|
153719
|
+
|
|
153716
153720
|
#include <stdexcept>
|
|
153717
153721
|
|
|
153718
153722
|
namespace duckdb_fastpforlib {
|
package/src/duckdb.hpp
CHANGED
|
@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
|
11
11
|
#pragma once
|
|
12
12
|
#define DUCKDB_AMALGAMATION 1
|
|
13
13
|
#define DUCKDB_AMALGAMATION_EXTENDED 1
|
|
14
|
-
#define DUCKDB_SOURCE_ID "
|
|
15
|
-
#define DUCKDB_VERSION "0.3.2-
|
|
14
|
+
#define DUCKDB_SOURCE_ID "c9573d243"
|
|
15
|
+
#define DUCKDB_VERSION "0.3.2-dev772"
|
|
16
16
|
//===----------------------------------------------------------------------===//
|
|
17
17
|
// DuckDB
|
|
18
18
|
//
|