Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into summary
Browse files Browse the repository at this point in the history
# Conflicts:
#	wasm_parts/main.js
  • Loading branch information
akvlad committed Nov 26, 2023
2 parents f2b85d1 + 027f4c3 commit 5603718
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/node-clickhouse.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@ jobs:
CLICKHOUSE_TSDB: qryn
INTEGRATION_E2E: 1
CLOKI_EXT_URL: 127.0.0.1:3100
QRYN_LOGIN: a
QRYN_PASSWORD: b
run: node qryn.mjs >/dev/stdout & npm run test --forceExit
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qryn",
"version": "3.0.12",
"version": "3.0.16",
"description": "Polyglot Observability Stack with ClickHouse storage",
"main": "qryn_node.js",
"bin": {
Expand Down
4 changes: 1 addition & 3 deletions wasm_parts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ const pql = async (query, wasmCall, getData) => {
writer.writeString(JSON.stringify(matchers))
writer.writeBytes([data])
}
fs.writeFileSync('req.txt', query)
fs.writeFileSync('data.bin', writer.buffer())
ctx.write(writer.buffer())
_wasm.exports.onDataLoad(reqId)
return ctx.read()
Expand Down Expand Up @@ -273,7 +271,7 @@ class Uint8ArrayWriter {
writeString (str) {
const bStr = (new TextEncoder()).encode(str)
this.writeULeb(bStr.length)
this.maybeGrow(b.length)
this.maybeGrow(bStr.length)
this.buf.set(bStr, this.i)
this.i += bStr.length
return this
Expand Down

0 comments on commit 5603718

Please sign in to comment.