updates, gh actions

Author: asg017

.cargo/config

@@ -0,0 +1,95 @@
+name: "test build"
+on:
+  push:
+    branches:
+      - main
+permissions:
+  contents: read
+jobs:
+  test-ubuntu:
+    name: Testing ubuntu-latest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - run: cargo build --release --verbose
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: sqlite-regex-ubuntu
+          path: target/release/libregex0.so
+  test-macos:
+    name: Testing macos-latest
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - run: cargo build --release --verbose
+      #- run: make test
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: sqlite-regex-macos
+          path: target/release/libregex0.dylib
+  test-windows:
+    name: Testing windows-latest
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - run: cargo build --release --verbose
+      #- run: make test
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: sqlite-regex-windows
+          path: target/release/regex0.dll
+  upload:
+    name: upload to unstable
+    needs: [test-macos, test-ubuntu, test-windows]
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download workflow artifacts
+        uses: actions/download-artifact@v2
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const script = require('.github/workflows/upload.js')
+            await script({github, context})

.github/workflows/test.yaml

@@ -0,0 +1,34 @@
+const fs = require("fs").promises;
+
+module.exports = async ({ github, context }) => {
+  const {
+    repo: { owner, repo },
+    sha,
+  } = context;
+  console.log(process.env.GITHUB_REF);
+  const release = await github.rest.repos.getReleaseByTag({
+    owner,
+    repo,
+    tag: "unstable",
+  });
+
+  const release_id = release.data.id;
+  async function uploadReleaseAsset(path, name) {
+    console.log("Uploading", name, "at", path);
+
+    return github.rest.repos.uploadReleaseAsset({
+      owner,
+      repo,
+      release_id,
+      name,
+      data: await fs.readFile(path),
+    });
+  }
+  await Promise.all([
+    uploadReleaseAsset("sqlite-regex-ubuntu/libregex0.so", "regex0.so"),
+    uploadReleaseAsset("sqlite-regex-macos/libregex0.dylib", "regex0.dylib"),
+    uploadReleaseAsset("sqlite-regex-windows/regex0.dll", "regex0.dll"),
+  ]);
+
+  return;
+};

.github/workflows/upload.js

@@ -3,11 +3,8 @@ name = "sqlite-regex"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-sqlite3-loadable = {path="../rust-sqlite-exts/sqlite3-loadable"}
-sqlite3ext-sys = {path="../rust-sqlite-exts/sqlite3ext-sys"}
+sqlite-loadable = "0.0.1"
 regex = "1"
 
 [lib]

Cargo.lock

@@ -1,2 +1,2 @@
 test:
-	sqlite3x :memory: '.read test.sql'
+	python3 tests/test-loadable.py

Cargo.toml

@@ -1,3 +1,6 @@
+.load ../sqlite-lines/dist/lines0
+create table words as select line as word from lines_read('/usr/share/dict/words');
+
 gcc regexp.c -fPIC -shared -o regexp.dylib -I /Users/alex/projects/sqlite-lines/sqlite
 
 ## TODO

Makefile

@@ -1,6 +1,10 @@
 #!/bin/bash
-hyperfine --warmup 5 \
-  'duckdb benchmarks/test.duckdb ".read benchmarks/duckdb.sql"' \
-  'sqlite3x benchmarks/test.sqlite ".read benchmarks/this.sql"' \
-  'sqlite3x benchmarks/test.sqlite ".read benchmarks/sqlean.sql"' \
-  'sqlite3x benchmarks/test.sqlite ".read benchmarks/regexp.sql"'
+#'sqlite3x benchmarks/test.sqlite ".read benchmarks/this.sql"' \
+  
+  hyperfine --warmup 10 \
+  'sqlite3x benchmarks/test.sqlite ".read benchmarks/this-pointer.sql"' \
+  'sqlite3x benchmarks/test.sqlite ".read benchmarks/regexp.sql"' \
+  'sqlite3x benchmarks/test.sqlite ".read benchmarks/sqlean.sql"'
+#'duckdb.0.5.1 benchmarks/test.duckdb ".read benchmarks/duckdb.sql"' \
+#'sqlite3x benchmarks/test.sqlite ".read benchmarks/thisx.sql"'
+  

README.md

@@ -0,0 +1,6 @@
+.load ./target/release/libregex0
+
+select sum(
+  regexp(regex('^\d{4}-\d{2}-\d{2}$'), date)
+)
+from dates;

benchmarks/bench.sh

@@ -0,0 +1,6 @@
+.load ./target/release/libregex0
+
+select sum(
+  regexpx('^\d{4}-\d{2}-\d{2}$', date)
+)
+from dates;

benchmarks/this-pointer.sql

@@ -1,7 +1,7 @@
 use std::process::Command;
 fn main() {
     let output = Command::new("git")
-        .args(&["rev-parse", "HEAD"])
+        .args(["rev-parse", "HEAD"])
         .output()
         .unwrap();
     let git_hash = String::from_utf8(output.stdout).unwrap();