duckdb 0.2.10-dev345.0 → 0.2.10-dev362.0

package/package.json

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

package/src/duckdb.cpp

@@ -35991,7 +35991,7 @@ int64_t Interval::GetNanoseconds(interval_t val) {
 
 	return nano;
 }
-interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2) {
+interval_t Interval::GetAge(timestamp_t timestamp_1, timestamp_t timestamp_2) {
 	date_t date1, date2;
 	dtime_t time1, time2;
 
@@ -36079,6 +36079,18 @@ interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestam
 
 	return interval;
 }
+interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2) {
+	const auto us_1 = Timestamp::GetEpochMicroSeconds(timestamp_1);
+	const auto us_2 = Timestamp::GetEpochMicroSeconds(timestamp_2);
+	const auto delta_us = us_1 - us_2;
+
+	interval_t result;
+	result.months = 0;
+	result.days = delta_us / Interval::MICROS_PER_DAY;
+	result.micros = delta_us % Interval::MICROS_PER_DAY;
+
+	return result;
+}
 
 static void NormalizeIntervalEntries(interval_t input, int64_t &months, int64_t &days, int64_t &micros) {
 	int64_t extra_months_d = input.days / Interval::DAYS_PER_MONTH;
@@ -49217,7 +49229,6 @@ void Leaf::Insert(row_t row_id) {
 	row_ids[num_elements++] = row_id;
 }
 
-//! TODO: Maybe shrink array dynamically?
 void Leaf::Remove(row_t row_id) {
 	idx_t entry_offset = INVALID_INDEX;
 	for (idx_t i = 0; i < num_elements; i++) {
@@ -49230,8 +49241,19 @@ void Leaf::Remove(row_t row_id) {
 		return;
 	}
 	num_elements--;
-	for (idx_t j = entry_offset; j < num_elements; j++) {
-		row_ids[j] = row_ids[j + 1];
+	if (capacity > 2 && num_elements < capacity / 2) {
+		// Shrink array, if less than half full
+		auto new_row_id = unique_ptr<row_t[]>(new row_t[capacity / 2]);
+		memcpy(new_row_id.get(), row_ids.get(), entry_offset * sizeof(row_t));
+		memcpy(new_row_id.get() + entry_offset, row_ids.get() + entry_offset + 1,
+		       (num_elements - entry_offset) * sizeof(row_t));
+		capacity /= 2;
+		row_ids = move(new_row_id);
+	} else {
+		// Copy the rest
+		for (idx_t j = entry_offset; j < num_elements; j++) {
+			row_ids[j] = row_ids[j + 1];
+		}
 	}
 }
 
@@ -49327,7 +49349,6 @@ Node16::Node16(ART &art, size_t compression_length) : Node(art, NodeType::N16, c
 	memset(key, 16, sizeof(key));
 }
 
-// TODO : In the future this can be performed using SIMD (#include <emmintrin.h>  x86 SSE intrinsics)
 idx_t Node16::GetChildPos(uint8_t k) {
 	for (idx_t pos = 0; pos < count; pos++) {
 		if (key[pos] == k) {
@@ -76572,7 +76593,7 @@ static void AgeFunctionStandard(DataChunk &input, ExpressionState &state, Vector
 	auto current_timestamp = Timestamp::GetCurrentTimestamp();
 
 	UnaryExecutor::Execute<timestamp_t, interval_t>(input.data[0], result, input.size(), [&](timestamp_t input) {
-		return Interval::GetDifference(current_timestamp, input);
+		return Interval::GetAge(current_timestamp, input);
 	});
 }
 
@@ -76581,7 +76602,7 @@ static void AgeFunction(DataChunk &input, ExpressionState &state, Vector &result
 
 	BinaryExecutor::Execute<timestamp_t, timestamp_t, interval_t>(
 	    input.data[0], input.data[1], result, input.size(),
-	    [&](timestamp_t input1, timestamp_t input2) { return Interval::GetDifference(input1, input2); });
+	    [&](timestamp_t input1, timestamp_t input2) { return Interval::GetAge(input1, input2); });
 }
 
 void AgeFun::RegisterFunction(BuiltinFunctions &set) {
@@ -77951,7 +77972,7 @@ struct DateSub {
 			// Our interval difference will now give the correct result.
 			// Note that PG gives different interval subtraction results,
 			// so if we change this we will have to reimplement.
-			return Interval::GetDifference(end_ts, start_ts).months;
+			return Interval::GetAge(end_ts, start_ts).months;
 		}
 	};
 
@@ -129685,8 +129706,7 @@ SetScope ToSetScope(duckdb_libpgquery::VariableSetScope pg_scope) {
 	case duckdb_libpgquery::VariableSetScope::VAR_SET_SCOPE_GLOBAL:
 		return SetScope::GLOBAL;
 	case duckdb_libpgquery::VariableSetScope::VAR_SET_SCOPE_DEFAULT:
-		// FIXME: This should be SESSION. See https://github.com/duckdb/duckdb/pull/2247
-		return SetScope::GLOBAL;
+		return SetScope::SESSION;
 	default:
 		throw InternalException("Unexpected pg_scope: %d", pg_scope);
 	}

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "71553c06e"
-#define DUCKDB_VERSION "0.2.10-dev345"
+#define DUCKDB_SOURCE_ID "622ee7e43"
+#define DUCKDB_VERSION "0.2.10-dev362"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -5964,7 +5964,10 @@ public:
 	//! Get Interval in Nanoseconds
 	static int64_t GetNanoseconds(interval_t val);
 
-	//! Returns the difference between two timestamps
+	//! Returns the age between two timestamps (including 30 day months)
+	static interval_t GetAge(timestamp_t timestamp_1, timestamp_t timestamp_2);
+
+	//! Returns the exact difference between two timestamps (days and seconds)
 	static interval_t GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2);
 
 	//! Comparison operators