duckdb 0.4.1-dev1344.0 → 0.4.1-dev1349.0

package/package.json

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

package/src/duckdb.cpp

@@ -36395,11 +36395,12 @@ public:
 	DUCKDB_API bool IsEnabled() const;
 	DUCKDB_API bool IsDetailedEnabled() const;
 	DUCKDB_API ProfilerPrintFormat GetPrintFormat() const;
+	DUCKDB_API bool PrintOptimizerOutput() const;
 	DUCKDB_API string GetSaveLocation() const;
 
 	DUCKDB_API static QueryProfiler &Get(ClientContext &context);
 
-	DUCKDB_API void StartQuery(string query, bool is_explain_analyze = false);
+	DUCKDB_API void StartQuery(string query, bool is_explain_analyze = false, bool start_at_optimizer = false);
 	DUCKDB_API void EndQuery();
 
 	DUCKDB_API void StartExplainAnalyze();
@@ -36412,8 +36413,8 @@ public:
 
 	DUCKDB_API void Initialize(PhysicalOperator *root);
 
-	DUCKDB_API string QueryTreeToString(bool print_optimizer_output = false) const;
-	DUCKDB_API void QueryTreeToStream(std::ostream &str, bool print_optimizer_output = false) const;
+	DUCKDB_API string QueryTreeToString() const;
+	DUCKDB_API void QueryTreeToStream(std::ostream &str) const;
 	DUCKDB_API void Print();
 
 	//! return the printed as a string. Unlike ToString, which is always formatted as a string,
@@ -119125,6 +119126,17 @@ unique_ptr<QueryResult> ClientContext::FetchResultInternal(ClientContextLock &lo
 	return result;
 }
 
