Permalink
Browse files

Revert back to 3143 - work done on wrong branch

SVN: branches/1.2.x@3183
  • Loading branch information...
phatcher committed Dec 18, 2007
1 parent fbcea31 commit ba7ae5e7980ca171e6aaa6e18822a54177d9f37d
Showing with 2,478 additions and 2,110 deletions.
  1. +204 −189 src/NHibernate.Search.Tests/Bridge/Cloud.cs
  2. +4 −0 src/NHibernate.Search.Tests/DirectoryProvider/FSSlaveAndMasterDPTest.cs
  3. +20 −1 src/NHibernate.Search.Tests/DirectoryProvider/MultiplySessionFactoriesTestCase.cs
  4. +67 −63 src/NHibernate.Search.Tests/FileHleperTestCase.cs
  5. +10 −0 src/NHibernate.Search/AttributeUtil.cs
  6. +0 −19 src/NHibernate.Search/Attributes/ContainedInAttribute.cs
  7. +0 −34 src/NHibernate.Search/Attributes/Index.cs
  8. +2 −1 src/NHibernate.Search/Attributes/IndexedEmbedded.cs
  9. +0 −12 src/NHibernate.Search/Attributes/Store.cs
  10. +11 −0 src/NHibernate.Search/Backend/IBackendQueueProcessorFactory.cs
  11. +18 −0 src/NHibernate.Search/Backend/IQueueingProcessor.cs
  12. +17 −0 src/NHibernate.Search/Backend/Impl/BatchedQueueingProcessor.cs
  13. +26 −0 src/NHibernate.Search/Backend/Impl/Lucene/LuceneBackendQueueProcessor.cs
  14. +10 −0 src/NHibernate.Search/Backend/Impl/Lucene/LuceneBackendQueueProcessorFactory.cs
  15. +0 −99 src/NHibernate.Search/Backend/LuceneIndexingParameters.cs
  16. +171 −149 src/NHibernate.Search/Backend/Workspace.cs
  17. +30 −0 src/NHibernate.Search/Bridge/BridgeFactory.cs
  18. +8 −0 src/NHibernate.Search/Bridge/IFieldBridge.cs
  19. +4 −0 src/NHibernate.Search/Bridge/ITwoWayFieldBridge.cs
  20. +16 −2 src/NHibernate.Search/Bridge/String2FieldBridgeAdaptor.cs
  21. +4 −0 src/NHibernate.Search/Bridge/TwoWayString2FieldBridgeAdaptor.cs
  22. +119 −105 src/NHibernate.Search/DirectoryProviderHelper.cs
  23. +180 −21 src/NHibernate.Search/Engine/DocumentBuilder.cs
  24. +0 −13 src/NHibernate.Search/Engine/ISearchFactoryImplementor.cs
  25. +48 −16 src/NHibernate.Search/Engine/SearchFactory.cs
  26. +6 −0 src/NHibernate.Search/IFullTextSession.cs
  27. +0 −39 src/NHibernate.Search/ISearchFactory.cs
  28. +350 −336 src/NHibernate.Search/Impl/FullTextSessionImpl.cs
  29. +24 −0 src/NHibernate.Search/Impl/SearchInterceptor.cs
  30. +10 −0 src/NHibernate.Search/Index.cs
  31. +53 −44 src/NHibernate.Search/LuceneQueryExpression.cs
  32. +3 −7 src/NHibernate.Search/NHibernate.Search-2.0.csproj
  33. +237 −213 src/NHibernate.Search/Query/FullTextQueryImpl.cs
  34. +120 −89 src/NHibernate.Search/Query/FullTextSearchHelper.cs
  35. +0 −10 src/NHibernate.Search/Reader/IReaderProvider.cs
  36. +9 −0 src/NHibernate.Search/Store.cs
  37. +118 −108 src/NHibernate.Search/Store/DirectoryProviderFactory.cs
  38. +49 −48 src/NHibernate.Search/Store/FSDirectoryProvider.cs
  39. +170 −160 src/NHibernate.Search/Store/FSMasterDirectoryProvider.cs
  40. +249 −235 src/NHibernate.Search/Store/FSSlaveDirectoryProvider.cs
  41. +54 −43 src/NHibernate.Search/Store/FileHelper.cs
  42. +6 −5 src/NHibernate.Search/Store/IDirectoryProvider.cs
  43. +51 −49 src/NHibernate.Search/Store/RAMDirectoryProvider.cs
