duckdb 0.7.2-dev2233.0 → 0.7.2-dev2320.0

package/src/duckdb/src/function/table/system/duckdb_databases.cpp

@@ -42,7 +42,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBDatabasesInit(ClientContext &context,
 }
 
 void DuckDBDatabasesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBDatabasesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBDatabasesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_dependencies.cpp

@@ -69,7 +69,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBDependenciesInit(ClientContext &conte
 }
 
 void DuckDBDependenciesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBDependenciesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBDependenciesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_extensions.cpp

@@ -119,7 +119,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBExtensionsInit(ClientContext &context
 }
 
 void DuckDBExtensionsFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBExtensionsData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBExtensionsData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_indexes.cpp

@@ -72,7 +72,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBIndexesInit(ClientContext &context, T
 }
 
 void DuckDBIndexesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBIndexesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBIndexesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_keywords.cpp

@@ -32,7 +32,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBKeywordsInit(ClientContext &context,
 }
 
 void DuckDBKeywordsFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBKeywordsData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBKeywordsData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_schemas.cpp

@@ -49,7 +49,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBSchemasInit(ClientContext &context, T
 }
 
 void DuckDBSchemasFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBSchemasData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBSchemasData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_sequences.cpp

@@ -77,7 +77,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBSequencesInit(ClientContext &context,
 }
 
 void DuckDBSequencesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBSequencesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBSequencesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_settings.cpp

