Skip to content

Commit

Permalink
Added MacOS native library.
Browse files Browse the repository at this point in the history
Building script updated to use cmake
Added support to UTF8 (default encoding)
  • Loading branch information
c.esneault committed Oct 8, 2018
1 parent 36c5a33 commit ca286cf
Show file tree
Hide file tree
Showing 12 changed files with 379 additions and 40 deletions.
268 changes: 268 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
#*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
[Ss]tyle[Cc]op.*
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Visual Studio settings
.vs/

# Visual Studio Code settings
.vscode/
22 changes: 15 additions & 7 deletions Leveldb.net/DB.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ namespace LevelDB
/// </summary>
public class DB : LevelDBHandle, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<byte[],byte[]>>, IEnumerable<KeyValuePair<int, int[]>>
{
public static Encoding DefaultEncoding = Encoding.UTF8;

private Cache _Cache;
private Logger _InfoLog;
private Comparator _Comparator;
private Encoding _encoding;

static void Throw(IntPtr error)
{
Expand All @@ -38,17 +41,22 @@ static void Throw(IntPtr error, Func<string, Exception> exception)
}
}

public DB(Options options, string name)
: this (options, name, DefaultEncoding)
{
}

/// <summary>
/// Open the database with the specified "name".
/// </summary>
public DB(Options options, string name)
public DB(Options options, string name, Encoding encoding)
{
IntPtr error;
this._Cache = options.Cache;
this._InfoLog = options.InfoLog;
this._Comparator = options.Comparator;
this.Handle = LevelDBInterop.leveldb_open(options.Handle, name, out error);

this._encoding = encoding;

Throw(error, msg => new UnauthorizedAccessException(msg));
}
Expand All @@ -64,7 +72,7 @@ public void Close()
/// </summary>
public void Put(string key, string value, WriteOptions options)
{
this.Put(Encoding.ASCII.GetBytes(key), Encoding.ASCII.GetBytes(value), options);
this.Put(_encoding.GetBytes(key), _encoding.GetBytes(value), options);
}

/// <summary>
Expand Down Expand Up @@ -130,7 +138,7 @@ public void Delete(string key)
/// </summary>
public void Delete(string key, WriteOptions options)
{
this.Delete(Encoding.ASCII.GetBytes(key), options);
this.Delete(_encoding.GetBytes(key), options);
}

/// <summary>
Expand Down Expand Up @@ -172,8 +180,8 @@ public void Write(WriteBatch batch, WriteOptions options)
/// </summary>
public string Get(string key, ReadOptions options)
{
var value = Get(Encoding.ASCII.GetBytes(key), options);
if (value != null) return Encoding.ASCII.GetString(value);
var value = Get(_encoding.GetBytes(key), options);
if (value != null) return _encoding.GetString(value);
return null;
}

Expand Down Expand Up @@ -310,7 +318,7 @@ public Iterator CreateIterator()
/// </summary>
public Iterator CreateIterator(ReadOptions options)
{
return new Iterator(LevelDBInterop.leveldb_create_iterator(this.Handle, options.Handle));
return new Iterator(LevelDBInterop.leveldb_create_iterator(this.Handle, options.Handle), _encoding);
}

/// <summary>
Expand Down
11 changes: 7 additions & 4 deletions Leveldb.net/Iterator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ namespace LevelDB
/// </summary>
public class Iterator: LevelDBHandle
{
internal Iterator(IntPtr Handle)
private readonly Encoding _encoding;

internal Iterator(IntPtr Handle, Encoding encoding)
{
this._encoding = encoding;
this.Handle = Handle;
}

Expand Down Expand Up @@ -61,7 +64,7 @@ public void Seek(byte[] key)
/// </summary>
public void Seek(string key)
{
Seek(Encoding.ASCII.GetBytes(key));
Seek(_encoding.GetBytes(key));
}

/// <summary>
Expand Down Expand Up @@ -119,7 +122,7 @@ public int KeyAsInt()
/// </summary>
public string KeyAsString()
{
return Encoding.ASCII.GetString(this.Key());
return _encoding.GetString(this.Key());
}

/// <summary>
Expand Down Expand Up @@ -158,7 +161,7 @@ public int[] ValueAsInts()
/// </summary>
public string ValueAsString()
{
return Encoding.ASCII.GetString(this.Value());
return _encoding.GetString(this.Value());
}

/// <summary>
Expand Down
7 changes: 4 additions & 3 deletions Leveldb.net/LevelDB.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
</PropertyGroup>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>2.1.3</Version>
<AssemblyVersion>2.1.3.0</AssemblyVersion>
<FileVersion>2.1.3.0</FileVersion>
<Version>2.1.5</Version>
<AssemblyVersion>2.1.5.0</AssemblyVersion>
<FileVersion>2.1.5.0
</FileVersion>
</PropertyGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
Loading

0 comments on commit ca286cf

Please sign in to comment.