Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some bugs in FilterListBuilder #1254

Merged
merged 2 commits into from Mar 12, 2020
Merged

Fix some bugs in FilterListBuilder #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c483f
Fix some bugs in FilterListBuilder
plessbd Mar 12, 2020
7bb7852
review updates
plessbd Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions bin/xdmod-build-filter-lists
View file
Open in desktop
Expand Up @@ -84,8 +84,7 @@ build($realms, $logger);
function build($realms, $logger){

try {
$filterListBuilder = new FilterListBuilder();
$filterListBuilder->setLogger($logger);
$filterListBuilder = new FilterListBuilder($logger);
if (count($realms) > 0){
foreach($realms as $realm){
if(!empty($realm)){
Expand Down
181 changes: 73 additions & 108 deletions classes/DB/FilterListBuilder.php
View file
Open in desktop
Expand Up @@ -35,16 +35,6 @@ class FilterListBuilder extends Loggable
*/
private static $rolesDimensionNames = null;

/**
* Construct filter list builder.
*/
public function __construct()
{
if ($this->_logger === null) {
$this->_logger = Log::singleton('null');
}
}

/**
* Build filter lists for all realms' dimensions.
*/
Expand All @@ -53,7 +43,7 @@ public function buildAllLists()
$config = \Configuration\XdmodConfiguration::assocArrayFactory(
'datawarehouse.json',
CONFIG_DIR,
$this->_logger
$this->logger
);

// Get the realms to be processed.
Expand Down Expand Up @@ -106,56 +96,42 @@ public function buildDimensionLists(Query $realmQuery, GroupBy $groupBy)

$db = DB::factory('datawarehouse');
$targetSchema = FilterListHelper::getSchemaName();
$mainTableExistsResults = $db->query("SHOW TABLES FROM {$targetSchema} LIKE '$mainTableName'");
if (empty($mainTableExistsResults)) {
plessbd marked this conversation as resolved.
Show resolved Hide resolved
try {
$dimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $groupBy);
} catch (TableNotFoundException $e) {
$this->_logger->notice("Not creating $targetSchema.$mainTableName list table; {$e->getTable()} table not found");
return;
}

$dimensionColumnType = $dimensionProperties['type'];

$db->execute(
"CREATE TABLE `{$targetSchema}`.`{$mainTableName}` (
`{$dimensionName}` {$dimensionColumnType} NOT NULL,
PRIMARY KEY (`{$dimensionName}`)
);"
);
}

try {
$db->beginTransaction();

$dimensionQuery = $this->createDimensionQuery($realmQuery, $groupBy);
$dimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $groupBy);
} catch (TableNotFoundException $e) {
$this->logger->notice("Not creating $targetSchema.$mainTableName list table; {$e->getTable()} table not found");
return;
}
$dimensionColumnType = $dimensionProperties['type'];
$db->execute("DROP TABLE IF EXISTS `{$targetSchema}`.`{$mainTableName}`;");
$db->execute(
"CREATE TABLE `{$targetSchema}`.`{$mainTableName}` (
`{$dimensionName}` {$dimensionColumnType} NOT NULL,
PRIMARY KEY (`{$dimensionName}`)
);"
);
$dimensionQuery = $this->createDimensionQuery($realmQuery, $groupBy);

$selectTables = $dimensionQuery->getSelectTables();
$selectFields = $dimensionQuery->getSelectFields();
$wheres = $dimensionQuery->getWhereConditions();
$selectTables = $dimensionQuery->getSelectTables();
$selectFields = $dimensionQuery->getSelectFields();
$wheres = $dimensionQuery->getWhereConditions();

$idField = $selectFields['id'];
$idField = $selectFields['id'];

$selectTablesStr = implode(', ', $selectTables);
$wheresStr = implode(' AND ', $wheres);
$selectTablesStr = implode(', ', $selectTables);
$wheresStr = implode(' AND ', $wheres);

$db->execute("TRUNCATE TABLE `{$targetSchema}`.`{$mainTableName}`");
$db->execute(
"INSERT INTO
`{$targetSchema}`.`{$mainTableName}`
SELECT DISTINCT
$idField
FROM $selectTablesStr
WHERE $wheresStr"
);

$db->commit();
$db->execute(
"INSERT INTO
`{$targetSchema}`.`{$mainTableName}`
SELECT DISTINCT
$idField
FROM $selectTablesStr
WHERE $wheresStr"
);

$this->builtListTables[$mainTableName] = true;
} catch (Exception $e) {
$db->rollBack();
throw $e;
}
$this->builtListTables[$mainTableName] = true;

// Generate list tables pairing this dimension with every other
// dimension in the realm that's associated with roles.
Expand Down Expand Up @@ -200,61 +176,50 @@ public function buildDimensionLists(Query $realmQuery, GroupBy $groupBy)

