duckdb 0.6.2-dev484.0 → 0.6.2-dev499.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev484.0",
+  "version": "0.6.2-dev499.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -48577,9 +48577,6 @@ static_assert(sizeof(timestamp_t) == sizeof(int64_t), "timestamp_t was padded");
 // T may be a space
 // Z is optional
 // ISO 8601
-static inline bool CharacterIsTimeZone(char c) {
-	return StringUtil::CharacterIsAlpha(c) || StringUtil::CharacterIsDigit(c) || c == '_' || c == '/';
-}
 
 bool Timestamp::TryConvertTimestampTZ(const char *str, idx_t len, timestamp_t &result, bool &has_offset, string_t &tz) {
 	idx_t pos;
@@ -110150,8 +110147,8 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) {
 					pos++;
 				}
 				const auto tz_begin = data + pos;
-				// stop when we encounter a space or the end of the string
-				while (pos < size && !StringUtil::CharacterIsSpace(data[pos])) {
+				// stop when we encounter a non-tz character
+				while (pos < size && Timestamp::CharacterIsTimeZone(data[pos])) {
 					pos++;
 				}
 				const auto tz_end = data + pos;
@@ -156979,6 +156976,7 @@ private:
 	void UpdateDPTree(JoinNode *new_plan);
 
 	void UpdateJoinNodesInFullPlan(JoinNode *node);
+	bool NodeInFullPlan(JoinNode *node);
 
 	std::pair<JoinRelationSet *, unique_ptr<LogicalOperator>>
 	GenerateJoins(vector<unique_ptr<LogicalOperator>> &extracted_relations, JoinNode *node);
@@ -157709,7 +157707,6 @@ string JoinNode::ToString() {
 
 
 
-
 #include <algorithm>
 
 namespace std {
@@ -157978,6 +157975,10 @@ unique_ptr<JoinNode> JoinOrderOptimizer::CreateJoinTree(JoinRelationSet *set,
 	return result;
 }
 
+bool JoinOrderOptimizer::NodeInFullPlan(JoinNode *node) {
+	return join_nodes_in_full_plan.find(node->set->ToString()) != join_nodes_in_full_plan.end();
+}
+
 void JoinOrderOptimizer::UpdateJoinNodesInFullPlan(JoinNode *node) {
 	if (!node) {
 		return;
@@ -158208,7 +158209,7 @@ static vector<unordered_set<idx_t>> AddSuperSets(vector<unordered_set<idx_t>> cu
 }
 
 // works by first creating all sets with cardinality 1
-// then iterates over each previously create group of subsets and will only add a neighbor if the neighbor
+// then iterates over each previously created group of subsets and will only add a neighbor if the neighbor
 // is greater than all relations in the set.
 static vector<unordered_set<idx_t>> GetAllNeighborSets(JoinRelationSet *new_set, unordered_set<idx_t> &exclusion_set,
                                                        vector<idx_t> neighbors) {
@@ -158244,6 +158245,11 @@ static vector<unordered_set<idx_t>> GetAllNeighborSets(JoinRelationSet *new_set,
 }
 
 void JoinOrderOptimizer::UpdateDPTree(JoinNode *new_plan) {
+	if (!NodeInFullPlan(new_plan)) {
+		// if the new node is not in the full plan, feel free to return
+		// because you won't be updating the full plan.
+		return;
+	}
 	auto new_set = new_plan->set;
 	// now update every plan that uses this plan
 	unordered_set<idx_t> exclusion_set;
@@ -158305,6 +158311,7 @@ void JoinOrderOptimizer::SolveJoinOrderApproximately() {
 					// update the DP tree in case a plan created by the DP algorithm uses the node
 					// that was potentially just updated by EmitPair. You will get a use-after-free
 					// error if future plans rely on the old node that was just replaced.
+					// if node in FullPath, then updateDP tree.
 					UpdateDPTree(node);
 
 					if (!best_connection || node->GetCost() < best_connection->GetCost()) {