@@ -3,193 +3,208 @@
namespace NHibernate.Search.Tests.Bridge
{
- [Indexed]
- public class Cloud
- {
- private int id;
- private long? long1;
- private int? int1;
- private double? double1;
- private float? float1;
- private long long2;
- private double double2;
- private float float2;
- private int int2;
- private string string1;
- private DateTime? dateTime;
- private DateTime? dateTimeYear;
- private DateTime? dateTimeMonth;
- private DateTime? dateTimeDay;
- private DateTime? dateTimeHour;
- private DateTime? dateTimeMinute;
- private DateTime? dateTimeSecond;
- private DateTime? dateTimeMillisecond;
- private String customFieldBridge;
- private String customStringBridge;
- private CloudType type;
- private bool storm;
-
- [Field(Index.Tokenized, Store = Store.Yes)]
- [FieldBridge(typeof(TruncateFieldBridge))]
- public virtual string CustomFieldBridge
- {
- get { return customFieldBridge; }
- set { customFieldBridge = value; }
- }
-
- [Field(Index.Tokenized, Store = Store.Yes)]
- [FieldBridge(typeof(TruncateStringBridge), 4)]
- public virtual string CustomStringBridge
- {
- get { return customStringBridge; }
- set { customStringBridge = value; }
- }
-
- [DocumentId]
- public virtual int Id
- {
- get { return id; }
- set { id = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual long? Long1
- {
- get { return long1; }
- set { long1 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual int? Int1
- {
- get { return int1; }
- set { int1 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual double? Double1
- {
- get { return double1; }
- set { double1 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual float? Float1
- {
- get { return float1; }
- set { float1 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual long Long2
- {
- get { return long2; }
- set { long2 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual int Int2
- {
- get { return int2; }
- set { int2 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual double Double2
- {
- get { return double2; }
- set { double2 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual float Float2
- {
- get { return float2; }
- set { float2 = value; }
- }
-
- [Field(Index.Tokenized, Store = Store.Yes)]
- public virtual string String1
- {
- get { return string1; }
- set { string1 = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual DateTime? DateTime
- {
- get { return dateTime; }
- set { dateTime = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Year)]
- public virtual DateTime? DateTimeYear
- {
- get { return dateTimeYear; }
- set { dateTimeYear = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Month)]
- public virtual DateTime? DateTimeMonth
- {
- get { return dateTimeMonth; }
- set { dateTimeMonth = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Day)]
- public virtual DateTime? DateTimeDay
- {
- get { return dateTimeDay; }
- set { dateTimeDay = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Hour)]
- public virtual DateTime? DateTimeHour
- {
- get { return dateTimeHour; }
- set { dateTimeHour = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Minute)]
- public virtual DateTime? DateTimeMinute
- {
- get { return dateTimeMinute; }
- set { dateTimeMinute = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Second)]
- public virtual DateTime? DateTimeSecond
- {
- get { return dateTimeSecond; }
- set { dateTimeSecond = value; }
- }
-
- [Field(Index.UnTokenized, Store = Store.Yes)]
- [DateBridge(Resolution.Millisecond)]
- public virtual DateTime? DateTimeMillisecond
- {
- get { return dateTimeMillisecond; }
- set { dateTimeMillisecond = value; }
- }
-
- [Field(Index.Tokenized)]
- public virtual CloudType Type
- {
- get { return type; }
- set { type = value; }
- }
-
- [Field(Index.Tokenized)]
- public virtual bool Storm
- {
- get { return storm; }
- set { storm = value; }
- }
- }
+ [Indexed]
+ public class Cloud
+ {
+ private int id;
+#if NET_2_0
+ private long? long1;
+ private int? int1;
+ private double? double1;
+ private float? float1;
+#endif
+ private long long2;
+ private double double2;
+ private float float2;
+ private int int2;
+ private string string1;
+#if NET_2_0
+ private DateTime? dateTime;
+ private DateTime? dateTimeYear;
+ private DateTime? dateTimeMonth;
+ private DateTime? dateTimeDay;
+ private DateTime? dateTimeHour;
+ private DateTime? dateTimeMinute;
+ private DateTime? dateTimeSecond;
+ private DateTime? dateTimeMillisecond;
+#endif
+ private String customFieldBridge;
+ private String customStringBridge;
+ private CloudType type;
+ private bool storm;
+
+ [Field(Index.Tokenized, Store = Store.Yes)]
+ [FieldBridge(typeof (TruncateFieldBridge))]
+ public virtual string CustomFieldBridge
+ {
+ get { return customFieldBridge; }
+ set { this.customFieldBridge = value; }
+ }
+
+ [Field(Index.Tokenized, Store = Store.Yes)]
+ [FieldBridge(typeof (TruncateStringBridge), 4)]
+ public virtual string CustomStringBridge
+ {
+ get { return customStringBridge; }
+ set { this.customStringBridge = value; }
+ }
+
+ [DocumentId]
+ public virtual int Id
+ {
+ get { return id; }
+ set { this.id = value; }
+ }
+
+#if NET_2_0
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual long? Long1
+ {
+ get { return long1; }
+ set { this.long1 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual int? Int1
+ {
+ get { return int1; }
+ set { this.int1 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual double? Double1
+ {
+ get { return double1; }
+ set { this.double1 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual float? Float1
+ {
+ get { return float1; }
+ set { this.float1 = value; }
+ }
+#endif
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual long Long2
+ {
+ get { return long2; }
+ set { this.long2 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual int Int2
+ {
+ get { return int2; }
+ set { this.int2 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual double Double2
+ {
+ get { return double2; }
+ set { this.double2 = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual float Float2
+ {
+ get { return float2; }
+ set { this.float2 = value; }
+ }
+
+ [Field(Index.Tokenized, Store = Store.Yes)]
+ public virtual string String1
+ {
+ get { return string1; }
+ set { this.string1 = value; }
+ }
+
+#if NET_2_0
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ public virtual DateTime? DateTime
+ {
+ get { return dateTime; }
+ set { this.dateTime = value; }
+ }
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Year)]
+ public virtual DateTime? DateTimeYear
+ {
+ get { return dateTimeYear; }
+ set { this.dateTimeYear = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Month)]
+ public virtual DateTime? DateTimeMonth
+ {
+ get { return dateTimeMonth; }
+ set { this.dateTimeMonth = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Day)]
+ public virtual DateTime? DateTimeDay
+ {
+ get { return dateTimeDay; }
+ set { this.dateTimeDay = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Hour)]
+ public virtual DateTime? DateTimeHour
+ {
+ get { return dateTimeHour; }
+ set { this.dateTimeHour = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Minute)]
+ public virtual DateTime? DateTimeMinute
+ {
+ get { return dateTimeMinute; }
+ set { this.dateTimeMinute = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Second)]
+ public virtual DateTime? DateTimeSecond
+ {
+ get { return dateTimeSecond; }
+ set { this.dateTimeSecond = value; }
+ }
+
+
+ [Field(Index.UnTokenized, Store = Store.Yes)]
+ [DateBridge(Resolution.Millisecond)]
+ public virtual DateTime? DateTimeMillisecond
+ {
+ get { return dateTimeMillisecond; }
+ set { this.dateTimeMillisecond = value; }
+ }
+#endif
+
+ [Field(Index.Tokenized)]
+ public virtual CloudType Type
+ {
+ get { return type; }
+ set { this.type = value; }
+ }
+
+
+ [Field(Index.Tokenized)]
+ public virtual bool Storm
+ {
+ get { return storm; }
+ set { this.storm = value; }
+ }
+ }
}
Oops, something went wrong.

0 comments on commit ba7ae5e

Please sign in to comment.