duckdb 0.5.2-dev291.0 → 0.5.2-dev314.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.5.2-dev291.0",
+  "version": "0.5.2-dev314.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -34655,7 +34655,8 @@ void Deserializer::ReadStringVector(vector<string> &list) {
 
 namespace duckdb {
 
-bool Comparators::TieIsBreakable(const idx_t &col_idx, const data_ptr_t row_ptr, const RowLayout &row_layout) {
+bool Comparators::TieIsBreakable(const idx_t &tie_col, const data_ptr_t &row_ptr, const SortLayout &sort_layout) {
+	const auto &col_idx = sort_layout.sorting_to_blob_col.at(tie_col);
 	// Check if the blob is NULL
 	ValidityBytes row_mask(row_ptr);
 	idx_t entry_idx;
@@ -34665,13 +34666,16 @@ bool Comparators::TieIsBreakable(const idx_t &col_idx, const data_ptr_t row_ptr,
 		// Can't break a NULL tie
 		return false;
 	}
-	if (row_layout.GetTypes()[col_idx].InternalType() == PhysicalType::VARCHAR) {
-		const auto &tie_col_offset = row_layout.GetOffsets()[col_idx];
-		string_t tie_string = Load<string_t>(row_ptr + tie_col_offset);
-		if (tie_string.GetSize() < string_t::INLINE_LENGTH) {
-			// No need to break the tie - we already compared the full string
-			return false;
-		}
+	auto &row_layout = sort_layout.blob_layout;
+	if (row_layout.GetTypes()[col_idx].InternalType() != PhysicalType::VARCHAR) {
+		// Nested type, must be broken
+		return true;
+	}
+	const auto &tie_col_offset = row_layout.GetOffsets()[col_idx];
+	auto tie_string = Load<string_t>(row_ptr + tie_col_offset);
+	if (tie_string.GetSize() < sort_layout.prefix_lengths[tie_col]) {
+		// No need to break the tie - we already compared the full string
+		return false;
 	}
 	return true;
 }
@@ -34713,14 +34717,14 @@ int Comparators::CompareVal(const data_ptr_t l_ptr, const data_ptr_t r_ptr, cons
 
 int Comparators::BreakBlobTie(const idx_t &tie_col, const SBScanState &left, const SBScanState &right,
                               const SortLayout &sort_layout, const bool &external) {
-	const idx_t &col_idx = sort_layout.sorting_to_blob_col.at(tie_col);
 	data_ptr_t l_data_ptr = left.DataPtr(*left.sb->blob_sorting_data);
 	data_ptr_t r_data_ptr = right.DataPtr(*right.sb->blob_sorting_data);
-	if (!TieIsBreakable(col_idx, l_data_ptr, sort_layout.blob_layout)) {
+	if (!TieIsBreakable(tie_col, l_data_ptr, sort_layout)) {
 		// Quick check to see if ties can be broken
 		return 0;
 	}
 	// Align the pointers
+	const idx_t &col_idx = sort_layout.sorting_to_blob_col.at(tie_col);
 	const auto &tie_col_offset = sort_layout.blob_layout.GetOffsets()[col_idx];
 	l_data_ptr += tie_col_offset;
 	r_data_ptr += tie_col_offset;
@@ -36381,11 +36385,10 @@ namespace duckdb {
 static void SortTiedBlobs(BufferManager &buffer_manager, const data_ptr_t dataptr, const idx_t &start, const idx_t &end,
                           const idx_t &tie_col, bool *ties, const data_ptr_t blob_ptr, const SortLayout &sort_layout) {
 	const auto row_width = sort_layout.blob_layout.GetRowWidth();
-	const idx_t &col_idx = sort_layout.sorting_to_blob_col.at(tie_col);
 	// Locate the first blob row in question
 	data_ptr_t row_ptr = dataptr + start * sort_layout.entry_size;
 	data_ptr_t blob_row_ptr = blob_ptr + Load<uint32_t>(row_ptr + sort_layout.comparison_size) * row_width;
-	if (!Comparators::TieIsBreakable(col_idx, blob_row_ptr, sort_layout.blob_layout)) {
+	if (!Comparators::TieIsBreakable(tie_col, blob_row_ptr, sort_layout)) {
 		// Quick check to see if ties can be broken
 		return;
 	}
@@ -36398,6 +36401,7 @@ static void SortTiedBlobs(BufferManager &buffer_manager, const data_ptr_t datapt
 	}
 	// Slow pointer-based sorting
 	const int order = sort_layout.order_types[tie_col] == OrderType::DESCENDING ? -1 : 1;
+	const idx_t &col_idx = sort_layout.sorting_to_blob_col.at(tie_col);
 	const auto &tie_col_offset = sort_layout.blob_layout.GetOffsets()[col_idx];
 	auto logical_type = sort_layout.blob_layout.GetTypes()[col_idx];
 	std::sort(entry_ptrs, entry_ptrs + end - start,

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "e682812c7"
-#define DUCKDB_VERSION "v0.5.2-dev291"
+#define DUCKDB_SOURCE_ID "18dbc32f8"
+#define DUCKDB_VERSION "v0.5.2-dev314"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -19132,7 +19132,7 @@ using ValidityBytes = RowLayout::ValidityBytes;
 struct Comparators {
 public:
 	//! Whether a tie between two blobs can be broken
-	static bool TieIsBreakable(const idx_t &col_idx, const data_ptr_t row_ptr, const RowLayout &row_layout);
+	static bool TieIsBreakable(const idx_t &col_idx, const data_ptr_t &row_ptr, const SortLayout &sort_layout);
 	//! Compares the tuples that a being read from in the 'left' and 'right blocks during merge sort
 	//! (only in case we cannot simply 'memcmp' - if there are blob columns)
 	static int CompareTuple(const SBScanState &left, const SBScanState &right, const data_ptr_t &l_ptr,