duckdb 0.3.3-dev1275.0 → 0.3.3-dev1291.0

package/package.json

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

package/src/duckdb.cpp

@@ -96977,9 +96977,14 @@ unique_ptr<FunctionData> ArrowTableFunction::ArrowScanBind(ClientContext &contex
 	    uintptr_t stream_factory_ptr,
 	    std::pair<std::unordered_map<idx_t, string>, std::vector<string>> & project_columns,
 	    TableFilterCollection * filters);
+
+	typedef void (*stream_factory_get_schema_t)(uintptr_t stream_factory_ptr, ArrowSchemaWrapper & schema);
+
 	auto stream_factory_ptr = input.inputs[0].GetPointer();
 	auto stream_factory_produce = (stream_factory_produce_t)input.inputs[1].GetPointer();
-	auto rows_per_thread = input.inputs[2].GetValue<uint64_t>();
+	auto stream_factory_get_schema = (stream_factory_get_schema_t)input.inputs[2].GetPointer();
+	auto rows_per_thread = input.inputs[3].GetValue<uint64_t>();
+
 	std::pair<std::unordered_map<idx_t, string>, std::vector<string>> project_columns;
 #ifndef DUCKDB_NO_THREADS
 
@@ -96989,15 +96994,7 @@ unique_ptr<FunctionData> ArrowTableFunction::ArrowScanBind(ClientContext &contex
 	auto res = make_unique<ArrowScanFunctionData>(rows_per_thread, stream_factory_produce, stream_factory_ptr);
 #endif
 	auto &data = *res;
-	auto stream = stream_factory_produce(stream_factory_ptr, project_columns, nullptr);
-
-	data.number_of_rows = stream->number_of_rows;
-	if (!stream) {
-		throw InvalidInputException("arrow_scan: NULL pointer passed");
-	}
-
-	stream->GetSchema(data.schema_root);
-
+	stream_factory_get_schema(stream_factory_ptr, data.schema_root);
 	for (idx_t col_idx = 0; col_idx < (idx_t)data.schema_root.arrow_schema.n_children; col_idx++) {
 		auto &schema = *data.schema_root.arrow_schema.children[col_idx];
 		if (!schema.release) {
@@ -97907,11 +97904,11 @@ double ArrowTableFunction::ArrowProgress(ClientContext &context, const FunctionD
 
 void ArrowTableFunction::RegisterFunction(BuiltinFunctions &set) {
 	TableFunctionSet arrow("arrow_scan");
-	arrow.AddFunction(TableFunction({LogicalType::POINTER, LogicalType::POINTER, LogicalType::UBIGINT},
-	                                ArrowScanFunction, ArrowScanBind, ArrowScanInit, nullptr, nullptr, nullptr,
-	                                ArrowScanCardinality, nullptr, nullptr, ArrowScanMaxThreads,
-	                                ArrowScanInitParallelState, ArrowScanFunctionParallel, ArrowScanParallelInit,
-	                                ArrowScanParallelStateNext, true, true, ArrowProgress));
+	arrow.AddFunction(
+	    TableFunction({LogicalType::POINTER, LogicalType::POINTER, LogicalType::POINTER, LogicalType::UBIGINT},
+	                  ArrowScanFunction, ArrowScanBind, ArrowScanInit, nullptr, nullptr, nullptr, ArrowScanCardinality,
+	                  nullptr, nullptr, ArrowScanMaxThreads, ArrowScanInitParallelState, ArrowScanFunctionParallel,
+	                  ArrowScanParallelInit, ArrowScanParallelStateNext, true, true, ArrowProgress));
 	set.AddFunction(arrow);
 }
 
@@ -106099,11 +106096,21 @@ RESULT_TYPE TryCastCInternal(duckdb_result *result, idx_t col, idx_t row) {
 	return result_value;
 }
 
-static bool CanFetchValue(duckdb_result *result, idx_t col, idx_t row) {
+static bool CanUseDeprecatedFetch(duckdb_result *result, idx_t col, idx_t row) {
+	if (!result) {
+		return false;
+	}
 	if (!duckdb::deprecated_materialize_result(result)) {
 		return false;
 	}
-	if (!result || col >= result->__deprecated_column_count || row >= result->__deprecated_row_count) {
+	if (col >= result->__deprecated_column_count || row >= result->__deprecated_row_count) {
+		return false;
+	}
+	return true;
+}
+
+static bool CanFetchValue(duckdb_result *result, idx_t col, idx_t row) {
+	if (!CanUseDeprecatedFetch(result, col, row)) {
 		return false;
 	}
 	if (result->__deprecated_columns[col].__deprecated_nullmask[row]) {
@@ -106285,7 +106292,7 @@ duckdb_blob duckdb_value_blob(duckdb_result *result, idx_t col, idx_t row) {
 }
 
 bool duckdb_value_is_null(duckdb_result *result, idx_t col, idx_t row) {
-	if (!result || col >= result->__deprecated_column_count || row >= result->__deprecated_row_count) {
+	if (!CanUseDeprecatedFetch(result, col, row)) {
 		return false;
 	}
 	return result->__deprecated_columns[col].__deprecated_nullmask[row];

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 "2ff182df8"
-#define DUCKDB_VERSION "v0.3.3-dev1275"
+#define DUCKDB_SOURCE_ID "261c21b49"
+#define DUCKDB_VERSION "v0.3.3-dev1291"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -5504,10 +5504,9 @@ class CycleCounter {
 	friend struct ExpressionInfo;
 	friend struct ExpressionRootInfo;
 	static constexpr int SAMPLING_RATE = 50;
-	static constexpr int SAMPLING_VARIANCE = 100;
 
 public:
-	CycleCounter() : random(-1) {
+	CycleCounter() {
 	}
 	// Next_sample determines if a sample needs to be taken, if so start the profiler
 	void BeginSample() {
@@ -5522,7 +5521,7 @@ public:
 			time += Tick() - tmp;
 		}
 		if (current_count >= next_sample) {
-			next_sample = SAMPLING_RATE + random.NextRandomInteger() % SAMPLING_VARIANCE;
+			next_sample = SAMPLING_RATE;
 			++sample_count;
 			sample_tuples_count += chunk_size;
 			current_count = 0;
@@ -5548,8 +5547,6 @@ private:
 	uint64_t sample_tuples_count = 0;
 	//! Count the number of ALL tuples
 	uint64_t tuples_count = 0;
-	//! the random number generator used for sampling
-	RandomEngine random;
 };
 
 } // namespace duckdb