duckdb 0.6.2-dev416.0 → 0.6.2-dev447.0

package/package.json

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

package/src/duckdb.cpp

@@ -6290,7 +6290,7 @@ static DefaultView internal_views[] = {
     {"pg_catalog", "pg_index", "SELECT index_oid indexrelid, table_oid indrelid, 0 indnatts, 0 indnkeyatts, is_unique indisunique, is_primary indisprimary, false indisexclusion, true indimmediate, false indisclustered, true indisvalid, false indcheckxmin, true indisready, true indislive, false indisreplident, NULL::INT[] indkey, NULL::OID[] indcollation, NULL::OID[] indclass, NULL::INT[] indoption, expressions indexprs, NULL indpred FROM duckdb_indexes()"},
     {"pg_catalog", "pg_indexes", "SELECT schema_name schemaname, table_name tablename, index_name indexname, NULL \"tablespace\", sql indexdef FROM duckdb_indexes()"},
     {"pg_catalog", "pg_namespace", "SELECT oid, schema_name nspname, 0 nspowner, NULL nspacl FROM duckdb_schemas()"},
-	{"pg_catalog", "pg_proc", "SELECT f.function_oid oid, function_name proname, s.oid pronamespace FROM duckdb_functions() f LEFT JOIN duckdb_schemas() s USING (schema_name)"},
+	{"pg_catalog", "pg_proc", "SELECT f.function_oid oid, function_name proname, s.oid pronamespace, varargs provariadic, function_type = 'aggregate' proisagg, function_type = 'table' proretset, return_type prorettype, parameter_types proargtypes, parameters proargnames FROM duckdb_functions() f LEFT JOIN duckdb_schemas() s USING (schema_name)"},
     {"pg_catalog", "pg_sequence", "SELECT sequence_oid seqrelid, 0 seqtypid, start_value seqstart, increment_by seqincrement, max_value seqmax, min_value seqmin, 0 seqcache, cycle seqcycle FROM duckdb_sequences()"},
 	{"pg_catalog", "pg_sequences", "SELECT schema_name schemaname, sequence_name sequencename, 'duckdb' sequenceowner, 0 data_type, start_value, min_value, max_value, increment_by, cycle, 0 cache_size, last_value FROM duckdb_sequences()"},
 	{"pg_catalog", "pg_settings", "SELECT name, value setting, description short_desc, CASE WHEN input_type = 'VARCHAR' THEN 'string' WHEN input_type = 'BOOLEAN' THEN 'bool' WHEN input_type IN ('BIGINT', 'UBIGINT') THEN 'integer' ELSE input_type END vartype FROM duckdb_settings()"},
@@ -8284,56 +8284,6 @@ void DuckDBAssertInternal(bool condition, const char *condition_name, const char
 
 
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/common/profiler.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-
-
-
-namespace duckdb {
-
-//! The profiler can be used to measure elapsed time
-template <typename T>
-class BaseProfiler {
-public:
-	//! Starts the timer
-	void Start() {
-		finished = false;
-		start = Tick();
-	}
-	//! Finishes timing
-	void End() {
-		end = Tick();
-		finished = true;
-	}
-
-	//! Returns the elapsed time in seconds. If End() has been called, returns
-	//! the total elapsed time. Otherwise returns how far along the timer is
-	//! right now.
-	double Elapsed() const {
-		auto _end = finished ? end : Tick();
-		return std::chrono::duration_cast<std::chrono::duration<double>>(_end - start).count();
-	}
-
-private:
-	time_point<T> Tick() const {
-		return T::now();
-	}
-	time_point<T> start;
-	time_point<T> end;
-	bool finished = false;
-};
-
-using Profiler = BaseProfiler<system_clock>;
-
-} // namespace duckdb
 
 
 
@@ -30246,72 +30196,6 @@ bool PreservedError::operator==(const PreservedError &other) const {
 
 } // namespace duckdb
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/common/progress_bar.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-
-
-
-
-
-namespace duckdb {
-
-class ProgressBar {
-public:
-	explicit ProgressBar(Executor &executor, idx_t show_progress_after, bool print_progress);
-
-	//! Starts the thread
-	void Start();
-	//! Updates the progress bar and prints it to the screen
-	void Update(bool final);
-	//! Gets current percentage
-	double GetCurrentPercentage();
-
-private:
-	static constexpr const idx_t PARTIAL_BLOCK_COUNT = 8;
-#ifndef DUCKDB_ASCII_TREE_RENDERER
-	const char *PROGRESS_EMPTY = " ";
-	const char *PROGRESS_PARTIAL[PARTIAL_BLOCK_COUNT] {
-	    " ",           "\xE2\x96\x8F", "\xE2\x96\x8E", "\xE2\x96\x8D", "\xE2\x96\x8C", "\xE2\x96\x8B", "\xE2\x96\x8A",
-	    "\xE2\x96\x89"};
-	const char *PROGRESS_BLOCK = "\xE2\x96\x88";
-	const char *PROGRESS_START = "\xE2\x96\x95";
-	const char *PROGRESS_END = "\xE2\x96\x8F";
-#else
-	const char *PROGRESS_EMPTY = " ";
-	const char *PROGRESS_PARTIAL[PARTIAL_BLOCK_COUNT] {" ", " ", " ", " ", " ", " ", " ", " "};
-	const char *PROGRESS_BLOCK = "=";
-	const char *PROGRESS_START = "[";
-	const char *PROGRESS_END = "]";
-#endif
-	static constexpr const idx_t PROGRESS_BAR_WIDTH = 60;
-
-	void PrintProgressInternal(int percentage);
-	void PrintProgress(int percentage);
-	void FinishProgressBarPrint();
-
-private:
-	//! The executor
-	Executor &executor;
-	//! The profiler used to measure the time since the progress bar was started
-	Profiler profiler;
-	//! The time in ms after which to start displaying the progress bar
-	idx_t show_progress_after;
-	//! The current progress percentage
-	double current_percentage;
-	//! Whether or not we print the progress bar
-	bool print_progress;
-	//! Whether or not profiling is supported for the current query
-	bool supported = true;
-};
-} // namespace duckdb
 
 
 
@@ -30394,13 +30278,70 @@ idx_t Printer::TerminalWidth() {
 } // namespace duckdb
 
 
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/common/progress_bar/display/terminal_progress_bar_display.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
 
 
 namespace duckdb {
 
-ProgressBar::ProgressBar(Executor &executor, idx_t show_progress_after, bool print_progress)
-    : executor(executor), show_progress_after(show_progress_after), current_percentage(-1),
-      print_progress(print_progress) {
+class TerminalProgressBarDisplay : public ProgressBarDisplay {
+public:
+	TerminalProgressBarDisplay() {
+	}
+	~TerminalProgressBarDisplay() override final {
+	}
+
+public:
+	void Update(double percentage) override;
+	void Finish() override;
+
+private:
+	static constexpr const idx_t PARTIAL_BLOCK_COUNT = 8;
+#ifndef DUCKDB_ASCII_TREE_RENDERER
+	const char *PROGRESS_EMPTY = " ";
+	const char *PROGRESS_PARTIAL[PARTIAL_BLOCK_COUNT] {
+	    " ",           "\xE2\x96\x8F", "\xE2\x96\x8E", "\xE2\x96\x8D", "\xE2\x96\x8C", "\xE2\x96\x8B", "\xE2\x96\x8A",
+	    "\xE2\x96\x89"};
+	const char *PROGRESS_BLOCK = "\xE2\x96\x88";
+	const char *PROGRESS_START = "\xE2\x96\x95";
+	const char *PROGRESS_END = "\xE2\x96\x8F";
+#else
+	const char *PROGRESS_EMPTY = " ";
+	const char *PROGRESS_PARTIAL[PARTIAL_BLOCK_COUNT] {" ", " ", " ", " ", " ", " ", " ", " "};
+	const char *PROGRESS_BLOCK = "=";
+	const char *PROGRESS_START = "[";
+	const char *PROGRESS_END = "]";
+#endif
+	static constexpr const idx_t PROGRESS_BAR_WIDTH = 60;
+
+private:
+	void PrintProgressInternal(int percentage);
+};
+
+} // namespace duckdb
+
+
+namespace duckdb {
+
+unique_ptr<ProgressBarDisplay> ProgressBar::DefaultProgressBarDisplay() {
+	return make_unique<TerminalProgressBarDisplay>();
+}
+
+ProgressBar::ProgressBar(Executor &executor, idx_t show_progress_after,
+                         progress_bar_display_create_func_t create_display_func)
+    : executor(executor), show_progress_after(show_progress_after), current_percentage(-1) {
+	if (create_display_func) {
+		display = create_display_func();
+	}
 }
 
 double ProgressBar::GetCurrentPercentage() {
@@ -30413,20 +30354,44 @@ void ProgressBar::Start() {
 	supported = true;
 }
 
-void ProgressBar::Update(bool final) {
+bool ProgressBar::PrintEnabled() const {
+	return display != nullptr;
+}
+
+bool ProgressBar::ShouldPrint(bool final) const {
+	if (!PrintEnabled()) {
+		// Don't print progress at all
+		return false;
+	}
+	// FIXME - do we need to check supported before running `profiler.Elapsed()` ?
+	auto sufficient_time_elapsed = profiler.Elapsed() > show_progress_after / 1000.0;
+	if (!sufficient_time_elapsed) {
+		// Don't print yet
+		return false;
+	}
+	if (final) {
+		// Print the last completed bar
+		return true;
+	}
 	if (!supported) {
+		return false;
+	}
+	return current_percentage > -1;
+}
+
+void ProgressBar::Update(bool final) {
+	if (!final && !supported) {
 		return;
 	}
 	double new_percentage;
 	supported = executor.GetPipelinesProgress(new_percentage);
-	if (!supported) {
+	if (!final && !supported) {
 		return;
 	}
-	auto sufficient_time_elapsed = profiler.Elapsed() > show_progress_after / 1000.0;
 	if (new_percentage > current_percentage) {
 		current_percentage = new_percentage;
 	}
-	if (supported && print_progress && sufficient_time_elapsed && current_percentage > -1 && print_progress) {
+	if (ShouldPrint(final)) {
 #ifndef DUCKDB_DISABLE_PRINT
 		if (final) {
 			FinishProgressBarPrint();
@@ -30437,7 +30402,28 @@ void ProgressBar::Update(bool final) {
 	}
 }
 
-void ProgressBar::PrintProgressInternal(int percentage) {
+void ProgressBar::PrintProgress(int current_percentage) {
+	D_ASSERT(display);
+	display->Update(current_percentage);
+}
+
+void ProgressBar::FinishProgressBarPrint() {
+	if (finished) {
+		return;
+	}
+	D_ASSERT(display);
+	display->Finish();
+	finished = true;
+}
+
+} // namespace duckdb
+
+
+
+
+namespace duckdb {
+
+void TerminalProgressBarDisplay::PrintProgressInternal(int percentage) {
 	if (percentage > 100) {
 		percentage = 100;
 	}
@@ -30484,12 +30470,13 @@ void ProgressBar::PrintProgressInternal(int percentage) {
 
 	Printer::RawPrint(OutputStream::STREAM_STDOUT, result);
 }
-void ProgressBar::PrintProgress(int percentage) {
+
+void TerminalProgressBarDisplay::Update(double percentage) {
 	PrintProgressInternal(percentage);
 	Printer::Flush(OutputStream::STREAM_STDOUT);
 }
 
-void ProgressBar::FinishProgressBarPrint() {
+void TerminalProgressBarDisplay::Finish() {
 	PrintProgressInternal(100);
 	Printer::RawPrint(OutputStream::STREAM_STDOUT, "\n");
 	Printer::Flush(OutputStream::STREAM_STDOUT);
@@ -136881,7 +136868,13 @@ unique_ptr<PendingQueryResult> ClientContext::PendingPreparedStatement(ClientCon
 	active_query->executor = make_unique<Executor>(*this);
 	auto &executor = *active_query->executor;
 	if (config.enable_progress_bar) {
-		active_query->progress_bar = make_unique<ProgressBar>(executor, config.wait_time, config.print_progress_bar);
+		progress_bar_display_create_func_t display_create_func = nullptr;
+		if (config.print_progress_bar) {
+			// If a custom display is set, use that, otherwise just use the default
+			display_create_func =
+			    config.display_create_func ? config.display_create_func : ProgressBar::DefaultProgressBarDisplay;
+		}
+		active_query->progress_bar = make_unique<ProgressBar>(executor, config.wait_time, display_create_func);
 		active_query->progress_bar->Start();
 		query_progress = 0;
 	}
@@ -138015,6 +138008,14 @@ struct EnableProgressBarSetting {
 	static void SetLocal(ClientContext &context, const Value &parameter);
 	static Value GetSetting(ClientContext &context);
 };
+struct EnableProgressBarPrintSetting {
+	static constexpr const char *Name = "enable_progress_bar_print";
+	static constexpr const char *Description =
+	    "Controls the printing of the progress bar, when 'enable_progress_bar' is true";
+	static constexpr const LogicalTypeId InputType = LogicalTypeId::BOOLEAN;
+	static void SetLocal(ClientContext &context, const Value &parameter);
+	static Value GetSetting(ClientContext &context);
+};
 
 struct ExperimentalParallelCSVSetting {
 	static constexpr const char *Name = "experimental_parallel_csv";
@@ -138249,6 +138250,7 @@ static ConfigurationOption internal_options[] = {DUCKDB_GLOBAL(AccessModeSetting
                                                  DUCKDB_GLOBAL(EnableHTTPMetadataCacheSetting),
                                                  DUCKDB_LOCAL(EnableProfilingSetting),
                                                  DUCKDB_LOCAL(EnableProgressBarSetting),
+                                                 DUCKDB_LOCAL(EnableProgressBarPrintSetting),
                                                  DUCKDB_GLOBAL(ExperimentalParallelCSVSetting),
                                                  DUCKDB_LOCAL(ExplainOutputSetting),
                                                  DUCKDB_GLOBAL(ExternalThreadsSetting),
@@ -152672,6 +152674,17 @@ Value EnableProgressBarSetting::GetSetting(ClientContext &context) {
 	return Value::BOOLEAN(ClientConfig::GetConfig(context).enable_progress_bar);
 }
 
+//===--------------------------------------------------------------------===//
+// Enable Progress Bar Print
+//===--------------------------------------------------------------------===//
+void EnableProgressBarPrintSetting::SetLocal(ClientContext &context, const Value &input) {
+	ClientConfig::GetConfig(context).print_progress_bar = input.GetValue<bool>();
+}
+
+Value EnableProgressBarPrintSetting::GetSetting(ClientContext &context) {
+	return Value::BOOLEAN(ClientConfig::GetConfig(context).print_progress_bar);
+}
+
 //===--------------------------------------------------------------------===//
 // Experimental Parallel CSV
 //===--------------------------------------------------------------------===//