Merge pull request #23 from marvin-j97/data-partitions

[WIP] 0.3.0: New architecture

Author: marvin-j97

.github/workflows/release.yml

@@ -0,0 +1,87 @@
+name: Tests
+
+on:
+  #  TODO: remove
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**"
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    cancel-timeout-minutes: 20
+    strategy:
+      matrix:
+        rust_version:
+          - stable
+          - "1.74.0" # MSRV
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ matrix.rust_version }}
+      - name: Add rustfmt
+        run: rustup component add rustfmt
+      - name: Add clippy
+        run: rustup component add clippy
+      - name: Set up cargo cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: ${{ runner.os }}-cargo
+          workspaces: >
+            fjall -> target
+            fjall/examples/actix-kv -> target
+            fjall/examples/actix-triplestore -> target
+            fjall/examples/structured -> target
+      - name: Build
+        run: cargo build -v
+        working-directory: fjall
+      - name: Format
+        run: cargo fmt --all -- --check
+        working-directory: fjall
+      - name: Clippy
+        run: cargo clippy
+        working-directory: fjall
+      - name: Run tests
+        run: cargo test -v -- --nocapture
+        working-directory: fjall
+        env:
+          RUST_LOG: debug
+      - name: Build & test examples
+        run: node compile_examples.mjs
+        working-directory: fjall
+  cross:
+    cancel-timeout-minutes: 20
+    name: cross
+    strategy:
+      matrix:
+        target:
+          - aarch64-unknown-linux-gnu
+          # - aarch64-linux-android
+          - aarch64-unknown-linux-musl
+          # - i686-linux-android
+          # - x86_64-linux-android
+          # - i686-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
+          #- mips64-unknown-linux-gnuabi64
+          - riscv64gc-unknown-linux-gnu
+          #- x86_64-apple-darwin
+          #- aarch64-apple-darwin
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: cross build --target ${{ matrix.target }}
+        run: |
+          cargo install cross
+          cross build --target ${{ matrix.target }}

.github/workflows/test_fjall.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Tests
 
 on:
   #  TODO: remove
@@ -14,11 +14,12 @@ env:
 
 jobs:
   test:
+    cancel-timeout-minutes: 20
     strategy:
       matrix:
         rust_version:
           - stable
-          - "1.74.0"
+          - "1.74.0" # MSRV
         os:
           - ubuntu-latest
           - windows-latest
@@ -39,33 +40,37 @@ jobs:
         with:
           prefix-key: ${{ runner.os }}-cargo
           workspaces: >
-            . -> target
-            examples/actix-kv -> target
-            examples/actix-triplestore -> target
-            examples/structured -> target
+            lsm-tree -> target
+            lsm-tree/examples/kv -> target
       - name: Build
         run: cargo build -v
+        working-directory: lsm-tree
       - name: Format
         run: cargo fmt --all -- --check
+        working-directory: lsm-tree
       - name: Clippy
         run: cargo clippy
+        working-directory: lsm-tree
       - name: Run tests
         run: cargo test -v -- --nocapture
+        working-directory: lsm-tree
         env:
           RUST_LOG: debug
-      - name: Build & test examples
+      - name: Build & test LSM examples
         run: node compile_examples.mjs
+        working-directory: lsm-tree
   cross:
+    cancel-timeout-minutes: 20
     name: cross
     strategy:
       matrix:
         target:
           - aarch64-unknown-linux-gnu
-          - aarch64-linux-android
+          # - aarch64-linux-android
           - aarch64-unknown-linux-musl
-          - i686-linux-android
-          - x86_64-linux-android
-          - i686-unknown-linux-gnu
+          # - i686-linux-android
+          # - x86_64-linux-android
+          # - i686-unknown-linux-gnu
           - powerpc64-unknown-linux-gnu
           #- mips64-unknown-linux-gnuabi64
           - riscv64gc-unknown-linux-gnu

.github/workflows/test.yml renamed to .github/workflows/test_lsmt.yml

@@ -17,6 +17,8 @@ Cargo.lock
 
 /target
 .lsm.data
+.fjall_data
 .data
+.fjall_data
 
-levels.json
+/old_*

.gitignore

@@ -0,0 +1,3 @@
+{
+  "rust-analyzer.showUnlinkedFileNotification": false
+}

.vscode/settings.json

@@ -1,48 +1,12 @@
-[package]
-name = "lsm-tree"
-description = "A K.I.S.S. implementation of log-structured merge trees (LSM-trees/LSMTs)"
-version = "0.2.3"
+[workspace]
+resolver = "2"
+members = ["lsm-tree", "fjall"]
+
+[workspace.package]
 edition = "2021"
 rust-version = "1.74.0"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["database", "lsmt", "lsm", "rocksdb", "leveldb"]
 categories = ["data-structures", "database-implementations", "algorithms"]
-repository = "https://github.com/marvin-j97/lsm-tree"
-include = ["src/**/*", "LICENSE", "README.md"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "lsm_tree"
-path = "src/lib.rs"
-
-[features]
-default = []
-segment_history = []
-
-[dependencies]
-byteorder = "1.5.0"
-chrono = "0.4.31"
-crc32fast = "1.3.2"
-crossbeam-skiplist = "0.1.1"
-fs_extra = "1.3.0"
-log = "0.4.20"
-lz4_flex = "0.11.1"
-min-max-heap = "1.3.0"
-quick_cache = { version = "0.4.0", default-features = false, features = [] }
-rand = "0.8.5"
-serde = { version = "1.0.193", features = ["derive", "rc"] }
-serde_json = "1.0.108"
-std-semaphore = "0.1.0"
-tempfile = "3.8.1"
-
-[dev-dependencies]
-criterion = { version = "0.5.1", features = ["html_reports"] }
-env_logger = "0.10.1"
-nanoid = "0.4.0"
-test-log = "0.2.14"
-
-# [[bench]]
-# name = "lsmt"
-# harness = false
+homepage = "https://github.com/marvin-j97/fjall"

Cargo.toml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 marvin-j97
+Copyright (c) 2024 marvin-j97
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal