Fix session class

Author: auxten

lib/README.md

@@ -1,6 +1,9 @@
-## libchdb `Execute` function binding
+## libchdb `Query` function binding
 
 ```bash
+# install dependencies
+./update_libchdb.sh
+
 # build the dynamic library
 
 ./build.sh

lib/binding.bun

@@ -1,8 +1,13 @@
+#!/bin/bash
+
 if [ "$(uname)" == "Darwin" ]; then
-    gcc -dynamiclib -o libchdb_bun.dylib -L. -lchdb libchdb_bun.c 
+    clang -O3 -dynamiclib -o chdb_bun.so -L. -lchdb chdb_bun.c 
 elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    gcc -shared -fPIC -o libchdb_bun.so libchdb_bun.c -L. -lchdb
+    clang -O3 -shared -fPIC -o chdb_bun.so -L. -lchdb chdb_bun.c
 else
     echo "Unsupported operating system"
     exit 1
-fi
+fi
+
+mv chdb_bun.so ../chdb_bun.so
+mv libchdb.so ../libchdb.so

lib/build.sh

@@ -0,0 +1,28 @@
+#pragma once
+
+#ifdef __cplusplus
+#    include <cstddef>
+#    include <cstdint>
+extern "C" {
+#else
+#    include <stddef.h>
+#    include <stdint.h>
+#endif
+
+#define CHDB_EXPORT __attribute__((visibility("default")))
+struct CHDB_EXPORT local_result
+{
+    char * buf;
+    size_t len;
+    void * _vec; // std::vector<char> *, for freeing
+    double elapsed;
+    uint64_t rows_read;
+    uint64_t bytes_read;
+};
+
+CHDB_EXPORT struct local_result * query_stable(int argc, char ** argv);
+CHDB_EXPORT void free_result(struct local_result * result);
+
+#ifdef __cplusplus
+}
+#endif

lib/chdb.h

@@ -0,0 +1,77 @@
+#include "chdb.h"
+#include "chdb_bun.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MAX_FORMAT_LENGTH 64
+#define MAX_PATH_LENGTH 4096
+#define MAX_ARG_COUNT 6
+
+// Utility function to construct argument string
+void construct_arg(char *dest, const char *prefix, const char *value,
+                   size_t dest_size) {
+  snprintf(dest, dest_size, "%s%s", prefix, value);
+}
+
+// Generalized query function
+char *general_query(int argc, char *args[]) {
+  struct local_result *result = query_stable(argc, args);
+
+  if (result == NULL) {
+    return NULL;
+  } else {
+    return result->buf;
+  }
+}
+
+// Query function without session
+char *Query(const char *query, const char *format) {
+  char dataFormat[MAX_FORMAT_LENGTH];
+  char *dataQuery;
+  char *args[MAX_ARG_COUNT] = {"clickhouse", "--multiquery", NULL, NULL};
+  int argc = 4;
+
+  construct_arg(dataFormat, "--output-format=", format, MAX_FORMAT_LENGTH);
+  args[2] = dataFormat;
+
+  dataQuery = (char *)malloc(strlen(query) + strlen("--query=") + 1);
+  if (dataQuery == NULL) {
+    return NULL;
+  }
+  construct_arg(dataQuery, "--query=", query,
+                strlen(query) + strlen("--query=") + 1);
+  args[3] = dataQuery;
+
+  char *result = general_query(argc, args);
+  free(dataQuery);
+  return result;
+}
+
+// QuerySession function will save the session to the path
+// queries with same path will use the same session
+char *QuerySession(const char *query, const char *format, const char *path) {
+  char dataFormat[MAX_FORMAT_LENGTH];
+  char dataPath[MAX_PATH_LENGTH];
+  char *dataQuery;
+  char *args[MAX_ARG_COUNT] = {"clickhouse", "--multiquery", NULL, NULL, NULL};
+  int argc = 5;
+
+  construct_arg(dataFormat, "--output-format=", format, MAX_FORMAT_LENGTH);
+  args[2] = dataFormat;
+
+  dataQuery = (char *)malloc(strlen(query) + strlen("--query=") + 1);
+  if (dataQuery == NULL) {
+    return NULL;
+  }
+  construct_arg(dataQuery, "--query=", query,
+                strlen(query) + strlen("--query=") + 1);
+  args[3] = dataQuery;
+
+  construct_arg(dataPath, "--path=", path, MAX_PATH_LENGTH);
+  args[4] = dataPath;
+
+  char *result = general_query(argc, args);
+  free(dataQuery);
+  return result;
+}

lib/chdb_bun.c

@@ -0,0 +1,4 @@
+#pragma once
+
+char *Query(const char *query, const char *format);
+char *QuerySession(const char *query, const char *format, const char *path);

lib/chdb_bun.h

@@ -0,0 +1,43 @@
+
+#!/bin/bash
+
+# Get the newest release version
+LATEST_RELEASE=$(curl --silent "https://api.github.com/repos/chdb-io/chdb/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+
+# Download the correct version based on the platform
+case "$(uname -s)" in
+    Linux)
+        if [[ $(uname -m) == "aarch64" ]]; then
+            PLATFORM="linux-aarch64-libchdb.tar.gz"
+        else
+            PLATFORM="linux-x86_64-libchdb.tar.gz"
+        fi
+        ;;
+    Darwin)
+        if [[ $(uname -m) == "arm64" ]]; then
+            PLATFORM="macos-arm64-libchdb.tar.gz"
+        else
+            PLATFORM="macos-x86_64-libchdb.tar.gz"
+        fi
+        ;;
+    *)
+        echo "Unsupported platform"
+        exit 1
+        ;;
+esac
+
+DOWNLOAD_URL="https://github.com/chdb-io/chdb/releases/download/$LATEST_RELEASE/$PLATFORM"
+
+echo "Downloading $PLATFORM from $DOWNLOAD_URL"
+
+# Download the file
+curl -L -o libchdb.tar.gz $DOWNLOAD_URL
+
+# Untar the file
+tar -xzf libchdb.tar.gz
+
+# Set execute permission for libchdb.so
+chmod +x libchdb.so
+
+# Clean up
+rm -f libchdb.tar.gz