Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
node-sqlite3
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
node-sqlite3
Commits
873e91e6
Commit
873e91e6
authored
Nov 07, 2011
by
Konstantin Käfer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ev_ref -> uv_ref
* remove 0.2.x Buffer compatibility
parent
25388bcd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
19 deletions
+8
-19
async.h
src/async.h
+2
-2
database.cc
src/database.cc
+2
-2
database.h
src/database.h
+2
-2
statement.cc
src/statement.cc
+0
-11
statement.h
src/statement.h
+2
-2
No files found.
src/async.h
View file @
873e91e6
...
...
@@ -30,14 +30,14 @@ public:
rows
.
swap
(
async
->
data
);
pthread_mutex_unlock
(
&
async
->
mutex
);
for
(
unsigned
int
i
=
0
,
size
=
rows
.
size
();
i
<
size
;
i
++
)
{
ev_unref
(
EV_DEFAULT_UC
);
uv_unref
(
uv_default_loop
()
);
async
->
callback
(
async
->
parent
,
rows
[
i
]);
}
}
inline
void
add
(
Item
*
item
)
{
// Make sure node runs long enough to deliver the messages.
ev_ref
(
EV_DEFAULT_UC
);
uv_ref
(
uv_default_loop
()
);
pthread_mutex_lock
(
&
mutex
);
data
.
push_back
(
item
);
pthread_mutex_unlock
(
&
mutex
);
...
...
src/database.cc
View file @
873e91e6
...
...
@@ -657,7 +657,7 @@ void Database::Destruct(Persistent<Value> value, void *data) {
if
(
db
->
handle
)
{
eio_custom
(
EIO_Destruct
,
EIO_PRI_DEFAULT
,
EIO_AfterDestruct
,
db
);
ev_ref
(
EV_DEFAULT_UC
);
uv_ref
(
uv_default_loop
()
);
}
else
{
delete
db
;
...
...
@@ -673,7 +673,7 @@ void Database::EIO_Destruct(eio_req *req) {
int
Database
::
EIO_AfterDestruct
(
eio_req
*
req
)
{
Database
*
db
=
static_cast
<
Database
*>
(
req
->
data
);
ev_unref
(
EV_DEFAULT_UC
);
uv_unref
(
uv_default_loop
()
);
delete
db
;
return
0
;
}
src/database.h
View file @
873e91e6
...
...
@@ -38,12 +38,12 @@ public:
Baton
(
Database
*
db_
,
Handle
<
Function
>
cb_
)
:
db
(
db_
),
status
(
SQLITE_OK
)
{
db
->
Ref
();
ev_ref
(
EV_DEFAULT_UC
);
uv_ref
(
uv_default_loop
()
);
callback
=
Persistent
<
Function
>::
New
(
cb_
);
}
virtual
~
Baton
()
{
db
->
Unref
();
ev_unref
(
EV_DEFAULT_UC
);
uv_unref
(
uv_default_loop
()
);
callback
.
Dispose
();
}
};
...
...
src/statement.cc
View file @
873e91e6
...
...
@@ -2,7 +2,6 @@
#include <v8.h>
#include <node.h>
#include <node_buffer.h>
#include <node_version.h>
#include "macros.h"
#include "database.h"
...
...
@@ -185,13 +184,8 @@ template <class T> Values::Field*
return
new
Values
::
Null
(
pos
);
}
else
if
(
Buffer
::
HasInstance
(
source
))
{
#if NODE_VERSION_AT_LEAST(0,3,0)
Local
<
Object
>
buffer
=
source
->
ToObject
();
return
new
Values
::
Blob
(
pos
,
Buffer
::
Length
(
buffer
),
Buffer
::
Data
(
buffer
));
#else
Buffer
*
buffer
=
ObjectWrap
::
Unwrap
<
Buffer
>
(
source
->
ToObject
());
return
new
Values
::
Blob
(
pos
,
buffer
->
length
(),
buffer
->
data
());
#endif
}
else
if
(
source
->
IsDate
())
{
return
new
Values
::
Float
(
pos
,
source
->
NumberValue
());
...
...
@@ -774,12 +768,7 @@ Local<Object> Statement::RowToJS(Row* row) {
value
=
Local
<
Value
>
(
String
::
New
(((
Values
::
Text
*
)
field
)
->
value
.
c_str
(),
((
Values
::
Text
*
)
field
)
->
value
.
size
()));
}
break
;
case
SQLITE_BLOB
:
{
#if NODE_VERSION_AT_LEAST(0,3,0)
Buffer
*
buffer
=
Buffer
::
New
(((
Values
::
Blob
*
)
field
)
->
value
,
((
Values
::
Blob
*
)
field
)
->
length
);
#else
Buffer
*
buffer
=
Buffer
::
New
(((
Values
::
Blob
*
)
field
)
->
length
);
memcpy
(
buffer
->
data
(),
((
Values
::
Blob
*
)
field
)
->
value
,
buffer
->
length
());
#endif
value
=
Local
<
Value
>::
New
(
buffer
->
handle_
);
}
break
;
case
SQLITE_NULL
:
{
...
...
src/statement.h
View file @
873e91e6
...
...
@@ -85,7 +85,7 @@ public:
Baton
(
Statement
*
stmt_
,
Handle
<
Function
>
cb_
)
:
stmt
(
stmt_
)
{
stmt
->
Ref
();
ev_ref
(
EV_DEFAULT_UC
);
uv_ref
(
uv_default_loop
()
);
callback
=
Persistent
<
Function
>::
New
(
cb_
);
}
virtual
~
Baton
()
{
...
...
@@ -94,7 +94,7 @@ public:
DELETE_FIELD
(
field
);
}
stmt
->
Unref
();
ev_unref
(
EV_DEFAULT_UC
);
uv_unref
(
uv_default_loop
()
);
callback
.
Dispose
();
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment