Skip to content

Make a version of sql.js compiled with ALLOW_MEMORY_GROWTH=1 #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2016
Merged

Make a version of sql.js compiled with ALLOW_MEMORY_GROWTH=1 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77aea00
Make a version of sql.js compiled with ALLOW_MEMORY_GROWTH=1 avalible…
dinedal Mar 11, 2016
6a23043
Merge branch 'master' into allow_memory_growth
Mar 11, 2016
076cd36
Update Readme with different varient locations for download
Mar 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ EMCC=$(EMSCRIPTEN)/emcc

CFLAGS=-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=double -DSQLITE_INT64_TYPE="long long int" -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS

all: js/sql.js js/sql-debug.js js/worker.sql.js
all: js/sql.js debug js/worker.sql.js memory-growth

# RESERVED_FUNCTION_POINTERS setting is used for registering custom functions
debug: EMFLAGS= -O1 -g -s INLINING_LIMIT=10 -s RESERVED_FUNCTION_POINTERS=64
Expand All @@ -15,6 +15,9 @@ debug: js/sql-debug.js
optimized: EMFLAGS= --memory-init-file 0 --closure 1 -O3 -s INLINING_LIMIT=50 -s RESERVED_FUNCTION_POINTERS=64
optimized: js/sql-optimized.js

memory-growth: EMFLAGS= --memory-init-file 0 --closure 1 -O3 -s INLINING_LIMIT=50 -s RESERVED_FUNCTION_POINTERS=64 -s ALLOW_MEMORY_GROWTH=1
memory-growth: js/sql-memory-growth.js

js/sql.js: optimized
cp js/sql-optimized.js js/sql.js

Expand Down Expand Up @@ -46,6 +49,6 @@ module.tar.gz: test package.json AUTHORS README.md js/sql.js
tar --create --gzip $^ > $@

clean:
rm -rf js/sql.js js/api.js js/sql*-raw.js js/worker.sql.js js/worker.js c/sqlite3.bc c/extension-functions.bc
rm -rf js/sql.js js/api.js js/sql*-raw.js js/worker.sql.js js/worker.js js/sql-memory-growth.js c/sqlite3.bc c/extension-functions.bc


2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ See : https://github.com/kripken/sql.js/blob/master/test/test_worker.js
## Downloads
- You can download `sql.js` here : https://raw.githubusercontent.com/kripken/sql.js/master/js/sql.js
- And the Web Worker version: https://raw.githubusercontent.com/kripken/sql.js/master/js/worker.sql.js
- You can find a non minified or optimized version for debugging, `sql-debug.js` here : https://raw.githubusercontent.com/kripken/sql.js/master/js/sql-debug.js
- If you see the message, `Cannot enlarge memory arrays`, try this version, `sql-memory-growth.js` here : https://raw.githubusercontent.com/kripken/sql.js/master/js/sql-memory-growth.js

## Related

Expand Down
166,910 changes: 92,304 additions & 74,606 deletions js/sql-debug.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading