Fixing an issue on service resolution preventing the creation of the …

…TableCellCache instance (and preventing cache, slowing performances)
deveel · May 4, 2016 · 13e1c0e · 13e1c0e
1 parent 85ee231
commit 13e1c0e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 31 deletions.
diff --git a/src/deveeldb-nunit/Deveel.Data.Client/DbCommandTest.cs b/src/deveeldb-nunit/Deveel.Data.Client/DbCommandTest.cs
@@ -104,7 +104,7 @@ public sealed class DbCommandTest : ContextBasedTest {
 			command.Parameters.Add(22);
 
 			var result = command.ExecuteScalar();
-
+			
 			Assert.IsNotNull(result);
 			Assert.IsInstanceOf<int>(result);
 			Assert.AreEqual(22, result);

diff --git a/src/deveeldb-nunit/Deveel.Data/ShowTests.cs b/src/deveeldb-nunit/Deveel.Data/ShowTests.cs
@@ -61,6 +61,15 @@ public sealed class ShowTests : ContextBasedTest {
 
 			Assert.AreEqual("APP", schemaName);
 			Assert.AreEqual("DEFAULT", schemaType);
+
+			Assert.DoesNotThrow(() => row = result.ElementAt(1));
+			Assert.IsNotNull(row);
+
+			schemaName = row.GetValue(0).Value.ToString();
+			schemaType = row.GetValue(1).Value.ToString();
+
+			Assert.AreEqual("INFORMATION_SCHEMA", schemaName);
+			Assert.AreEqual("SYSTEM", schemaType);
 		}
 
 		[Test]

diff --git a/src/deveeldb/Deveel.Data.Caching/TableCellCache.cs b/src/deveeldb/Deveel.Data.Caching/TableCellCache.cs
@@ -35,7 +35,7 @@ public sealed class TableCellCache : ITableCellCache, IDisposable {
 
 		public const int DefaultMaxCellSize = 1024*64;
 
-		public TableCellCache(IContext context) {
+		public TableCellCache(ISystemContext context) {
 			Configure(context);
 		}
 
@@ -45,7 +45,7 @@ public sealed class TableCellCache : ITableCellCache, IDisposable {
 
 		public int MaxCellSize { get; private set; }
 
-		public IContext Context { get; private set; }
+		public ISystemContext Context { get; private set; }
 
 		public long Size {
 			get {
@@ -73,7 +73,7 @@ public sealed class TableCellCache : ITableCellCache, IDisposable {
 			size -= value;
 		}
 
-		private void Configure(IContext context) {
+		private void Configure(ISystemContext context) {
 			var config = context.ResolveService<IConfiguration>();
 			var hashSize = DefaultHashSize;
 			var maxSize = config.GetInt32("system.tableCellCache.maxSize", DefaultMaxSize);

diff --git a/src/deveeldb/Deveel.Data.Routines/SystemFunctions.cs b/src/deveeldb/Deveel.Data.Routines/SystemFunctions.cs
@@ -383,26 +383,5 @@ public static class SystemFunctions {
 			var s = String.Join(", ", array);
 			return Field.String(s);
 		}
-
-		//internal static Field HasPrivilege(Field priv, Field arg) {
-		//	var privileges = ToPrivileges(priv);
-		//	var other = ToPrivileges(arg);
-		//	return Field.Boolean((privileges & other) != 0);
-		//}
-
-		//private static Privileges ToPrivileges(Field value) {
-		//	Privileges priv;
-		//	if (value.Type is StringType) {
-		//		var s = value.Value.ToString();
-		//		priv = (Privileges)Enum.Parse(typeof(Privileges), s, true);
-		//	} else if (value.Type is NumericType) {
-		//		var i = ((SqlNumber)value.Value).ToInt32();
-		//		priv = (Privileges)i;
-		//	} else {
-		//		throw new ArgumentException(String.Format("Invalid argument of type '{0}' in HASPRIV", value.Type));
-		//	}
-
-		//	return priv;
-		//}
 	}
 }
diff --git a/src/deveeldb/Deveel.Data.Routines/SystemFunctionsProvider.cs b/src/deveeldb/Deveel.Data.Routines/SystemFunctionsProvider.cs
@@ -473,12 +473,6 @@ class DistinctComparer : IComparer<int> {
 				.WhenExecute(context => Simple(context, args => SystemFunctions.PrivilegeString(args[0])))
 				.ReturnsString());
 
-			//Register(config => config.Named("haspriv")
-			//	.WithDynamicParameter("priv")
-			//	.WithDynamicParameter("other")
-			//	.WhenExecute(context => Simple(context, args => SystemFunctions.HasPrivilege(args[0], args[1])))
-			//	.ReturnsBoolean());
-
 			// VERSION
 			Register(config => config
 			.Named("version")