Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to Azure.Storage.Blobs (V12) library #41

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updates to Azure.Storage.Blobs (V12) library #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1ecb8
Modified to use V12 Azure Storage (Azure.Storaeg.Blobs) libraries and…
jamesburton Dec 4, 2020
557e5fe
Added note in readme about latest udpates
jamesburton Dec 4, 2020
9f65d6d
Merge branch 'master' of https://github.com/azure-contrib/AzureDirectory
jamesburtonqubithealth Feb 24, 2021
6f06c4b
Tweaks to tests
jamesburton Mar 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ obj/
csx/
Profiles/
*.ncrunch*
packages/
packages/
.vs/
2 changes: 1 addition & 1 deletion AzureDirectory.Tests/AzureDirectory.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
181 changes: 92 additions & 89 deletions AzureDirectory.Tests/IntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using Lucene.Net.Index;
using Lucene.Net.Search;
using Lucene.Net.Store.Azure;
using Microsoft.Azure.Storage;
using Microsoft.Azure.Storage.Blob;
using Azure;
using Azure.Storage.Blobs;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Text;
Expand All @@ -13,108 +13,111 @@
namespace AzureDirectory.Tests
{

[TestClass]
public class IntegrationTests
{
private readonly string connectionString;

public IntegrationTests()
{
this.connectionString = System.Environment.GetEnvironmentVariable("DataConnectionString") ?? "UseDevelopmentStorage=true";
}


[TestMethod]
public void TestReadAndWrite()
[TestClass]
public class IntegrationTests
{
var cloudStorageAccount = CloudStorageAccount.Parse(connectionString);

const string containerName = "testcatalog2";
private readonly string connectionString;

var azureDirectory = new Lucene.Net.Store.Azure.AzureDirectory(cloudStorageAccount, "temp", containerName: containerName);

var indexWriterConfig = new IndexWriterConfig(
Lucene.Net.Util.LuceneVersion.LUCENE_48,
new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));

int dog = 0, cat = 0, car = 0;

using (var indexWriter = new IndexWriter(azureDirectory, indexWriterConfig))
{

for (var iDoc = 0; iDoc < 10000; iDoc++)
public IntegrationTests()
{
var bodyText = GeneratePhrase(40);
var doc = new Document {
new TextField("id", DateTime.Now.ToFileTimeUtc() + "-" + iDoc, Field.Store.YES),
new TextField("Title", GeneratePhrase(10), Field.Store.YES),
new TextField("Body", bodyText, Field.Store.YES)
};
dog += bodyText.Contains(" dog ") ? 1 : 0;
cat += bodyText.Contains(" cat ") ? 1 : 0;
car += bodyText.Contains(" car ") ? 1 : 0;
indexWriter.AddDocument(doc);
this.connectionString = Environment.GetEnvironmentVariable("DataConnectionString") ?? "UseDevelopmentStorage=true";
}

Console.WriteLine("Total docs is {0}, {1} dog, {2} cat, {3} car", indexWriter.NumDocs, dog, cat, car);
}
try
{

var ireader = DirectoryReader.Open(azureDirectory);
for (var i = 0; i < 100; i++)
[TestMethod]
public void TestReadAndWrite()
{
var searcher = new IndexSearcher(ireader);
var searchForPhrase = SearchForPhrase(searcher, "dog");
Assert.AreEqual(dog, searchForPhrase);
searchForPhrase = SearchForPhrase(searcher, "cat");
Assert.AreEqual(cat, searchForPhrase);
searchForPhrase = SearchForPhrase(searcher, "car");
Assert.AreEqual(car, searchForPhrase);
//var cloudStorageAccount = CloudStorageAccount.Parse(connectionString);

const string containerName = "testcatalog2";

//var azureDirectory = new Lucene.Net.Store.Azure.AzureDirectory(cloudStorageAccount, "temp", containerName: containerName);
var azureDirectory = new Lucene.Net.Store.Azure.AzureDirectory(connectionString, "temp", containerName: containerName);

var indexWriterConfig = new IndexWriterConfig(
Lucene.Net.Util.LuceneVersion.LUCENE_48,
new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48, StandardAnalyzer.STOP_WORDS_SET));

int dog = 0, cat = 0, car = 0;

using (var indexWriter = new IndexWriter(azureDirectory, indexWriterConfig))
{

for (var iDoc = 0; iDoc < 10000; iDoc++)
{
var bodyText = GeneratePhrase(40);
var doc = new Document {
new TextField("id", DateTime.Now.ToFileTimeUtc() + "-" + iDoc, Field.Store.YES),
new TextField("Title", GeneratePhrase(10), Field.Store.YES),
new TextField("Body", bodyText, Field.Store.YES)
};
dog += bodyText.Contains(" dog ") ? 1 : 0;
cat += bodyText.Contains(" cat ") ? 1 : 0;
car += bodyText.Contains(" car ") ? 1 : 0;
indexWriter.AddDocument(doc);
}

Console.WriteLine("Total docs is {0}, {1} dog, {2} cat, {3} car", indexWriter.NumDocs, dog, cat, car);
}
try
{

var ireader = DirectoryReader.Open(azureDirectory);
for (var i = 0; i < 100; i++)
{
var searcher = new IndexSearcher(ireader);
var searchForPhrase = SearchForPhrase(searcher, "dog");
Assert.AreEqual(dog, searchForPhrase);
searchForPhrase = SearchForPhrase(searcher, "cat");
Assert.AreEqual(cat, searchForPhrase);
searchForPhrase = SearchForPhrase(searcher, "car");
Assert.AreEqual(car, searchForPhrase);
}
Console.WriteLine("Tests passsed");
}
catch (Exception x)
{
Console.WriteLine("Tests failed:\n{0}", x);
}
finally
{
// check the container exists, and delete it
//var blobClient = cloudStorageAccount.CreateBlobServiceClient();
var blobClient = new BlobServiceClient(connectionString);
//var container = blobClient.GetContainerReference(containerName);
var container = blobClient.GetBlobContainerClient(containerName);
Assert.IsTrue(container.Exists()); // check the container exists
container.Delete();
}
}
Console.WriteLine("Tests passsed");
}
catch (Exception x)
{
Console.WriteLine("Tests failed:\n{0}", x);
}
finally
{
// check the container exists, and delete it
var blobClient = cloudStorageAccount.CreateCloudBlobClient();
var container = blobClient.GetContainerReference(containerName);
Assert.IsTrue(container.Exists()); // check the container exists
container.Delete();
}
}

