[MediaWiki-commits] [Gerrit] Database schema improvements (T102992) - change (mediawiki...WikibaseQualityConstraints)

[Soeren.oldag (Code Review)]

Soeren.oldag has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222861

Change subject: Database schema improvements (T102992)
......................................................................

Database schema improvements (T102992)

Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
---
M includes/ConstraintRepository.php
M maintenance/UpdateTable.php
M sql/create_wbqc_constraints.sql
3 files changed, 8 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
 refs/changes/61/222861/1

diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index ee811ac..c051f01 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -49,9 +49,6 @@
                );
 
                $db = wfGetDB( DB_MASTER );
-               $db->commit( __METHOD__, "flush" );
-               wfWaitForSlaves();
-
                return $db->insert( CONSTRAINT_TABLE, $accumulator );
        }
 
@@ -87,4 +84,4 @@
                return $constraints;
        }
 
-}
\ No newline at end of file
+}
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index a016025..7f2d65b 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -31,6 +31,10 @@
                        $data = fgetcsv( $csvFile );
                        if ( $data === false || ++$i % $this->mBatchSize === 0 
) {
                                $constraintRepo->insertBatch( $accumulator );
+
+                               wfGetDB( DB_MASTER )->commit( __METHOD__, 
"flush" );
+                               wfWaitForSlaves();
+
                                if ( !$this->isQuiet() ) {
                                        print "\r\033[K";
                                        print "$i rows inserted";
@@ -54,4 +58,4 @@
 // @codeCoverageIgnoreStart
 $maintClass = 'WikibaseQuality\ConstraintReport\Maintenance\UpdateTable';
 require_once RUN_MAINTENANCE_IF_MAIN;
-// @codeCoverageIgnoreEnd
\ No newline at end of file
+// @codeCoverageIgnoreEnd
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 7b371c1..969cbab 100644
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,12 +1,9 @@
 CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
-  constraint_guid                VARCHAR(255)          PRIMARY KEY,
+  constraint_guid                VARBINARY(63)         PRIMARY KEY,
   pid                            INT(11)               NOT NULL,
-  constraint_type_qid          VARCHAR(255)    NOT NULL,
+  constraint_type_qid          VARBINARY(25)   NOT NULL,
   constraint_parameters                TEXT                          DEFAULT 
NULL
 ) /*$wgDBTableOptions*/;
 
 CREATE INDEX /*i*/wbqc_constraints_pid_index
 ON /*_*/wbqc_constraints (pid);
-
-CREATE INDEX /*i*/wbqc_constraints_constraint_type_qid_index
-ON /*_*/wbqc_constraints (constraint_type_qid);
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/222861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: refs/master
Gerrit-Owner: Soeren.oldag <soeren_ol...@freenet.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits