duckdb 0.5.2-dev618.0 → 0.5.2-dev630.0

package/package.json

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

package/src/duckdb.cpp

@@ -2214,6 +2214,8 @@ private:
 	bool Next();
 	//! Push part of the key to cur_key
 	void PushKey(Node *node, uint16_t pos);
+	//! Pop node
+	void PopNode();
 };
 } // namespace duckdb
 
@@ -59319,14 +59321,19 @@ bool Iterator::Scan(Key *bound, idx_t max_count, vector<row_t> &result_ids, bool
 	return true;
 }
 
+void Iterator::PopNode() {
+	auto cur_node = nodes.top();
+	idx_t elements_to_pop = cur_node.node->prefix.Size() + (nodes.size() != 1);
+	cur_key.Pop(elements_to_pop);
+	nodes.pop();
+}
+
 bool Iterator::Next() {
 	if (!nodes.empty()) {
 		auto cur_node = nodes.top().node;
 		if (cur_node->type == NodeType::NLeaf) {
 			// Pop Leaf (We must pop the prefix size + the key to the node (unless we are popping the root)
-			idx_t elements_to_pop = cur_node->prefix.Size() + (nodes.size() != 1);
-			cur_key.Pop(elements_to_pop);
-			nodes.pop();
+			PopNode();
 		}
 	}
 
@@ -59354,17 +59361,14 @@ bool Iterator::Next() {
 			nodes.push(IteratorEntry(next_node, DConstants::INVALID_INDEX));
 		} else {
 			// no node found: move up the tree and Pop prefix and key of current node
-			auto cur_node = nodes.top().node;
-			idx_t elements_to_pop = cur_node->prefix.Size() + (nodes.size() != 1);
-			cur_key.Pop(elements_to_pop);
-			nodes.pop();
+			PopNode();
 		}
 	}
 	return false;
 }
 
 bool Iterator::LowerBound(Node *node, Key &key, bool inclusive) {
-	bool equal = false;
+	bool equal = true;
 	if (!node) {
 		return false;
 	}
@@ -59376,6 +59380,7 @@ bool Iterator::LowerBound(Node *node, Key &key, bool inclusive) {
 		for (idx_t i = 0; i < top.node->prefix.Size(); i++) {
 			cur_key.Push(top.node->prefix[i]);
 		}
+		// greater case: find leftmost leaf node directly
 		if (!equal) {
 			while (node->type != NodeType::NLeaf) {
 				auto min_pos = node->GetMin();
@@ -59408,28 +59413,21 @@ bool Iterator::LowerBound(Node *node, Key &key, bool inclusive) {
 			if (cur_key > key) {
 				return true;
 			}
-			// Leaf is lower than key
-			// Check if next leaf is still lower than key
-			while (Next()) {
-				if (cur_key == key) {
-					// if it's not inclusive check if there is a next leaf
-					if (!inclusive && !Next()) {
-						return false;
-					} else {
-						return true;
-					}
-				} else if (cur_key > key) {
-					// if it's not inclusive check if there is a next leaf
-					return true;
-				}
-			}
-			return false;
+			// Case1: When the ART has only one leaf node, the Next() will return false
+			// Case2: This means the previous node prefix(if any) + a_key(one element of of key array of previous node)
+			// == key[q..=w].
+			// But key[w+1..=z] maybe greater than leaf node prefix.
+			// One fact is key[w] is alawys equal to a_key and the next element
+			// of key array of previous node is always > a_key So we just call Next() once.
+
+			return Next();
 		}
+		// equal case:
 		uint32_t mismatch_pos = node->prefix.KeyMismatchPosition(key, depth);
 		if (mismatch_pos != node->prefix.Size()) {
 			if (node->prefix[mismatch_pos] < key[depth + mismatch_pos]) {
 				// Less
-				nodes.pop();
+				PopNode();
 				return Next();
 			} else {
 				// Greater
@@ -59437,14 +59435,18 @@ bool Iterator::LowerBound(Node *node, Key &key, bool inclusive) {
 				return Next();
 			}
 		}
+
 		// prefix matches, search inside the child for the key
 		depth += node->prefix.Size();
 
 		top.pos = node->GetChildGreaterEqual(key[depth], equal);
+		// The maximum key byte of the current node is less than the key
+		// So fall back to the previous node
 		if (top.pos == DConstants::INVALID_INDEX) {
-			// Find min leaf
-			top.pos = node->GetMin();
+			PopNode();
+			return Next();
 		}
+		PushKey(node, top.pos);
 		node = node->GetChild(*art, top.pos);
 		// This means all children of this node qualify as geq
 		depth++;
@@ -59979,7 +59981,7 @@ idx_t Node16::GetChildGreaterEqual(uint8_t k, bool &equal) {
 			return pos;
 		}
 	}
-	return Node::GetChildGreaterEqual(k, equal);
+	return DConstants::INVALID_INDEX;
 }
 
 idx_t Node16::GetMin() {
@@ -60220,7 +60222,7 @@ idx_t Node4::GetChildGreaterEqual(uint8_t k, bool &equal) {
 			return pos;
 		}
 	}
-	return Node::GetChildGreaterEqual(k, equal);
+	return DConstants::INVALID_INDEX;
 }
 
 idx_t Node4::GetMin() {
@@ -60355,7 +60357,7 @@ idx_t Node48::GetChildGreaterEqual(uint8_t k, bool &equal) {
 			return pos;
 		}
 	}
-	return Node::GetChildGreaterEqual(k, equal);
+	return DConstants::INVALID_INDEX;
 }
 
 idx_t Node48::GetMin() {

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 "fcd036218"
-#define DUCKDB_VERSION "v0.5.2-dev618"
+#define DUCKDB_SOURCE_ID "770dfea87"
+#define DUCKDB_VERSION "v0.5.2-dev630"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //