Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'etobi_mono' of https://github.com/e-tobi/ravendb

  • Loading branch information...
commit 03a8ef707325c28e02cf5e01326aac5ddb97634a 2 parents 54b8ff8 + e493a3f
@ayende ayende authored
View
2  Raven.Client.Lightweight/Connection/MultiGetOperation.cs
@@ -38,7 +38,7 @@ public string RequestUri
requestUri = url + "/multi_get";
if (convention.UseParallelMultiGet)
{
- requestUri = requestUri += "?parallel=yes";
+ requestUri += "?parallel=yes";
}
}
View
2  Raven.Client.Lightweight/Document/AbstractDocumentQuery.cs
@@ -12,7 +12,6 @@
using System.Linq.Expressions;
using System.Text;
using System.Threading;
-using NLog;
#if !NET_3_5
using Raven.Client.Connection.Async;
using System.Threading.Tasks;
@@ -38,7 +37,6 @@ namespace Raven.Client.Document
/// </summary>
public abstract class AbstractDocumentQuery<T, TSelf> : IDocumentQueryCustomization, IRavenQueryInspector, IAbstractDocumentQuery<T>
{
- private static readonly Logger log = LogManager.GetCurrentClassLogger();
/// <summary>
/// Whatever to negate the next operation
/// </summary>
View
1  Raven.Client.Lightweight/Linq/RavenQueryProviderProcessor.cs
@@ -773,7 +773,6 @@ private void VisitQueryableMethodCall(MethodCallExpression expression)
private void VisitOrderBy(LambdaExpression expression, bool descending)
{
- var member = ((MemberExpression) expression.Body).Member;
var propertyInfo = ((MemberExpression)expression.Body).Member as PropertyInfo;
var fieldInfo = ((MemberExpression)expression.Body).Member as FieldInfo;
var expressionMemberInfo = GetMember(expression.Body);
View
20 Raven.Database/Config/InMemoryRavenConfiguration.cs
@@ -174,8 +174,24 @@ private X509Certificate2 GetCertificate()
private int GetDefaultMemoryCacheLimitMegabytes()
{
- var totalPhysicalMemoryMegabytes =
- (int) (new Microsoft.VisualBasic.Devices.ComputerInfo().TotalPhysicalMemory/1024/1024);
+ int totalPhysicalMemoryMegabytes;
+ if (Type.GetType("Mono.Runtime") != null)
+ {
+ var pc = new System.Diagnostics.PerformanceCounter ("Mono Memory", "Total Physical Memory");
+ totalPhysicalMemoryMegabytes = (int)(pc.RawValue/1024/1024);
+ if (totalPhysicalMemoryMegabytes == 0)
+ totalPhysicalMemoryMegabytes = 128; // 128MB, the Mono runtime default
+ }
+ else
+ {
+#if __MonoCS__
+ throw new PlatformNotSupportedException("This build can only run on Mono");
+#else
+ totalPhysicalMemoryMegabytes =
+ (int)(new Microsoft.VisualBasic.Devices.ComputerInfo().TotalPhysicalMemory/1024/1024);
+#endif
+ }
+
// we need to leave ( a lot ) of room for other things as well, so we limit the cache size
var val = (totalPhysicalMemoryMegabytes / 2) -
View
0  raven.tests/bugs/WhenRavenClrTypeNotFound.cs → Raven.Tests/Bugs/WhenRavenClrTypeNotFound.cs
File renamed without changes
View
8 build-mono
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Server
+xbuild /property:StyleCopEnabled=false Raven.Server/Raven.Server.csproj
+
+# Client
+# Remark: There's no "Client Profile" on Mono
+xbuild /p:TargetFrameworkProfile="" /property:StyleCopEnabled=false Raven.Client.Lightweight/Raven.Client.Lightweight.csproj
Please sign in to comment.
Something went wrong with that request. Please try again.