Context Navigation

← Previous Change
Next Change →

HeuristicLab.Services.Hive.DataAccess

Timestamp:

07/18/14 13:34:37 (11 years ago)

Author:

ascheibe

Message:

merged only Hive changes from trunk into branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess

Files:

: 18 edited

. (modified) (1 prop)
3.3/Convert.cs (modified) (1 diff)
3.3/Enums/Command.cs (modified) (1 diff)
3.3/Enums/CpuArchitecture.cs (modified) (1 diff)
3.3/Enums/DowntimeType.cs (modified) (1 diff)
3.3/Enums/Permission.cs (modified) (1 diff)
3.3/Enums/SlaveState.cs (modified) (1 diff)
3.3/Enums/TaskState.cs (modified) (1 diff)
3.3/Exceptions/DaoException.cs (modified) (1 diff)
3.3/HiveDao.cs (modified) (1 diff)
3.3/HiveDataContext.cs (modified) (1 diff)
3.3/ITransactionManager.cs (modified) (1 diff)
3.3/Interfaces/IHiveDao.cs (modified) (1 diff)
3.3/Logger.cs (modified) (1 diff)
3.3/Plugin.cs.frame (modified) (2 diffs)
3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
3.3/SQL Scripts/Migrate to Filestream.sql (modified) (1 diff)
3.3/TransactionManager.cs (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess

Property svn:mergeinfo changed

/branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess (added)	merged: 9539,9634,9636
/stable/HeuristicLab.Services.Hive.DataAccess (added)	merged: 10032,11170,11173
/trunk/sources/HeuristicLab.Services.Hive.DataAccess	merged: 9456,9462,9665,9675,10037,11171,11174

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Convert.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Command.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/CpuArchitecture.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/DowntimeType.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Permission.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/SlaveState.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/TaskState.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Exceptions/DaoException.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/ITransactionManager.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Logger.cs

r11203	r11204
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Plugin.cs.frame

-                      r11203
+                      r11204
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Services.Hive.DataAccess {
   [Plugin("HeuristicLab.Services.Hive.DataAccess", "3.3.7.$WCREV$")]
+  [Plugin("HeuristicLab.Services.Hive.DataAccess", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Services.Hive.DataAccess-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabServicesHiveDataAccessPlugin : PluginBase {

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

-                      r11203
+                      r11204
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Migrate to Filestream.sql

r9492	r11204
	1	/* Upgrade script from HeuristicLab Hive 3.3.8 to 3.3.9 */
	2
1	3	USE [HeuristicLab.Hive-3.3]
2	4

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs

-                      r11203
+                      r11204
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System;
-using System.IO;
 using System.Transactions;
 …
           n--; // probably deadlock situation, let it roll back and repeat the transaction n times
           LogFactory.GetLogger(typeof(TransactionManager).Namespace).Log(string.Format("Exception occured, repeating transaction {0} more times. Details: {1}", n, e.ToString()));
-          //var log = new StreamWriter(@"C:\Temp\AbortedTransactions.log", true);
-          //log.WriteLine(DateTime.Now + ": Transaction aborted: " + n + " (" + e.Message + ")");
-          //log.WriteLine(e.StackTrace);
-          //log.Close();
           if (n <= 0) throw;
+        }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11204 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess

Legend:

Download in other formats: