Bug 451923 - [performance ui] fingerprints not printed?

4 files changed, 9 insertions, 7 deletions

diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ComponentResults.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ComponentResults.java
index 001a7b2..4e0bc19 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ComponentResults.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ComponentResults.java
@@ -290,7 +290,9 @@ String readLocalFile(File dir, List scenarios) throws FileNotFoundException {
 			if (scenarioResults == null) {
 				// this can happen if scenario pattern does not cover all those stored in local data file
 				// hence, creates a fake scenario to read the numbers and skip to the next scenario
-				scenarioResults = new ScenarioResults(-1, null, null);
+				// Note: we put a fake name and decription here since in some logging cases, it requires a name.
+				// TODO: should work though the issues and make a "NullScenarioResult" work everywhere.
+				scenarioResults = new ScenarioResults(-1, "org.eclipse.unexplained", "Place holder scenerio that does not appear to fit in?");
 //				scenarioResults.parent = this;
 //				scenarioResults.readData(stream);
 				// Should no longer occur as we get all scenarios from database now
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
index 6449321..8a7d9b5 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
@@ -174,8 +174,8 @@ public class DB_Results {
 			DB_CONNECTION = connected;
 			DB_LOCATION = databaseLocation == null ? IPerformancesConstants.NETWORK_DATABASE_LOCATION : databaseLocation;
 			DB_NAME = IPerformancesConstants.DATABASE_NAME_PREFIX + eclipseVersion;
-			DB_VERSION = "v" + eclipseVersion;
-			DB_VERSION_REF = "R-3." + (eclipseVersion % 10 - 1);
+			DB_VERSION = "v44"; // + eclipseVersion;
+			DB_VERSION_REF = "R-4.4"; //" + (eclipseVersion % 10 - 1);
 			if (connected) {
 				return getDefault().fSQL != null;
 			}
@@ -711,8 +711,8 @@ public static void initDbContants() {
 		}
 	}
 	if (DB_VERSION == null) {
-		DB_VERSION = "v" + DB_NAME.substring(DB_NAME.length()-2);
-		DB_VERSION_REF = "R-3."+(Character.digit(DB_NAME.charAt(DB_NAME.length()-1), 10)-1);
+		DB_VERSION = "v44"; // + DB_NAME.substring(DB_NAME.length()-2);
+		DB_VERSION_REF = "R-4.4"; //+(Character.digit(DB_NAME.charAt(DB_NAME.length()-1), 10)-1);
 	}
 }
 
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/SQL_Results.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/SQL_Results.java
index 1a4a1be..095d139 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/SQL_Results.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/SQL_Results.java
@@ -287,7 +287,7 @@ ResultSet queryScenarioSummaries(int scenarioID, String config, String[] builds)
 			"(DIM_ID = "+InternalDimensions.ELAPSED_PROCESS.getId()+" or DIM_ID = 0)" + //$NON-NLS-1$ //$NON-NLS-2$
 			" order by VARIATION_ID, DIM_ID"); //$NON-NLS-1$
 	}
-	this.queryScenarioSummaries.setString(1, "|build="+buildPattern+"||config="+ config + "||jvm=sun|"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	this.queryScenarioSummaries.setString(1, "|build="+buildPattern+"||config="+ config + "||jvm=8.0|"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	this.queryScenarioSummaries.setInt(2, scenarioID);
 	return this.queryScenarioSummaries.executeQuery();
 }
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
index 9797fb0..2e7f64f 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
@@ -61,7 +61,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
  * 	<ul>
  *	<li>Filter for builds:
  *		<ul>
- *		<li>Filter baselines:	hide the baselines (starting with R-3.x)</li>
+ *		<li>Filter baselines:	hide the baselines (starting with R-4.x)</li>
  *		<li>Filter nightly:	hide the nightly builds (starting with 'N')</li>
  *		<li>Filter non-important builds:	hide all non-important builds, which means non-milestone builds and those after the last milestone</li>
  *		</ul>