duckdb 0.7.2-dev2995.0 → 0.7.2-dev3117.0

package/binding.gyp

@@ -135,6 +135,7 @@
                 "src/duckdb/ub_src_transaction.cpp", 
                 "src/duckdb/src/verification/copied_statement_verifier.cpp", 
                 "src/duckdb/src/verification/deserialized_statement_verifier.cpp", 
+                "src/duckdb/src/verification/deserialized_statement_verifier_v2.cpp", 
                 "src/duckdb/src/verification/external_statement_verifier.cpp", 
                 "src/duckdb/src/verification/no_operator_caching_verifier.cpp", 
                 "src/duckdb/src/verification/parsed_statement_verifier.cpp", 

package/package.json

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

package/src/duckdb/extension/json/include/json_deserializer.hpp

@@ -7,6 +7,7 @@ namespace duckdb {
 class JsonDeserializer : public FormatDeserializer {
 public:
 	JsonDeserializer(yyjson_val *val, yyjson_doc *doc) : doc(doc) {
+		deserialize_enum_from_string = true;
 		stack.emplace_back(val);
 	}
 	~JsonDeserializer() {

package/src/duckdb/extension/json/include/json_serializer.hpp

@@ -24,12 +24,19 @@ private:
 	// Either adds a value to the current object with the current tag, or appends it to the current array
 	void PushValue(yyjson_mut_val *val);
 
-public:
 	explicit JsonSerializer(yyjson_mut_doc *doc, bool skip_if_null, bool skip_if_empty)
 	    : doc(doc), stack({yyjson_mut_obj(doc)}), skip_if_null(skip_if_null), skip_if_empty(skip_if_empty) {
 		serialize_enum_as_string = true;
 	}
 
+public:
+	template <class T>
+	static yyjson_mut_val *Serialize(T &value, yyjson_mut_doc *doc, bool skip_if_null, bool skip_if_empty) {
+		JsonSerializer serializer(doc, skip_if_null, skip_if_empty);
+		value.FormatSerialize(serializer);
+		return serializer.GetRootObject();
+	}
+
 	yyjson_mut_val *GetRootObject() {
 		D_ASSERT(stack.size() == 1); // or we forgot to pop somewhere
 		return stack.front();

package/src/duckdb/extension/json/json_functions/json_serialize_sql.cpp

@@ -98,9 +98,7 @@ static void JsonSerializeFunction(DataChunk &args, ExpressionState &state, Vecto
 					throw NotImplementedException("Only SELECT statements can be serialized to json!");
 				}
 				auto &select = statement->Cast<SelectStatement>();
-				auto serializer = JsonSerializer(doc, info.skip_if_null, info.skip_if_empty);
-				select.FormatSerialize(serializer);
-				auto json = serializer.GetRootObject();
+				auto json = JsonSerializer::Serialize(select, doc, info.skip_if_null, info.skip_if_empty);
 
 				yyjson_mut_arr_append(statements_arr, json);
 			}

package/src/duckdb/extension/json/json_functions/json_structure.cpp

@@ -3,6 +3,7 @@
 #include "json_executors.hpp"
 #include "json_scan.hpp"
 #include "json_transform.hpp"
+#include "duckdb/common/enum_util.hpp"
 
 namespace duckdb {
 
@@ -300,7 +301,7 @@ bool JSONStructureNode::EliminateCandidateFormats(idx_t count, Vector &string_ve
 			success = TryParse<TryParseTimeStamp, timestamp_t>(string_vector, format, count);
 			break;
 		default:
-			throw InternalException("No date/timestamp formats for %s", LogicalTypeIdToString(type));
+			throw InternalException("No date/timestamp formats for %s", EnumUtil::ToString(type));
 		}
 		if (success) {
 			while (formats.size() > i) {
@@ -457,8 +458,7 @@ static inline yyjson_mut_val *ConvertStructure(const JSONStructureNode &node, yy
 	case LogicalTypeId::STRUCT:
 		return ConvertStructureObject(node, doc);
 	default:
-		auto type_string = LogicalTypeIdToString(desc.type); // TODO: this requires copying, can be optimized
-		return yyjson_mut_strncpy(doc, type_string.c_str(), type_string.length());
+		return yyjson_mut_str(doc, EnumUtil::ToChars(desc.type));
 	}
 }
 

package/src/duckdb/extension/json/json_functions/json_transform.cpp

@@ -1,6 +1,7 @@
 #include "json_transform.hpp"
 
 #include "duckdb/common/types.hpp"
+#include "duckdb/common/enum_util.hpp"
 #include "duckdb/execution/expression_executor.hpp"
 #include "duckdb/function/scalar/nested_functions.hpp"
 #include "json_functions.hpp"
@@ -266,7 +267,7 @@ bool JSONTransform::GetStringVector(yyjson_val *vals[], const idx_t count, const
 		if (!val || unsafe_yyjson_is_null(val)) {
 			validity.SetInvalid(i);
 		} else if (options.strict_cast && !unsafe_yyjson_is_str(val)) {
-			options.error_message = StringUtil::Format("Unable to cast '%s' to " + LogicalTypeIdToString(target.id()),
+			options.error_message = StringUtil::Format("Unable to cast '%s' to " + EnumUtil::ToString(target.id()),
 			                                           JSONCommon::ValToString(val, 50));
 			options.object_index = i;
 			return false;
@@ -343,7 +344,7 @@ static bool TransformFromStringWithFormat(yyjson_val *vals[], Vector &result, co
 	case LogicalTypeId::TIMESTAMP:
 		return TransformStringWithFormat<TryParseTimeStamp, timestamp_t>(string_vector, format, count, result, options);
 	default:
-		throw InternalException("No date/timestamp formats for %s", LogicalTypeIdToString(result.GetType().id()));
+		throw InternalException("No date/timestamp formats for %s", EnumUtil::ToString(result.GetType().id()));
 	}
 }
 

package/src/duckdb/extension/parquet/parquet-extension.cpp

@@ -304,6 +304,9 @@ public:
 				parquet_options.file_row_number = BooleanValue::Get(kv.second);
 			}
 		}
+		if (parquet_options.file_options.auto_detect_hive_partitioning) {
+			parquet_options.file_options.hive_partitioning = MultiFileReaderOptions::AutoDetectHivePartitioning(files);
+		}
 		return ParquetScanBindInternal(context, std::move(files), return_types, names, parquet_options);
 	}
 
@@ -665,14 +668,13 @@ unique_ptr<LocalFunctionData> ParquetWriteInitializeLocal(ExecutionContext &cont
 }
 
 //===--------------------------------------------------------------------===//
-// Parallel
+// Execution Mode
 //===--------------------------------------------------------------------===//
-bool ParquetWriteIsParallel(ClientContext &context, FunctionData &bind_data) {
-	auto &config = DBConfig::GetConfig(context);
-	if (config.options.preserve_insertion_order) {
-		return false;
+CopyFunctionExecutionMode ParquetWriteExecutionMode(bool preserve_insertion_order, bool supports_batch_index) {
+	if (!preserve_insertion_order) {
+		return CopyFunctionExecutionMode::PARALLEL_COPY_TO_FILE;
 	}
-	return true;
+	return CopyFunctionExecutionMode::REGULAR_COPY_TO_FILE;
 }
 
 unique_ptr<TableRef> ParquetScanReplacement(ClientContext &context, const string &table_name,
@@ -714,7 +716,7 @@ void ParquetExtension::Load(DuckDB &db) {
 	function.copy_to_sink = ParquetWriteSink;
 	function.copy_to_combine = ParquetWriteCombine;
 	function.copy_to_finalize = ParquetWriteFinalize;
-	function.parallel = ParquetWriteIsParallel;
+	function.execution_mode = ParquetWriteExecutionMode;
 	function.copy_from_bind = ParquetScanFunction::ParquetReadBind;
 	function.copy_from_function = scan_fun.functions[0];