Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4f1e4aa2
Commit
4f1e4aa2
authored
Jul 09, 2019
by
Eugene Kosov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix clang warnings
parent
26c389b7
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
95 additions
and
209 deletions
+95
-209
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+1
-1
storage/mroonga/ha_mroonga.hpp
storage/mroonga/ha_mroonga.hpp
+94
-94
storage/mroonga/vendor/groonga/lib/hash.c
storage/mroonga/vendor/groonga/lib/hash.c
+0
-34
storage/mroonga/vendor/groonga/lib/ii.c
storage/mroonga/vendor/groonga/lib/ii.c
+0
-17
storage/mroonga/vendor/groonga/lib/pat.c
storage/mroonga/vendor/groonga/lib/pat.c
+0
-14
storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
+0
-49
No files found.
storage/connect/ha_connect.cc
View file @
4f1e4aa2
...
...
@@ -1317,7 +1317,7 @@ char *ha_connect::GetRealString(PCSZ s)
{
char
*
sv
;
if
(
IsPartitioned
()
&&
s
&&
partname
&&
*
partname
)
{
if
(
IsPartitioned
()
&&
s
&&
*
partname
)
{
sv
=
(
char
*
)
PlugSubAlloc
(
xp
->
g
,
NULL
,
0
);
sprintf
(
sv
,
s
,
partname
);
PlugSubAlloc
(
xp
->
g
,
NULL
,
strlen
(
sv
)
+
1
);
...
...
storage/mroonga/ha_mroonga.hpp
View file @
4f1e4aa2
This diff is collapsed.
Click to expand it.
storage/mroonga/vendor/groonga/lib/hash.c
View file @
4f1e4aa2
...
...
@@ -89,12 +89,6 @@ grn_tiny_array_at_inline(grn_tiny_array *array, grn_id id)
return
id
?
grn_tiny_array_put
(
array
,
id
)
:
NULL
;
}
inline
static
void
*
grn_tiny_array_next
(
grn_tiny_array
*
array
)
{
return
grn_tiny_array_put
(
array
,
array
->
max
+
1
);
}
void
grn_tiny_array_init
(
grn_ctx
*
ctx
,
grn_tiny_array
*
array
,
uint16_t
element_size
,
uint16_t
flags
)
...
...
@@ -202,15 +196,6 @@ grn_tiny_bitmap_put_byte(grn_tiny_bitmap *bitmap, grn_id bit_id) {
return
(
uint8_t
*
)
*
block
+
byte_id
-
offset
;
}
/* Requirements: bit_id != GRN_ID_NIL. */
/* Return value: 1/0 on success, -1 on failure. */
inline
static
int
grn_tiny_bitmap_get
(
grn_tiny_bitmap
*
bitmap
,
grn_id
bit_id
)
{
uint8_t
*
const
ptr
=
grn_tiny_bitmap_get_byte
(
bitmap
,
bit_id
);
return
ptr
?
((
*
ptr
>>
(
bit_id
&
7
))
&
1
)
:
-
1
;
}
/* Requirements: bit_id != GRN_ID_NIL. */
/* Return value: 1/0 on success, -1 on failure. */
/* Note: A bitmap is extended if needed. */
...
...
@@ -309,18 +294,6 @@ grn_io_array_bit_off(grn_ctx *ctx, grn_io *io,
return
ptr
;
}
inline
static
void
*
grn_io_array_bit_flip
(
grn_ctx
*
ctx
,
grn_io
*
io
,
uint32_t
segment_id
,
uint32_t
offset
)
{
uint8_t
*
const
ptr
=
(
uint8_t
*
)
grn_io_array_at_inline
(
ctx
,
io
,
segment_id
,
(
offset
>>
3
)
+
1
,
GRN_TABLE_ADD
);
if
(
ptr
)
{
*
ptr
^=
1
<<
(
offset
&
7
);
}
return
ptr
;
}
/* grn_table_queue */
static
void
...
...
@@ -1738,13 +1711,6 @@ get_value(grn_ctx *ctx, grn_hash *hash, entry_str *n)
return
grn_hash_entry_get_value
(
ctx
,
hash
,
(
grn_hash_entry
*
)
n
);
}
inline
static
grn_rc
put_key
(
grn_ctx
*
ctx
,
grn_hash
*
hash
,
entry_str
*
n
,
uint32_t
h
,
const
char
*
key
,
unsigned
int
len
)
{
return
grn_hash_entry_put_key
(
ctx
,
hash
,
(
grn_hash_entry
*
)
n
,
h
,
key
,
len
);
}
inline
static
int
match_key
(
grn_ctx
*
ctx
,
grn_hash
*
hash
,
entry_str
*
ee
,
uint32_t
h
,
const
char
*
key
,
unsigned
int
len
)
...
...
storage/mroonga/vendor/groonga/lib/ii.c
View file @
4f1e4aa2
...
...
@@ -2194,23 +2194,6 @@ buffer_close(grn_ctx *ctx, grn_ii *ii, uint32_t pseg)
return
GRN_SUCCESS
;
}
inline
static
uint32_t
buffer_open_if_capable
(
grn_ctx
*
ctx
,
grn_ii
*
ii
,
int32_t
seg
,
int
size
,
buffer
**
b
)
{
uint32_t
pseg
,
pos
=
SEG2POS
(
seg
,
0
);
if
((
pseg
=
buffer_open
(
ctx
,
ii
,
pos
,
NULL
,
b
))
!=
GRN_II_PSEG_NOT_ASSIGNED
)
{
uint16_t
nterms
=
(
*
b
)
->
header
.
nterms
-
(
*
b
)
->
header
.
nterms_void
;
if
(
!
((
nterms
<
4096
||
(
ii
->
header
->
total_chunk_size
>>
((
nterms
>>
8
)
-
6
))
>
(
*
b
)
->
header
.
chunk_size
)
&&
((
*
b
)
->
header
.
buffer_free
>=
size
+
sizeof
(
buffer_term
))))
{
buffer_close
(
ctx
,
ii
,
pseg
);
return
GRN_II_PSEG_NOT_ASSIGNED
;
}
}
return
pseg
;
}
typedef
struct
{
uint32_t
rid
;
uint32_t
sid
;
...
...
storage/mroonga/vendor/groonga/lib/pat.c
View file @
4f1e4aa2
...
...
@@ -142,20 +142,6 @@ pat_get(grn_ctx *ctx, grn_pat *pat, grn_id id)
return
res
;
}
inline
static
pat_node
*
pat_node_new
(
grn_ctx
*
ctx
,
grn_pat
*
pat
,
grn_id
*
id
)
{
uint32_t
n
=
pat
->
header
->
curr_rec
+
1
;
pat_node
*
res
;
if
(
n
>
GRN_ID_MAX
)
{
return
NULL
;
}
if
((
res
=
pat_get
(
ctx
,
pat
,
n
)))
{
pat
->
header
->
curr_rec
=
n
;
pat
->
header
->
n_entries
++
;
}
if
(
id
)
{
*
id
=
n
;
}
return
res
;
}
/* sis operation */
inline
static
sis_node
*
...
...
storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
View file @
4f1e4aa2
...
...
@@ -187,55 +187,6 @@ grn_ts_ref_zero(void)
return
(
grn_ts_ref
){
0
,
0
.
0
};
}
/* grn_ts_bool_vector_zero() returns a zero. */
inline
static
grn_ts_bool_vector
grn_ts_bool_vector_zero
(
void
)
{
return
(
grn_ts_bool_vector
){
NULL
,
0
};
}
/* grn_ts_int_vector_zero() returns a zero. */
inline
static
grn_ts_int_vector
grn_ts_int_vector_zero
(
void
)
{
return
(
grn_ts_int_vector
){
NULL
,
0
};
}
/* grn_ts_float_vector_zero() returns a zero. */
inline
static
grn_ts_float_vector
grn_ts_float_vector_zero
(
void
)
{
return
(
grn_ts_float_vector
){
NULL
,
0
};
}
/* grn_ts_time_vector_zero() returns a zero. */
inline
static
grn_ts_time_vector
grn_ts_time_vector_zero
(
void
)
{
return
(
grn_ts_time_vector
){
NULL
,
0
};
}
/* grn_ts_text_vector_zero() returns a zero. */
inline
static
grn_ts_text_vector
grn_ts_text_vector_zero
(
void
)
{
return
(
grn_ts_text_vector
){
NULL
,
0
};
}
/* grn_ts_geo_vector_zero() returns a zero. */
inline
static
grn_ts_geo_vector
grn_ts_geo_vector_zero
(
void
)
{
return
(
grn_ts_geo_vector
){
NULL
,
0
};
}
/* grn_ts_ref_vector_zero() returns a zero. */
inline
static
grn_ts_ref_vector
grn_ts_ref_vector_zero
(
void
)
{
return
(
grn_ts_ref_vector
){
NULL
,
0
};
}
/* grn_ts_data_type_to_kind() returns a kind associated with a type. */
static
grn_ts_data_kind
grn_ts_data_type_to_kind
(
grn_ts_data_type
type
)
...
...
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