Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fluencelabs/sqlite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.15.0_w
Choose a base ref
...
head repository: fluencelabs/sqlite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.17.0_w
Choose a head ref
  • 2 commits
  • 120 files changed
  • 2 contributors

Commits on Feb 14, 2023

  1. feat: this bumps sqlite up to 3.40.1 [fixes VM-223]

    @raftedproc
    raftedproc committed Feb 14, 2023
    Copy the full SHA
    216ca8f View commit details

  2. Merge pull request #9 from fluencelabs/VM-223-sqlite-3.4.40 

    feat: this bumps sqlite up to 3.40.1 [fixes VM-223]
    @raftedproc
    raftedproc authored Feb 14, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e90ea8b View commit details
Showing with 51,384 additions and 28,158 deletions.
  1. +12 −10 Dockerfile
  2. +6 −6 Makefile
  3. +3 −3 Readme.md
  4. +787 −214 src/alter.c
  5. +246 −181 src/analyze.c
  6. +120 −161 src/attach.c
  7. +8 −13 src/auth.c
  8. +7 −39 src/backup.c
  9. +1 −1 src/bitvec.c
  10. +1 −0 src/btmutex.c
  11. +1,167 −587 src/btree.c
  12. +35 −14 src/btree.h
  13. +28 −10 src/btreeInt.h
  14. +1,058 −403 src/build.c
  15. +22 −6 src/callback.c
  16. +234 −212 src/ctime.c
  17. +311 −203 src/date.c
  18. +24 −15 src/dbpage.c
  19. +64 −14 src/dbstat.c
  20. +102 −49 src/delete.c
  21. +18 −15 src/demo_vfs.c
  22. +1,050 −486 src/expr.c
  23. +75 −48 src/fkey.c
  24. +122 −70 src/fts3.c
  25. +18 −13 src/fts3Int.h
  26. +6 −1 src/fts3_aux.c
  27. +11 −9 src/fts3_expr.c
  28. +1 −1 src/fts3_porter.c
  29. +26 −23 src/fts3_snippet.c
  30. +7 −4 src/fts3_tokenize_vtab.c
  31. +1 −1 src/fts3_tokenizer1.c
  32. +1 −0 src/fts3_unicode.c
  33. +93 −54 src/fts3_write.c
  34. +1,242 −605 src/fts5.c
  35. +495 −136 src/func.c
  36. +17 −11 src/geopoly.c
  37. +83 −10 src/global.c
  38. +1 −1 src/hash.h
  39. +6 −5 src/icu.c
  40. +501 −209 src/insert.c
  41. +298 −224 src/{json1.c → json.c}
  42. +145 −135 src/keywordhash.h
  43. +52 −50 src/legacy.c
  44. +75 −20 src/loadext.c
  45. +903 −593 src/main.c
  46. +123 −48 src/malloc.c
  47. +6 −6 src/mem2.c
  48. +74 −74 src/mem3.c
  49. +11 −2 src/mem5.c
  50. +372 −68 src/memdb.c
  51. +41 −30 src/memjournal.c
  52. +1 −0 src/mutex.c
  53. +1 −1 src/mutex_unix.c
  54. +1 −1 src/mutex_w32.c
  55. +8 −8 src/notify.c
  56. +173 −162 src/opcodes.c
  57. +199 −187 src/opcodes.h
  58. +22 −6 src/os.c
  59. +13 −0 src/os.h
  60. +913 −0 src/os_kv.c
  61. +60 −26 src/os_setup.h
  62. +431 −225 src/os_unix.c
  63. +82 −22 src/os_win.c
  64. +311 −377 src/pager.c
  65. +18 −21 src/pager.h
  66. +3,897 −3,434 src/parse.c
  67. +90 −86 src/parse.h
  68. +55 −15 src/pcache.c
  69. +51 −48 src/pcache1.c
  70. +372 −127 src/pragma.c
  71. +118 −141 src/pragma.h
  72. +229 −94 src/prepare.c
  73. +132 −40 src/printf.c
  74. +59 −36 src/random.c
  75. +494 −261 src/resolve.c
  76. +2 −2 src/rowset.c
  77. +118 −61 src/rtree.c
  78. +2,012 −889 src/select.c
  79. +15,153 −7,750 src/shell.c
  80. +2,806 −2,092 src/sqlite3.h
  81. +55 −0 src/sqlite3ext.h
  82. +169 −101 src/sqlite3rbu.c
  83. +28 −0 src/sqlite3rbu.h
  84. +562 −212 src/sqlite3session.c
  85. +71 −10 src/sqlite3session.h
  86. +2,838 −2,152 src/sqliteInt.h
  87. +5 −6 src/sqliteLimit.h
  88. +143 −0 src/sqlite_cfg.h
  89. +0 −1 src/sqliteicu.h
  90. +9 −4 src/status.c
  91. +81 −43 src/stmt.c
  92. +2 −2 src/table.c
  93. +131 −110 src/tclsqlite.c
  94. +70 −81 src/tokenize.c
  95. +603 −84 src/treeview.c
  96. +391 −114 src/trigger.c
  97. +483 −206 src/update.c
  98. +146 −89 src/upsert.c
  99. +58 −59 src/utf.c
  100. +136 −61 src/util.c
  101. +23 −25 src/vacuum.c
  102. +1,386 −516 src/vdbe.c
  103. +22 −18 src/vdbe.h
  104. +140 −53 src/vdbeInt.h
  105. +913 −828 src/vdbeapi.c
  106. +715 −566 src/vdbeaux.c
  107. +18 −10 src/vdbeblob.c
  108. +145 −66 src/vdbemem.c
  109. +14 −8 src/vdbesort.c
  110. +2 −4 src/vdbetrace.c
  111. +424 −0 src/vdbevtab.c
  112. +101 −74 src/vtab.c
  113. +653 −361 src/wal.c
  114. +5 −0 src/wal.h
  115. +75 −26 src/walker.c
  116. +1,553 −455 src/where.c
  117. +81 −54 src/whereInt.h
  118. +592 −290 src/wherecode.c
  119. +411 −169 src/whereexpr.c
  120. +199 −95 src/window.c
