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
Requêtes de fusion
!143
Fix move command
Code
Examiner les modifications
Extraire la branche
Télécharger
Correctifs
Diff brut
Étendre la barre latérale
Fusionnées
Fix move command
fix_move_command
vers
martin2018-master-patch-10517
Vue d'ensemble
0
Validations
2
Pipelines
1
Modifications
1
Fusionnées
Deurstann
a demandé de fusionner
fix_move_command
vers
martin2018-master-patch-10517
Il y a 4 ans
Vue d'ensemble
0
Validations
2
Pipelines
1
Modifications
1
move command does now work properly (finally)
0
0
Rapports de requête de fusion
Comparer
martin2018-master-patch-10517
martin2018-master-patch-10517 (base)
et
dernière version
dernière version
9ff67d0b
2 validations,
Il y a 4 ans
1 file
+
25
−
89
En ligne
Comparer les modifications
Côte à côte
En ligne
Afficher les modifications des espaces
Afficher un fichier à la fois
src/database/queue.c
+
25
−
89
Afficher le fichier @ 9ff67d0b
Modifier dans l'éditeur de fichier unique
Ouvrir dans Web EDI
Afficher le fichier complet
@@ -574,128 +574,64 @@ error_no_rollback:
bool
database_queue_move
(
volatile
sqlite3
*
db
,
int
from
,
int
to
)
{
/* TODO: See if there is a solution with less lines of code */
static
const
char
*
SQL_TEMPLATE_toINFfrom
=
static
const
char
*
SQL_TEMPLATE_PART_1
=
/* Clean queue_tmp */
"DELETE FROM queue_tmp;"
"DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';"
/* Construct queue */
"INSERT INTO queue_tmp(
position,
kara_id,priority)"
"INSERT INTO queue_tmp(kara_id,priority)"
"WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION, kara_id, priority"
" FROM queue)"
"SELECT POSITION, kara_id, priority"
" position, kara_id, priority"
" FROM queue"
" ORDER BY position ASC, priority DESC)"
"SELECT kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION < %d AND POSITION != %d ORDER BY POSITION;"
/* Construct queue */
"INSERT INTO queue_tmp(
position,
kara_id,priority)"
" VALUES(
%d,
("
"INSERT INTO queue_tmp(kara_id,priority)"
" VALUES(("
" WITH TEMP_TABLE AS ("
" SELECT ROW_NUMBER() OVER(ORDER BY p
riority DESC, position A
SC) AS POSITION,"
" SELECT ROW_NUMBER() OVER(ORDER BY p
osition ASC, priority DE
SC) AS POSITION,"
" kara_id, priority FROM queue)"
" SELECT kara_id FROM TEMP_TABLE WHERE POSITION = %d"
" ),("
" WITH TEMP_TABLE AS ("
" SELECT ROW_NUMBER() OVER(ORDER BY p
riority DESC, position A
SC) AS POSITION,"
" SELECT ROW_NUMBER() OVER(ORDER BY p
osition ASC, priority DE
SC) AS POSITION,"
" kara_id, priority FROM queue)"
" SELECT priority FROM TEMP_TABLE WHERE POSITION = %d"
" SELECT priority FROM TEMP_TABLE WHERE POSITION = "
" CASE WHEN (SELECT COUNT(*) FROM TEMP_TABLE)>=%d THEN %d ELSE %d-1 END"
" ));"
;
static
const
char
*
SQL_TEMPLATE_toSUPfrom_Part1
=
/* Clean queue_tmp */
"DELETE FROM queue_tmp;"
"DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';"
/* Construct queue */
"INSERT INTO queue_tmp(position, kara_id,priority)"
"WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION, kara_id, priority"
" FROM queue)"
"SELECT POSITION, kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION < %d ORDER BY POSITION;"
/* Construct queue */
"INSERT INTO queue_tmp(position, kara_id,priority)"
"WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION, kara_id, priority"
" FROM queue)"
"SELECT POSITION - 1, kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION > %d AND POSITION < %d ORDER BY POSITION;"
;
static
const
char
*
SQL_TEMPLATE_toSUPfrom_Part2
=
static
const
char
*
SQL_TEMPLATE_PART_2
=
/* Construct queue */
"INSERT INTO queue_tmp(position, kara_id,priority)"
" VALUES(%d-1,("
" WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION,"
" kara_id, priority FROM queue)"
" SELECT kara_id FROM TEMP_TABLE WHERE POSITION = %d"
" ),("
" WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION,"
" kara_id, priority FROM queue)"
" SELECT priority FROM TEMP_TABLE WHERE POSITION ="
" CASE WHEN (SELECT COUNT(*) FROM TEMP_TABLE)>=%d THEN %d ELSE %d-1 END"
"));"
;
static
const
char
*
SQL_TEMPLATE_PART_2_toINFfrom
=
/* Construct queue */
"INSERT INTO queue_tmp(position, kara_id,priority)"
"WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION,"
" kara_id, priority FROM queue)"
"SELECT (POSITION+1) , kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION >= %d AND POSITION < %d ORDER BY POSITION;"
"INSERT INTO queue_tmp(position, kara_id,priority)"
" WITH TEMP_TABLE AS (SELECT"
" ROW_NUMBER() OVER(ORDER BY priority DESC, position ASC) AS POSITION,"
" kara_id, priority"
" FROM queue)"
" SELECT POSITION , kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION > %d AND POSITION >=%d ORDER BY POSITION;"
/* Clean queue and insert back */
"DELETE FROM queue;"
"DELETE FROM sqlite_sequence WHERE name = 'queue';"
"INSERT INTO queue(position, kara_id, priority)"
" SELECT position, kara_id, priority FROM queue_tmp ORDER BY priority, position;"
/* Clean queue_tmp */
"DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';"
"DELETE FROM queue_tmp;"
;
static
const
char
*
SQL_TEMPLATE_PART_2_toSUPfrom
=
/* Construct queue */
"INSERT INTO queue_tmp(position, kara_id,priority)"
"INSERT INTO queue_tmp(kara_id,priority)"
"WITH TEMP_TABLE AS ("
" SELECT ROW_NUMBER() OVER(ORDER BY p
riority DESC, position A
SC) AS POSITION,"
" SELECT ROW_NUMBER() OVER(ORDER BY p
osition ASC, priority DE
SC) AS POSITION,"
" kara_id, priority FROM queue)"
"SELECT
POSITION ,
kara_id, priority"
"SELECT kara_id, priority"
" FROM TEMP_TABLE WHERE POSITION >= %d AND POSITION != %d ORDER BY POSITION;"
/* Clean queue and insert back */
"UPDATE queue_state"
" SET current = CASE"
" WHEN current NOT NULL "
" THEN (SELECT position FROM queue_tmp "
" WHERE kara_id=(SELECT kara_id FROM queue WHERE position = current))"
" ELSE NULL END;"
"DELETE FROM queue;"
"DELETE FROM sqlite_sequence WHERE name = 'queue';"
"INSERT INTO queue(position, kara_id, priority)"
" SELECT position, kara_id, priority FROM queue_tmp ORDER BY priority, position;"
/* Clean queue_tmp */
"DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';"
"DELETE FROM queue_tmp;"
;
char
SQL
[
LKT_MAX_SQLITE_STATEMENT
];
SQLITE_EXEC
(
db
,
"BEGIN TRANSACTION;"
,
error_no_rollback
);
if
(
to
<
from
)
{
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_toINFfrom
,
to
,
from
,
to
,
from
,
to
);
SQLITE_EXEC
(
db
,
SQL
,
error
);
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_PART_2_toINFfrom
,
to
,
from
,
from
,
to
);
SQLITE_EXEC
(
db
,
SQL
,
error
);
}
else
{
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_toSUPfrom_Part1
,
from
,
from
,
to
);
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_PART_1
,
to
,
from
,
from
,
to
,
to
,
to
);
SQLITE_EXEC
(
db
,
SQL
,
error
);
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_
toSUPfrom_Part2
,
to
,
from
,
to
,
to
,
to
);
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_
PART_2
,
to
,
from
);
SQLITE_EXEC
(
db
,
SQL
,
error
);
safe_snprintf
(
SQL
,
LKT_MAX_SQLITE_STATEMENT
,
SQL_TEMPLATE_PART_2_toSUPfrom
,
to
,
from
,
from
,
to
);
SQLITE_EXEC
(
db
,
SQL
,
error
);
}
SQLITE_EXEC
(
db
,
"COMMIT;"
,
error
);
return
true
;
error:
Chargement en cours