Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
lektor
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Kubat
lektor
Validations
0fc43780
Vérifiée
Valider
0fc43780
rédigé
Il y a 5 ans
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Use the sql search functions for stickers (factorisation)
parent
f090c971
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion
!71
Resolve "Performance of search commands"
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
inc/lektor/database.h
+16
-5
16 ajouts, 5 suppressions
inc/lektor/database.h
src/database/find.c
+34
-0
34 ajouts, 0 suppression
src/database/find.c
avec
50 ajouts
et
5 suppressions
inc/lektor/database.h
+
16
−
5
Voir le fichier @
0fc43780
...
...
@@ -83,22 +83,33 @@ struct lkt_search {
lkt_search_database
,
lkt_search_playlist
,
lkt_search_queue
,
lkt_search_sticker
,
lkt_add_queue
,
}
type
;
bool
(
*
init
)(
volatile
sqlite3
*
);
/* Called at the end of the init phase */
void
(
*
call
)(
void
);
/* Called during the iter phase, casted */
struct
lkt_state
*
srv
;
size_t
c
;
long
continuation
;
/* The continuation state of the client */
int
msg_count
;
/* How much messages we can send */
int
priority
;
/* Can be used... where the priority is needed! */
const
char
*
name
;
/* Stickers and playlists */
union
{
int
qu_priority
;
/* Can be used... where the priority is needed! */
int
st_value
;
/* The value of a sticker */
};
int
st_uri
;
/* URI of a sticker */
};
typedef
bool
(
*
lkt_search_database_func
)(
struct
lkt_state
*
srv
,
size_t
c
,
int
id
,
int
id_len
,
const
char
*
row
);
typedef
bool
(
*
lkt_search_database_func
)(
struct
lkt_state
*
srv
,
size_t
c
,
int
id
,
int
id_len
,
const
char
*
row
);
typedef
bool
(
*
lkt_search_sticker_func
)
(
struct
lkt_state
*
srv
,
size_t
c
,
const
char
*
sticker
,
const
char
*
type
,
int
uri
,
int
value
);
bool
database_search_database_init
(
volatile
sqlite3
*
db
,
char
*
col_name
,
char
*
rgx
,
struct
lkt_search
*
ret
);
bool
database_search_queue_init
(
volatile
sqlite3
*
db
,
char
*
col_name
,
char
*
rgx
,
struct
lkt_search
*
ret
);
bool
database_search_sticker_init
(
volatile
sqlite3
*
db
,
char
*
type
,
char
*
name
,
struct
lkt_search
*
ret
);
bool
database_search_iter
(
struct
lkt_search
*
item
);
/* Next and prev operation on the queue. */
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
src/database/find.c
+
34
−
0
Voir le fichier @
0fc43780
...
...
@@ -3,6 +3,7 @@
#include
<common/common.h>
#include
<lektor/database.h>
#include
<strings.h>
#include
<limits.h>
#include
<stdio.h>
#include
<string.h>
...
...
@@ -53,6 +54,39 @@ error:
return
false
;
}
bool
database_search_sticker_init
(
volatile
sqlite3
*
db
,
char
*
type
,
char
*
name
,
struct
lkt_search
*
ret
)
{
/* No bound checks in strcats, should be fine. Possible SQL injection, depend on the `type`. */
static
const
char
*
SQL_all_types
=
"SELECT name, sts.id, value FROM 'stickers' LEFT OUTER JOIN "
"( SELECT id, sticker, value FROM 'stickers.song'"
" UNION"
" SELECT id, sticker, value FROM 'stickers.plt'"
") AS sts"
"ON sts.sticker = 'stickers'.id"
;
static
const
char
*
SQL_one_type
=
"SELECT name, 'stickers.%s'.id, value "
"FROM 'stickers' "
"LEFT OUTER JOIN 'stickers' "
"ON 'stickers'.id = 'stickers.%s'.sticker"
;
static
const
char
*
SQL_check_name
=
" AND name = ?;"
;
char
SQL
[
LKT_MAX_SQLITE_STATEMENT
];
if
(
type
==
NULL
)
memcpy
(
SQL
,
SQL_all_types
,
strlen
(
SQL_all_types
)
+
1
);
else
sprintf
(
SQL
,
SQL_one_type
,
type
,
type
);
strcat
(
SQL
,
name
?
SQL_check_name
:
";"
);
SQLITE_PREPARE
(
db
,
ret
->
stmt
,
SQL
,
error
);
if
(
name
)
SQLITE_BIND_TEXT
(
db
,
ret
->
stmt
,
1
,
name
,
error
)
return
true
;
error:
sqlite3_finalize
(
ret
->
stmt
);
return
false
;
}
bool
database_search_queue_init
(
volatile
sqlite3
*
db
,
char
*
col_name
,
char
*
rgx
,
struct
lkt_search
*
ret
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter