Permalink
Browse files

made the type system more robus to support parsing of complex types f…

…rom Cassandra i.e. DynamicCompositeType
  • Loading branch information...
1 parent 4526a65 commit d5764600c342e46a5904661400bdf4c3efbed56a @nberardi nberardi committed Feb 8, 2012
Showing with 919 additions and 1,201 deletions.
  1. +11 −0 src/BaseCassandraColumnFamily.cs
  2. +2 −2 src/CassandraColumnFamily.cs
  3. +20 −72 src/CassandraColumnFamilyOperations.cs
  4. +16 −16 src/CassandraColumnFamilySchema.cs
  5. +9 −10 src/CassandraColumnSchema.cs
  6. +4 −4 src/CassandraContext.cs
  7. +23 −42 src/CassandraKeyspace.cs
  8. +3 −3 src/CassandraSuperColumnFamily.cs
  9. +28 −154 src/CassandraSuperColumnFamilyOperations.cs
  10. +4 −8 src/FluentCassandra.csproj
  11. +9 −9 src/FluentColumn.cs
  12. +13 −13 src/FluentColumnFamily.cs
  13. +11 −11 src/FluentSuperColumn.cs
  14. +12 −12 src/FluentSuperColumnFamily.cs
  15. +1 −1 src/IFluentBaseColumn.cs
  16. +1 −1 src/IFluentBaseColumnFamily.cs
  17. +1 −1 src/IFluentRecordExpression.cs
  18. +1 −1 src/Linq/CassandraColumnFamily+QueryProvider.cs
  19. +4 −4 src/Linq/CqlQueryEvaluator.cs
  20. +1 −1 src/Linq/CqlQueryExtensions.cs
  21. +2 −2 src/Linq/ICqlRow.cs
  22. +5 −5 src/Operations/AddColumn.cs
  23. +9 −9 src/Operations/CassandraClientWrapper.cs
  24. +2 −2 src/Operations/CassandraColumn.cs
  25. +1 −1 src/Operations/CassandraColumnParent.cs
  26. +1 −1 src/Operations/CassandraColumnPath.cs
  27. +2 −2 src/Operations/CassandraColumnSlicePredicate.cs
  28. +1 −1 src/Operations/CassandraCounterColumn.cs
  29. +3 −3 src/Operations/CassandraIndexClause.cs
  30. +4 −4 src/Operations/CassandraIndexClauseBuilder.cs
  31. +3 −3 src/Operations/CassandraKeyRange.cs
  32. +4 −4 src/Operations/CassandraQuerySetup.cs
  33. +19 −10 src/Operations/CassandraQueryable.cs
  34. +3 −3 src/Operations/CassandraRangeSlicePredicate.cs
  35. +11 −7 src/Operations/CassandraSlicePredicateBuilder.cs
  36. +1 −1 src/Operations/CassandraSlicePredicateQuery.cs
  37. +4 −4 src/Operations/ColumnCount.cs
  38. +5 −5 src/Operations/ExecuteCqlQuery.cs
  39. +7 −7 src/Operations/GetColumn.cs
  40. +0 −1 src/Operations/GetColumnFamilyIndexedSlices.cs
  41. +2 −2 src/Operations/GetColumnFamilySlice.cs
  42. +3 −3 src/Operations/GetSuperColumn.cs
  43. +0 −2 src/Operations/GetSuperColumnFamilyIndexedSlices.cs
  44. +4 −5 src/Operations/GetSuperColumnFamilyRangeSlices.cs
  45. +2 −2 src/Operations/GetSuperColumnFamilySlice.cs
  46. +0 −53 src/Operations/GetSuperColumnIndexedSlices.cs
  47. +0 −53 src/Operations/GetSuperColumnRangeSlices.cs
  48. +3 −3 src/Operations/GetSuperColumnSlice.cs
  49. +7 −7 src/Operations/Helper.cs
  50. +2 −2 src/Operations/ICassandraQueryProvider.cs
  51. +1 −1 src/Operations/ICassandraQueryable.cs
  52. +8 −8 src/Operations/InsertColumn.cs
  53. +7 −7 src/Operations/MultiGetColumnCount.cs
  54. +3 −3 src/Operations/MultiGetColumnFamilySlice.cs
  55. +8 −6 src/Operations/MultiGetSuperColumnFamilySlice.cs
  56. +0 −53 src/Operations/MultiGetSuperColumnSlice.cs
  57. +12 −7 src/Operations/{RemoveColumn.cs → Remove.cs}
  58. +0 −36 src/Operations/RemoveKey.cs
  59. +0 −42 src/Operations/RemoveSuperColumn.cs
  60. +1 −1 src/Types/AsciiType.cs
  61. +1 −1 src/Types/AsciiTypeConverter.cs
  62. +1 −1 src/Types/BooleanType.cs
  63. +1 −1 src/Types/BooleanTypeConverter.cs
  64. +1 −1 src/Types/BytesType.cs
  65. +1 −1 src/Types/BytesTypeConverter.cs
  66. +306 −0 src/Types/CassandraObject.cs
  67. +3 −3 src/Types/{CassandraTypeConverter.cs → CassandraObjectConverter.cs}
  68. +79 −257 src/Types/CassandraType.cs
  69. +40 −40 src/Types/CompositeType.cs
  70. +18 −18 src/Types/CompositeTypeConverter.cs
  71. +35 −35 src/Types/CompositeType`1.cs
  72. +1 −1 src/Types/DateType.cs
  73. +1 −1 src/Types/DateTypeConverter.cs
  74. +1 −1 src/Types/DecimalType.cs
  75. +1 −1 src/Types/DecimalTypeConverter.cs
  76. +1 −1 src/Types/DoubleType.cs
  77. +1 −1 src/Types/DoubleTypeConverter.cs
  78. +22 −22 src/Types/DynamicCompositeType.cs
  79. +15 −15 src/Types/DynamicCompositeTypeConverter.cs
  80. +1 −1 src/Types/FloatType.cs
  81. +1 −1 src/Types/FloatTypeConverter.cs
  82. +1 −1 src/Types/Int32Type.cs
  83. +1 −1 src/Types/Int32TypeConverter.cs
  84. +1 −1 src/Types/IntegerType.cs
  85. +1 −1 src/Types/IntegerTypeConverter.cs
  86. +1 −1 src/Types/LexicalUUIDType.cs
  87. +1 −1 src/Types/LexicalUUIDTypeConverter.cs
  88. +1 −1 src/Types/LongType.cs
  89. +1 −1 src/Types/LongTypeConverter.cs
  90. +1 −1 src/Types/NullType.cs
  91. +1 −1 src/Types/TimeUUIDType.cs
  92. +1 −1 src/Types/TimeUUIDTypeConverter.cs
  93. +1 −1 src/Types/UTF8Type.cs
  94. +1 −1 src/Types/UTF8TypeConverter.cs
  95. +1 −1 src/Types/UUIDType.cs
  96. +1 −1 src/Types/UUIDTypeConverter.cs
  97. +1 −1 src/Types/VoidType.cs
  98. +3 −1 test/FluentCassandra.Tests/CassandraDatabaseSetup.cs
  99. +22 −22 test/FluentCassandra.Tests/Operations/CassandraIndexClauseTest.cs
  100. +1 −1 test/FluentCassandra.Tests/Types/AsciiTypeTest.cs
  101. +1 −1 test/FluentCassandra.Tests/Types/BytesTypeTest.cs
  102. +9 −9 test/FluentCassandra.Tests/Types/CompositeTypeTest.cs
  103. +5 −5 test/FluentCassandra.Tests/Types/DynamicCompositeTypeTest.cs
  104. +1 −1 test/FluentCassandra.Tests/Types/IntegerTypeTest.cs
  105. +1 −1 test/FluentCassandra.Tests/Types/LexicalUUIDTypeTest.cs
  106. +1 −1 test/FluentCassandra.Tests/Types/LongTypeTest.cs
  107. +1 −1 test/FluentCassandra.Tests/Types/TimeUUIDTypeTest.cs
  108. +1 −1 test/FluentCassandra.Tests/Types/UTF8TypeTest.cs
  109. +2 −2 utility/FluentCassandra.LinqPad/FluentCassandraMemberProvider.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Linq.Expressions;
using FluentCassandra.Operations;
+using FluentCassandra.Types;
namespace FluentCassandra
{
@@ -79,6 +80,16 @@ public void TryCreateSelf()
}
/// <summary>
+ ///
+ /// </summary>
+ /// <param name="key"></param>
+ public void RemoveKey(CassandraObject key)
+ {
+ var op = new Remove(key);
+ ExecuteOperation(op);
+ }
+
+ /// <summary>
/// Removes all the rows from the given column family.
/// </summary>
public void RemoveAllRows()
@@ -6,7 +6,7 @@ namespace FluentCassandra
{
[Obsolete("Use \"CassandraColumnFamily\" class with out generic type")]
public class CassandraColumnFamily<CompareWith> : CassandraColumnFamily
- where CompareWith : CassandraType
+ where CompareWith : CassandraObject
{
public CassandraColumnFamily(CassandraContext context, string columnFamily)
: base(context, columnFamily)
@@ -25,7 +25,7 @@ public partial class CassandraColumnFamily : BaseCassandraColumnFamily
public CassandraColumnFamily(CassandraContext context, string columnFamily)
: base(context, columnFamily) { }
- public FluentColumnFamily CreateRecord(CassandraType key)
+ public FluentColumnFamily CreateRecord(CassandraObject key)
{
if (key.GetValue<byte[]>().Length == 0)
throw new ArgumentException("'key' is not allowed to be zero length.", "key");
@@ -11,13 +11,13 @@ public static class CassandraColumnFamilyOperations
{
#region ColumnCount
- public static int ColumnCount(this CassandraColumnFamily family, CassandraType key, IEnumerable<CassandraType> columnNames)
+ public static int ColumnCount(this CassandraColumnFamily family, CassandraObject key, IEnumerable<CassandraObject> columnNames)
{
var op = new ColumnCount(key, new CassandraColumnSlicePredicate(columnNames));
return family.ExecuteOperation(op);
}
- public static int ColumnCount(this CassandraColumnFamily family, CassandraType key, CassandraType columnStart, CassandraType columnEnd, bool reversed = false, int count = 100)
+ public static int ColumnCount(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnStart, CassandraObject columnEnd, bool reversed = false, int count = 100)
{
var op = new ColumnCount(key, new CassandraRangeSlicePredicate(columnStart, columnEnd, reversed, count));
return family.ExecuteOperation(op);
@@ -27,12 +27,12 @@ public static int ColumnCount(this CassandraColumnFamily family, CassandraType k
#region InsertColumn
- public static void InsertColumn(this CassandraColumnFamily family, CassandraType key, FluentColumn column)
+ public static void InsertColumn(this CassandraColumnFamily family, CassandraObject key, FluentColumn column)
{
InsertColumn(family, key, column.GetPath());
}
- public static void InsertColumn(this CassandraColumnFamily family, CassandraType key, FluentColumnPath path)
+ public static void InsertColumn(this CassandraColumnFamily family, CassandraObject key, FluentColumnPath path)
{
var columnName = path.Column.ColumnName;
var columnValue = path.Column.ColumnValue;
@@ -43,12 +43,12 @@ public static void InsertColumn(this CassandraColumnFamily family, CassandraType
family.ExecuteOperation(op);
}
- public static void InsertColumn(this CassandraColumnFamily family, CassandraType key, CassandraType columnName, BytesType columnValue)
+ public static void InsertColumn(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnName, BytesType columnValue)
{
InsertColumn(family, key, columnName, columnValue, DateTimeOffset.UtcNow, null);
}
- public static void InsertColumn(this CassandraColumnFamily family, CassandraType key, CassandraType columnName, BytesType columnValue, DateTimeOffset timestamp, int? timeToLive)
+ public static void InsertColumn(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnName, BytesType columnValue, DateTimeOffset timestamp, int? timeToLive)
{
var op = new InsertColumn(key, columnName, columnValue, timestamp, timeToLive);
family.ExecuteOperation(op);
@@ -58,7 +58,7 @@ public static void InsertColumn(this CassandraColumnFamily family, CassandraType
#region AddColumn
- public static void InsertColumn(this CassandraColumnFamily family, CassandraType key, CassandraType columnName, long columnValue)
+ public static void InsertColumn(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnName, long columnValue)
{
var op = new AddColumn(key, columnName, columnValue);
family.ExecuteOperation(op);
@@ -68,13 +68,13 @@ public static void InsertColumn(this CassandraColumnFamily family, CassandraType
#region GetColumn
- public static FluentColumn GetColumn(this CassandraColumnFamily family, CassandraType key, FluentColumnPath path)
+ public static FluentColumn GetColumn(this CassandraColumnFamily family, CassandraObject key, FluentColumnPath path)
{
var columnName = path.Column.ColumnName;
return GetColumn(family, key, columnName);
}
- public static FluentColumn GetColumn(this CassandraColumnFamily family, CassandraType key, CassandraType columnName)
+ public static FluentColumn GetColumn(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnName)
{
var op = new GetColumn(key, columnName);
return family.ExecuteOperation(op);
@@ -84,39 +84,29 @@ public static FluentColumn GetColumn(this CassandraColumnFamily family, Cassandr
#region RemoveColumn
- public static void RemoveColumn(this CassandraColumnFamily family, CassandraType key, FluentColumnPath path)
+ public static void RemoveColumn(this CassandraColumnFamily family, CassandraObject key, FluentColumnPath path)
{
var columnName = path.Column.ColumnName;
RemoveColumn(family, key, columnName);
}
- public static void RemoveColumn(this CassandraColumnFamily family, CassandraType key, CassandraType columnName)
+ public static void RemoveColumn(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnName)
{
- var op = new RemoveColumn(key, columnName);
- family.ExecuteOperation(op);
- }
-
- #endregion
-
- #region RemoveKey
-
- public static void RemoveKey(this CassandraColumnFamily family, CassandraType key)
- {
- var op = new RemoveKey(key);
+ var op = new Remove(key, columnName);
family.ExecuteOperation(op);
}
#endregion
#region GetSingle
- public static FluentColumnFamily GetSingle(this CassandraColumnFamily family, CassandraType key, IEnumerable<CassandraType> columnNames)
+ public static FluentColumnFamily GetSingle(this CassandraColumnFamily family, CassandraObject key, IEnumerable<CassandraObject> columnNames)
{
var op = new GetColumnFamilySlice(key, new CassandraColumnSlicePredicate(columnNames));
return family.ExecuteOperation(op);
}
- public static FluentColumnFamily GetSingle(this CassandraColumnFamily family, CassandraType key, CassandraType columnStart, CassandraType columnEnd, bool columnsReversed = false, int columnCount = 100)
+ public static FluentColumnFamily GetSingle(this CassandraColumnFamily family, CassandraObject key, CassandraObject columnStart, CassandraObject columnEnd, bool columnsReversed = false, int columnCount = 100)
{
var op = new GetColumnFamilySlice(key, new CassandraRangeSlicePredicate(columnStart, columnEnd, columnsReversed, columnCount));
return family.ExecuteOperation(op);
@@ -128,75 +118,33 @@ public static FluentColumnFamily GetSingle(this CassandraColumnFamily family, Ca
// queryable
- public static ICassandraQueryable<FluentColumnFamily, CassandraType> Get(this CassandraColumnFamily family, params BytesType[] keys)
+ public static ICassandraQueryable<FluentColumnFamily, CassandraObject> Get(this CassandraColumnFamily family, params CassandraObject[] keys)
{
- var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraType> {
+ var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraObject> {
Keys = keys,
CreateQueryOperation = (s, slice) => new MultiGetColumnFamilySlice(s.Keys, slice)
};
return ((ICassandraQueryProvider)family).CreateQuery(setup, null);
}
- public static ICassandraQueryable<FluentColumnFamily, CassandraType> Get(this CassandraColumnFamily family, BytesType startKey, BytesType endKey, string startToken, string endToken, int keyCount)
+ public static ICassandraQueryable<FluentColumnFamily, CassandraObject> Get(this CassandraColumnFamily family, CassandraObject startKey, CassandraObject endKey, string startToken, string endToken, int keyCount)
{
- var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraType> {
+ var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraObject> {
KeyRange = new CassandraKeyRange(startKey, endKey, startToken, endToken, keyCount),
CreateQueryOperation = (s, slice) => new GetColumnFamilyRangeSlices(s.KeyRange, slice)
};
return ((ICassandraQueryProvider)family).CreateQuery(setup, null);
}
- public static ICassandraQueryable<FluentColumnFamily, CassandraType> Get(this CassandraColumnFamily family, BytesType startKey, int keyCount, Expression<Func<IFluentRecordExpression, bool>> expression)
+ public static ICassandraQueryable<FluentColumnFamily, CassandraObject> Get(this CassandraColumnFamily family, CassandraObject startKey, int keyCount, Expression<Func<IFluentRecordExpression, bool>> expression)
{
- var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraType> {
+ var setup = new CassandraQuerySetup<FluentColumnFamily, CassandraObject> {
IndexClause = new CassandraIndexClause(startKey, keyCount, expression),
CreateQueryOperation = (s, slice) => new GetColumnFamilyIndexedSlices(s.IndexClause, slice)
};
return ((ICassandraQueryProvider)family).CreateQuery(setup, null);
}
- // multi_get_slice
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, IEnumerable<BytesType> keys, IEnumerable<CassandraType> columnNames)
- {
- var op = new MultiGetColumnFamilySlice(keys, new CassandraColumnSlicePredicate(columnNames));
- return family.ExecuteOperation(op);
- }
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, IEnumerable<BytesType> keys, CassandraType columnStart, CassandraType columnEnd, bool columnsReversed = false, int columnCount = 100)
- {
- var op = new MultiGetColumnFamilySlice(keys, new CassandraRangeSlicePredicate(columnStart, columnEnd, columnsReversed, columnCount));
- return family.ExecuteOperation(op);
- }
-
- // get_range_slice
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, BytesType startKey, BytesType endKey, string startToken, string endToken, int keyCount, IEnumerable<CassandraType> columnNames)
- {
- var op = new GetColumnFamilyRangeSlices(new CassandraKeyRange(startKey, endKey, startToken, endToken, keyCount), new CassandraColumnSlicePredicate(columnNames));
- return family.ExecuteOperation(op);
- }
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, BytesType startKey, BytesType endKey, string startToken, string endToken, int keyCount, CassandraType columnStart, CassandraType columnEnd, bool columnsReversed = false, int columnCount = 100)
- {
- var op = new GetColumnFamilyRangeSlices(new CassandraKeyRange(startKey, endKey, startToken, endToken, keyCount), new CassandraRangeSlicePredicate(columnStart, columnEnd, columnsReversed, columnCount));
- return family.ExecuteOperation(op);
- }
-
- // get_indexed_slices
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, CassandraType startKey, int keyCount, Expression<Func<IFluentRecordExpression, bool>> expression, IEnumerable<CassandraType> columnNames)
- {
- var op = new GetColumnFamilyIndexedSlices(new CassandraIndexClause(startKey, keyCount, expression), new CassandraColumnSlicePredicate(columnNames));
- return family.ExecuteOperation(op);
- }
-
- public static IEnumerable<FluentColumnFamily> Get(this CassandraColumnFamily family, CassandraType startKey, int keyCount, Expression<Func<IFluentRecordExpression, bool>> expression, CassandraType columnStart, CassandraType columnEnd, bool columnsReversed = false, int columnCount = 100)
- {
- var op = new GetColumnFamilyIndexedSlices(new CassandraIndexClause(startKey, keyCount, expression), new CassandraRangeSlicePredicate(columnStart, columnEnd, columnsReversed, columnCount));
- return family.ExecuteOperation(op);
- }
-
#endregion
public static IEnumerable<ICqlRow> Cql(this CassandraColumnFamily family, UTF8Type cqlQuery)
@@ -15,26 +15,26 @@ public CassandraColumnFamilySchema(CfDef def)
var familyType = ColumnType.Standard;
Enum.TryParse<ColumnType>(def.Column_type, out familyType);
- var keyType = CassandraType.GetCassandraType(def.Key_validation_class);
- var defaultColumnValueType = CassandraType.GetCassandraType(def.Default_validation_class);
- Type columnNameType, superColumnNameType;
+ var keyType = CassandraObject.ParseType(def.Key_validation_class);
+ var defaultColumnValueType = CassandraObject.ParseType(def.Default_validation_class);
+ CassandraType columnNameType, superColumnNameType;
if (familyType == ColumnType.Super)
{
- superColumnNameType = CassandraType.GetCassandraType(def.Comparator_type);
- columnNameType = CassandraType.GetCassandraType(def.Subcomparator_type);
+ superColumnNameType = CassandraObject.ParseType(def.Comparator_type);
+ columnNameType = CassandraObject.ParseType(def.Subcomparator_type);
}
else
{
superColumnNameType = null;
- columnNameType = CassandraType.GetCassandraType(def.Comparator_type);
+ columnNameType = CassandraObject.ParseType(def.Comparator_type);
}
FamilyType = familyType;
FamilyName = def.Name;
FamilyDescription = def.Comment;
- KeyName = CassandraType.GetTypeFromDatabaseValue<BytesType>(def.Key_alias);
+ KeyName = CassandraObject.GetTypeFromDatabaseValue(def.Key_alias, CassandraType.BytesType);
KeyType = keyType;
SuperColumnNameType = superColumnNameType;
ColumnNameType = columnNameType;
@@ -50,10 +50,10 @@ public CassandraColumnFamilySchema(string name = null, ColumnType type = ColumnT
FamilyDescription = null;
KeyName = DefaultKeyName;
- KeyType = typeof(BytesType);
- SuperColumnNameType = type == ColumnType.Super ? typeof(BytesType) : null;
- ColumnNameType = typeof(BytesType);
- DefaultColumnValueType = typeof(BytesType);
+ KeyType = CassandraType.BytesType;
+ SuperColumnNameType = type == ColumnType.Super ? CassandraType.BytesType : null;
+ ColumnNameType = CassandraType.BytesType;
+ DefaultColumnValueType = CassandraType.BytesType;
Columns = new List<CassandraColumnSchema>();
}
@@ -62,11 +62,11 @@ public CassandraColumnFamilySchema(string name = null, ColumnType type = ColumnT
public string FamilyName { get; set; }
public string FamilyDescription { get; set; }
- public CassandraType KeyName { get; set; }
- public Type KeyType { get; set; }
- public Type SuperColumnNameType { get; set; }
- public Type ColumnNameType { get; set; }
- public Type DefaultColumnValueType { get; set; }
+ public CassandraObject KeyName { get; set; }
+ public CassandraType KeyType { get; set; }
+ public CassandraType SuperColumnNameType { get; set; }
+ public CassandraType ColumnNameType { get; set; }
+ public CassandraType DefaultColumnValueType { get; set; }
public IList<CassandraColumnSchema> Columns { get; set; }
}
@@ -8,29 +8,28 @@ public class CassandraColumnSchema
{
public CassandraColumnSchema()
{
- NameType = typeof(BytesType);
- ValueType = typeof(BytesType);
+ NameType = CassandraType.BytesType;
+ ValueType = CassandraType.BytesType;
}
- public CassandraColumnSchema(ColumnDef def, Type columnNameType)
+ public CassandraColumnSchema(ColumnDef def, CassandraType columnNameType)
{
NameType = columnNameType;
Name = def.Name;
- ValueType = CassandraType.GetCassandraType(def.Validation_class);
+ ValueType = CassandraObject.ParseType(def.Validation_class);
}
- private CassandraType _name;
-
- public CassandraType Name
+ private CassandraObject _name;
+ public CassandraObject Name
{
get { return _name; }
set
{
- _name = (CassandraType)value.GetValue(NameType);
+ _name = (CassandraObject)value.GetValue(NameType);
}
}
- public Type NameType { get; set; }
- public Type ValueType { get; set; }
+ public CassandraType NameType { get; set; }
+ public CassandraType ValueType { get; set; }
}
}
@@ -83,7 +83,7 @@ public CassandraColumnFamily GetSuperColumnFamily(string columnFamily)
/// <returns></returns>
[Obsolete("Use \"GetColumnFamily\" with out generic parameters")]
public CassandraColumnFamily<CompareWith> GetColumnFamily<CompareWith>(string columnFamily)
- where CompareWith : CassandraType
+ where CompareWith : CassandraObject
{
return new CassandraColumnFamily<CompareWith>(this, columnFamily);
}
@@ -97,16 +97,16 @@ public CassandraColumnFamily<CompareWith> GetColumnFamily<CompareWith>(string co
/// <returns></returns>
[Obsolete("Use \"GetSuperColumnFamily\" with out generic parameters")]
public CassandraSuperColumnFamily<CompareWith, CompareSubcolumnWith> GetColumnFamily<CompareWith, CompareSubcolumnWith>(string columnFamily)
- where CompareWith : CassandraType
- where CompareSubcolumnWith : CassandraType
+ where CompareWith : CassandraObject
+ where CompareSubcolumnWith : CassandraObject
{
return new CassandraSuperColumnFamily<CompareWith, CompareSubcolumnWith>(this, columnFamily);
}
/// <summary>
///
/// </summary>
- public CassandraKeyspace Keyspace { get; private set; }
+ public CassandraKeyspace Keyspace { get; set; }
#region Cassandra System For Server
Oops, something went wrong. Retry.

0 comments on commit d576460

Please sign in to comment.