Merge pull request #6 from exceptionless/feature/config-refactor

Added improved support for Querying, Batching, Reindexing and Time Series Indexes

Author: ejsmith

.gitignore

@@ -16,7 +16,7 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
-
+Build/elasticsearch*/
 # Roslyn cache directories
 *.ide/
 
@@ -181,3 +181,4 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 .vs/config/applicationhost.config
+*.nugetreferenceswitcher

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PowerShell",
+            "type": "PowerShell",
+            "request": "launch",
+            "program": "${file}",
+            "args": [],
+            "cwd": "${file}"
+        }
+    ]
+}

Build/Start-ElasticSearch.ps1

@@ -1,23 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories", "src\Core\Foundatio.Repositories.csproj", "{F5B6C2B5-485F-4A4B-8E00-D5F77676CD6E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories", "src\Foundatio.Repositories\Foundatio.Repositories.csproj", "{F5B6C2B5-485F-4A4B-8E00-D5F77676CD6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Tests", "src\Core\Tests\Foundatio.Repositories.Tests.csproj", "{23002BA4-8663-460B-8D67-3AA941B0322A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Tests", "tests\Foundatio.Repositories.Tests\Foundatio.Repositories.Tests.csproj", "{23002BA4-8663-460B-8D67-3AA941B0322A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{70515E66-DAF8-4D18-8F8F-8A2934171AA9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E12E4C1-2EC6-4EC7-8956-AF2721DA4ECE}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		README.md = README.md
+		Build\Replace-FileString.ps1 = Build\Replace-FileString.ps1
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Elasticsearch", "src\Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj", "{3BFBD4C1-3F2C-46A4-9400-2CB9803644BE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Elasticsearch", "src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj", "{3BFBD4C1-3F2C-46A4-9400-2CB9803644BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Elasticsearch.Tests", "src\Elasticsearch\Tests\Foundatio.Repositories.Elasticsearch.Tests.csproj", "{93E138E9-D06C-4B78-B62D-317786025013}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundatio.Repositories.Elasticsearch.Tests", "tests\Foundatio.Repositories.Elasticsearch.Tests\Foundatio.Repositories.Elasticsearch.Tests.csproj", "{93E138E9-D06C-4B78-B62D-317786025013}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Build/elasticsearch.yml

@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>

Foundatio.Repositories.sln

@@ -1,6 +1,10 @@
-version: 1.0.{build}
+version: 2.0.{build}
 os: Visual Studio 2015
 clone_depth: 2
+configuration: Release
+
+pull_requests:
+  do_not_increment_build_number: true
 
 environment:
   JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
@@ -13,28 +17,26 @@ init:
 
 install:
   - choco install gitlink
-  - ps: .\Build\Start-ElasticSearch.ps1
+  - ps: .\build\Start-ElasticSearch.ps1
 
 assembly_info:
   patch: true
   file: AssemblyInfo.*
-  assembly_version: "1.0.0.0"
+  assembly_version: "{version}.0"
   assembly_file_version: "{version}.0"
   assembly_informational_version: "{version}$(VERSION_SUFFIX) $(GIT_HASH)"
 
 before_build:
   - nuget restore
-  - ps: .\Build\Replace-FileString -Pattern '\$version\$' -Replacement "$($env:appveyor_build_version)$($env:VERSION_SUFFIX)" -Path src\**\*.nuspec -Overwrite
-
-configuration: Release
+  - ps: .\build\Replace-FileString -Pattern '\$version\$' -Replacement "$($env:appveyor_build_version)$($env:VERSION_SUFFIX)" -Path src\**\*.nuspec -Overwrite
 
 build:
   project: Foundatio.Repositories.sln
   verbosity: minimal
   publish_nuget: true
 
 before_package:
-  - ps: if ((-not $env:APPVEYOR_PULL_REQUEST_NUMBER) -and ($env:APPVEYOR_REPO_BRANCH -eq 'master')) { & "GitLink" .\ }
+  - ps: if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & "GitLink" .\ }
 
 #on_failure:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
@@ -58,5 +60,4 @@ notifications:
   - provider: Slack
     auth_token:
       secure: GniMpFE62HprSyQNQoej/fBOAdbQe8EMWAMMNXX0s2JxeNePjemiO1bCf4eYweE4p70mm0sCwMjeEP/Ps9aTMA==
-    channel: '#notifications'
- 
+    channel: '#notifications'

Foundatio.Repositories.sln.DotSettings

@@ -0,0 +1,36 @@
+$es_version = "1.7.5"
+If ($env:ES_VERSION) {
+    $es_version = $env:ES_VERSION
+}
+
+If ($env:JAVA_HOME -eq $null -or !(Test-Path -Path $env:JAVA_HOME)) {
+    Write-Error "Please ensure the latest version of java is installed and the JAVA_HOME environmental variable has been set."
+    Return
+}
+
+Push-Location $PSScriptRoot
+
+If (!(Test-Path -Path "elasticsearch-$es_version") -And !(Test-Path -Path "elasticsearch.zip")) {
+    Invoke-WebRequest "http://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$es_version.zip" -OutFile "elasticsearch-$es_version.zip"
+}
+
+If ((Test-Path -Path "elasticsearch-$es_version.zip") -And !(Test-Path -Path "elasticsearch-$es_version")) {
+    Add-Type -assembly "system.io.compression.filesystem"
+    [io.compression.zipfile]::ExtractToDirectory("$PSScriptRoot\elasticsearch-$es_version.zip", $PSScriptRoot)
+    cp .\elasticsearch.yml .\elasticsearch-$es_version\config -Force
+    rm elasticsearch-$es_version.zip
+    & ".\elasticsearch-$es_version\bin\plugin.bat" install elasticsearch/marvel/latest
+
+    cp .\elasticsearch-$es_version .\elasticsearch-node1 -Recurse
+    cp .\elasticsearch-$es_version .\elasticsearch-node2 -Recurse
+    cp .\elasticsearch-$es_version .\elasticsearch-node3 -Recurse
+}
+
+Write-Output "Starting node 1..."
+Start-Process "$(Get-Location)\elasticsearch-node1\bin\elasticsearch.bat"
+Write-Output "Starting node 2..."
+Start-Process "$(Get-Location)\elasticsearch-node2\bin\elasticsearch.bat"
+Write-Output "Starting node 3..."
+Start-Process "$(Get-Location)\elasticsearch-node3\bin\elasticsearch.bat"
+
+Pop-Location

appveyor.yml

@@ -0,0 +1,8 @@
+cluster.name: foundatio
+cluster.routing.allocation.disk.threshold_enabled: false
+action.auto_create_index: false
+script.groovy.sandbox.enabled: true
+index.number_of_shards: 3
+index.number_of_replicas: 1
+bootstrap.mlockall: true
+discovery.zen.ping.multicast.enabled: true