Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
e6e7e0e9
Commit
e6e7e0e9
authored
Jun 17, 2016
by
Paul Sokolovsky
Browse files
Options
Downloads
Patches
Plain Diff
extmod/modbtree: items(): Implement DESC flag.
parent
7c8d76fa
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
extmod/modbtree.c
+10
-2
10 additions, 2 deletions
extmod/modbtree.c
with
10 additions
and
2 deletions
extmod/modbtree.c
+
10
−
2
View file @
e6e7e0e9
...
@@ -43,7 +43,8 @@ typedef struct _mp_obj_btree_t {
...
@@ -43,7 +43,8 @@ typedef struct _mp_obj_btree_t {
mp_obj_t
start_key
;
mp_obj_t
start_key
;
mp_obj_t
end_key
;
mp_obj_t
end_key
;
#define FLAG_END_KEY_INCL 1
#define FLAG_END_KEY_INCL 1
bool
flags
;
#define FLAG_DESC 2
byte
flags
;
}
mp_obj_btree_t
;
}
mp_obj_btree_t
;
STATIC
const
mp_obj_type_t
btree_type
;
STATIC
const
mp_obj_type_t
btree_type
;
...
@@ -141,16 +142,19 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
...
@@ -141,16 +142,19 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
mp_obj_btree_t
*
self
=
MP_OBJ_TO_PTR
(
self_in
);
mp_obj_btree_t
*
self
=
MP_OBJ_TO_PTR
(
self_in
);
DBT
key
,
val
;
DBT
key
,
val
;
int
res
;
int
res
;
bool
desc
=
self
->
flags
&
FLAG_DESC
;
if
(
self
->
start_key
!=
MP_OBJ_NULL
)
{
if
(
self
->
start_key
!=
MP_OBJ_NULL
)
{
int
flags
=
R_FIRST
;
int
flags
=
R_FIRST
;
if
(
self
->
start_key
!=
mp_const_none
)
{
if
(
self
->
start_key
!=
mp_const_none
)
{
key
.
data
=
(
void
*
)
mp_obj_str_get_data
(
self
->
start_key
,
&
key
.
size
);
key
.
data
=
(
void
*
)
mp_obj_str_get_data
(
self
->
start_key
,
&
key
.
size
);
flags
=
R_CURSOR
;
flags
=
R_CURSOR
;
}
else
if
(
desc
)
{
flags
=
R_LAST
;
}
}
res
=
__bt_seq
(
self
->
db
,
&
key
,
&
val
,
flags
);
res
=
__bt_seq
(
self
->
db
,
&
key
,
&
val
,
flags
);
self
->
start_key
=
MP_OBJ_NULL
;
self
->
start_key
=
MP_OBJ_NULL
;
}
else
{
}
else
{
res
=
__bt_seq
(
self
->
db
,
&
key
,
&
val
,
R_NEXT
);
res
=
__bt_seq
(
self
->
db
,
&
key
,
&
val
,
desc
?
R_PREV
:
R_NEXT
);
}
}
if
(
res
==
RET_SPECIAL
)
{
if
(
res
==
RET_SPECIAL
)
{
...
@@ -163,6 +167,9 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
...
@@ -163,6 +167,9 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
end_key
.
data
=
(
void
*
)
mp_obj_str_get_data
(
self
->
end_key
,
&
end_key
.
size
);
end_key
.
data
=
(
void
*
)
mp_obj_str_get_data
(
self
->
end_key
,
&
end_key
.
size
);
BTREE
*
t
=
self
->
db
->
internal
;
BTREE
*
t
=
self
->
db
->
internal
;
int
cmp
=
t
->
bt_cmp
(
&
key
,
&
end_key
);
int
cmp
=
t
->
bt_cmp
(
&
key
,
&
end_key
);
if
(
desc
)
{
cmp
=
-
cmp
;
}
if
(
self
->
flags
&
FLAG_END_KEY_INCL
)
{
if
(
self
->
flags
&
FLAG_END_KEY_INCL
)
{
cmp
--
;
cmp
--
;
}
}
...
@@ -254,6 +261,7 @@ STATIC const mp_rom_map_elem_t mp_module_btree_globals_table[] = {
...
@@ -254,6 +261,7 @@ STATIC const mp_rom_map_elem_t mp_module_btree_globals_table[] = {
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_btree
)
},
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_btree
)
},
{
MP_ROM_QSTR
(
MP_QSTR_open
),
MP_ROM_PTR
(
&
mod_btree_open_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_open
),
MP_ROM_PTR
(
&
mod_btree_open_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_INCL
),
MP_OBJ_NEW_SMALL_INT
(
FLAG_END_KEY_INCL
)
},
{
MP_ROM_QSTR
(
MP_QSTR_INCL
),
MP_OBJ_NEW_SMALL_INT
(
FLAG_END_KEY_INCL
)
},
{
MP_ROM_QSTR
(
MP_QSTR_DESC
),
MP_OBJ_NEW_SMALL_INT
(
FLAG_DESC
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_btree_globals
,
mp_module_btree_globals_table
);
STATIC
MP_DEFINE_CONST_DICT
(
mp_module_btree_globals
,
mp_module_btree_globals_table
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment