Skip to content

Update everything #45

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 101 commits into from
Jun 12, 2014
Merged

Update everything #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
71d17fb
Set to /usr/bin if not previously set. Allows to run 'make' instead …
lovasoa Apr 23, 2014
46cff2d
Correct printf format
lovasoa Apr 23, 2014
6c237cf
clean. Use clang
lovasoa Apr 23, 2014
78d60a7
Remove warnings
lovasoa Apr 23, 2014
e2b768b
Correct dependencies
lovasoa Apr 23, 2014
347786e
Better GUI
lovasoa Apr 24, 2014
fb064ee
Reflect code changes
lovasoa Apr 24, 2014
2c951d9
change title
lovasoa Apr 24, 2014
f651f75
Add informations about whats new in the fork
lovasoa Apr 24, 2014
67a14ec
Add ability to save and load a database.
lovasoa Apr 27, 2014
a8bdf14
extend list of new features
lovasoa Apr 27, 2014
5ee0316
Update Makefile according to @kripken advices.
lovasoa Apr 29, 2014
f5a11ac
Whoops! I forgot to remove my nasty hack to the Makefile.
lovasoa Apr 29, 2014
6d6e4bd
Separate javascript code from HTML
lovasoa Apr 29, 2014
2a65161
Add an outlining_limit again. Otherwise, it would take several second…
lovasoa Apr 29, 2014
a7cc65a
More simple function to generate HTML tables.
lovasoa Apr 29, 2014
6949388
Add an outlining performance benchmark
lovasoa May 3, 2014
1d514c7
Update the benchmarks. Choose the default OUTLINING_LIMIT according t…
lovasoa May 3, 2014
8d5f15a
Improve compilation time by disabling inlining instead of enabling ou…
lovasoa May 5, 2014
dc13d20
Object-oriented API, with support for prepared statements
lovasoa May 7, 2014
787cc78
The API, written in coffeescript
lovasoa May 7, 2014
26b7580
Documentation
lovasoa May 7, 2014
958673e
corrections
lovasoa May 7, 2014
bfddd8f
Bug correction
lovasoa May 7, 2014
88d61c2
Bug correction, getErrors -> handleErrors
lovasoa May 7, 2014
f91ca55
Final bug corrections. Now the new API works.
lovasoa May 7, 2014
4a249da
Ad supprort for parameter binding to prepered statements.
lovasoa May 7, 2014
58fafff
Add support for freeing and resetting prepared statements.
lovasoa May 7, 2014
00c288e
clarify the README
lovasoa May 7, 2014
02d0e73
Add export to Uint8array
lovasoa May 11, 2014
e38ecaf
Do not pollute the global namespace
lovasoa May 11, 2014
4c9d107
Include the compiled js api
lovasoa May 11, 2014
763d162
Merge pull request #9 from lovasoa/api
lovasoa May 11, 2014
15070f5
Bug corrections
lovasoa May 13, 2014
4e5ad04
Bug correction
lovasoa May 13, 2014
c9e7a53
Use the new api in the gui
lovasoa May 13, 2014
2217694
Compile api with all optimizations.
lovasoa May 14, 2014
0aa2f98
Merge pull request #10 from lovasoa/api
lovasoa May 14, 2014
3341c5c
Update API
lovasoa May 23, 2014
6c5f42a
Add proper test files and remove old useless files
lovasoa May 23, 2014
e089e6e
Beautify the makefile
lovasoa May 23, 2014
a8bcdaf
Delete old files. Now the new api is exported in the file 'sql.js'.
lovasoa May 23, 2014
ed1b798
commit shell files (they avoid leaking variable to the global namespace)
lovasoa May 23, 2014
bafb517
Remove old coffee file
lovasoa May 23, 2014
d12bdf0
Update README with examples
lovasoa May 23, 2014
2a00f18
Update README with blob example
lovasoa May 23, 2014
0811189
Add link to docs
lovasoa May 23, 2014
8d6ef29
Add link to the GUI
lovasoa May 23, 2014
89c71ad
Remove GUI from master.
lovasoa May 23, 2014
78912eb
Add separate test for the Database class
lovasoa May 23, 2014
7f0054c
Rename test_api to test_statemnt, and remove general database testing…
lovasoa May 23, 2014
ca4ad52
Add Statement.getColumnNames and Statement.getAsObject
lovasoa May 23, 2014
1da8cfd
Present stmt.getAsObject()
lovasoa May 24, 2014
6621399
set the pointer to a statement to NULL when it's free() method is cal…
lovasoa May 24, 2014
d26d241
Reflect the recent new features in the API to the README
lovasoa May 24, 2014
937e927
Free all related statements before closing a database.
lovasoa May 24, 2014
f4f61e8
Add a test to test error throwing
lovasoa May 24, 2014
85127d6
Add a package.jon
lovasoa May 24, 2014
ca481a8
test UTF8 text (with 粵語😄)
lovasoa May 24, 2014
8bafedb
Free memory used by bound parameters manually.
lovasoa May 24, 2014
e6a6ac8
Split API code and data
lovasoa May 24, 2014
9bb8d0e
Improve build infrastructure
lovasoa May 24, 2014
36c3a83
Update sql.js to match previous changes in api.coffee
lovasoa May 24, 2014
d3c1069
Improve test infrastructure
lovasoa May 24, 2014
7b2ec0d
Add travis configuration file
lovasoa May 24, 2014
ada2f38
Only test against node O.10
lovasoa May 24, 2014
7915245
Update package.json
lovasoa May 24, 2014
1baae62
Add the test database file
lovasoa May 24, 2014
3d1ba01
Add travis build status
lovasoa May 24, 2014
087b059
Publish on npm
lovasoa May 24, 2014
64b703c
export compiled functions in a separate coffee file
lovasoa May 24, 2014
b049682
API CHANGE. Update db.exec, and add db.run
lovasoa May 24, 2014
977f5d4
Update readme to add travis build status
lovasoa May 24, 2014
54810c3
add the compiled js file
lovasoa May 24, 2014
ef8241c
Add support for web workers
lovasoa May 25, 2014
e234863
Add test for the worker API
lovasoa May 25, 2014
e06b972
Update examples
lovasoa May 25, 2014
612c346
Improve tests coverage
lovasoa May 25, 2014
9ff31e8
Add db.each
lovasoa May 25, 2014
07042f1
Remove useless console.log
lovasoa May 25, 2014
f5a20f2
worker: Don't throw an error when id is missing
lovasoa May 25, 2014
0190b08
Update the compiled worker file
lovasoa May 25, 2014
5857536
Add an example of how to write a database to the disk in node
lovasoa May 26, 2014
fc3f619
Add download links
lovasoa May 26, 2014
2f20c02
Update HTML example
lovasoa May 26, 2014
060ebf3
Update node example
lovasoa May 26, 2014
bca3458
Increment version
lovasoa May 26, 2014
3ff4f49
Add @hankinsoft to the authors
lovasoa Jun 3, 2014
5bb3690
Call postMessage without second argument if using transferable elemen…
lovasoa Jun 3, 2014
aa448b3
Fix a bug in internet explorer.
lovasoa Jun 3, 2014
3738933
bump version
lovasoa Jun 3, 2014
5275839
Add debug file, as suggested in #15
lovasoa Jun 3, 2014
de92cea
Improve error handling.
lovasoa Jun 8, 2014
a909703
Update version number
lovasoa Jun 10, 2014
44e183c
Update compiled files
lovasoa Jun 10, 2014
f460869
Correct headings level
lovasoa Jun 10, 2014
7a08327
Add link & reformat downloads
lovasoa Jun 10, 2014
6bf6684
Use lowercase keywords
lovasoa Jun 10, 2014
1d1292d
Update version
lovasoa Jun 10, 2014
999fd41
Update sqlite to 3.8.5
lovasoa Jun 11, 2014
7356d05
Optimize memory management.
lovasoa Jun 11, 2014
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
Prev Previous commit
Next Next commit
Object-oriented API, with support for prepared statements
  • Loading branch information
