duckdb 0.8.2-dev2044.0 → 0.8.2-dev2068.0

package/configure.py

@@ -31,6 +31,7 @@ if os.environ.get('DUCKDB_NODE_BUILD_CACHE') == '1' and os.path.isfile(cache_fil
     windows_options = cache['windows_options']
     cflags = cache['cflags']
 elif 'DUCKDB_NODE_BINDIR' in os.environ:
+
     def find_library_path(libdir, libname):
         flist = os.listdir(libdir)
         for fname in flist:
@@ -38,6 +39,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
             if os.path.isfile(fpath) and package_build.file_is_lib(fname, libname):
                 return fpath
         raise Exception(f"Failed to find library {libname} in {libdir}")
+
     # existing build
     existing_duckdb_dir = os.environ['DUCKDB_NODE_BINDIR']
     cflags = os.environ['DUCKDB_NODE_CFLAGS']
@@ -48,7 +50,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
 
     result_libraries = package_build.get_libraries(existing_duckdb_dir, libraries, extensions)
     libraries = []
-    for (libdir, libname) in result_libraries:
+    for libdir, libname in result_libraries:
         if libdir is None:
             continue
         libraries.append(find_library_path(libdir, libname))
@@ -72,7 +74,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
             'include_list': include_list,
             'libraries': libraries,
             'cflags': cflags,
-            'windows_options': windows_options
+            'windows_options': windows_options,
         }
         with open(cache_file, 'wb+') as f:
             pickle.dump(cache, f)
@@ -90,9 +92,11 @@ else:
     windows_options = ['/GR']
     cflags = ['-frtti']
 
+
 def sanitize_path(x):
     return x.replace('\\', '/')
 
+
 source_list = [sanitize_path(x) for x in source_list]
 include_list = [sanitize_path(x) for x in include_list]
 libraries = [sanitize_path(x) for x in libraries]
@@ -100,6 +104,7 @@ libraries = [sanitize_path(x) for x in libraries]
 with open(gyp_in, 'r') as f:
     input_json = json.load(f)
 
+
 def replace_entries(node, replacement_map):
     if type(node) == type([]):
         for key in replacement_map.keys():

package/package.json

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

package/src/duckdb/src/common/adbc/adbc.cpp

@@ -52,12 +52,14 @@ duckdb_adbc::AdbcStatusCode duckdb_adbc_init(size_t count, struct duckdb_adbc::A
 
 namespace duckdb_adbc {
 
+enum class IngestionMode { CREATE = 0, APPEND = 1 };
 struct DuckDBAdbcStatementWrapper {
 	::duckdb_connection connection;
 	::duckdb_arrow result;
 	::duckdb_prepared_statement statement;
 	char *ingestion_table_name;
 	ArrowArrayStream *ingestion_stream;
+	IngestionMode ingestion_mode = IngestionMode::CREATE;
 };
 static AdbcStatusCode QueryInternal(struct AdbcConnection *connection, struct ArrowArrayStream *out, const char *query,
                                     struct AdbcError *error);
@@ -428,7 +430,7 @@ void stream_schema(uintptr_t factory_ptr, duckdb::ArrowSchemaWrapper &schema) {
 }
 
 AdbcStatusCode Ingest(duckdb_connection connection, const char *table_name, struct ArrowArrayStream *input,
-                      struct AdbcError *error) {
+                      struct AdbcError *error, IngestionMode ingestion_mode) {
 
 	auto status = SetErrorMaybe(connection, error, "Invalid connection");
 	if (status != ADBC_STATUS_OK) {
@@ -446,12 +448,11 @@ AdbcStatusCode Ingest(duckdb_connection connection, const char *table_name, stru
 	}
 	auto cconn = (duckdb::Connection *)connection;
 
-	auto has_table = cconn->TableInfo(table_name);
 	auto arrow_scan = cconn->TableFunction("arrow_scan", {duckdb::Value::POINTER((uintptr_t)input),
 	                                                      duckdb::Value::POINTER((uintptr_t)stream_produce),
 	                                                      duckdb::Value::POINTER((uintptr_t)get_schema)});
 	try {
-		if (!has_table) {
+		if (ingestion_mode == IngestionMode::CREATE) {
 			// We create the table based on an Arrow Scanner
 			arrow_scan->Create(table_name);
 		} else {
@@ -505,6 +506,7 @@ AdbcStatusCode StatementNew(struct AdbcConnection *connection, struct AdbcStatem
 	statement_wrapper->result = nullptr;
 	statement_wrapper->ingestion_stream = nullptr;
 	statement_wrapper->ingestion_table_name = nullptr;
+	statement_wrapper->ingestion_mode = IngestionMode::CREATE;
 	return ADBC_STATUS_OK;
 }
 
@@ -557,7 +559,7 @@ AdbcStatusCode StatementExecuteQuery(struct AdbcStatement *statement, struct Arr
 	if (wrapper->ingestion_stream && wrapper->ingestion_table_name) {
 		auto stream = wrapper->ingestion_stream;
 		wrapper->ingestion_stream = nullptr;
-		return Ingest(wrapper->connection, wrapper->ingestion_table_name, stream, error);
+		return Ingest(wrapper->connection, wrapper->ingestion_table_name, stream, error, wrapper->ingestion_mode);
 	}
 
 	auto res = duckdb_execute_prepared_arrow(wrapper->statement, &wrapper->result);
@@ -643,6 +645,18 @@ AdbcStatusCode StatementSetOption(struct AdbcStatement *statement, const char *k
 		wrapper->ingestion_table_name = strdup(value);
 		return ADBC_STATUS_OK;
 	}
+	if (strcmp(key, ADBC_INGEST_OPTION_MODE) == 0) {
+		if (strcmp(value, ADBC_INGEST_OPTION_MODE_CREATE) == 0) {
+			wrapper->ingestion_mode = IngestionMode::CREATE;
+			return ADBC_STATUS_OK;
+		} else if (strcmp(value, ADBC_INGEST_OPTION_MODE_APPEND) == 0) {
+			wrapper->ingestion_mode = IngestionMode::APPEND;
+			return ADBC_STATUS_OK;
+		} else {
+			SetError(error, "Invalid ingestion mode");
+			return ADBC_STATUS_INVALID_ARGUMENT;
+		}
+	}
 	return ADBC_STATUS_INVALID_ARGUMENT;
 }
 

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

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.8.2-dev2044"
+#define DUCKDB_VERSION "0.8.2-dev2068"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "762396f87b"
+#define DUCKDB_SOURCE_ID "83481168e0"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/common/assert.hpp

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#if (defined(DUCKDB_USE_STANDARD_ASSERT) || !defined(DEBUG)) && !defined(DUCKDB_FORCE_ASSERT)
+#if (defined(DUCKDB_USE_STANDARD_ASSERT) || !defined(DEBUG)) && !defined(DUCKDB_FORCE_ASSERT) && !defined(__MVS__)
 
 #include <assert.h>
 #define D_ASSERT assert

package/src/duckdb/src/include/duckdb/core_functions/scalar/math_functions.hpp

@@ -101,9 +101,9 @@ struct AtanFun {
 
 struct Atan2Fun {
 	static constexpr const char *Name = "atan2";
-	static constexpr const char *Parameters = "x,y";
-	static constexpr const char *Description = "computes the arctangent (x, y)";
-	static constexpr const char *Example = "atan2(0.5, 0.5)";
+	static constexpr const char *Parameters = "y,x";
+	static constexpr const char *Description = "computes the arctangent (y, x)";
+	static constexpr const char *Example = "atan2(1.0, 0.0)";
 
 	static ScalarFunction GetFunction();
 };

package/src/duckdb/src/planner/expression/bound_window_expression.cpp

@@ -61,10 +61,7 @@ bool BoundWindowExpression::KeysAreCompatible(const BoundWindowExpression &other
 		return false;
 	}
 	for (idx_t i = 0; i < orders.size(); i++) {
-		if (orders[i].type != other.orders[i].type) {
-			return false;
-		}
-		if (!Expression::Equals(*orders[i].expression, *other.orders[i].expression)) {
+		if (!orders[i].Equals(other.orders[i])) {
 			return false;
 		}
 	}

package/src/duckdb/third_party/concurrentqueue/lightweightsemaphore.h

@@ -29,6 +29,7 @@ extern "C" {
 #include <chrono>
 #elif defined(__MVS__)
 #include <zos-semaphore.h>
+#include <chrono>
 #endif
 
 namespace duckdb_moodycamel
@@ -162,9 +163,9 @@ public:
 		}
 	}
 };
-#elif defined(__unix__)
+#elif defined(__unix__) || defined(__MVS__)
 //---------------------------------------------------------
-// Semaphore (POSIX, Linux)
+// Semaphore (POSIX, Linux, zOS aka MVS)
 //---------------------------------------------------------
 class Semaphore
 {
@@ -256,80 +257,6 @@ public:
 		}
 	}
 };
-#elif defined(__MVS__)
-//---------------------------------------------------------
-// Semaphore (MVS aka z/OS)
-//---------------------------------------------------------
-class Semaphore
-{
-private:
-	sem_t m_sema;
-
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		int rc = sem_init(&m_sema, 0, initialCount);
-		assert(rc == 0);
-		(void)rc;
-	}
-
-	~Semaphore()
-	{
-		sem_destroy(&m_sema);
-	}
-
-	bool wait()
-	{
-		// http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
-		int rc;
-		do {
-			rc = sem_wait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool try_wait()
-	{
-		int rc;
-		do {
-			rc = sem_trywait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool timed_wait(std::uint64_t usecs)
-	{
-		struct timespec ts;
-		const int usecs_in_1_sec = 1000000;
-		const int nsecs_in_1_sec = 1000000000;
-
-		ts.tv_sec = usecs / usecs_in_1_sec;
-		ts.tv_nsec = (usecs % usecs_in_1_sec) * 1000;
-
-		int rc;
-		do {
-			rc = sem_timedwait(&m_sema, &ts);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	void signal()
-	{
-		while (sem_post(&m_sema) == -1);
-	}
-
-	void signal(int count)
-	{
-		while (count-- > 0)
-		{
-			while (sem_post(&m_sema) == -1);
-		}
-	}
-};
 #else
 #error Unsupported platform! (No semaphore wrapper available)
 #endif

package/src/duckdb/third_party/libpg_query/pg_functions.cpp

@@ -8,6 +8,9 @@
 #include <mutex>
 #include <cstring>
 
+#ifdef __MVS__
+#include <zos-tls.h>
+#endif
 
 // max parse tree size approx 100 MB, should be enough
 #define PG_MALLOC_SIZE 10240
@@ -26,7 +29,17 @@ struct pg_parser_state_str {
 	size_t malloc_ptr_size;
 };
 
+#ifdef __MVS__
+// --------------------------------------------------------
+// Permanent - WIP
+// static __tlssim<parser_state> pg_parser_state_impl();
+// #define pg_parser_state (*pg_parser_state_impl.access())
+// --------------------------------------------------------
+// Temporary
+static parser_state pg_parser_state;
+#else
 static __thread parser_state pg_parser_state;
+#endif
 
 #ifndef __GNUC__
 __thread PGNode *duckdb_newNodeMacroHolder;

package/src/duckdb/third_party/libpg_query/src_backend_parser_scansup.cpp

@@ -30,6 +30,10 @@
 #include "parser/scansup.hpp"
 #include "mb/pg_wchar.hpp"
 
+#ifdef __MVS__
+#include <zos-tls.h>
+#endif
+
 namespace duckdb_libpgquery {
 
 /* ----------------
@@ -60,7 +64,12 @@ char *downcase_truncate_identifier(const char *ident, int len, bool warn) {
 	return downcase_identifier(ident, len, warn, true);
 }
 
+#ifdef __MVS__
+static __tlssim<bool> pg_preserve_identifier_case_impl(false);
+#define pg_preserve_identifier_case (*pg_preserve_identifier_case_impl.access())
+#else
 static __thread bool pg_preserve_identifier_case = false;
+#endif
 
 void set_preserve_identifier_case(bool preserve) {
 	pg_preserve_identifier_case = preserve;