Skip to content

Commit eac279f

Browse files
authored
Merge pull request #4 from xq262144/main
Keepup libchdb.so/chdb.h with main repo
2 parents 363f55e + 34192d5 commit eac279f

File tree

11 files changed

+121
-8645
lines changed

11 files changed

+121
-8645
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
node_modules
22
build
33
/metadata
4-
/user_defined
4+
/user_defined
5+
.vscode/
6+
libchdb.so

binding.gyp

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,34 @@
11
{
2+
"variables": {
3+
"openssl_fips": "",
4+
},
25
"targets": [
6+
{
7+
"target_name": "action_before_build",
8+
"type": "none",
9+
"hard_dependency": 1,
10+
"actions": [
11+
{
12+
"action_name": "update_libchdb",
13+
"inputs": [],
14+
"outputs": [
15+
"<(module_root_dir)/libchdb.so"
16+
],
17+
"action": ["./update_libchdb.sh"]
18+
}
19+
]
20+
},
321
{
422
"target_name": "addon",
523
"sources": [ "src/addon.cc" ],
24+
"dependencies": [
25+
"action_before_build"
26+
],
627
"include_dirs": [
7-
"<!(node -p \"require('node-addon-api').include\")",
28+
"<!@(node -p \"require('node-addon-api').include\")",
829
"include/"
930
],
10-
"libraries": [ "-L/usr/src/chdb-node-addon/lib", "-lchdb" ],
31+
"libraries": [ "-L<(module_root_dir)", "-lchdb" ],
1132
"cflags!": [ "-fno-exceptions" ],
1233
"cflags_cc!": [ "-fno-exceptions" ],
1334
"defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ]

include/chdb.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#pragma once
2+
3+
#ifdef __cplusplus
4+
# include <cstddef>
5+
# include <cstdint>
6+
extern "C" {
7+
#else
8+
# include <stddef.h>
9+
# include <stdint.h>
10+
#endif
11+
12+
#define CHDB_EXPORT __attribute__((visibility("default")))
13+
struct CHDB_EXPORT local_result
14+
{
15+
char * buf;
16+
size_t len;
17+
void * _vec; // std::vector<char> *, for freeing
18+
double elapsed;
19+
uint64_t rows_read;
20+
uint64_t bytes_read;
21+
};
22+
23+
CHDB_EXPORT struct local_result * query_stable(int argc, char ** argv);
24+
CHDB_EXPORT void free_result(struct local_result * result);
25+
26+
#ifdef __cplusplus
27+
}
28+
#endif

include/libchdb.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

include/napi-inl.deprecated.h

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)