@lovasoa
lovasoa committed May 7, 2014
commit dc13d20b70c7df0185352a42cfd3bcb0bea145b5
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ EMSCRIPTEN?=/usr/bin
EMCC=$(EMSCRIPTEN)/emcc -s RESERVED_FUNCTION_POINTERS=2 --closure 1 -O3 -s INLINING_LIMIT=10
Copy link
Collaborator

@kripken kripken May 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this means all the builds will be with inlining limit 10? That's way too low to make sense (10 AST nodes means maybe 2 or 3 lines on average, making a function call for that would be bigger with the call overhead).

Copy link
Member Author

@lovasoa lovasoa May 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did that in order to completely disable inlining, and reduce asm.js compile time. I tweaked this parameter a bit before choosing 10, and the performances are correct. What value would you advice?

CC=clang -O2
CFLAGS=-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=double -DSQLITE_INT64_TYPE="long long int" -DSQLITE_THREADSAFE=0
EXPORTED_FUNCTIONS="['_sqlite3_open', '_sqlite3_close', '_sqlite3_exec', '_sqlite3_free', '_sqlite3_column_count', ' _sqlite3_column_type', '_sqlite3_column_text', '_sqlite3_column_double', '_sqlite3_prepare_v2', '_sqlite3_step']"
EXPORTED_FUNCTIONS="['_sqlite3_open', '_sqlite3_close', '_sqlite3_exec', '_sqlite3_free', '_sqlite3_data_count', ' _sqlite3_column_type', '_sqlite3_column_text', '_sqlite3_column_double', '_sqlite3_prepare_v2', '_sqlite3_step']"


all: js/sql.js test/benchmark.js test/benchmark
Expand All @@ -15,6 +15,12 @@ js/sql.js: c/sqlite3.bc js/pre.js js/post.js
js/sql-faststart.js: c/sqlite3.bc js/pre.js js/post.js
$(EMCC) -s ASM_JS=2 $(CFLAGS) c/sqlite3.c --pre-js js/pre.js --post-js js/post.js -o js/sql-faststart.js -s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS)

js/sql-api.js: c/sqlite3.bc js/api.js
$(EMSCRIPTEN)/emcc -s RESERVED_FUNCTION_POINTERS=2 $(CFLAGS) c/sqlite3.c --post-js js/api.js -o js/sql-api.js -s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS)

js/api.js: js/api.coffee
coffee -c js/api.coffee

c/sqlite3.bc: c/sqlite3.c
# Generate llvm bitcode
$(EMCC) $(CFLAGS) c/sqlite3.c -o c/sqlite3.bc
Expand Down
12 changes: 6 additions & 6 deletions js/sql.js
View file
Open in desktop

Large diffs are not rendered by default.