private static int SearchForPhrase(IndexSearcher searcher, string phrase)
{
var parser = new Lucene.Net.QueryParsers.Classic.QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Body", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
var query = parser.Parse(phrase);
var topDocs = searcher.Search(query, 100);
return topDocs.TotalHits;
}
private static int SearchForPhrase(IndexSearcher searcher, string phrase)
{
var parser = new Lucene.Net.QueryParsers.Classic.QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Body", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
var query = parser.Parse(phrase);
var topDocs = searcher.Search(query, 100);
return topDocs.TotalHits;
}

static Random rand = new Random();
static Random rand = new Random();

static string[] sampleTerms =
{
static string[] sampleTerms =
{
"dog","cat","car","horse","door","tree","chair","microsoft","apple","adobe","google","golf","linux","windows","firefox","mouse","hornet","monkey","giraffe","computer","monitor",
"steve","fred","lili","albert","tom","shane","gerald","chris",
"love","hate","scared","fast","slow","new","old"
};

private static string GeneratePhrase(int MaxTerms)
{
var phrase = new StringBuilder();
int nWords = 2 + rand.Next(MaxTerms);
for (int i = 0; i < nWords; i++)
{
phrase.AppendFormat(" {0} {1}", sampleTerms[rand.Next(sampleTerms.Length)], rand.Next(32768).ToString());
}
return phrase.ToString();
}
private static string GeneratePhrase(int MaxTerms)
{
var phrase = new StringBuilder();
int nWords = 2 + rand.Next(MaxTerms);
for (int i = 0; i < nWords; i++)
{
phrase.AppendFormat(" {0} {1}", sampleTerms[rand.Next(sampleTerms.Length)], rand.Next(32768).ToString());
}
return phrase.ToString();
}

}
}
}
Loading