Skip to content

Commit 756308d

Browse files
author
Anderson Bestteti Santos
committed
Adjusted range constant START_RANGE_LARGE and its conditional test from '>' to '>='.
1 parent f25685a commit 756308d

1 file changed

Lines changed: 35 additions & 34 deletions

File tree

DesignerRulesAndTransformations/CustomLibraries/DataModelerCustomLibraries.xml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ function normalizeStorageProperties() {
562562
var END_RANGE_SMALL = 100000;
563563
var START_RANGE_MEDIUM = 100001;
564564
var END_RANGE_MEDIUM = 1000000;
565-
var START_RANGE_LARGE = 1000000;
565+
var START_RANGE_LARGE = 1000001;
566566
567567
// Retrieve and process a set of tables from the Physical Model
568568
var tables = model.getStorageDesign().getTableProxySet().toArray();
@@ -591,7 +591,7 @@ function normalizeStorageProperties() {
591591
} else if (tableVolumetry >= START_RANGE_MEDIUM && tableVolumetry <= END_RANGE_MEDIUM) {
592592
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_MEDIUM);
593593
table.setTableSpace(tableSpace);
594-
} else if (tableVolumetry > START_RANGE_LARGE) {
594+
} else if (tableVolumetry >= START_RANGE_LARGE) {
595595
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_LARGE);
596596
table.setTableSpace(tableSpace);
597597
}
@@ -609,7 +609,7 @@ function normalizeStorageProperties() {
609609
} else if (tableVolumetry >= START_RANGE_MEDIUM && tableVolumetry <= END_RANGE_MEDIUM) {
610610
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(INDEX_TABLESPACE_MEDIUM);
611611
tableIndex.setTableSpace(tableSpace);
612-
} else if (tableVolumetry > START_RANGE_LARGE) {
612+
} else if (tableVolumetry >= START_RANGE_LARGE) {
613613
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(INDEX_TABLESPACE_LARGE);
614614
tableIndex.setTableSpace(tableSpace);
615615
}
@@ -639,7 +639,7 @@ function normalizeStorageProperties() {
639639
} else if (tableVolumetry >= START_RANGE_MEDIUM && tableVolumetry <= END_RANGE_MEDIUM) {
640640
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(LOB_TABLESPACE_MEDIUM);
641641
tableLobStorage.setTableSpace(tableSpace);
642-
} else if (tableVolumetry > START_RANGE_LARGE) {
642+
} else if (tableVolumetry >= START_RANGE_LARGE) {
643643
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(LOB_TABLESPACE_LARGE);
644644
tableLobStorage.setTableSpace(tableSpace);
645645
}
@@ -684,46 +684,47 @@ function validateTableTablespaceUsage(table) {
684684
var END_RANGE_SMALL = 100000;
685685
var START_RANGE_MEDIUM = 100001;
686686
var END_RANGE_MEDIUM = 1000000;
687-
var START_RANGE_LARGE = 1000000;
687+
var START_RANGE_LARGE = 1000001;
688688
689689
var result = true;
690690
691+
var model table.getDesignPart();
692+
691693
// Get the expected amount of rows
692694
tableVolumetry = table.getExpectedVolumes();
693695
if (tableVolumetry != null) {
694696
695-
ruleMessage = "Invalid tablespace definition. Using "
696-
697-
if (tableVolumetry >= START_RANGE_SMALL && tableVolumetry <= END_RANGE_SMALL) {
698-
tableSpaceName = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_SMALL).getName();
699-
if (!tableSpaceName.equals(TABLE_TABLESPACE_SMALL)) {
700-
result = false;
701-
ruleMessage += tableSpaceName;
702-
ruleMessage += " instead of " + TABLE_TABLESPACE_SMALL;
703-
errType = "Error";
704-
}
705-
} else if (tableVolumetry >= START_RANGE_MEDIUM && tableVolumetry <= END_RANGE_MEDIUM) {
706-
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_MEDIUM);
707-
if (!tableSpaceName.equals(TABLE_TABLESPACE_MEDIUM)) {
708-
result = false;
709-
ruleMessage += tableSpaceName;
710-
ruleMessage += " instead of " + TABLE_TABLESPACE_MEDIUM;
711-
errType = "Error";
712-
}
713-
} else if (tableVolumetry > START_RANGE_LARGE) {
714-
tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_LARGE);
715-
if (!tableSpaceName.equals(START_RANGE_LARGE)) {
716-
result = false;
717-
ruleMessage += tableSpaceName;
718-
ruleMessage += " instead of " + START_RANGE_LARGE;
719-
errType = "Error";
720-
}
721-
}
697+
//ruleMessage = "Invalid tablespace definition. Using "
698+
//
699+
//if (tableVolumetry >= START_RANGE_SMALL && tableVolumetry <= END_RANGE_SMALL) {
700+
// tableSpaceName = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_SMALL).getName();
701+
// if (!tableSpaceName.equals(TABLE_TABLESPACE_SMALL)) {
702+
// result = false;
703+
// ruleMessage += tableSpaceName;
704+
// ruleMessage += " instead of " + TABLE_TABLESPACE_SMALL;
705+
// errType = "Error";
706+
// }
707+
//} else if (tableVolumetry >= START_RANGE_MEDIUM && tableVolumetry <= END_RANGE_MEDIUM) {
708+
// tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_MEDIUM);
709+
// if (!tableSpaceName.equals(TABLE_TABLESPACE_MEDIUM)) {
710+
// result = false;
711+
// ruleMessage += tableSpaceName;
712+
// ruleMessage += " instead of " + TABLE_TABLESPACE_MEDIUM;
713+
// errType = "Error";
714+
// }
715+
//} else if (tableVolumetry >= START_RANGE_LARGE) {
716+
// tableSpace = model.getStorageDesign().getTableSpaceSet().getByName(TABLE_TABLESPACE_LARGE);
717+
// if (!tableSpaceName.equals(START_RANGE_LARGE)) {
718+
// result = false;
719+
// ruleMessage += tableSpaceName;
720+
// ruleMessage += " instead of " + START_RANGE_LARGE;
721+
// errType = "Error";
722+
// }
723+
//}
722724
}
723725
724726
return result;
725-
}
726-
]]>
727+
}]]>
727728
</script>
728729
</lib>
729730
</custom_libraries>

0 commit comments

Comments
 (0)