// Generate the pair table. If the pair table does not exist,
// create it.
$pairTableExistsResults = $db->query("SHOW TABLES FROM {$targetSchema} LIKE '$pairTableName'");
if (empty($pairTableExistsResults)) {
try {
$firstDimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $firstGroupBy);
$firstDimensionColumnType = $firstDimensionProperties['type'];
$secondDimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $secondGroupBy);
$secondDimensionColumnType = $secondDimensionProperties['type'];
} catch (TableNotFoundException $e) {
$this->_logger->notice("Not creating $targetSchema.$pairTableName pair table; {$e->getTable()} table not found");
continue;
}
$db->execute(
"CREATE TABLE `{$targetSchema}`.`{$pairTableName}` (
`{$firstDimensionName}` {$firstDimensionColumnType} NOT NULL,
`{$secondDimensionName}` {$secondDimensionColumnType} NOT NULL,
PRIMARY KEY (`{$firstDimensionName}`, `{$secondDimensionName}`),
INDEX `idx_second_dimension` (`{$secondDimensionName}` ASC)
)"
);
}

try {
$db->beginTransaction();

$firstSelectTables = $firstDimensionQuery->getSelectTables();
$firstSelectFields = $firstDimensionQuery->getSelectFields();
$firstWheres = $firstDimensionQuery->getWhereConditions();
$secondSelectTables = $secondDimensionQuery->getSelectTables();
$secondSelectFields = $secondDimensionQuery->getSelectFields();
$secondWheres = $secondDimensionQuery->getWhereConditions();

$firstIdField = $firstSelectFields['id'];
$secondIdField = $secondSelectFields['id'];

$selectTablesStr = implode(', ', array_unique(array_merge($firstSelectTables, $secondSelectTables)));
$wheresStr = implode(' AND ', array_unique(array_merge($firstWheres, $secondWheres)));

$db->execute("TRUNCATE TABLE `{$targetSchema}`.`{$pairTableName}`");
$db->execute(
"INSERT INTO
`{$targetSchema}`.`{$pairTableName}`
SELECT DISTINCT
$firstIdField,
$secondIdField
FROM $selectTablesStr
WHERE $wheresStr"
);

$db->commit();

$this->builtListTables[$pairTableName] = true;
} catch (Exception $e) {
$db->rollBack();
throw $e;
$firstDimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $firstGroupBy);
$firstDimensionColumnType = $firstDimensionProperties['type'];
$secondDimensionProperties = $this->getDimensionDatabaseProperties($realmQuery, $secondGroupBy);
$secondDimensionColumnType = $secondDimensionProperties['type'];
} catch (TableNotFoundException $e) {
$this->logger->notice("Not creating $targetSchema.$pairTableName pair table; {$e->getTable()} table not found");
continue;
}
$db->execute("DROP TABLE IF EXISTS `{$targetSchema}`.`{$pairTableName}`");
$db->execute(
"CREATE TABLE `{$targetSchema}`.`{$pairTableName}` (
`{$firstDimensionName}` {$firstDimensionColumnType} NOT NULL,
`{$secondDimensionName}` {$secondDimensionColumnType} NOT NULL,
PRIMARY KEY (`{$firstDimensionName}`, `{$secondDimensionName}`),
INDEX `idx_second_dimension` (`{$secondDimensionName}` ASC)
)"
);


$firstSelectTables = $firstDimensionQuery->getSelectTables();
$firstSelectFields = $firstDimensionQuery->getSelectFields();
$firstWheres = $firstDimensionQuery->getWhereConditions();
$secondSelectTables = $secondDimensionQuery->getSelectTables();
$secondSelectFields = $secondDimensionQuery->getSelectFields();
$secondWheres = $secondDimensionQuery->getWhereConditions();

$firstIdField = $firstSelectFields['id'];
$secondIdField = $secondSelectFields['id'];

$selectTablesStr = implode(', ', array_unique(array_merge($firstSelectTables, $secondSelectTables)));
$wheresStr = implode(' AND ', array_unique(array_merge($firstWheres, $secondWheres)));

$db->execute(
"INSERT INTO
`{$targetSchema}`.`{$pairTableName}`
SELECT DISTINCT
$firstIdField,
$secondIdField
FROM $selectTablesStr
WHERE $wheresStr"
);

$this->builtListTables[$pairTableName] = true;
}
}

Expand Down Expand Up @@ -330,7 +295,7 @@ private function getDimensionDatabaseProperties(Query $realmQuery, GroupBy $grou
{
$db = DB::factory('datawarehouse');
$helper = MySQLHelper::factory($db);
$helper->setLogger($this->_logger);
$helper->setLogger($this->logger);

// TODO After GroupBy is refactored, use GroupBy methods to get the
// table and column names,
Expand Down