@@ -71,7 +71,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBSettingsInit(ClientContext &context,
 }
 
 void DuckDBSettingsFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBSettingsData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBSettingsData>();
 	if (data.offset >= data.settings.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_tables.cpp

@@ -102,7 +102,7 @@ static idx_t CheckConstraintCount(TableCatalogEntry &table) {
 }
 
 void DuckDBTablesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBTablesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBTablesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_temporary_files.cpp

@@ -30,7 +30,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBTemporaryFilesInit(ClientContext &con
 }
 
 void DuckDBTemporaryFilesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBTemporaryFilesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBTemporaryFilesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/duckdb_types.cpp

@@ -68,7 +68,7 @@ unique_ptr<GlobalTableFunctionState> DuckDBTypesInit(ClientContext &context, Tab
 }
 
 void DuckDBTypesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (DuckDBTypesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<DuckDBTypesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/pragma_collations.cpp

@@ -35,7 +35,7 @@ unique_ptr<GlobalTableFunctionState> PragmaCollateInit(ClientContext &context, T
 }
 
 static void PragmaCollateFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (PragmaCollateData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<PragmaCollateData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/system/pragma_database_size.cpp

@@ -65,7 +65,7 @@ unique_ptr<GlobalTableFunctionState> PragmaDatabaseSizeInit(ClientContext &conte
 }
 
 void PragmaDatabaseSizeFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (PragmaDatabaseSizeData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<PragmaDatabaseSizeData>();
 	idx_t row = 0;
 	for (; data.index < data.databases.size() && row < STANDARD_VECTOR_SIZE; data.index++) {
 		auto db = data.databases[data.index];

package/src/duckdb/src/function/table/system/pragma_storage_info.cpp

@@ -18,10 +18,10 @@
 namespace duckdb {
 
 struct PragmaStorageFunctionData : public TableFunctionData {
-	explicit PragmaStorageFunctionData(TableCatalogEntry *table_entry) : table_entry(table_entry) {
+	explicit PragmaStorageFunctionData(TableCatalogEntry &table_entry) : table_entry(table_entry) {
 	}
 
-	TableCatalogEntry *table_entry;
+	TableCatalogEntry &table_entry;
 	TableStorageInfo storage_info;
 };
 
@@ -81,7 +81,7 @@ static unique_ptr<FunctionData> PragmaStorageInfoBind(ClientContext &context, Ta
 	// look up the table name in the catalog
 	Binder::BindSchemaOrCatalog(context, qname.catalog, qname.schema);
 	auto table_entry = Catalog::GetEntry<TableCatalogEntry>(context, qname.catalog, qname.schema, qname.name);
-	auto result = make_uniq<PragmaStorageFunctionData>(table_entry);
+	auto result = make_uniq<PragmaStorageFunctionData>(*table_entry);
 	result->storage_info = table_entry->GetStorageInfo(context);
 	return std::move(result);
 }
@@ -91,10 +91,10 @@ unique_ptr<GlobalTableFunctionState> PragmaStorageInfoInit(ClientContext &contex
 }
 
 static void PragmaStorageInfoFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &bind_data = (PragmaStorageFunctionData &)*data_p.bind_data;
+	auto &bind_data = data_p.bind_data->Cast<PragmaStorageFunctionData>();
 	auto &data = data_p.global_state->Cast<PragmaStorageOperatorData>();
 	idx_t count = 0;
-	auto &columns = bind_data.table_entry->GetColumns();
+	auto &columns = bind_data.table_entry.GetColumns();
 	while (data.offset < bind_data.storage_info.column_segments.size() && count < STANDARD_VECTOR_SIZE) {
 		auto &entry = bind_data.storage_info.column_segments[data.offset++];
 

package/src/duckdb/src/function/table/system/pragma_table_info.cpp

@@ -163,7 +163,7 @@ static void PragmaTableInfoView(PragmaTableOperatorData &data, ViewCatalogEntry
 }
 
 static void PragmaTableInfoFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &bind_data = (PragmaTableFunctionData &)*data_p.bind_data;
+	auto &bind_data = data_p.bind_data->Cast<PragmaTableFunctionData>();
 	auto &state = data_p.global_state->Cast<PragmaTableOperatorData>();
 	switch (bind_data.entry.type) {
 	case CatalogType::TABLE_ENTRY:

package/src/duckdb/src/function/table/system/test_all_types.cpp

@@ -224,7 +224,7 @@ unique_ptr<GlobalTableFunctionState> TestAllTypesInit(ClientContext &context, Ta
 }
 
 void TestAllTypesFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (TestAllTypesData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<TestAllTypesData>();
 	if (data.offset >= data.entries.size()) {
 		// finished returning values
 		return;

package/src/duckdb/src/function/table/table_scan.cpp

@@ -103,7 +103,7 @@ static unique_ptr<BaseStatistics> TableScanStatistics(ClientContext &context, co
                                                       column_t column_id) {
 	auto &bind_data = bind_data_p->Cast<TableScanBindData>();
 	auto &local_storage = LocalStorage::Get(context, *bind_data.table->catalog);
-	if (local_storage.Find(bind_data.table->GetStoragePtr())) {
+	if (local_storage.Find(bind_data.table->GetStorage())) {
 		// we don't emit any statistics for tables that have outstanding transaction-local data
 		return nullptr;
 	}
@@ -192,7 +192,7 @@ unique_ptr<NodeStatistics> TableScanCardinality(ClientContext &context, const Fu
 	auto &bind_data = bind_data_p->Cast<TableScanBindData>();
 	auto &local_storage = LocalStorage::Get(context, *bind_data.table->catalog);
 	auto &storage = bind_data.table->GetStorage();
-	idx_t estimated_cardinality = storage.info->cardinality + local_storage.AddedRows(bind_data.table->GetStoragePtr());
+	idx_t estimated_cardinality = storage.info->cardinality + local_storage.AddedRows(bind_data.table->GetStorage());
 	return make_uniq<NodeStatistics>(storage.info->cardinality, estimated_cardinality);
 }
 
@@ -220,8 +220,7 @@ static unique_ptr<GlobalTableFunctionState> IndexScanInitGlobal(ClientContext &c
 	auto &local_storage = LocalStorage::Get(context, *bind_data.table->catalog);
 	result->column_ids = input.column_ids;
 	result->local_storage_state.Initialize(input.column_ids, input.filters);
-	local_storage.InitializeScan(bind_data.table->GetStoragePtr(), result->local_storage_state.local_state,
-	                             input.filters);
+	local_storage.InitializeScan(bind_data.table->GetStorage(), result->local_storage_state.local_state, input.filters);
 
 	result->finished = false;
 	return std::move(result);

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.7.2-dev2233"
+#define DUCKDB_VERSION "0.7.2-dev2320"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "c81600ed51"
+#define DUCKDB_SOURCE_ID "04b7296af3"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/catalog/catalog.hpp

@@ -12,7 +12,7 @@
 #include "duckdb/common/mutex.hpp"
 #include "duckdb/parser/query_error_context.hpp"
 #include "duckdb/catalog/catalog_transaction.hpp"
-#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/common/reference_map.hpp"
 #include "duckdb/common/atomic.hpp"
 #include "duckdb/common/optional_ptr.hpp"
 
@@ -279,12 +279,12 @@ private:
 	//! Return an exception with did-you-mean suggestion.
 	static CatalogException CreateMissingEntryException(ClientContext &context, const string &entry_name,
 	                                                    CatalogType type,
-	                                                    const unordered_set<SchemaCatalogEntry *> &schemas,
+	                                                    const reference_set_t<SchemaCatalogEntry> &schemas,
 	                                                    QueryErrorContext error_context);
 
 	//! Return the close entry name, the distance and the belonging schema.
 	static SimilarCatalogEntry SimilarEntryInSchemas(ClientContext &context, const string &entry_name, CatalogType type,
-	                                                 const unordered_set<SchemaCatalogEntry *> &schemas);
+	                                                 const reference_set_t<SchemaCatalogEntry> &schemas);
 
 	virtual void DropSchema(ClientContext &context, DropInfo *info) = 0;
 

package/src/duckdb/src/include/duckdb/catalog/catalog_entry/duck_table_entry.hpp

@@ -24,7 +24,6 @@ public:
 	void UndoAlter(ClientContext &context, AlterInfo *info) override;
 	//! Returns the underlying storage of the table
 	DataTable &GetStorage() override;
-	DataTable *GetStoragePtr() override;
 	//! Returns a list of the bound constraints of the table
 	const vector<unique_ptr<BoundConstraint>> &GetBoundConstraints() override;
 
@@ -42,7 +41,7 @@ public:
 
 	TableStorageInfo GetStorageInfo(ClientContext &context) override;
 
-	bool IsDuckTable() override {
+	bool IsDuckTable() const override {
 		return true;
 	}
 

package/src/duckdb/src/include/duckdb/catalog/catalog_entry/table_catalog_entry.hpp

@@ -69,7 +69,6 @@ public:
 	DUCKDB_API ColumnList &GetColumnsMutable();
 	//! Returns the underlying storage of the table
 	virtual DataTable &GetStorage();
-	virtual DataTable *GetStoragePtr();
 	//! Returns a list of the bound constraints of the table
 	virtual const vector<unique_ptr<BoundConstraint>> &GetBoundConstraints();
 
@@ -94,7 +93,7 @@ public:
 	//! Returns the scan function that can be used to scan the given table
 	virtual TableFunction GetScanFunction(ClientContext &context, unique_ptr<FunctionData> &bind_data) = 0;
 
-	virtual bool IsDuckTable() {
+	virtual bool IsDuckTable() const {
 		return false;
 	}
 

package/src/duckdb/src/include/duckdb/common/adbc/adbc-init.hpp

@@ -0,0 +1,37 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#pragma once
+
+#ifndef DUCKDB_ADBC_INIT
+#define DUCKDB_ADBC_INIT
+
+#include "duckdb/common/adbc/adbc.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//! We gotta leak the symbols of the init function
+duckdb_adbc::AdbcStatusCode duckdb_adbc_init(size_t count, struct duckdb_adbc::AdbcDriver *driver,
+                                             struct duckdb_adbc::AdbcError *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif