汎用データベースの一覧表示処理の速度改善

Config/Migration/1753253996_add_index.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * AddIndex Migration
+ * インデックスを追加するためのMigration
+ *
+ * @author Hiroki Mochizuki <fj2532ir@fujitsu.com>
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+
+/**
+ * AddIndex Migration
+ *
+ * @author Hiroki Mochizuki <fj2532ir@fujitsu.com>
+ * @package NetCommons\Multidatabases\Config\Migration
+ *
+ */
+class AddIndex extends CakeMigration {
+
+/**
+ * Migration description
+ *
+ * @var string
+ */
+	public $description = 'add_index';
+
+/**
+ * Actions to be performed
+ *
+ * @var array $migration
+ */
+	public $migration = array(
+		'up' => array(
+			'create_field' => array(
+				'multidatabase_contents' => array(
+					'indexes' => array(
+						'key' => array('column' => 'key', 'unique' => 0),
+						'block_id' => array('column' => 'block_id', 'unique' => 0),
+					),
+				),
+			),
+		),
+		'down' => array(
+			'drop_field' => array(
+				'multidatabase_contents' => array('indexes' => array('key', 'block_id')),
+			),
+		),
+	);
+
+/**
+ * Before migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+	public function before($direction) {
+		return true;
+	}
+
+/**
+ * After migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+	public function after($direction) {
+		return true;
+	}
+}

Config/Schema/schema.php

@@ -161,7 +161,9 @@ public function after($event = array()) {
 		'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false, 'comment' => '更新者'),
 		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '更新日時'),
 		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'key' => array('column' => 'key', 'unique' => 0),
+			'block_id' => array('column' => 'block_id', 'unique' => 0)
 		),
 		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
 	);

Controller/MultidatabaseContentsController.php

@@ -130,13 +130,11 @@ public function beforeFilter() {
 			return false;
 		}
 
-		$frameSetting = $this->MultidatabaseFrameSetting->getMultidatabaseFrameSetting(true);
-		$this->set('multidatabaseFrameSetting', $frameSetting['MultidatabaseFrameSetting']);
-
 		// ゲストアクセスOKのアクションを設定
 		$this->Auth->allow('index', 'detail', 'search');
 
 		$this->_prepare();
+		$this->set('multidatabaseFrameSetting', $this->_frameSetting['MultidatabaseFrameSetting']);
 	}
 
 /**
@@ -503,7 +501,7 @@ private function __condSortOrder($sortCol = '') {
  */
 	private function __condSelect() {
 		$pagerNamed = $this->Paginator->Controller->params->named;
-		return $this->MultidatabaseContentSearch->getCondSelect($pagerNamed);
+		return $this->MultidatabaseContentSearch->getCondSelect($pagerNamed, $this->_metadata);
 	}
 
 /**
@@ -546,12 +544,39 @@ private function __list($extraConditions = []) {
 			);
 		}
 
+		$field = [
+			'Block.*',
+			'Like.*',
+			'LikesUser.*',
+			'MultidatabaseContent.id',
+			'MultidatabaseContent.key',
+			'MultidatabaseContent.multidatabase_key',
+			'MultidatabaseContent.multidatabase_id',
+			'MultidatabaseContent.language_id',
+			'MultidatabaseContent.block_id',
+			'MultidatabaseContent.title_icon',
+			'MultidatabaseContent.status',
+			'MultidatabaseContent.is_active',
+			'MultidatabaseContent.is_latest',
+			'MultidatabaseContent.created_user',
+			'MultidatabaseContent.created',
+			'MultidatabaseContent.modified_user',
+			'MultidatabaseContent.modified',
+		];
+
+		foreach ($this->_metadata as $metadata) {
+			if ($metadata['is_visible_list']) {
+				$field[] = 'MultidatabaseContent.' . 'value' . $metadata['col_no'];
+			}
+		}
+
 		$this->Paginator->settings = array_merge(
 			$this->Paginator->settings,
 			[
 				'conditions' => $conditions,
 				'limit' => $this->_frameSetting['MultidatabaseFrameSetting']['content_per_page'],
-				'order' => $this->__condSortOrder()
+				'order' => $this->__condSortOrder(),
+				'fields' => $field
 			]
 		);
 

Controller/MultidatabasesAppController.php

@@ -72,25 +72,10 @@ class MultidatabasesAppController extends AppController {
  * @return void
  */
 	protected function _prepare() {
-		$this->_setupMultidatabaseTitle();
 		$this->_initMultidatabase(['multidatabaseSetting']);
 		$this->_loadFrameSetting();
 	}
 
-/**
- * ブロック名を汎用DBタイトルとしてセットする
- *
- * @return void
- */
-	protected function _setupMultidatabaseTitle() {
-		$this->loadModel('Blocks.Block');
-		$block = $this->Block->find('first', [
-			'recursive' => 0,
-			'conditions' => ['Block.id' => Current::read('Block.id')],
-		]);
-		$this->_multidatabaseTitle = $block['BlocksLanguage']['name'];
-	}
-
 /**
  * 初期設定
  *
@@ -103,24 +88,23 @@ protected function _initMultidatabase() {
 		}
 
 		// メタデータを取得
-		if (!$metadata = $this->MultidatabaseMetadata->getEditMetadatas(
+		if (!$metadatas = $this->MultidatabaseMetadata->getEditMetadatas(
 			$multidatabase['Multidatabase']['id'])
 		) {
 			return $this->throwBadRequest();
 		}
 
-		if (!$metadataGroups = $this->MultidatabaseMetadata->getMetadataGroups(
-			$multidatabase['Multidatabase']['id'])
-		) {
-			return $this->throwBadRequest();
+		foreach ($metadatas as $metadata) {
+			$metadataGroups[$metadata['position']][$metadata['rank']] = $metadata;
 		}
 
 		$this->_multidatabaseTitle = $multidatabase['Multidatabase']['name'];
 		$this->set('multidatabase', $multidatabase);
-		$this->set('multidatabaseMetadata', $metadata);
+		$this->set('multidatabaseMetadata', $metadatas);
 		$this->set('multidatabaseMetadataGroups', $metadataGroups);
 
-		if (!$multidatabaseSetting = $this->MultidatabaseSetting->getMultidatabaseSetting()) {
+		$multidatabaseSetting['MultidatabaseSetting'] = $multidatabase['MultidatabaseSetting'];
+		if (!$multidatabaseSetting) {
 			$multidatabaseSetting = $this->MultidatabaseSetting->createBlockSetting();
 			$multidatabaseSetting['MultidatabaseSetting']['multidatabase_key'] = null;
 		} else {
@@ -129,7 +113,7 @@ protected function _initMultidatabase() {
 		}
 
 		$this->_multidatabase = $multidatabase;
-		$this->_metadata = $metadata;
+		$this->_metadata = $metadatas;
 		$this->_setting = $multidatabaseSetting;
 		$this->set('multidatabaseSetting', $multidatabaseSetting['MultidatabaseSetting']);
 		$this->set('userId', (int)$this->Auth->user('id'));

Model/MultidatabaseContentSearch.php

@@ -101,9 +101,10 @@ public function getSearchConds($query = []) {
  * 複数選択、単一選択の絞込条件出力
  *
  * @param array $values 値
+ * @param array $metadatas メタデータ
  * @return array
  */
-	public function getCondSelect($values = []) {
+	public function getCondSelect($values = [], $metadatas = []) {
 		$this->loadModels([
 			'MultidatabaseMetadata' => 'Multidatabases.MultidatabaseMetadata',
 			'MultidatabaseContentSearchCond' => 'Multidatabases.MultidatabaseContentSearchCond',
@@ -113,7 +114,9 @@ public function getCondSelect($values = []) {
 			return [];
 		}
 
-		$metadatas = $this->MultidatabaseMetadata->getEditMetadatas();
+		if (empty($metadatas)) {
+			$metadatas = $this->MultidatabaseMetadata->getEditMetadatas();
+		}
 		$result = [];
 
 		$valueKey = null;

Model/MultidatabaseFrameSetting.php

@@ -80,6 +80,7 @@ public function getMultidatabaseFrameSetting() {
 		$frameSetting = $this->find('first', [
 				'recursive' => -1,
 				'conditions' => $conditions,
+				'callbacks' => false,
 			]
 		);
 

Model/MultidatabaseMetadata.php

@@ -222,7 +222,14 @@ public function getMetadatasColNo($multidatabaseId = 0) {
  */
 	public function getMetadatas($multidatabaseId = 0, $extraConditions = []) {
 		if (empty($multidatabaseId)) {
-			if (! $multidatabase = $this->Multidatabase->getMultidatabase()) {
+			$multidatabase = $this->Multidatabase->find('first', [
+				'recursive' => 0,
+				'fields' => 'Multidatabase.id',
+				'conditions' => $this->Multidatabase->getBlockConditionById(),
+				'callbacks' => false,
+			]);
+
+			if (!$multidatabase) {
 				return false;
 			}
 			$multidatabaseId = $multidatabase['Multidatabase']['id'];