session support

Author: lmangani

chdb/chdb.go

@@ -11,11 +11,11 @@ package chdb
 char *Execute(char *query, char *format) {
 
     char * argv[] = {(char *)"clickhouse", (char *)"--multiquery", (char *)"--output-format=CSV", (char *)"--query="};
-    char dataFormat[100]; 
+    char dataFormat[100];
     char *localQuery;
     // Total 4 = 3 arguments + 1 programm name
     int argc = 4;
-    struct local_result *result;    
+    struct local_result *result;
 
     // Format
     snprintf(dataFormat, sizeof(dataFormat), "--format=%s", format);
@@ -24,33 +24,94 @@ char *Execute(char *query, char *format) {
     // Query - 10 characters + length of query
     localQuery = (char *) malloc(strlen(query)+10);
     if(localQuery == NULL) {
-    
+
+        printf("Out of memmory\n");
+        return NULL;
+    }
+
+    sprintf(localQuery, "--query=%s", query);
+    argv[3]=strdup(localQuery);
+    free(localQuery);
+
+    // Main query and result
+    result = query_stable(argc, argv);
+
+    //Free it
+    free(argv[2]);
+    free(argv[3]);
+
+    return result->buf;
+}
+
+char *Session(char *query, char *format, char* path) {
+
+    char * argv[] = {(char *)"clickhouse", (char *)"--multiquery", (char *)"--output-format=CSV", (char *)"--query=", (char *)"--path=/tmp/"};
+    char dataFormat[100];
+    char dataPath[100];
+    char *localQuery;
+    // Total 4 = 4 arguments + 1 programm name
+    int argc = 5;
+    struct local_result *result;
+
+    // Format
+    snprintf(dataFormat, sizeof(dataFormat), "--format=%s", format);
+    argv[2]=strdup(dataFormat);
+
+    // Query - 10 characters + length of query
+    localQuery = (char *) malloc(strlen(query)+10);
+    if(localQuery == NULL) {
+
         printf("Out of memmory\n");
         return NULL;
     }
-    
+
     sprintf(localQuery, "--query=%s", query);
     argv[3]=strdup(localQuery);
     free(localQuery);
 
+    // Path
+    snprintf(dataPath, sizeof(dataPath), "--path=%s", path);
+    argv[4]=strdup(dataPath);
+
     // Main query and result
     result = query_stable(argc, argv);
 
     //Free it
     free(argv[2]);
     free(argv[3]);
+    free(argv[4]);
 
     return result->buf;
 }
 */
 import "C"
 import "unsafe"
 
-func Query(str1, str2 string) string {
-    query := C.CString(str1)
-    defer C.free(unsafe.Pointer(query))
-    format := C.CString(str2)
-    defer C.free(unsafe.Pointer(format))
-    resultData := C.Execute(query, format)
-    return C.GoString(resultData)
+func Query(str1 string, str2 string) string {
+	if str2 == "" {
+		str2 = "CSV"
+	}
+	query := C.CString(str1)
+	defer C.free(unsafe.Pointer(query))
+	format := C.CString(str2)
+	defer C.free(unsafe.Pointer(format))
+	resultData := C.Execute(query, format)
+	return C.GoString(resultData)
+}
+
+func Session(str1 string, str2 string, str3 string) string {
+	if str3 == "" {
+		str3 = "/tmp/"
+	}
+	if str2 == "" {
+		str2 = "CSV"
+	}
+	query := C.CString(str1)
+	defer C.free(unsafe.Pointer(query))
+	format := C.CString(str2)
+	defer C.free(unsafe.Pointer(format))
+	path := C.CString(str3)
+	defer C.free(unsafe.Pointer(path))
+	resultData := C.Session(query, format, path)
+	return C.GoString(resultData)
 }

chdb/chdb_test.go

@@ -0,0 +1,25 @@
+package chdb
+
+import (
+    "testing"
+    "strings"
+)
+
+var testCases = []struct {
+    query       string
+    expected    string
+    description string
+}{
+    {"SELECT 1", "1", "Basic Select"},
+    {"SELECT 'hello'", "\"hello\"", "Basic Select"},
+}
+
+func TestChdb(t *testing.T) {
+    for _, test := range testCases {
+        observed := Query(test.query, "CSV")
+        observed = strings.Replace(observed, "\n", "", -1)
+        if observed != test.expected {
+            t.Fatalf("%s: %s is not %s", test.query, observed, test.expected)
+        }
+    }
+}

main.go

@@ -9,7 +9,14 @@ import (
 func main() {
     query := flag.String("query", "SELECT version()", "Query to execute")
     format := flag.String("format", "CSV", "Query output format")
+    path := flag.String("path", "", "Table persistence path")
     flag.Parse()
-    result := chdb.Query(string(*query), string(*format))
-    fmt.Println(result)
+
+    if (path !== ""){
+      result := chdb.Session(string(*query), string(*format), string(*path))
+      fmt.Println(result)
+    } else {
+      result := chdb.Query(string(*query), string(*format))
+      fmt.Println(result)
+    }
 }