Refactor of CSharp:
1) Add `Async` methods. 2) Remove uesless variables, codes. 3) Remove ConsoleApp and use UnitTest instead. 4) Add README.md instead.
This commit is contained in:
MaleDong
parent
af12f97152
commit
23dbb5ab2c
|
|
@ -31,5 +31,9 @@ Cargo.lock
|
|||
target
|
||||
|
||||
|
||||
|
||||
|
||||
# VS ignore cases
|
||||
/**/*.sln
|
||||
/binding/c#/**/.vs/
|
||||
/binding/c#/**/packages
|
||||
/binding/c#/**/bin
|
||||
/binding/c#/**/obj
|
||||
|
|
|
|||
17
README.md
17
README.md
|
|
@ -44,22 +44,7 @@ Install-Package IP2Region
|
|||
```
|
||||
|
||||
### 5. 测试程序：
|
||||
c#:
|
||||
```shell
|
||||
cd IP2Region_ConsoleTest
|
||||
dotnet run
|
||||
example result:
|
||||
请输入IP地址：
|
||||
36.149.160.55
|
||||
```
|
||||
|
||||
node:
|
||||
```
|
||||
> let ip2region = require('./ip2region.js');
|
||||
> let dbService = ip2region.create('./ip2region.db');
|
||||
> dbService.binarySearchSync(' 101.105.35.57')
|
||||
{ city: 0, region: '中国|0|广东|深圳|鹏博士' }
|
||||
```
|
||||
C# 和 Node.js，请具体参考文件夹中README.md 说明。
|
||||
|
||||
java:
|
||||
```shell
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
using BenchmarkDotNet.Attributes;
|
||||
using IP2Region;
|
||||
|
||||
namespace BenchmarkTest.BenchTests
|
||||
{
|
||||
public class BenchTestBase
|
||||
{
|
||||
protected DbSearcher _dbSearcher = null;
|
||||
|
||||
[GlobalSetup]
|
||||
public void Init()
|
||||
{
|
||||
_dbSearcher = new DbSearcher("../../../../../data/ip2region.db");
|
||||
}
|
||||
[GlobalCleanup]
|
||||
public void Clearup()
|
||||
{
|
||||
_dbSearcher.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
using BenchmarkDotNet.Attributes;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BenchmarkTest.BenchTests
|
||||
{
|
||||
public class NormalBenchmarkTests : BenchTestBase
|
||||
{
|
||||
[Params("0.0.0.0", "210.109.255.230", "192.168.0.1", "255.255.255.255", "183.196.233.159",
|
||||
"77.49.66.88", "210.248.255.231", "10.10.10.10", "197.84.60.202", "35.193.251.120",
|
||||
"20.108.91.101", "120.196.148.137", "249.255.250.200", "112.65.1.130")]
|
||||
public string validIp = null;
|
||||
|
||||
[Benchmark]
|
||||
public void TestSyncSpeedForMemorySearch()
|
||||
{
|
||||
_dbSearcher.MemorySearch(validIp);
|
||||
}
|
||||
[Benchmark]
|
||||
public async Task TestAsyncSpeedForMemorySearch()
|
||||
{
|
||||
await _dbSearcher.AsyncMemorySearch(validIp);
|
||||
}
|
||||
|
||||
[Benchmark]
|
||||
public void TestSyncSpeedForBinarySearch()
|
||||
{
|
||||
_dbSearcher.BinarySearch(validIp);
|
||||
}
|
||||
[Benchmark]
|
||||
public async Task TestAsyncBinarySearch()
|
||||
{
|
||||
await _dbSearcher.AsyncBinarySearch(validIp);
|
||||
}
|
||||
|
||||
[Benchmark]
|
||||
public void TestSyncSpeedForBTreeSearch()
|
||||
{
|
||||
_dbSearcher.BtreeSearch(validIp);
|
||||
}
|
||||
[Benchmark]
|
||||
public async Task TestAsyncSpeedForBTreeSearch()
|
||||
{
|
||||
await _dbSearcher.AsyncBtreeSearch(validIp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{053EA51E-2246-4FCB-A106-9B53E70FDC3F}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>BenchmarkTest</RootNamespace>
|
||||
<AssemblyName>BenchmarkTest</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="BenchmarkDotNet, Version=0.10.14.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BenchmarkDotNet.0.10.14\lib\net46\BenchmarkDotNet.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BenchmarkDotNet.Core, Version=0.10.14.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BenchmarkDotNet.Core.0.10.14\lib\net46\BenchmarkDotNet.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.10.14.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.14\lib\net46\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CodeAnalysis, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.1.1.1\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.Registry, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.StackTrace, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="BenchTests\BenchTestBase.cs" />
|
||||
<Compile Include="BenchTests\NormalBenchmarkTests.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
|
||||
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\IP2Region\IP2Region.csproj">
|
||||
<Project>{4c6032ee-43a5-4d5c-88f8-c411069e49e0}</Project>
|
||||
<Name>IP2Region</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
using BenchmarkDotNet.Running;
|
||||
using BenchmarkTest.BenchTests;
|
||||
|
||||
namespace BenchmarkTest
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
BenchmarkRunner.Run<NormalBenchmarkTests>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// 有关程序集的一般信息由以下
|
||||
// 控制。更改这些特性值可修改
|
||||
// 与程序集关联的信息。
|
||||
[assembly: AssemblyTitle("BenchmarkTest")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("BenchmarkTest")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2018")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// 将 ComVisible 设置为 false 会使此程序集中的类型
|
||||
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
|
||||
//请将此类型的 ComVisible 特性设置为 true。
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
|
||||
[assembly: Guid("053ea51e-2246-4fcb-a106-9b53e70fdc3f")]
|
||||
|
||||
// 程序集的版本信息由下列四个值组成:
|
||||
//
|
||||
// 主版本
|
||||
// 次版本
|
||||
// 生成号
|
||||
// 修订号
|
||||
//
|
||||
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
|
||||
// 方法是按如下所示使用“*”: :
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="BenchmarkDotNet" version="0.10.14" targetFramework="net46" />
|
||||
<package id="BenchmarkDotNet.Core" version="0.10.14" targetFramework="net46" />
|
||||
<package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net46" />
|
||||
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net46" />
|
||||
<package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net46" />
|
||||
<package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net46" />
|
||||
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
|
||||
<package id="Microsoft.DotNet.PlatformAbstractions" version="1.1.1" targetFramework="net46" />
|
||||
<package id="Microsoft.Win32.Registry" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.AppContext" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
|
||||
<package id="System.Console" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net46" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.ValueTuple" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net46" />
|
||||
<package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
|
||||
</packages>
|
||||
|
|
@ -3,261 +3,244 @@
|
|||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
using IP2Region.Models;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
public class DbSearcher
|
||||
public class DbSearcher : IDisposable
|
||||
{
|
||||
public static int BTREE_ALGORITHM = 1;
|
||||
public static int BINARY_ALGORITHM = 2;
|
||||
public static int MEMORY_ALGORITYM = 3;
|
||||
const int BTREE_ALGORITHM = 1;
|
||||
const int BINARY_ALGORITHM = 2;
|
||||
const int MEMORY_ALGORITYM = 3;
|
||||
|
||||
/**
|
||||
* db config
|
||||
*/
|
||||
private DbConfig dbConfig = null;
|
||||
private DbConfig _dbConfig = null;
|
||||
|
||||
/**
|
||||
* db file access handler
|
||||
*/
|
||||
private FileStream raf = null;
|
||||
private FileStream _raf = null;
|
||||
|
||||
/**
|
||||
* header blocks buffer
|
||||
*/
|
||||
private long[] HeaderSip = null;
|
||||
private int[] HeaderPtr = null;
|
||||
private int headerLength;
|
||||
private long[] _headerSip = null;
|
||||
private int[] _headerPtr = null;
|
||||
private int _headerLength;
|
||||
|
||||
/**
|
||||
* super blocks info
|
||||
*/
|
||||
private long firstIndexPtr = 0;
|
||||
private long lastIndexPtr = 0;
|
||||
private int totalIndexBlocks = 0;
|
||||
private long _firstIndexPtr = 0;
|
||||
private long _lastIndexPtr = 0;
|
||||
private int _totalIndexBlocks = 0;
|
||||
|
||||
/**
|
||||
* for memory mode
|
||||
* the original db binary string
|
||||
*/
|
||||
private byte[] dbBinStr = null;
|
||||
private byte[] _dbBinStr = null;
|
||||
|
||||
/**
|
||||
* construct class
|
||||
*
|
||||
* @param bdConfig
|
||||
* @param dbFile
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public DbSearcher(DbConfig dbConfig, String dbFile)
|
||||
/// <summary>
|
||||
/// Get by index ptr.
|
||||
/// </summary>
|
||||
private DataBlock GetByIndexPtr(long ptr)
|
||||
{
|
||||
this.dbConfig = dbConfig;
|
||||
raf = new FileStream(dbFile, FileMode.Open, FileAccess.Read);
|
||||
_raf.Seek(ptr, SeekOrigin.Begin);
|
||||
byte[]
|
||||
buffer = new byte[12];
|
||||
_raf.Read(buffer, 0, buffer.Length);
|
||||
|
||||
long extra = Utils.getIntLong(buffer, 8);
|
||||
|
||||
int dataLen = (int)((extra >> 24) & 0xFF);
|
||||
int dataPtr = (int)((extra & 0x00FFFFFF));
|
||||
|
||||
_raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
byte[] data = new byte[dataLen];
|
||||
_raf.Read(data, 0, data.Length);
|
||||
|
||||
int city_id = (int)Utils.getIntLong(data, 0);
|
||||
string region = Encoding.UTF8.GetString(data, 4, data.Length - 4);
|
||||
|
||||
return new DataBlock(city_id, region, dataPtr);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region with a int ip address with memory binary search algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock MemorySearch(long ip)
|
||||
public DbSearcher(DbConfig dbConfig, string dbFile)
|
||||
{
|
||||
int blen = IndexBlock.GetIndexBlockLength();
|
||||
if (dbBinStr == null)
|
||||
if (_dbConfig == null)
|
||||
{
|
||||
dbBinStr = new byte[(int)raf.Length];
|
||||
raf.Seek(0L, SeekOrigin.Begin);
|
||||
raf.Read(dbBinStr, 0, dbBinStr.Length);
|
||||
_dbConfig = dbConfig;
|
||||
}
|
||||
_raf = new FileStream(dbFile, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
}
|
||||
|
||||
public DbSearcher(string dbFile) : this(null, dbFile) { }
|
||||
|
||||
#region Sync Methods
|
||||
/// <summary>
|
||||
/// Get the region with a int ip address with memory binary search algorithm.
|
||||
/// </summary>
|
||||
private DataBlock MemorySearch(long ip)
|
||||
{
|
||||
int blen = IndexBlock.LENGTH;
|
||||
if (_dbBinStr == null)
|
||||
{
|
||||
_dbBinStr = new byte[(int)_raf.Length];
|
||||
_raf.Seek(0L, SeekOrigin.Begin);
|
||||
_raf.Read(_dbBinStr, 0, _dbBinStr.Length);
|
||||
|
||||
//initialize the global vars
|
||||
firstIndexPtr = Util.getIntLong(dbBinStr, 0);
|
||||
lastIndexPtr = Util.getIntLong(dbBinStr, 4);
|
||||
totalIndexBlocks = (int)((lastIndexPtr - firstIndexPtr) / blen) + 1;
|
||||
_firstIndexPtr = Utils.getIntLong(_dbBinStr, 0);
|
||||
_lastIndexPtr = Utils.getIntLong(_dbBinStr, 4);
|
||||
_totalIndexBlocks = (int)((_lastIndexPtr - _firstIndexPtr) / blen) + 1;
|
||||
}
|
||||
|
||||
//search the index blocks to define the data
|
||||
int l = 0, h = totalIndexBlocks;
|
||||
long sip, eip, dataptr = 0;
|
||||
int l = 0, h = _totalIndexBlocks;
|
||||
long sip = 0;
|
||||
|
||||
while (l <= h)
|
||||
{
|
||||
int m = (l + h) >> 1;
|
||||
int p = (int)(firstIndexPtr + m * blen);
|
||||
int p = (int)(_firstIndexPtr + m * blen);
|
||||
|
||||
sip = Utils.getIntLong(_dbBinStr, p);
|
||||
|
||||
sip = Util.getIntLong(dbBinStr, p);
|
||||
if (ip < sip)
|
||||
{
|
||||
h = m - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
eip = Util.getIntLong(dbBinStr, p + 4);
|
||||
if (ip > eip)
|
||||
sip = Utils.getIntLong(_dbBinStr, p + 4);
|
||||
if (ip > sip)
|
||||
{
|
||||
l = m + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
dataptr = Util.getIntLong(dbBinStr, p + 8);
|
||||
sip = Utils.getIntLong(_dbBinStr, p + 8);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched
|
||||
if (dataptr == 0) return null;
|
||||
if (sip == 0) return null;
|
||||
|
||||
//get the data
|
||||
int dataLen = (int)((dataptr >> 24) & 0xFF);
|
||||
int dataPtr = (int)((dataptr & 0x00FFFFFF));
|
||||
int city_id = (int)Util.getIntLong(dbBinStr, dataPtr);
|
||||
String region = System.Text.Encoding.UTF8.GetString(dbBinStr, dataPtr + 4, dataLen - 4);//new String(dbBinStr, dataPtr + 4, dataLen - 4, Encoding.UTF8);
|
||||
int dataLen = (int)((sip >> 24) & 0xFF);
|
||||
int dataPtr = (int)((sip & 0x00FFFFFF));
|
||||
int city_id = (int)Utils.getIntLong(_dbBinStr, dataPtr);
|
||||
string region = Encoding.UTF8.GetString(_dbBinStr, dataPtr + 4, dataLen - 4);//new String(dbBinStr, dataPtr + 4, dataLen - 4, Encoding.UTF8);
|
||||
|
||||
return new DataBlock(city_id, region, dataPtr);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region throught the ip address with memory binary search algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @return DataBlock
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock MemorySearch(String ip)
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with memory binary search algorithm.
|
||||
/// </summary>
|
||||
public DataBlock MemorySearch(string ip)
|
||||
{
|
||||
return MemorySearch(Util.ip2long(ip));
|
||||
return MemorySearch(Utils.ip2long(ip));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* get by index ptr
|
||||
*
|
||||
* @param indexPtr
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock GetByIndexPtr(long ptr)
|
||||
{
|
||||
raf.Seek(ptr, SeekOrigin.Begin);
|
||||
byte[]
|
||||
buffer = new byte[12];
|
||||
raf.Read(buffer, 0, buffer.Length);
|
||||
//long startIp = Util.getIntLong(buffer, 0);
|
||||
//long endIp = Util.getIntLong(buffer, 4);
|
||||
long extra = Util.getIntLong(buffer, 8);
|
||||
|
||||
int dataLen = (int)((extra >> 24) & 0xFF);
|
||||
int dataPtr = (int)((extra & 0x00FFFFFF));
|
||||
|
||||
raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
byte[] data = new byte[dataLen];
|
||||
raf.Read(data, 0, data.Length);
|
||||
|
||||
int city_id = (int)Util.getIntLong(data, 0);
|
||||
String region = Encoding.UTF8.GetString(data, 4, data.Length - 4);
|
||||
//new String(data, 4, data.Length - 4, "UTF-8");
|
||||
|
||||
return new DataBlock(city_id, region, dataPtr);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region with a int ip address with b-tree algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock BtreeSearch(long ip)
|
||||
/// <summary>
|
||||
/// Get the region with a int ip address with b-tree algorithm.
|
||||
/// </summary>
|
||||
private DataBlock BtreeSearch(long ip)
|
||||
{
|
||||
//check and load the header
|
||||
if (HeaderSip == null)
|
||||
if (_headerSip == null)
|
||||
{
|
||||
raf.Seek(8L, SeekOrigin.Begin); //pass the super block
|
||||
//byte[] b = new byte[dbConfig.getTotalHeaderSize()];
|
||||
_raf.Seek(8L, SeekOrigin.Begin); //pass the super block
|
||||
//byte[] b = new byte[dbConfig.getTotalHeaderSize()];
|
||||
byte[] b = new byte[4096];
|
||||
raf.Read(b, 0, b.Length);
|
||||
_raf.Read(b, 0, b.Length);
|
||||
|
||||
//fill the header
|
||||
int len = b.Length >> 3, idx = 0; //b.lenght / 8
|
||||
HeaderSip = new long[len];
|
||||
HeaderPtr = new int[len];
|
||||
_headerSip = new long[len];
|
||||
_headerPtr = new int[len];
|
||||
long startIp, dataPtrTemp;
|
||||
for (int i = 0; i < b.Length; i += 8)
|
||||
{
|
||||
startIp = Util.getIntLong(b, i);
|
||||
dataPtrTemp = Util.getIntLong(b, i + 4);
|
||||
startIp = Utils.getIntLong(b, i);
|
||||
dataPtrTemp = Utils.getIntLong(b, i + 4);
|
||||
if (dataPtrTemp == 0) break;
|
||||
|
||||
HeaderSip[idx] = startIp;
|
||||
HeaderPtr[idx] = (int)dataPtrTemp;
|
||||
_headerSip[idx] = startIp;
|
||||
_headerPtr[idx] = (int)dataPtrTemp;
|
||||
idx++;
|
||||
}
|
||||
|
||||
headerLength = idx;
|
||||
_headerLength = idx;
|
||||
}
|
||||
|
||||
//1. define the index block with the binary search
|
||||
if (ip == HeaderSip[0])
|
||||
if (ip == _headerSip[0])
|
||||
{
|
||||
return GetByIndexPtr(HeaderPtr[0]);
|
||||
return GetByIndexPtr(_headerPtr[0]);
|
||||
}
|
||||
else if (ip == HeaderSip[headerLength - 1])
|
||||
else if (ip == _headerPtr[_headerLength - 1])
|
||||
{
|
||||
return GetByIndexPtr(HeaderPtr[headerLength - 1]);
|
||||
return GetByIndexPtr(_headerPtr[_headerLength - 1]);
|
||||
}
|
||||
|
||||
int l = 0, h = headerLength, sptr = 0, eptr = 0;
|
||||
int l = 0, h = _headerLength, sptr = 0, eptr = 0;
|
||||
int m = 0;
|
||||
|
||||
while (l <= h)
|
||||
{
|
||||
int m = (l + h) >> 1;
|
||||
m = (l + h) >> 1;
|
||||
|
||||
//perfetc matched, just return it
|
||||
if (ip == HeaderSip[m])
|
||||
//perfectly matched, just return it
|
||||
if (ip == _headerSip[m])
|
||||
{
|
||||
if (m > 0)
|
||||
{
|
||||
sptr = HeaderPtr[m - 1];
|
||||
eptr = HeaderPtr[m];
|
||||
sptr = _headerPtr[m - 1];
|
||||
eptr = _headerPtr[m];
|
||||
}
|
||||
else
|
||||
{
|
||||
sptr = HeaderPtr[m];
|
||||
eptr = HeaderPtr[m + 1];
|
||||
sptr = _headerPtr[m];
|
||||
eptr = _headerPtr[m + 1];
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
//less then the middle value
|
||||
if (ip < HeaderSip[m])
|
||||
else if (ip < _headerSip[m])
|
||||
{
|
||||
if (m == 0)
|
||||
{
|
||||
sptr = HeaderPtr[m];
|
||||
eptr = HeaderPtr[m + 1];
|
||||
sptr = _headerPtr[m];
|
||||
eptr = _headerPtr[m + 1];
|
||||
break;
|
||||
}
|
||||
else if (ip > HeaderSip[m - 1])
|
||||
else if (ip > _headerSip[m - 1])
|
||||
{
|
||||
sptr = HeaderPtr[m - 1];
|
||||
eptr = HeaderPtr[m];
|
||||
sptr = _headerPtr[m - 1];
|
||||
eptr = _headerPtr[m];
|
||||
break;
|
||||
}
|
||||
h = m - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m == headerLength - 1)
|
||||
if (m == _headerLength - 1)
|
||||
{
|
||||
sptr = HeaderPtr[m - 1];
|
||||
eptr = HeaderPtr[m];
|
||||
sptr = _headerPtr[m - 1];
|
||||
eptr = _headerPtr[m];
|
||||
break;
|
||||
}
|
||||
else if (ip <= HeaderSip[m + 1])
|
||||
else if (ip <= _headerSip[m + 1])
|
||||
{
|
||||
sptr = HeaderPtr[m];
|
||||
eptr = HeaderPtr[m + 1];
|
||||
sptr = _headerPtr[m];
|
||||
eptr = _headerPtr[m + 1];
|
||||
break;
|
||||
}
|
||||
l = m + 1;
|
||||
|
|
@ -268,169 +251,179 @@ namespace IP2Region
|
|||
if (sptr == 0) return null;
|
||||
|
||||
//2. search the index blocks to define the data
|
||||
int blockLen = eptr - sptr, blen = IndexBlock.GetIndexBlockLength();
|
||||
byte[]
|
||||
iBuffer = new byte[blockLen + blen]; //include the right border block
|
||||
raf.Seek(sptr, SeekOrigin.Begin);
|
||||
raf.Read(iBuffer, 0, iBuffer.Length);
|
||||
int blockLen = eptr - sptr, blen = IndexBlock.LENGTH;
|
||||
byte[] iBuffer = new byte[blockLen + blen]; //include the right border block
|
||||
_raf.Seek(sptr, SeekOrigin.Begin);
|
||||
_raf.Read(iBuffer, 0, iBuffer.Length);
|
||||
|
||||
l = 0; h = blockLen / blen;
|
||||
long sip, eip, dataptr = 0;
|
||||
long sip = 0;
|
||||
int p = 0;
|
||||
|
||||
while (l <= h)
|
||||
{
|
||||
int m = (l + h) >> 1;
|
||||
int p = m * blen;
|
||||
sip = Util.getIntLong(iBuffer, p);
|
||||
m = (l + h) >> 1;
|
||||
p = m * blen;
|
||||
sip = Utils.getIntLong(iBuffer, p);
|
||||
if (ip < sip)
|
||||
{
|
||||
h = m - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
eip = Util.getIntLong(iBuffer, p + 4);
|
||||
if (ip > eip)
|
||||
sip = Utils.getIntLong(iBuffer, p + 4);
|
||||
if (ip > sip)
|
||||
{
|
||||
l = m + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
dataptr = Util.getIntLong(iBuffer, p + 8);
|
||||
sip = Utils.getIntLong(iBuffer, p + 8);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched
|
||||
if (dataptr == 0) return null;
|
||||
if (sip == 0) return null;
|
||||
|
||||
//3. get the data
|
||||
int dataLen = (int)((dataptr >> 24) & 0xFF);
|
||||
int dataPtr = (int)((dataptr & 0x00FFFFFF));
|
||||
int dataLen = (int)((sip >> 24) & 0xFF);
|
||||
int dataPtr = (int)((sip & 0x00FFFFFF));
|
||||
|
||||
raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
_raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
byte[] data = new byte[dataLen];
|
||||
raf.Read(data, 0, data.Length);
|
||||
_raf.Read(data, 0, data.Length);
|
||||
|
||||
int city_id = (int)Util.getIntLong(data, 0);
|
||||
int city_id = (int)Utils.getIntLong(data, 0);
|
||||
String region = Encoding.UTF8.GetString(data, 4, data.Length - 4);// new String(data, 4, data.Length - 4, "UTF-8");
|
||||
|
||||
return new DataBlock(city_id, region, dataPtr);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region throught the ip address with b-tree search algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @return DataBlock
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock BtreeSearch(String ip)
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with b-tree search algorithm.
|
||||
/// </summary>
|
||||
public DataBlock BtreeSearch(string ip)
|
||||
{
|
||||
return BtreeSearch(Util.ip2long(ip));
|
||||
return BtreeSearch(Utils.ip2long(ip));
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region with a int ip address with binary search algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @throws IOException
|
||||
*/
|
||||
public DataBlock BinarySearch(long ip)
|
||||
/// <summary>
|
||||
/// Get the region with a int ip address with binary search algorithm.
|
||||
/// </summary>
|
||||
private DataBlock BinarySearch(long ip)
|
||||
{
|
||||
int blen = IndexBlock.GetIndexBlockLength();
|
||||
if (totalIndexBlocks == 0)
|
||||
int blen = IndexBlock.LENGTH;
|
||||
if (_totalIndexBlocks == 0)
|
||||
{
|
||||
raf.Seek(0L, SeekOrigin.Begin);
|
||||
_raf.Seek(0L, SeekOrigin.Begin);
|
||||
byte[] superBytes = new byte[8];
|
||||
raf.Read(superBytes, 0, superBytes.Length);
|
||||
_raf.Read(superBytes, 0, superBytes.Length);
|
||||
//initialize the global vars
|
||||
firstIndexPtr = Util.getIntLong(superBytes, 0);
|
||||
lastIndexPtr = Util.getIntLong(superBytes, 4);
|
||||
totalIndexBlocks = (int)((lastIndexPtr - firstIndexPtr) / blen) + 1;
|
||||
_firstIndexPtr = Utils.getIntLong(superBytes, 0);
|
||||
_lastIndexPtr = Utils.getIntLong(superBytes, 4);
|
||||
_totalIndexBlocks = (int)((_lastIndexPtr - _firstIndexPtr) / blen) + 1;
|
||||
}
|
||||
|
||||
//search the index blocks to define the data
|
||||
int l = 0, h = totalIndexBlocks;
|
||||
byte[]
|
||||
buffer = new byte[blen];
|
||||
long sip, eip, dataptr = 0;
|
||||
int l = 0, h = _totalIndexBlocks;
|
||||
byte[] buffer = new byte[blen];
|
||||
long sip = 0;
|
||||
|
||||
while (l <= h)
|
||||
{
|
||||
int m = (l + h) >> 1;
|
||||
raf.Seek(firstIndexPtr + m * blen, SeekOrigin.Begin); //set the file pointer
|
||||
raf.Read(buffer, 0, buffer.Length);
|
||||
sip = Util.getIntLong(buffer, 0);
|
||||
_raf.Seek(_firstIndexPtr + m * blen, SeekOrigin.Begin); //set the file pointer
|
||||
_raf.Read(buffer, 0, buffer.Length);
|
||||
sip = Utils.getIntLong(buffer, 0);
|
||||
if (ip < sip)
|
||||
{
|
||||
h = m - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
eip = Util.getIntLong(buffer, 4);
|
||||
if (ip > eip)
|
||||
sip = Utils.getIntLong(buffer, 4);
|
||||
if (ip > sip)
|
||||
{
|
||||
l = m + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
dataptr = Util.getIntLong(buffer, 8);
|
||||
sip = Utils.getIntLong(buffer, 8);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched
|
||||
if (dataptr == 0) return null;
|
||||
if (sip == 0) return null;
|
||||
|
||||
//get the data
|
||||
int dataLen = (int)((dataptr >> 24) & 0xFF);
|
||||
int dataPtr = (int)((dataptr & 0x00FFFFFF));
|
||||
int dataLen = (int)((sip >> 24) & 0xFF);
|
||||
int dataPtr = (int)((sip & 0x00FFFFFF));
|
||||
|
||||
raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
_raf.Seek(dataPtr, SeekOrigin.Begin);
|
||||
byte[] data = new byte[dataLen];
|
||||
raf.Read(data, 0, data.Length);
|
||||
_raf.Read(data, 0, data.Length);
|
||||
|
||||
int city_id = (int)Util.getIntLong(data, 0);
|
||||
int city_id = (int)Utils.getIntLong(data, 0);
|
||||
String region = Encoding.UTF8.GetString(data, 4, data.Length - 4);//new String(data, 4, data.Length - 4, "UTF-8");
|
||||
|
||||
return new DataBlock(city_id, region, dataPtr);
|
||||
}
|
||||
|
||||
/**
|
||||
* get the region throught the ip address with binary search algorithm
|
||||
*
|
||||
* @param ip
|
||||
* @return DataBlock
|
||||
* @throws IOException
|
||||
*/
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with binary search algorithm.
|
||||
/// </summary>
|
||||
public DataBlock BinarySearch(String ip)
|
||||
{
|
||||
return BinarySearch(Util.ip2long(ip));
|
||||
return BinarySearch(Utils.ip2long(ip));
|
||||
}
|
||||
|
||||
/**
|
||||
* get the db config
|
||||
*
|
||||
* @return DbConfig
|
||||
*/
|
||||
public DbConfig GetDbConfig()
|
||||
#endregion
|
||||
|
||||
#region Async Methods
|
||||
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with memory binary search algorithm.
|
||||
/// </summary>
|
||||
public async Task<DataBlock> AsyncMemorySearch(string ip)
|
||||
{
|
||||
return dbConfig;
|
||||
return await Task.FromResult(MemorySearch(ip));
|
||||
}
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with b-tree search algorithm.
|
||||
/// </summary>
|
||||
public async Task<DataBlock> AsyncBtreeSearch(string ip)
|
||||
{
|
||||
return await Task.FromResult(BtreeSearch(ip));
|
||||
}
|
||||
|
||||
/**
|
||||
* close the db
|
||||
*
|
||||
* @throws IOException
|
||||
*/
|
||||
/// <summary>
|
||||
/// Get the region throught the ip address with binary search algorithm.
|
||||
/// </summary>
|
||||
public async Task<DataBlock> AsyncBinarySearch(string ip)
|
||||
{
|
||||
return await Task.FromResult(BinarySearch(ip));
|
||||
}
|
||||
|
||||
#endregion
|
||||
/// <summary>
|
||||
/// Close the db.
|
||||
/// </summary>
|
||||
public void Close()
|
||||
{
|
||||
HeaderSip = null; //let gc do its work
|
||||
HeaderPtr = null;
|
||||
dbBinStr = null;
|
||||
raf.Close();
|
||||
_headerSip = null; //let gc do its work
|
||||
_headerPtr = null;
|
||||
_dbBinStr = null;
|
||||
_raf.Close();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
public class DataBlock
|
||||
{
|
||||
/**
|
||||
* city id
|
||||
*/
|
||||
private int city_id;
|
||||
|
||||
/**
|
||||
* region address
|
||||
*/
|
||||
private String region;
|
||||
|
||||
/**
|
||||
* region ptr in the db file
|
||||
*/
|
||||
private int dataPtr;
|
||||
|
||||
/**
|
||||
* construct method
|
||||
*
|
||||
* @param city_id
|
||||
* @param region region string
|
||||
* @param ptr data ptr
|
||||
*/
|
||||
public DataBlock(int city_id, String region, int dataPtr)
|
||||
{
|
||||
this.city_id = city_id;
|
||||
this.region = region;
|
||||
this.dataPtr = dataPtr;
|
||||
}
|
||||
|
||||
public DataBlock(int city_id, String region)
|
||||
{
|
||||
this.city_id = city_id;
|
||||
this.region = region;
|
||||
this.dataPtr = 0;
|
||||
}
|
||||
|
||||
public int GetCityId()
|
||||
{
|
||||
return city_id;
|
||||
}
|
||||
|
||||
public DataBlock SetCityId(int city_id)
|
||||
{
|
||||
this.city_id = city_id;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String GetRegion()
|
||||
{
|
||||
return region;
|
||||
}
|
||||
|
||||
public DataBlock SetRegion(String region)
|
||||
{
|
||||
this.region = region;
|
||||
return this;
|
||||
}
|
||||
|
||||
public int GetDataPtr()
|
||||
{
|
||||
return dataPtr;
|
||||
}
|
||||
|
||||
public DataBlock SetDataPtr(int dataPtr)
|
||||
{
|
||||
this.dataPtr = dataPtr;
|
||||
return this;
|
||||
}
|
||||
|
||||
public override String ToString()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
sb.Append(city_id).Append('|').Append(region).Append('|').Append(dataPtr);
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
using System;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
public class DbConfig
|
||||
{
|
||||
/**
|
||||
* total header data block size
|
||||
*/
|
||||
private int totalHeaderSize;
|
||||
|
||||
/**
|
||||
* max index data block size
|
||||
* u should always choice the fastest read block size
|
||||
*/
|
||||
private int indexBlockSize;
|
||||
|
||||
/**
|
||||
* construct method
|
||||
*
|
||||
* @param totalHeaderSize
|
||||
* @param dataBlockSize
|
||||
* @throws DbMakerConfigException
|
||||
*/
|
||||
public DbConfig(int totalHeaderSize)
|
||||
{
|
||||
if ((totalHeaderSize % 8) != 0)
|
||||
{
|
||||
throw new DbMakerConfigException("totalHeaderSize must be times of 8");
|
||||
}
|
||||
this.totalHeaderSize = totalHeaderSize;
|
||||
this.indexBlockSize = 8192; //4 * 2048
|
||||
}
|
||||
|
||||
public DbConfig()
|
||||
{
|
||||
this.totalHeaderSize = 8 * 2048;
|
||||
this.indexBlockSize = 8192;
|
||||
}
|
||||
|
||||
public int GetTotalHeaderSize()
|
||||
{
|
||||
return totalHeaderSize;
|
||||
}
|
||||
|
||||
public DbConfig SetTotalHeaderSize(int totalHeaderSize)
|
||||
{
|
||||
this.totalHeaderSize = totalHeaderSize;
|
||||
return this;
|
||||
}
|
||||
|
||||
public int GetIndexBlockSize()
|
||||
{
|
||||
return indexBlockSize;
|
||||
}
|
||||
|
||||
public DbConfig SetIndexBlockSize(int dataBlockSize)
|
||||
{
|
||||
this.indexBlockSize = dataBlockSize;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
namespace IP2Region
|
||||
{
|
||||
public class DbMakerConfigException : System.Exception
|
||||
{
|
||||
public string ErrorCode { get; set; }
|
||||
public DbMakerConfigException(string ErrorCode)
|
||||
{
|
||||
this.ErrorCode=ErrorCode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
|
||||
using System;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
|
||||
public class HeaderBlock
|
||||
{
|
||||
/**
|
||||
* index block start ip address
|
||||
*/
|
||||
private long indexStartIp;
|
||||
|
||||
/**
|
||||
* ip address
|
||||
*/
|
||||
private int indexPtr;
|
||||
|
||||
public HeaderBlock(long indexStartIp, int indexPtr)
|
||||
{
|
||||
this.indexStartIp = indexStartIp;
|
||||
this.indexPtr = indexPtr;
|
||||
}
|
||||
|
||||
public long GetIndexStartIp()
|
||||
{
|
||||
return indexStartIp;
|
||||
}
|
||||
|
||||
public HeaderBlock SetIndexStartIp(long indexStartIp)
|
||||
{
|
||||
this.indexStartIp = indexStartIp;
|
||||
return this;
|
||||
}
|
||||
|
||||
public int GetIndexPtr()
|
||||
{
|
||||
return indexPtr;
|
||||
}
|
||||
|
||||
public HeaderBlock SetIndexPtr(int indexPtr)
|
||||
{
|
||||
this.indexPtr = indexPtr;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the bytes for db storage
|
||||
*
|
||||
* @return byte[]
|
||||
*/
|
||||
public byte[] GetBytes()
|
||||
{
|
||||
/*
|
||||
* +------------+-----------+
|
||||
* | 4bytes | 4bytes |
|
||||
* +------------+-----------+
|
||||
* start ip index ptr
|
||||
*/
|
||||
byte[] b = new byte[8];
|
||||
|
||||
Util.writeIntLong(b, 0, indexStartIp);
|
||||
Util.writeIntLong(b, 4, indexPtr);
|
||||
|
||||
return b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,10 @@
|
|||
<Version>1.1.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
|
||||
<LangVersion>7</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="DBFile\ip2region.db">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//*******************************
|
||||
using System;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
|
||||
public class IndexBlock
|
||||
{
|
||||
private static int LENGTH = 12;
|
||||
|
||||
/**
|
||||
* start ip address
|
||||
*/
|
||||
private long startIp;
|
||||
|
||||
/**
|
||||
* end ip address
|
||||
*/
|
||||
private long endIp;
|
||||
|
||||
/**
|
||||
* data ptr and data length
|
||||
*/
|
||||
private uint dataPtr;
|
||||
|
||||
/**
|
||||
* data length
|
||||
*/
|
||||
private int dataLen;
|
||||
|
||||
public IndexBlock(long startIp, long endIp, uint dataPtr, int dataLen)
|
||||
{
|
||||
this.startIp = startIp;
|
||||
this.endIp = endIp;
|
||||
this.dataPtr = dataPtr;
|
||||
this.dataLen = dataLen;
|
||||
}
|
||||
|
||||
public long GetStartIp()
|
||||
{
|
||||
return startIp;
|
||||
}
|
||||
|
||||
public IndexBlock SetStartIp(long startIp)
|
||||
{
|
||||
this.startIp = startIp;
|
||||
return this;
|
||||
}
|
||||
|
||||
public long GetEndIp()
|
||||
{
|
||||
return endIp;
|
||||
}
|
||||
|
||||
public IndexBlock SetEndIp(long endIp)
|
||||
{
|
||||
this.endIp = endIp;
|
||||
return this;
|
||||
}
|
||||
|
||||
public uint GetDataPtr()
|
||||
{
|
||||
return dataPtr;
|
||||
}
|
||||
|
||||
public IndexBlock SetDataPtr(uint dataPtr)
|
||||
{
|
||||
this.dataPtr = dataPtr;
|
||||
return this;
|
||||
}
|
||||
|
||||
public int GetDataLen()
|
||||
{
|
||||
return dataLen;
|
||||
}
|
||||
|
||||
public IndexBlock SetDataLen(int dataLen)
|
||||
{
|
||||
this.dataLen = dataLen;
|
||||
return this;
|
||||
}
|
||||
|
||||
public static int GetIndexBlockLength()
|
||||
{
|
||||
return LENGTH;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the bytes for storage
|
||||
*
|
||||
* @return byte[]
|
||||
*/
|
||||
public byte[] GetBytes()
|
||||
{
|
||||
/*
|
||||
* +------------+-----------+-----------+
|
||||
* | 4bytes | 4bytes | 4bytes |
|
||||
* +------------+-----------+-----------+
|
||||
* start ip end ip data ptr + len
|
||||
*/
|
||||
byte[] b = new byte[12];
|
||||
|
||||
Util.writeIntLong(b, 0, startIp); //start ip
|
||||
Util.writeIntLong(b, 4, endIp); //end ip
|
||||
|
||||
//write the data ptr and the length
|
||||
long mix = dataPtr | ((dataLen << 24) & 0xFF000000L);
|
||||
Util.writeIntLong(b, 8, mix);
|
||||
|
||||
return b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//
|
||||
// Modified By Dongwei
|
||||
// Date 2018.07.18
|
||||
// GitHub https://github.com/Maledong
|
||||
//*******************************
|
||||
|
||||
namespace IP2Region.Models
|
||||
{
|
||||
public class DataBlock
|
||||
{
|
||||
#region Private Properties
|
||||
public int CityID
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public string Region
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public int DataPtr
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Constructor
|
||||
public DataBlock(int city_id, string region, int dataPtr = 0)
|
||||
{
|
||||
CityID = city_id;
|
||||
Region = region;
|
||||
DataPtr = dataPtr;
|
||||
}
|
||||
|
||||
public DataBlock(int city_id, string region):this(city_id,region,0)
|
||||
{
|
||||
}
|
||||
#endregion
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"{CityID}|{Region}|{DataPtr}";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//
|
||||
// Modified By Dongwei
|
||||
// Date 2018.07.18
|
||||
// GitHub https://github.com/Maledong
|
||||
//*******************************
|
||||
|
||||
using System;
|
||||
|
||||
namespace IP2Region.Models
|
||||
{
|
||||
public class DbMakerConfigException : Exception
|
||||
{
|
||||
public string ErrMsg { get; private set; }
|
||||
public DbMakerConfigException(string errMsg)
|
||||
{
|
||||
ErrMsg = errMsg;
|
||||
}
|
||||
}
|
||||
|
||||
public class DbConfig
|
||||
{
|
||||
public int TotalHeaderSize
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public int indexBlockSize
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public DbConfig(int totalHeaderSize)
|
||||
{
|
||||
if ((totalHeaderSize % 8) != 0)
|
||||
{
|
||||
throw new DbMakerConfigException("totalHeaderSize must be times of 8");
|
||||
}
|
||||
TotalHeaderSize = totalHeaderSize;
|
||||
//4 * 2048
|
||||
indexBlockSize = 8192;
|
||||
}
|
||||
|
||||
public DbConfig():this(8 * 2048)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//
|
||||
// Modified By Dongwei
|
||||
// Date 2018.07.18
|
||||
// GitHub https://github.com/Maledong
|
||||
//*******************************
|
||||
|
||||
|
||||
namespace IP2Region.Models
|
||||
{
|
||||
internal class HeaderBlock
|
||||
{
|
||||
public long IndexStartIp
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public int IndexPtr
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public HeaderBlock(long indexStartIp, int indexPtr)
|
||||
{
|
||||
IndexStartIp = indexStartIp;
|
||||
IndexPtr = indexPtr;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the bytes for total storage
|
||||
/// </summary>
|
||||
/// <returns>
|
||||
/// Bytes gotten.
|
||||
/// </returns>
|
||||
public byte[] GetBytes()
|
||||
{
|
||||
/*
|
||||
* +------------+-----------+
|
||||
* | 4bytes | 4bytes |
|
||||
* +------------+-----------+
|
||||
* start ip index ptr
|
||||
*/
|
||||
byte[] b = new byte[8];
|
||||
|
||||
Utils.writeIntLong(b, 0, IndexStartIp);
|
||||
Utils.writeIntLong(b, 4, IndexPtr);
|
||||
|
||||
return b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
//*******************************
|
||||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//
|
||||
// Modified By Dongwei
|
||||
// Date 2018.07.18
|
||||
// GitHub https://github.com/Maledong
|
||||
//*******************************
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
internal class IndexBlock
|
||||
{
|
||||
public const int LENGTH = 12;
|
||||
|
||||
public long StartIP
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public long EndIp
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public uint DataPtr
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public int DataLen
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public IndexBlock(long startIp, long endIp, uint dataPtr, int dataLen)
|
||||
{
|
||||
StartIP = startIp;
|
||||
EndIp = endIp;
|
||||
DataPtr = dataPtr;
|
||||
DataLen = dataLen;
|
||||
}
|
||||
|
||||
public byte[] GetBytes()
|
||||
{
|
||||
/*
|
||||
* +------------+-----------+-----------+
|
||||
* | 4bytes | 4bytes | 4bytes |
|
||||
* +------------+-----------+-----------+
|
||||
* start ip end ip data ptr + len
|
||||
*/
|
||||
byte[] b = new byte[12];
|
||||
|
||||
Utils.writeIntLong(b, 0, StartIP); //start ip
|
||||
Utils.writeIntLong(b, 4, EndIp); //end ip
|
||||
|
||||
//write the data ptr and the length
|
||||
long mix = DataPtr | ((DataLen << 24) & 0xFF000000L);
|
||||
Utils.writeIntLong(b, 8, mix);
|
||||
|
||||
return b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,25 +2,27 @@
|
|||
// Create By Rocher Kong
|
||||
// Github https://github.com/RocherKong
|
||||
// Date 2018.02.09
|
||||
//
|
||||
// Modified By Dongwei
|
||||
// Date 2018.07.18
|
||||
// GitHub https://github.com/Maledong
|
||||
//*******************************
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
|
||||
namespace IP2Region
|
||||
{
|
||||
|
||||
public class Util
|
||||
public class IPInValidException : Exception
|
||||
{
|
||||
/**
|
||||
* write specfield bytes to a byte array start from offset
|
||||
*
|
||||
* @param b
|
||||
* @param offset
|
||||
* @param v
|
||||
* @param bytes
|
||||
*/
|
||||
public static void write(byte[] b, int offset, ulong v, int bytes)
|
||||
const string ERROR_MSG = "IP Illigel. Please input a valid IP.";
|
||||
|
||||
public IPInValidException() : base(ERROR_MSG) { }
|
||||
}
|
||||
internal static class Utils
|
||||
{
|
||||
/// <summary>
|
||||
/// Write specfield bytes to a byte array start from offset.
|
||||
/// </summary>
|
||||
public static void Write(byte[] b, int offset, ulong v, int bytes)
|
||||
{
|
||||
for (int i = 0; i < bytes; i++)
|
||||
{
|
||||
|
|
@ -28,13 +30,9 @@ namespace IP2Region
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* write a int to a byte array
|
||||
*
|
||||
* @param b
|
||||
* @param offet
|
||||
* @param v
|
||||
*/
|
||||
/// <summary>
|
||||
/// Write a int to a byte array.
|
||||
/// </summary>
|
||||
public static void writeIntLong(byte[] b, int offset, long v)
|
||||
{
|
||||
b[offset++] = (byte)((v >> 0) & 0xFF);
|
||||
|
|
@ -43,12 +41,9 @@ namespace IP2Region
|
|||
b[offset] = (byte)((v >> 24) & 0xFF);
|
||||
}
|
||||
|
||||
/**
|
||||
* get a int from a byte array start from the specifiled offset
|
||||
*
|
||||
* @param b
|
||||
* @param offset
|
||||
*/
|
||||
/// <summary>
|
||||
/// Get a int from a byte array start from the specifiled offset.
|
||||
/// </summary>
|
||||
public static long getIntLong(byte[] b, int offset)
|
||||
{
|
||||
return (
|
||||
|
|
@ -59,12 +54,9 @@ namespace IP2Region
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* get a int from a byte array start from the specifield offset
|
||||
*
|
||||
* @param b
|
||||
* @param offset
|
||||
*/
|
||||
/// <summary>
|
||||
/// Get a int from a byte array start from the specifield offset.
|
||||
/// </summary>
|
||||
public static int getInt3(byte[] b, int offset)
|
||||
{
|
||||
return (
|
||||
|
|
@ -89,16 +81,23 @@ namespace IP2Region
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* string ip to long ip
|
||||
*
|
||||
* @param ip
|
||||
* @return long
|
||||
*/
|
||||
/// <summary>
|
||||
/// String ip to long ip.
|
||||
/// </summary>
|
||||
public static long ip2long(string ip)
|
||||
{
|
||||
string[] p = ip.Split('.');
|
||||
if (p.Length != 4) return 0;
|
||||
if (p.Length != 4) throw new IPInValidException();
|
||||
|
||||
foreach (string pp in p)
|
||||
{
|
||||
if (pp.Length > 3) throw new IPInValidException();
|
||||
if (!int.TryParse(pp, out int value) || value > 255)
|
||||
{
|
||||
throw new IPInValidException();
|
||||
}
|
||||
}
|
||||
|
||||
var bip1 = long.TryParse(p[0], out long ip1);
|
||||
var bip2 = long.TryParse(p[1], out long ip2);
|
||||
var bip3 = long.TryParse(p[2], out long ip3);
|
||||
|
|
@ -106,11 +105,12 @@ namespace IP2Region
|
|||
|
||||
if (!bip1 || !bip2 || !bip3 || !bip4
|
||||
|| ip4 > 255 || ip1 > 255 || ip2 > 255 || ip3 > 255
|
||||
|| ip4 < 1 || ip1 < 1 || ip2 < 1 || ip3 < 1)
|
||||
|| ip4 < 0 || ip1 < 0 || ip2 < 0 || ip3 < 0)
|
||||
{
|
||||
throw new Exception("IP Illegal.");
|
||||
throw new IPInValidException();
|
||||
}
|
||||
|
||||
|
||||
long p1 = ((ip1 << 24) & 0xFF000000);
|
||||
long p2 = ((ip2 << 16) & 0x00FF0000);
|
||||
long p3 = ((ip3 << 8) & 0x0000FF00);
|
||||
|
|
@ -118,44 +118,12 @@ namespace IP2Region
|
|||
return ((p1 | p2 | p3 | p4) & 0xFFFFFFFFL);
|
||||
}
|
||||
|
||||
/**
|
||||
* int to ip string
|
||||
*
|
||||
* @param ip
|
||||
* @return string
|
||||
*/
|
||||
/// <summary>
|
||||
/// Int to ip string.
|
||||
/// </summary>
|
||||
public static string long2ip(long ip)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
sb
|
||||
.Append((ip >> 24) & 0xFF).Append('.')
|
||||
.Append((ip >> 16) & 0xFF).Append('.')
|
||||
.Append((ip >> 8) & 0xFF).Append('.')
|
||||
.Append((ip >> 0) & 0xFF);
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
/**
|
||||
* check the validate of the specifeld ip address
|
||||
*
|
||||
* @param ip
|
||||
* @return boolean
|
||||
*/
|
||||
public static Boolean isIpAddress(string ip)
|
||||
{
|
||||
string[] p = ip.Split('.');
|
||||
if (p.Length != 4) return false;
|
||||
|
||||
foreach (string pp in p)
|
||||
{
|
||||
if (pp.Length > 3) return false;
|
||||
int val = int.Parse(pp);
|
||||
if (val > 255) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return $"{(ip >> 24) & 0xFF}.{(ip >> 16) & 0xFF}.{(ip >> 8) & 0xFF}.{ip & 0xFF}";
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
|
@ -1,24 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\IP2Region\IP2Region.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="netstandard">
|
||||
<HintPath>C:\Program Files (x86)\Microsoft SDKs\NuGetPackagesFallback\netstandard.library\2.0.1\build\netstandard2.0\ref\netstandard.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="DBFile\ip2region.db">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
using IP2Region;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace IP2Region_ConsoleTest
|
||||
{
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
DbSearcher dbSearcher = new DbSearcher(new DbConfig
|
||||
{
|
||||
|
||||
}, AppContext.BaseDirectory + @"/DBFile/ip2region.db");
|
||||
string ipAddress = "";
|
||||
DataBlock result = null, result2 = null,result3=null;
|
||||
Console.WriteLine("请输入IP地址：");
|
||||
ipAddress = Console.ReadLine();
|
||||
Stopwatch sw = new Stopwatch();
|
||||
do
|
||||
{
|
||||
sw.Start();
|
||||
try
|
||||
{
|
||||
result = dbSearcher.BtreeSearch(ipAddress);
|
||||
sw.Stop();
|
||||
Console.WriteLine("[btree]你的IP所属区域为：" + result.GetRegion() + ";耗时：" + sw.Elapsed.TotalMilliseconds + "ms");
|
||||
sw.Start();
|
||||
result2 = dbSearcher.BinarySearch(ipAddress);
|
||||
sw.Stop();
|
||||
Console.WriteLine("[binarySearch]你的IP所属区域为：" + result2.GetRegion() + ";耗时：" + sw.Elapsed.TotalMilliseconds + "ms");
|
||||
sw.Start();
|
||||
result3 = dbSearcher.MemorySearch(ipAddress);
|
||||
sw.Stop();
|
||||
Console.WriteLine("[MemorySearch]你的IP所属区域为：" + result3.GetRegion() + ";耗时：" + sw.Elapsed.TotalMilliseconds + "ms");
|
||||
Console.WriteLine("请输入IP地址：");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
Console.WriteLine(ex.Message);
|
||||
sw.Stop();
|
||||
}
|
||||
|
||||
//Console.WriteLine("结束请输入bye");
|
||||
|
||||
} while ((ipAddress = Console.ReadLine()) != "bye");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
This file is used by the publish/package process of your project. You can customize the behavior of this process
|
||||
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
|
||||
-->
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<PublishProtocol>FileSystem</PublishProtocol>
|
||||
<Configuration>Release</Configuration>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
<PublishDir>bin\Release\PublishOutput</PublishDir>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
This file is used by the publish/package process of your project. You can customize the behavior of this process
|
||||
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
|
||||
-->
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# C# 客户端
|
||||
|
||||
## 实现情况：
|
||||
|
||||
现已实现同步和异步查询，具体使用方法可以参考 UnitTests 中的使用方法。
|
||||
|
||||
## 如何贡献？
|
||||
|
||||
你可以任意修改代码，但必须确保通过全部的单元测试。
|
||||
在此之前，请保证你已经安装了 Net4.6 和 Net Core 2.0 版本。
|
||||
|
||||
操作步骤：
|
||||
1）使用 VS2017（推荐，可以到 https://visualstudio.microsoft.com/zh-hans/downloads/ 下载。），或者其它相关版本打开 IP2Region 项目。
|
||||
2）使用 VS 打开IP2Region 项目。
|
||||
3）保存 sln 文件到 c# 文件夹下（该文件应该自动被忽略）。
|
||||
4）右键点击“解决方案IP2Region”，添加 UnitTests 和 BenchmarkTest 项目。
|
||||
5）请右键点击整个解决方案，选择“重新生成解决方案”。
|
||||
6）菜单栏上“测试”=>“运行”=>“所有测试”，检测是否通过全部测试即可（你可以根据需要自行增加特定的单元测试）。
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
using IP2Region;
|
||||
using IP2Region.Models;
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
namespace UnitTests
|
||||
{
|
||||
/// <summary>
|
||||
/// This test class is mainly used to test your exception types.
|
||||
/// It should throw exceptions of differnt kinds of types on certain occations.
|
||||
/// </summary>
|
||||
[TestClass]
|
||||
public class ExceptionTest
|
||||
{
|
||||
/// <summary>
|
||||
/// Path error should throw "DbMakerConfigException"
|
||||
/// </summary>
|
||||
[TestMethod]
|
||||
[ExpectedException(typeof(DbMakerConfigException))]
|
||||
public void TestDbMakerConfigException()
|
||||
{
|
||||
using (var _dbSearcher = new DbSearcher(new DbConfig(255), "../../../../../data/ip2region.db")) { }
|
||||
}
|
||||
/// <summary>
|
||||
/// Invalid IP should throw "IPInValidException"
|
||||
/// </summary>
|
||||
[TestMethod]
|
||||
public void TestInvalidIP()
|
||||
{
|
||||
using (var _dbSearcher = new DbSearcher("../../../../../data/ip2region.db"))
|
||||
{
|
||||
var invalidIps = new string[] { "256.255.1.1", "-1.0.0.0", "192.168.4", "x.y.z" };
|
||||
var counter = 0;
|
||||
|
||||
foreach (var item in invalidIps)
|
||||
{
|
||||
try
|
||||
{
|
||||
_dbSearcher.MemorySearch(item);
|
||||
}
|
||||
catch (IPInValidException)
|
||||
{
|
||||
counter++;
|
||||
}
|
||||
}
|
||||
|
||||
Assert.AreEqual(counter, 4);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
using IP2Region;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace UnitTests
|
||||
{
|
||||
/// <summary>
|
||||
/// This class is used to test with normal IPs (Chinese, Foreign and Special).
|
||||
/// Use async functions for testing.
|
||||
/// </summary>
|
||||
[TestClass]
|
||||
public class NormalAsyncTest
|
||||
{
|
||||
private static DbSearcher _dbSearcher = null;
|
||||
|
||||
[ClassInitialize]
|
||||
public static void Init(TestContext context)
|
||||
{
|
||||
_dbSearcher = new DbSearcher("../../../../../data/ip2region.db");
|
||||
}
|
||||
|
||||
[ClassCleanup]
|
||||
public static void ClearUp()
|
||||
{
|
||||
_dbSearcher.Dispose();
|
||||
}
|
||||
|
||||
#region Normal Valid Chinese IP Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Async Chinese Ip Test")]
|
||||
public async Task AsyncBinarySearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = await _dbSearcher.AsyncBinarySearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Chinese Ip Test")]
|
||||
public async Task AsyncBtreeSearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = await _dbSearcher.AsyncBtreeSearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Chinese Ip Test")]
|
||||
public async Task AsyncMemorySearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = await _dbSearcher.AsyncMemorySearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Normal Valid Foreign IP Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Async Foreign Ip Test")]
|
||||
public async Task AsyncBinarySearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = await _dbSearcher.AsyncBinarySearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Foreign Ip Test")]
|
||||
public async Task AsyncBtreeSearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = await _dbSearcher.AsyncBtreeSearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Foreign Ip Test")]
|
||||
public async Task AsyncMemorySearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = await _dbSearcher.AsyncMemorySearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Normal Valid Special Ip Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Async Special Ip Test")]
|
||||
public async Task AsyncBinarySearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = await _dbSearcher.AsyncBinarySearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Special Ip Test")]
|
||||
public async Task AsyncBtreeSearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = await _dbSearcher.AsyncBtreeSearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Async Special Ip Test")]
|
||||
public async Task AsyncMemorySearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = await _dbSearcher.AsyncMemorySearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,146 @@
|
|||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
using IP2Region;
|
||||
namespace UnitTests
|
||||
{
|
||||
/// <summary>
|
||||
/// This class is used to test with normal IPs (Chinese, Foreign and Special).
|
||||
/// Use sync functions for testing.
|
||||
/// </summary>
|
||||
[TestClass]
|
||||
public class NormalSyncTest
|
||||
{
|
||||
private static DbSearcher _dbSearcher = null;
|
||||
|
||||
[ClassInitialize]
|
||||
public static void Init(TestContext context)
|
||||
{
|
||||
_dbSearcher = new DbSearcher("../../../../../data/ip2region.db");
|
||||
}
|
||||
|
||||
[ClassCleanup]
|
||||
public static void ClearUp()
|
||||
{
|
||||
_dbSearcher.Dispose();
|
||||
}
|
||||
|
||||
#region Normal Valid Chinese IP Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Chinese Ip Test")]
|
||||
public void BinarySearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = _dbSearcher.BinarySearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Chinese Ip Test")]
|
||||
public void BtreeSearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = _dbSearcher.BtreeSearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Chinese Ip Test")]
|
||||
public void MemorySearchTestForChinese()
|
||||
{
|
||||
const int cityId = 2163;
|
||||
const string region = "中国|0|广东省|深圳市|鹏博士";
|
||||
|
||||
var result = _dbSearcher.MemorySearch("101.105.35.57");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Normal Valid Foreign IP Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Foreign Ip Test")]
|
||||
public void BinarySearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = _dbSearcher.BinarySearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Foreign Ip Test")]
|
||||
public void BtreeSearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = _dbSearcher.BtreeSearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Foreign Ip Test")]
|
||||
public void MemorySearchTestForForeign()
|
||||
{
|
||||
const int cityId = 71;
|
||||
const string region = "荷兰|0|0|0|0";
|
||||
|
||||
var result = _dbSearcher.MemorySearch("86.84.21.60");
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Normal Valid Special Ip Test Cases
|
||||
[TestMethod]
|
||||
[TestCategory("Special Ip Test")]
|
||||
public void BinarySearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = _dbSearcher.BinarySearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Special Ip Test")]
|
||||
public void BtreeSearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = _dbSearcher.BtreeSearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
[TestMethod]
|
||||
[TestCategory("Special Ip Test")]
|
||||
public void MemorySearchTestForSpecial()
|
||||
{
|
||||
const int cityId = 0;
|
||||
const string region = "0|0|0|内网IP|内网IP";
|
||||
string[] specialIps = new string[] { "255.255.255.255", "0.0.0.0" };
|
||||
|
||||
foreach (var item in specialIps)
|
||||
{
|
||||
var result = _dbSearcher.MemorySearch(item);
|
||||
Assert.AreEqual(result.CityID, cityId);
|
||||
Assert.AreEqual(result.Region, region);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: AssemblyTitle("UnitTests")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("UnitTests")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2018")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
[assembly: Guid("38abc99f-cc14-47e3-9eeb-06c67d5ac33f")]
|
||||
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{38ABC99F-CC14-47E3-9EEB-06C67D5AC33F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>UnitTests</RootNamespace>
|
||||
<AssemblyName>UnitTests</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
|
||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
|
||||
<IsCodedUITest>False</IsCodedUITest>
|
||||
<TestProjectType>UnitTest</TestProjectType>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="NormalAsyncTest.cs" />
|
||||
<Compile Include="NormalSyncTest.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="ExceptionTest.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\IP2Region\IP2Region.csproj">
|
||||
<Project>{4c6032ee-43a5-4d5c-88f8-c411069e49e0}</Project>
|
||||
<Name>IP2Region</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
|
||||
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net45" />
|
||||
<package id="MSTest.TestFramework" version="1.2.1" targetFramework="net45" />
|
||||
</packages>
|
||||
Loading…
Reference in New Issue