+static bool IsExplainAnalyze(SQLStatement *statement) {
+	if (!statement) {
+		return false;
+	}
+	if (statement->type != StatementType::EXPLAIN_STATEMENT) {
+		return false;
+	}
+	auto &explain = (ExplainStatement &)*statement;
+	return explain.explain_type == ExplainType::EXPLAIN_ANALYZE;
+}
+
 shared_ptr<PreparedStatementData> ClientContext::CreatePreparedStatement(ClientContextLock &lock, const string &query,
                                                                          unique_ptr<SQLStatement> statement,
                                                                          vector<Value> *values) {
@@ -119132,6 +119144,7 @@ shared_ptr<PreparedStatementData> ClientContext::CreatePreparedStatement(ClientC
 	auto result = make_shared<PreparedStatementData>(statement_type);
 
 	auto &profiler = QueryProfiler::Get(*this);
+	profiler.StartQuery(query, IsExplainAnalyze(statement.get()), true);
 	profiler.StartPhase("planner");
 	Planner planner(*this);
 	if (values) {
@@ -119423,17 +119436,6 @@ bool ClientContext::IsActiveResult(ClientContextLock &lock, BaseQueryResult *res
 	return active_query->open_result == result;
 }
 
-static bool IsExplainAnalyze(SQLStatement *statement) {
-	if (!statement) {
-		return false;
-	}
-	if (statement->type != StatementType::EXPLAIN_STATEMENT) {
-		return false;
-	}
-	auto &explain = (ExplainStatement &)*statement;
-	return explain.explain_type == ExplainType::EXPLAIN_ANALYZE;
-}
-
 unique_ptr<PendingQueryResult> ClientContext::PendingStatementOrPreparedStatementInternal(
     ClientContextLock &lock, const string &query, unique_ptr<SQLStatement> statement,
     shared_ptr<PreparedStatementData> &prepared, PendingQueryParameters parameters) {
@@ -120707,6 +120709,67 @@ idx_t DBConfig::ParseMemoryLimit(const string &arg) {
 
 
 
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/main/connection_manager.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+
+
+
+
+namespace duckdb {
+class ClientContext;
+class DatabaseInstance;
+
+class ConnectionManager {
+public:
+	ConnectionManager() {
+	}
+
+	void AddConnection(ClientContext &context) {
+		lock_guard<mutex> lock(connections_lock);
+		connections.insert(make_pair(&context, weak_ptr<ClientContext>(context.shared_from_this())));
+	}
+
+	void RemoveConnection(ClientContext &context) {
+		lock_guard<mutex> lock(connections_lock);
+		connections.erase(&context);
+	}
+
+	vector<shared_ptr<ClientContext>> GetConnectionList() {
+		vector<shared_ptr<ClientContext>> result;
+		for (auto &it : connections) {
+			auto connection = it.second.lock();
+			if (!connection) {
+				connections.erase(it.first);
+				continue;
+			} else {
+				result.push_back(move(connection));
+			}
+		}
+
+		return result;
+	}
+
+	static ConnectionManager &Get(DatabaseInstance &db);
+	static ConnectionManager &Get(ClientContext &context);
+
+public:
+	mutex connections_lock;
+	unordered_map<ClientContext *, weak_ptr<ClientContext>> connections;
+};
+
+} // namespace duckdb
+
+
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -120784,7 +120847,7 @@ public:
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// duckdb/main/relation/table_relation.hpp
+// duckdb/main/relation/table_function_relation.hpp
 //
 //
 //===----------------------------------------------------------------------===//
@@ -120793,26 +120856,29 @@ public:
 
 
 
-
 namespace duckdb {
 
-class TableRelation : public Relation {
+class TableFunctionRelation : public Relation {
 public:
-	TableRelation(const std::shared_ptr<ClientContext> &context, unique_ptr<TableDescription> description);
+	TableFunctionRelation(const std::shared_ptr<ClientContext> &context, string name, vector<Value> parameters,
+	                      named_parameter_map_t named_parameters, shared_ptr<Relation> input_relation_p = nullptr);
 
-	unique_ptr<TableDescription> description;
+	TableFunctionRelation(const std::shared_ptr<ClientContext> &context, string name, vector<Value> parameters,
+	                      shared_ptr<Relation> input_relation_p = nullptr);
+
+	string name;
+	vector<Value> parameters;
+	named_parameter_map_t named_parameters;
+	vector<ColumnDefinition> columns;
+	shared_ptr<Relation> input_relation;
 
 public:
 	unique_ptr<QueryNode> GetQueryNode() override;
+	unique_ptr<TableRef> GetTableRef() override;
 
 	const vector<ColumnDefinition> &Columns() override;
 	string ToString(idx_t depth) override;
 	string GetAlias() override;
-
-	unique_ptr<TableRef> GetTableRef() override;
-
-	void Update(const string &update, const string &condition = string()) override;
-	void Delete(const string &condition = string()) override;
 };
 
 } // namespace duckdb
@@ -120820,7 +120886,7 @@ public:
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
-// duckdb/main/relation/table_function_relation.hpp
+// duckdb/main/relation/table_relation.hpp
 //
 //
 //===----------------------------------------------------------------------===//
@@ -120829,29 +120895,26 @@ public:
 
 
 
+
 namespace duckdb {
 
-class TableFunctionRelation : public Relation {
+class TableRelation : public Relation {
 public:
-	TableFunctionRelation(const std::shared_ptr<ClientContext> &context, string name, vector<Value> parameters,
-	                      named_parameter_map_t named_parameters, shared_ptr<Relation> input_relation_p = nullptr);
-
-	TableFunctionRelation(const std::shared_ptr<ClientContext> &context, string name, vector<Value> parameters,
-	                      shared_ptr<Relation> input_relation_p = nullptr);
+	TableRelation(const std::shared_ptr<ClientContext> &context, unique_ptr<TableDescription> description);
 
-	string name;
-	vector<Value> parameters;
-	named_parameter_map_t named_parameters;
-	vector<ColumnDefinition> columns;
-	shared_ptr<Relation> input_relation;
+	unique_ptr<TableDescription> description;
 
 public:
 	unique_ptr<QueryNode> GetQueryNode() override;
-	unique_ptr<TableRef> GetTableRef() override;
 
 	const vector<ColumnDefinition> &Columns() override;
 	string ToString(idx_t depth) override;
 	string GetAlias() override;
+
+	unique_ptr<TableRef> GetTableRef() override;
+
+	void Update(const string &update, const string &condition = string()) override;
+	void Delete(const string &condition = string()) override;
 };
 
 } // namespace duckdb
@@ -120930,66 +120993,6 @@ public:
 
 
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/main/connection_manager.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-
-
-
-
-
-namespace duckdb {
-class ClientContext;
-class DatabaseInstance;
-
-class ConnectionManager {
-public:
-	ConnectionManager() {
-	}
-
-	void AddConnection(ClientContext &context) {
-		lock_guard<mutex> lock(connections_lock);
-		connections.insert(make_pair(&context, weak_ptr<ClientContext>(context.shared_from_this())));
-	}
-
-	void RemoveConnection(ClientContext &context) {
-		lock_guard<mutex> lock(connections_lock);
-		connections.erase(&context);
-	}
-
-	vector<shared_ptr<ClientContext>> GetConnectionList() {
-		vector<shared_ptr<ClientContext>> result;
-		for (auto &it : connections) {
-			auto connection = it.second.lock();
-			if (!connection) {
-				connections.erase(it.first);
-				continue;
-			} else {
-				result.push_back(move(connection));
-			}
-		}
-
-		return result;
-	}
-
-	static ConnectionManager &Get(DatabaseInstance &db);
-	static ConnectionManager &Get(ClientContext &context);
-
-public:
-	mutex connections_lock;
-	unordered_map<ClientContext *, weak_ptr<ClientContext>> connections;
-};
-
-} // namespace duckdb
-
-
 
 namespace duckdb {
 
@@ -130828,6 +130831,10 @@ ProfilerPrintFormat QueryProfiler::GetPrintFormat() const {
 	return ClientConfig::GetConfig(context).profiler_print_format;
 }
 
+bool QueryProfiler::PrintOptimizerOutput() const {
+	return GetPrintFormat() == ProfilerPrintFormat::QUERY_TREE_OPTIMIZER || IsDetailedEnabled();
+}
+
 string QueryProfiler::GetSaveLocation() const {
 	return is_explain_analyze ? string() : ClientConfig::GetConfig(context).profiler_save_location;
 }
@@ -130836,13 +130843,22 @@ QueryProfiler &QueryProfiler::Get(ClientContext &context) {
 	return *ClientData::Get(context).profiler;
 }
 
-void QueryProfiler::StartQuery(string query, bool is_explain_analyze) {
+void QueryProfiler::StartQuery(string query, bool is_explain_analyze, bool start_at_optimizer) {
 	if (is_explain_analyze) {
 		StartExplainAnalyze();
 	}
 	if (!IsEnabled()) {
 		return;
 	}
+	if (start_at_optimizer && !PrintOptimizerOutput()) {
+		// This is the StartQuery call before the optimizer, but we don't have to print optimizer output
+		return;
+	}
+	if (running) {
+		// Called while already running: this should only happen when we print optimizer output
+		D_ASSERT(PrintOptimizerOutput());
+		return;
+	}
 	this->running = true;
 	this->query = move(query);
 	tree_map.clear();
@@ -130933,11 +130949,10 @@ string QueryProfiler::ToString() const {
 	const auto format = GetPrintFormat();
 	switch (format) {
 	case ProfilerPrintFormat::QUERY_TREE:
+	case ProfilerPrintFormat::QUERY_TREE_OPTIMIZER:
 		return QueryTreeToString();
 	case ProfilerPrintFormat::JSON:
 		return ToJSON();
-	case ProfilerPrintFormat::QUERY_TREE_OPTIMIZER:
-		return QueryTreeToString(true);
 	default:
 		throw InternalException("Unknown ProfilerPrintFormat \"%s\"", format);
 	}
@@ -131133,13 +131148,13 @@ static string RenderTiming(double timing) {
 	return timing_s + "s";
 }
 
-string QueryProfiler::QueryTreeToString(bool print_optimizer_output) const {
+string QueryProfiler::QueryTreeToString() const {
 	std::stringstream str;
-	QueryTreeToStream(str, print_optimizer_output);
+	QueryTreeToStream(str);
 	return str.str();
 }
 
-void QueryProfiler::QueryTreeToStream(std::ostream &ss, bool print_optimizer_output) const {
+void QueryProfiler::QueryTreeToStream(std::ostream &ss) const {
 	if (!IsEnabled()) {
 		ss << "Query profiling is disabled. Call "
 		      "Connection::EnableProfiling() to enable profiling!";
@@ -131163,7 +131178,7 @@ void QueryProfiler::QueryTreeToStream(std::ostream &ss, bool print_optimizer_out
 	ss << "│└───────────────────────────────────┘│\n";
 	ss << "└─────────────────────────────────────┘\n";
 	// print phase timings
-	if (print_optimizer_output) {
+	if (PrintOptimizerOutput()) {
 		bool has_previous_phase = false;
 		for (const auto &entry : GetOrderedPhaseTimings()) {
 			if (!StringUtil::Contains(entry.first, " > ")) {

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 "457bc43db"
-#define DUCKDB_VERSION "v0.4.1-dev1344"
+#define DUCKDB_SOURCE_ID "8c44f8fc1"
+#define DUCKDB_VERSION "v0.4.1-dev1349"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //