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

2015-07-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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(+), 9 deletions(-)

Approvals:
  Tamslo: Looks good to me, approved
  Jonaskeutel: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index 000de2c..df66a75 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -51,9 +51,6 @@
);
 
$db = wfGetDB( DB_MASTER );
-   $db->commit( __METHOD__, "flush" );
-   wfWaitForSlaves();
-
return $db->insert( CONSTRAINT_TABLE, $accumulator );
}
 
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index 8078776..d234411 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -46,11 +46,16 @@
private function insertValues( $constraintRepo, $csvFile ) {
 
$i = 0;
+   $db = wfGetDB( DB_MASTER );
$accumulator = array();
while ( true ) {
$data = fgetcsv( $csvFile );
if ( $data === false || ++$i % $this->mBatchSize === 0 
) {
$constraintRepo->insertBatch( $accumulator );
+
+   $db->commit( __METHOD__, 'flush' );
+   wfWaitForSlaves();
+
if ( !$this->isQuiet() ) {
$this->output( "\r\033[K" );
$this->output( "$i rows inserted" );
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 7b371c1..18c4bb4 100755
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,12 +1,9 @@
 CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
-  constraint_guidVARCHAR(255)  PRIMARY KEY,
+  constraint_guidVARBINARY(63) PRIMARY KEY,
   pidINT(11)   NOT NULL,
-  constraint_type_qid  VARCHAR(255)NOT NULL,
+  constraint_type_qid  VARBINARY(25)   NOT NULL,
   constraint_parametersTEXT  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
+ON /*_*/wbqc_constraints (pid);
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag 
Gerrit-Reviewer: Jonaskeutel 
Gerrit-Reviewer: Tamslo 
Gerrit-Reviewer: jenkins-bot <>

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

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

2015-07-04 Thread Soeren.oldag (Code Review) 
Soeren.oldag has uploaded a new change for review.

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

Change subject: Database schema improvements (T102992)
..

Database schema improvements (T102992)

Change-Id: I32dacbde7aef28bf012ca90218d9fb3a7cd703a0
---
M includes/ConstraintRepository.php
M maintenance/UpdateConstraintsTable.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/62/222862/1

diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index d25e0bc..0f6e55d 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -51,9 +51,6 @@
);
 
$db = wfGetDB( DB_MASTER );
-   $db->commit( __METHOD__, "flush" );
-   wfWaitForSlaves();
-
return $db->insert( CONSTRAINT_TABLE, $accumulator );
}
 
@@ -90,4 +87,4 @@
return $constraints;
}
 
-}
\ No newline at end of file
+}
diff --git a/maintenance/UpdateConstraintsTable.php 
b/maintenance/UpdateConstraintsTable.php
index a1885d8..5f0e656 100644
--- a/maintenance/UpdateConstraintsTable.php
+++ b/maintenance/UpdateConstraintsTable.php
@@ -45,6 +45,10 @@
$data = fgetcsv( $csvFile );
if ( $data === false || ++$i % $this->mBatchSize === 0 
) {
$constraintRepo->insertBatch( $accumulator );
+
+   wfGetDB( DB_MASTER )->commit( __METHOD__, 
"flush" );
+   wfWaitForSlaves();
+
if ( !$this->isQuiet() ) {
$this->output( "\r\033[K" );
$this->output( "$i rows inserted" );
@@ -68,4 +72,4 @@
 // @codeCoverageIgnoreStart
 $maintClass = 
'WikibaseQuality\ConstraintReport\Maintenance\UpdateConstraintsTable';
 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_guidVARCHAR(255)  PRIMARY KEY,
+  constraint_guidVARBINARY(63) PRIMARY KEY,
   pidINT(11)   NOT NULL,
-  constraint_type_qid  VARCHAR(255)NOT NULL,
+  constraint_type_qid  VARBINARY(25)   NOT NULL,
   constraint_parametersTEXT  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/222862
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: master
Gerrit-Owner: Soeren.oldag 

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

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

2015-07-04 Thread 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_guidVARCHAR(255)  PRIMARY KEY,
+  constraint_guidVARBINARY(63) PRIMARY KEY,
   pidINT(11)   NOT NULL,
-  constraint_type_qid  VARCHAR(255)NOT NULL,
+  constraint_type_qid  VARBINARY(25)   NOT NULL,
   constraint_parametersTEXT  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 

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