22 changes: 12 additions & 10 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

RUN apt-get update \
&& apt-get install -y ca-certificates \
curl \
git \
make \
cargo
RUN apt update \
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata \
&& apt install -y ca-certificates \
curl \
git \
make \
pkg-config \
libtinfo6 \
cargo

RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz | tar xz --strip-components=1 -C /

RUN cargo install fcli --version 0.1.12
RUN cargo install marine --version 0.12.7
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-15/wasi-sdk-15.0-linux.tar.gz | tar xz -C /

VOLUME /code
WORKDIR /code
12 changes: 6 additions & 6 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TARGET = sqlite3
CC = /bin/clang
SYSROOT = /share/wasi-sysroot
CC = /wasi-sdk-15.0/bin/clang
SYSROOT = /wasi-sdk-15.0/share/wasi-sysroot
TARGET_TRIPLE = wasm32-wasi
CFLAGS = -fvisibility=hidden
SDK = sdk/logger.h
@@ -77,7 +77,7 @@ SQLITE_SRC = \
src/global.c\
src/hash.c\
src/insert.c\
src/json1.c\
src/json.c\
src/legacy.c\
src/loadext.c\
src/main.c\
@@ -122,6 +122,7 @@ SQLITE_SRC = \
src/vdbemem.c\
src/vdbesort.c\
src/vdbetrace.c\
src/vdbevtab.c\
src/vtab.c\
src/wal.c\
src/walker.c\
@@ -133,7 +134,6 @@ WRAPPER_SRC = src/wrapper.c
SQLITE_FLAGS = \
-DSQLITE_CORE\
-D_HAVE_SQLITE_CONFIG_H\
-DSQLITE_ENABLE_JSON1\
-DENABLE_LOG\
-DBUILD_sqlite\
-DNDEBUG\
@@ -142,7 +142,6 @@ SQLITE_FLAGS = \
-DHAVE_READLINE=0\
-DHAVE_EDITLINE=0\
-DSQLITE_OMIT_LOAD_EXTENSION\
-DSQLITE_ENABLE_JSON1\
-DSQLITE_ENABLE_FTS5\
-DSQLITE_ENABLE_RTREE\
-DSQLITE_ENABLE_EXPLAIN_COMMENTS\
@@ -163,7 +162,8 @@ all: default

$(TARGET): $(SQLITE_SRC) $(WRAPPER_SRC)
$(CC) -O3 --sysroot=$(SYSROOT) --target=$(TARGET_TRIPLE) $(SQLITE_FLAGS) $(CFLAGS) $(LDFLAGS) -Wl,$(EXPORT_FUNCS) $^ -o $@.wasm
# /root/.cargo/bin/fce embed_it -i sqlite3.wasm -w sqlite3.wit
/root/.cargo/bin/marine set version -i ./sqlite3.wasm -v 0.7.0
/root/.cargo/bin/marine set it -i ./sqlite3.wasm -w sqlite3.wit

.PRECIOUS: $(TARGET)

6 changes: 3 additions & 3 deletions Readme.md
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

Sqlite fork ported to WebAssembly and adapted for the Fluence network. Could be launched and played on the Fluence [dashboard](http://dash.fluence.network/deploy/sqlite).

Based on SQlite version 3.31.1.
Based on SQlite version 3.40.1.

# How to build

This app could be built either with docker
This app could be built either with docker

```bash
docker-compose up
@@ -69,7 +69,7 @@ Given char string `sql` as the request, the general scheme to use it is followin
2. `void *res = invoke(ptr, strlen(sql))` to execute the request
3. read a result from the `res` by reading 4 bytes as little-endian `result_size` and the read `result_size` bytes as the final result.
4. `deallocate(res, strlen(sql))` to clean memory.
Depends on your Wasm execution environment, `load`/`store` could be used for reading and writing a module memory.
## More insights
Loading