Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated thrift interface to cassandra 1.1.1

  • Loading branch information...
commit 907160a7edb7b5136b3a9e18946656470763df36 1 parent 5525512
@nberardi nberardi authored
View
160 FluentCassandra_All.sln
@@ -0,0 +1,160 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra", "src\FluentCassandra.csproj", "{EAA32600-3C2A-4B34-B9B2-5764F280FCE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.Sandbox", "test\FluentCassandra.Sandbox\FluentCassandra.Sandbox.csproj", "{DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{53AE6E93-92B4-4D33-9BE5-3CE59C1A2AD6}"
+ ProjectSection(SolutionItems) = preProject
+ FluentCassandra.msbuild = FluentCassandra.msbuild
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BF5D399F-A637-4DE2-980F-1CF057A6953C}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1A88B962-9A09-4692-80D3-E88712A9E516}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.StressTest", "test\FluentCassandra.StressTest\FluentCassandra.StressTest.csproj", "{AC3818E2-E260-4193-A3D1-6E3FF87383F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.Tests", "test\FluentCassandra.Tests\FluentCassandra.Tests.csproj", "{9DAF7022-5820-4214-B13E-AC0A1B37691F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{AC1223D1-1638-4DEB-9CFF-8B0C43854BB0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentCassandra.LinqPad", "utility\FluentCassandra.LinqPad\FluentCassandra.LinqPad.csproj", "{CACA3463-BBEE-4C7E-AC89-49240B0D8F46}"
+EndProject
+Global
+ GlobalSection(TestCaseManagementSettings) = postSolution
+ CategoryFile = FluentCassandra.vsmdi
+ EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|x86.ActiveCfg = Release|Any CPU
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|x86.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|x86.Build.0 = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Any CPU.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Mixed Platforms.Build.0 = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|x86.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|x86.Build.0 = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|x86.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|x86.Build.0 = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Any CPU.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Mixed Platforms.Build.0 = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|x86.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|x86.Build.0 = Release|x86
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F}.Release|x86.ActiveCfg = Release|Any CPU
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|x86.ActiveCfg = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Debug|x86.Build.0 = Debug|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Any CPU.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|Mixed Platforms.Build.0 = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|x86.ActiveCfg = Release|x86
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6}.Release|x86.Build.0 = Release|x86
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|x86.ActiveCfg = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Debug|x86.Build.0 = Debug|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Any CPU.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|Mixed Platforms.Build.0 = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|x86.ActiveCfg = Release|x86
+ {DE6B46DE-C37A-49AF-8B9A-B9B6D4F03A55}.Release|x86.Build.0 = Release|x86
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EAA32600-3C2A-4B34-B9B2-5764F280FCE3}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {AC3818E2-E260-4193-A3D1-6E3FF87383F6} = {1A88B962-9A09-4692-80D3-E88712A9E516}
+ {9DAF7022-5820-4214-B13E-AC0A1B37691F} = {1A88B962-9A09-4692-80D3-E88712A9E516}
+ {CACA3463-BBEE-4C7E-AC89-49240B0D8F46} = {AC1223D1-1638-4DEB-9CFF-8B0C43854BB0}
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = test\FluentCassandra.Sandbox\FluentCassandra.Sandbox.csproj
+ Policies = $0
+ $0.DotNetNamingPolicy = $1
+ $1.DirectoryNamespaceAssociation = None
+ $1.ResourceNamePolicy = FileFormatDefault
+ $0.TextStylePolicy = $2
+ $2.inheritsSet = null
+ $2.scope = text/x-csharp
+ $0.CSharpFormattingPolicy = $3
+ $3.inheritsSet = Mono
+ $3.inheritsScope = text/x-csharp
+ $3.scope = text/x-csharp
+ $0.StandardHeader = $4
+ $4.Text =
+ $4.IncludeInNewFiles = True
+ $0.VersionControlPolicy = $5
+ $5.inheritsSet = Mono
+ $0.ChangeLogPolicy = $6
+ $6.UpdateMode = None
+ $6.MessageStyle = $7
+ $7.LineAlign = 0
+ $6.inheritsSet = Mono
+ version = 1.0.0
+ EndGlobalSection
+ GlobalSection(TestCaseManagementSettings) = postSolution
+ CategoryFile = FluentCassandra.vsmdi
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
View
536 src/Apache/Cassandra/Cassandra.cs
@@ -38,6 +38,7 @@ public interface Iface {
string describe_cluster_name();
string describe_version();
List<TokenRange> describe_ring(string keyspace);
+ Dictionary<string, string> describe_token_map();
string describe_partitioner();
string describe_snitch();
KsDef describe_keyspace(string keyspace);
@@ -926,6 +927,41 @@ public List<TokenRange> recv_describe_ring()
throw new TApplicationException(TApplicationException.ExceptionType.MissingResult, "describe_ring failed: unknown result");
}
+ public Dictionary<string, string> describe_token_map()
+ {
+ send_describe_token_map();
+ return recv_describe_token_map();
+ }
+
+ public void send_describe_token_map()
+ {
+ oprot_.WriteMessageBegin(new TMessage("describe_token_map", TMessageType.Call, seqid_));
+ describe_token_map_args args = new describe_token_map_args();
+ args.Write(oprot_);
+ oprot_.WriteMessageEnd();
+ oprot_.Transport.Flush();
+ }
+
+ public Dictionary<string, string> recv_describe_token_map()
+ {
+ TMessage msg = iprot_.ReadMessageBegin();
+ if (msg.Type == TMessageType.Exception) {
+ TApplicationException x = TApplicationException.Read(iprot_);
+ iprot_.ReadMessageEnd();
+ throw x;
+ }
+ describe_token_map_result result = new describe_token_map_result();
+ result.Read(iprot_);
+ iprot_.ReadMessageEnd();
+ if (result.__isset.success) {
+ return result.Success;
+ }
+ if (result.__isset.ire) {
+ throw result.Ire;
+ }
+ throw new TApplicationException(TApplicationException.ExceptionType.MissingResult, "describe_token_map failed: unknown result");
+ }
+
public string describe_partitioner()
{
send_describe_partitioner();
@@ -1490,6 +1526,7 @@ public Processor(Iface iface)
processMap_["describe_cluster_name"] = describe_cluster_name_Process;
processMap_["describe_version"] = describe_version_Process;
processMap_["describe_ring"] = describe_ring_Process;
+ processMap_["describe_token_map"] = describe_token_map_Process;
processMap_["describe_partitioner"] = describe_partitioner_Process;
processMap_["describe_snitch"] = describe_snitch_Process;
processMap_["describe_keyspace"] = describe_keyspace_Process;
@@ -1945,6 +1982,23 @@ public void describe_ring_Process(int seqid, TProtocol iprot, TProtocol oprot)
oprot.Transport.Flush();
}
+ public void describe_token_map_Process(int seqid, TProtocol iprot, TProtocol oprot)
+ {
+ describe_token_map_args args = new describe_token_map_args();
+ args.Read(iprot);
+ iprot.ReadMessageEnd();
+ describe_token_map_result result = new describe_token_map_result();
+ try {
+ result.Success = iface_.describe_token_map();
+ } catch (InvalidRequestException ire) {
+ result.Ire = ire;
+ }
+ oprot.WriteMessageBegin(new TMessage("describe_token_map", TMessageType.Reply, seqid));
+ result.Write(oprot);
+ oprot.WriteMessageEnd();
+ oprot.Transport.Flush();
+ }
+
public void describe_partitioner_Process(int seqid, TProtocol iprot, TProtocol oprot)
{
describe_partitioner_args args = new describe_partitioner_args();
@@ -3222,13 +3276,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<ColumnOrSuperColumn>();
- TList _list91 = iprot.ReadListBegin();
- for( int _i92 = 0; _i92 < _list91.Count; ++_i92)
+ TList _list95 = iprot.ReadListBegin();
+ for( int _i96 = 0; _i96 < _list95.Count; ++_i96)
{
- ColumnOrSuperColumn _elem93 = new ColumnOrSuperColumn();
- _elem93 = new ColumnOrSuperColumn();
- _elem93.Read(iprot);
- Success.Add(_elem93);
+ ColumnOrSuperColumn _elem97 = new ColumnOrSuperColumn();
+ _elem97 = new ColumnOrSuperColumn();
+ _elem97.Read(iprot);
+ Success.Add(_elem97);
}
iprot.ReadListEnd();
}
@@ -3282,9 +3336,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (ColumnOrSuperColumn _iter94 in Success)
+ foreach (ColumnOrSuperColumn _iter98 in Success)
{
- _iter94.Write(oprot);
+ _iter98.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -3797,12 +3851,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Keys = new List<byte[]>();
- TList _list95 = iprot.ReadListBegin();
- for( int _i96 = 0; _i96 < _list95.Count; ++_i96)
+ TList _list99 = iprot.ReadListBegin();
+ for( int _i100 = 0; _i100 < _list99.Count; ++_i100)
{
- byte[] _elem97 = null;
- _elem97 = iprot.ReadBinary();
- Keys.Add(_elem97);
+ byte[] _elem101 = null;
+ _elem101 = iprot.ReadBinary();
+ Keys.Add(_elem101);
}
iprot.ReadListEnd();
}
@@ -3853,9 +3907,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.String, Keys.Count));
- foreach (byte[] _iter98 in Keys)
+ foreach (byte[] _iter102 in Keys)
{
- oprot.WriteBinary(_iter98);
+ oprot.WriteBinary(_iter102);
}
oprot.WriteListEnd();
}
@@ -3995,25 +4049,25 @@ public void Read (TProtocol iprot)
if (field.Type == TType.Map) {
{
Success = new Dictionary<byte[], List<ColumnOrSuperColumn>>();
- TMap _map99 = iprot.ReadMapBegin();
- for( int _i100 = 0; _i100 < _map99.Count; ++_i100)
+ TMap _map103 = iprot.ReadMapBegin();
+ for( int _i104 = 0; _i104 < _map103.Count; ++_i104)
{
- byte[] _key101;
- List<ColumnOrSuperColumn> _val102;
- _key101 = iprot.ReadBinary();
+ byte[] _key105;
+ List<ColumnOrSuperColumn> _val106;
+ _key105 = iprot.ReadBinary();
{
- _val102 = new List<ColumnOrSuperColumn>();
- TList _list103 = iprot.ReadListBegin();
- for( int _i104 = 0; _i104 < _list103.Count; ++_i104)
+ _val106 = new List<ColumnOrSuperColumn>();
+ TList _list107 = iprot.ReadListBegin();
+ for( int _i108 = 0; _i108 < _list107.Count; ++_i108)
{
- ColumnOrSuperColumn _elem105 = new ColumnOrSuperColumn();
- _elem105 = new ColumnOrSuperColumn();
- _elem105.Read(iprot);
- _val102.Add(_elem105);
+ ColumnOrSuperColumn _elem109 = new ColumnOrSuperColumn();
+ _elem109 = new ColumnOrSuperColumn();
+ _elem109.Read(iprot);
+ _val106.Add(_elem109);
}
iprot.ReadListEnd();
}
- Success[_key101] = _val102;
+ Success[_key105] = _val106;
}
iprot.ReadMapEnd();
}
@@ -4067,14 +4121,14 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteMapBegin(new TMap(TType.String, TType.List, Success.Count));
- foreach (byte[] _iter106 in Success.Keys)
+ foreach (byte[] _iter110 in Success.Keys)
{
- oprot.WriteBinary(_iter106);
+ oprot.WriteBinary(_iter110);
{
- oprot.WriteListBegin(new TList(TType.Struct, Success[_iter106].Count));
- foreach (ColumnOrSuperColumn _iter107 in Success[_iter106])
+ oprot.WriteListBegin(new TList(TType.Struct, Success[_iter110].Count));
+ foreach (ColumnOrSuperColumn _iter111 in Success[_iter110])
{
- _iter107.Write(oprot);
+ _iter111.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -4222,12 +4276,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Keys = new List<byte[]>();
- TList _list108 = iprot.ReadListBegin();
- for( int _i109 = 0; _i109 < _list108.Count; ++_i109)
+ TList _list112 = iprot.ReadListBegin();
+ for( int _i113 = 0; _i113 < _list112.Count; ++_i113)
{
- byte[] _elem110 = null;
- _elem110 = iprot.ReadBinary();
- Keys.Add(_elem110);
+ byte[] _elem114 = null;
+ _elem114 = iprot.ReadBinary();
+ Keys.Add(_elem114);
}
iprot.ReadListEnd();
}
@@ -4278,9 +4332,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.String, Keys.Count));
- foreach (byte[] _iter111 in Keys)
+ foreach (byte[] _iter115 in Keys)
{
- oprot.WriteBinary(_iter111);
+ oprot.WriteBinary(_iter115);
}
oprot.WriteListEnd();
}
@@ -4420,14 +4474,14 @@ public void Read (TProtocol iprot)
if (field.Type == TType.Map) {
{
Success = new Dictionary<byte[], int>();
- TMap _map112 = iprot.ReadMapBegin();
- for( int _i113 = 0; _i113 < _map112.Count; ++_i113)
+ TMap _map116 = iprot.ReadMapBegin();
+ for( int _i117 = 0; _i117 < _map116.Count; ++_i117)
{
- byte[] _key114;
- int _val115;
- _key114 = iprot.ReadBinary();
- _val115 = iprot.ReadI32();
- Success[_key114] = _val115;
+ byte[] _key118;
+ int _val119;
+ _key118 = iprot.ReadBinary();
+ _val119 = iprot.ReadI32();
+ Success[_key118] = _val119;
}
iprot.ReadMapEnd();
}
@@ -4481,10 +4535,10 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteMapBegin(new TMap(TType.String, TType.I32, Success.Count));
- foreach (byte[] _iter116 in Success.Keys)
+ foreach (byte[] _iter120 in Success.Keys)
{
- oprot.WriteBinary(_iter116);
- oprot.WriteI32(Success[_iter116]);
+ oprot.WriteBinary(_iter120);
+ oprot.WriteI32(Success[_iter120]);
}
oprot.WriteMapEnd();
}
@@ -4811,13 +4865,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<KeySlice>();
- TList _list117 = iprot.ReadListBegin();
- for( int _i118 = 0; _i118 < _list117.Count; ++_i118)
+ TList _list121 = iprot.ReadListBegin();
+ for( int _i122 = 0; _i122 < _list121.Count; ++_i122)
{
- KeySlice _elem119 = new KeySlice();
- _elem119 = new KeySlice();
- _elem119.Read(iprot);
- Success.Add(_elem119);
+ KeySlice _elem123 = new KeySlice();
+ _elem123 = new KeySlice();
+ _elem123.Read(iprot);
+ Success.Add(_elem123);
}
iprot.ReadListEnd();
}
@@ -4871,9 +4925,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (KeySlice _iter120 in Success)
+ foreach (KeySlice _iter124 in Success)
{
- _iter120.Write(oprot);
+ _iter124.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -5198,13 +5252,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<KeySlice>();
- TList _list121 = iprot.ReadListBegin();
- for( int _i122 = 0; _i122 < _list121.Count; ++_i122)
+ TList _list125 = iprot.ReadListBegin();
+ for( int _i126 = 0; _i126 < _list125.Count; ++_i126)
{
- KeySlice _elem123 = new KeySlice();
- _elem123 = new KeySlice();
- _elem123.Read(iprot);
- Success.Add(_elem123);
+ KeySlice _elem127 = new KeySlice();
+ _elem127 = new KeySlice();
+ _elem127.Read(iprot);
+ Success.Add(_elem127);
}
iprot.ReadListEnd();
}
@@ -5258,9 +5312,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (KeySlice _iter124 in Success)
+ foreach (KeySlice _iter128 in Success)
{
- _iter124.Write(oprot);
+ _iter128.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -5587,13 +5641,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<KeySlice>();
- TList _list125 = iprot.ReadListBegin();
- for( int _i126 = 0; _i126 < _list125.Count; ++_i126)
+ TList _list129 = iprot.ReadListBegin();
+ for( int _i130 = 0; _i130 < _list129.Count; ++_i130)
{
- KeySlice _elem127 = new KeySlice();
- _elem127 = new KeySlice();
- _elem127.Read(iprot);
- Success.Add(_elem127);
+ KeySlice _elem131 = new KeySlice();
+ _elem131 = new KeySlice();
+ _elem131.Read(iprot);
+ Success.Add(_elem131);
}
iprot.ReadListEnd();
}
@@ -5647,9 +5701,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (KeySlice _iter128 in Success)
+ foreach (KeySlice _iter132 in Success)
{
- _iter128.Write(oprot);
+ _iter132.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -7078,37 +7132,37 @@ public void Read (TProtocol iprot)
if (field.Type == TType.Map) {
{
Mutation_map = new Dictionary<byte[], Dictionary<string, List<Mutation>>>();
- TMap _map129 = iprot.ReadMapBegin();
- for( int _i130 = 0; _i130 < _map129.Count; ++_i130)
+ TMap _map133 = iprot.ReadMapBegin();
+ for( int _i134 = 0; _i134 < _map133.Count; ++_i134)
{
- byte[] _key131;
- Dictionary<string, List<Mutation>> _val132;
- _key131 = iprot.ReadBinary();
+ byte[] _key135;
+ Dictionary<string, List<Mutation>> _val136;
+ _key135 = iprot.ReadBinary();
{
- _val132 = new Dictionary<string, List<Mutation>>();
- TMap _map133 = iprot.ReadMapBegin();
- for( int _i134 = 0; _i134 < _map133.Count; ++_i134)
+ _val136 = new Dictionary<string, List<Mutation>>();
+ TMap _map137 = iprot.ReadMapBegin();
+ for( int _i138 = 0; _i138 < _map137.Count; ++_i138)
{
- string _key135;
- List<Mutation> _val136;
- _key135 = iprot.ReadString();
+ string _key139;
+ List<Mutation> _val140;
+ _key139 = iprot.ReadString();
{
- _val136 = new List<Mutation>();
- TList _list137 = iprot.ReadListBegin();
- for( int _i138 = 0; _i138 < _list137.Count; ++_i138)
+ _val140 = new List<Mutation>();
+ TList _list141 = iprot.ReadListBegin();
+ for( int _i142 = 0; _i142 < _list141.Count; ++_i142)
{
- Mutation _elem139 = new Mutation();
- _elem139 = new Mutation();
- _elem139.Read(iprot);
- _val136.Add(_elem139);
+ Mutation _elem143 = new Mutation();
+ _elem143 = new Mutation();
+ _elem143.Read(iprot);
+ _val140.Add(_elem143);
}
iprot.ReadListEnd();
}
- _val132[_key135] = _val136;
+ _val136[_key139] = _val140;
}
iprot.ReadMapEnd();
}
- Mutation_map[_key131] = _val132;
+ Mutation_map[_key135] = _val136;
}
iprot.ReadMapEnd();
}
@@ -7143,19 +7197,19 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteMapBegin(new TMap(TType.String, TType.Map, Mutation_map.Count));
- foreach (byte[] _iter140 in Mutation_map.Keys)
+ foreach (byte[] _iter144 in Mutation_map.Keys)
{
- oprot.WriteBinary(_iter140);
+ oprot.WriteBinary(_iter144);
{
- oprot.WriteMapBegin(new TMap(TType.String, TType.List, Mutation_map[_iter140].Count));
- foreach (string _iter141 in Mutation_map[_iter140].Keys)
+ oprot.WriteMapBegin(new TMap(TType.String, TType.List, Mutation_map[_iter144].Count));
+ foreach (string _iter145 in Mutation_map[_iter144].Keys)
{
- oprot.WriteString(_iter141);
+ oprot.WriteString(_iter145);
{
- oprot.WriteListBegin(new TList(TType.Struct, Mutation_map[_iter140][_iter141].Count));
- foreach (Mutation _iter142 in Mutation_map[_iter140][_iter141])
+ oprot.WriteListBegin(new TList(TType.Struct, Mutation_map[_iter144][_iter145].Count));
+ foreach (Mutation _iter146 in Mutation_map[_iter144][_iter145])
{
- _iter142.Write(oprot);
+ _iter146.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -7688,24 +7742,24 @@ public void Read (TProtocol iprot)
if (field.Type == TType.Map) {
{
Success = new Dictionary<string, List<string>>();
- TMap _map143 = iprot.ReadMapBegin();
- for( int _i144 = 0; _i144 < _map143.Count; ++_i144)
+ TMap _map147 = iprot.ReadMapBegin();
+ for( int _i148 = 0; _i148 < _map147.Count; ++_i148)
{
- string _key145;
- List<string> _val146;
- _key145 = iprot.ReadString();
+ string _key149;
+ List<string> _val150;
+ _key149 = iprot.ReadString();
{
- _val146 = new List<string>();
- TList _list147 = iprot.ReadListBegin();
- for( int _i148 = 0; _i148 < _list147.Count; ++_i148)
+ _val150 = new List<string>();
+ TList _list151 = iprot.ReadListBegin();
+ for( int _i152 = 0; _i152 < _list151.Count; ++_i152)
{
- string _elem149 = null;
- _elem149 = iprot.ReadString();
- _val146.Add(_elem149);
+ string _elem153 = null;
+ _elem153 = iprot.ReadString();
+ _val150.Add(_elem153);
}
iprot.ReadListEnd();
}
- Success[_key145] = _val146;
+ Success[_key149] = _val150;
}
iprot.ReadMapEnd();
}
@@ -7743,14 +7797,14 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteMapBegin(new TMap(TType.String, TType.List, Success.Count));
- foreach (string _iter150 in Success.Keys)
+ foreach (string _iter154 in Success.Keys)
{
- oprot.WriteString(_iter150);
+ oprot.WriteString(_iter154);
{
- oprot.WriteListBegin(new TList(TType.String, Success[_iter150].Count));
- foreach (string _iter151 in Success[_iter150])
+ oprot.WriteListBegin(new TList(TType.String, Success[_iter154].Count));
+ foreach (string _iter155 in Success[_iter154])
{
- oprot.WriteString(_iter151);
+ oprot.WriteString(_iter155);
}
oprot.WriteListEnd();
}
@@ -7889,13 +7943,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<KsDef>();
- TList _list152 = iprot.ReadListBegin();
- for( int _i153 = 0; _i153 < _list152.Count; ++_i153)
+ TList _list156 = iprot.ReadListBegin();
+ for( int _i157 = 0; _i157 < _list156.Count; ++_i157)
{
- KsDef _elem154 = new KsDef();
- _elem154 = new KsDef();
- _elem154.Read(iprot);
- Success.Add(_elem154);
+ KsDef _elem158 = new KsDef();
+ _elem158 = new KsDef();
+ _elem158.Read(iprot);
+ Success.Add(_elem158);
}
iprot.ReadListEnd();
}
@@ -7933,9 +7987,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (KsDef _iter155 in Success)
+ foreach (KsDef _iter159 in Success)
{
- _iter155.Write(oprot);
+ _iter159.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -8370,13 +8424,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<TokenRange>();
- TList _list156 = iprot.ReadListBegin();
- for( int _i157 = 0; _i157 < _list156.Count; ++_i157)
+ TList _list160 = iprot.ReadListBegin();
+ for( int _i161 = 0; _i161 < _list160.Count; ++_i161)
{
- TokenRange _elem158 = new TokenRange();
- _elem158 = new TokenRange();
- _elem158.Read(iprot);
- Success.Add(_elem158);
+ TokenRange _elem162 = new TokenRange();
+ _elem162 = new TokenRange();
+ _elem162.Read(iprot);
+ Success.Add(_elem162);
}
iprot.ReadListEnd();
}
@@ -8414,9 +8468,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, Success.Count));
- foreach (TokenRange _iter159 in Success)
+ foreach (TokenRange _iter163 in Success)
{
- _iter159.Write(oprot);
+ _iter163.Write(oprot);
}
oprot.WriteListEnd();
}
@@ -8450,6 +8504,190 @@ public void Read (TProtocol iprot)
[Serializable]
+ public partial class describe_token_map_args : TBase
+ {
+
+ public describe_token_map_args() {
+ }
+
+ public void Read (TProtocol iprot)
+ {
+ TField field;
+ iprot.ReadStructBegin();
+ while (true)
+ {
+ field = iprot.ReadFieldBegin();
+ if (field.Type == TType.Stop) {
+ break;
+ }
+ switch (field.ID)
+ {
+ default:
+ TProtocolUtil.Skip(iprot, field.Type);
+ break;
+ }
+ iprot.ReadFieldEnd();
+ }
+ iprot.ReadStructEnd();
+ }
+
+ public void Write(TProtocol oprot) {
+ TStruct struc = new TStruct("describe_token_map_args");
+ oprot.WriteStructBegin(struc);
+ oprot.WriteFieldStop();
+ oprot.WriteStructEnd();
+ }
+
+ public override string ToString() {
+ StringBuilder sb = new StringBuilder("describe_token_map_args(");
+ sb.Append(")");
+ return sb.ToString();
+ }
+
+ }
+
+
+ [Serializable]
+ public partial class describe_token_map_result : TBase
+ {
+ private Dictionary<string, string> _success;
+ private InvalidRequestException _ire;
+
+ public Dictionary<string, string> Success
+ {
+ get
+ {
+ return _success;
+ }
+ set
+ {
+ __isset.success = true;
+ this._success = value;
+ }
+ }
+
+ public InvalidRequestException Ire
+ {
+ get
+ {
+ return _ire;
+ }
+ set
+ {
+ __isset.ire = true;
+ this._ire = value;
+ }
+ }
+
+
+ public Isset __isset;
+ [Serializable]
+ public struct Isset {
+ public bool success;
+ public bool ire;
+ }
+
+ public describe_token_map_result() {
+ }
+
+ public void Read (TProtocol iprot)
+ {
+ TField field;
+ iprot.ReadStructBegin();
+ while (true)
+ {
+ field = iprot.ReadFieldBegin();
+ if (field.Type == TType.Stop) {
+ break;
+ }
+ switch (field.ID)
+ {
+ case 0:
+ if (field.Type == TType.Map) {
+ {
+ Success = new Dictionary<string, string>();
+ TMap _map164 = iprot.ReadMapBegin();
+ for( int _i165 = 0; _i165 < _map164.Count; ++_i165)
+ {
+ string _key166;
+ string _val167;
+ _key166 = iprot.ReadString();
+ _val167 = iprot.ReadString();
+ Success[_key166] = _val167;
+ }
+ iprot.ReadMapEnd();
+ }
+ } else {
+ TProtocolUtil.Skip(iprot, field.Type);
+ }
+ break;
+ case 1:
+ if (field.Type == TType.Struct) {
+ Ire = new InvalidRequestException();
+ Ire.Read(iprot);
+ } else {
+ TProtocolUtil.Skip(iprot, field.Type);
+ }
+ break;
+ default:
+ TProtocolUtil.Skip(iprot, field.Type);
+ break;
+ }
+ iprot.ReadFieldEnd();
+ }
+ iprot.ReadStructEnd();
+ }
+
+ public void Write(TProtocol oprot) {
+ TStruct struc = new TStruct("describe_token_map_result");
+ oprot.WriteStructBegin(struc);
+ TField field = new TField();
+
+ if (this.__isset.success) {
+ if (Success != null) {
+ field.Name = "Success";
+ field.Type = TType.Map;
+ field.ID = 0;
+ oprot.WriteFieldBegin(field);
+ {
+ oprot.WriteMapBegin(new TMap(TType.String, TType.String, Success.Count));
+ foreach (string _iter168 in Success.Keys)
+ {
+ oprot.WriteString(_iter168);
+ oprot.WriteString(Success[_iter168]);
+ }
+ oprot.WriteMapEnd();
+ }
+ oprot.WriteFieldEnd();
+ }
+ } else if (this.__isset.ire) {
+ if (Ire != null) {
+ field.Name = "Ire";
+ field.Type = TType.Struct;
+ field.ID = 1;
+ oprot.WriteFieldBegin(field);
+ Ire.Write(oprot);
+ oprot.WriteFieldEnd();
+ }
+ }
+ oprot.WriteFieldStop();
+ oprot.WriteStructEnd();
+ }
+
+ public override string ToString() {
+ StringBuilder sb = new StringBuilder("describe_token_map_result(");
+ sb.Append("Success: ");
+ sb.Append(Success);
+ sb.Append(",Ire: ");
+ sb.Append(Ire== null ? "<null>" : Ire.ToString());
+ sb.Append(")");
+ return sb.ToString();
+ }
+
+ }
+
+
+ [Serializable]
public partial class describe_partitioner_args : TBase
{
@@ -9185,12 +9423,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Success = new List<string>();
- TList _list160 = iprot.ReadListBegin();
- for( int _i161 = 0; _i161 < _list160.Count; ++_i161)
+ TList _list169 = iprot.ReadListBegin();
+ for( int _i170 = 0; _i170 < _list169.Count; ++_i170)
{
- string _elem162 = null;
- _elem162 = iprot.ReadString();
- Success.Add(_elem162);
+ string _elem171 = null;
+ _elem171 = iprot.ReadString();
+ Success.Add(_elem171);
}
iprot.ReadListEnd();
}
@@ -9228,9 +9466,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.String, Success.Count));
- foreach (string _iter163 in Success)
+ foreach (string _iter172 in Success)
{
- oprot.WriteString(_iter163);
+ oprot.WriteString(_iter172);
}
oprot.WriteListEnd();
}
@@ -11329,12 +11567,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
Values = new List<byte[]>();
- TList _list164 = iprot.ReadListBegin();
- for( int _i165 = 0; _i165 < _list164.Count; ++_i165)
+ TList _list173 = iprot.ReadListBegin();
+ for( int _i174 = 0; _i174 < _list173.Count; ++_i174)
{
- byte[] _elem166 = null;
- _elem166 = iprot.ReadBinary();
- Values.Add(_elem166);
+ byte[] _elem175 = null;
+ _elem175 = iprot.ReadBinary();
+ Values.Add(_elem175);
}
iprot.ReadListEnd();
}
@@ -11370,9 +11608,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.String, Values.Count));
- foreach (byte[] _iter167 in Values)
+ foreach (byte[] _iter176 in Values)
{
- oprot.WriteBinary(_iter167);
+ oprot.WriteBinary(_iter176);
}
oprot.WriteListEnd();
}
View
2  src/Apache/Cassandra/Constants.cs
@@ -16,6 +16,6 @@ namespace Apache.Cassandra
{
public class Constants
{
- public static string VERSION = "19.30.0";
+ public static string VERSION = "19.32.0";
}
}
View
53 src/Apache/Cassandra/CqlPreparedResult.cs
@@ -22,6 +22,7 @@ public partial class CqlPreparedResult : TBase
private int _itemId;
private int _count;
private List<string> _variable_types;
+ private List<string> _variable_names;
public int ItemId
{
@@ -62,6 +63,19 @@ public List<string> Variable_types
}
}
+ public List<string> Variable_names
+ {
+ get
+ {
+ return _variable_names;
+ }
+ set
+ {
+ __isset.variable_names = true;
+ this._variable_names = value;
+ }
+ }
+
public Isset __isset;
[Serializable]
@@ -69,6 +83,7 @@ public struct Isset {
public bool itemId;
public bool count;
public bool variable_types;
+ public bool variable_names;
}
public CqlPreparedResult() {
@@ -117,6 +132,23 @@ public void Read (TProtocol iprot)
TProtocolUtil.Skip(iprot, field.Type);
}
break;
+ case 4:
+ if (field.Type == TType.List) {
+ {
+ Variable_names = new List<string>();
+ TList _list90 = iprot.ReadListBegin();
+ for( int _i91 = 0; _i91 < _list90.Count; ++_i91)
+ {
+ string _elem92 = null;
+ _elem92 = iprot.ReadString();
+ Variable_names.Add(_elem92);
+ }
+ iprot.ReadListEnd();
+ }
+ } else {
+ TProtocolUtil.Skip(iprot, field.Type);
+ }
+ break;
default:
TProtocolUtil.Skip(iprot, field.Type);
break;
@@ -153,9 +185,24 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.String, Variable_types.Count));
- foreach (string _iter90 in Variable_types)
+ foreach (string _iter93 in Variable_types)
+ {
+ oprot.WriteString(_iter93);
+ }
+ oprot.WriteListEnd();
+ }
+ oprot.WriteFieldEnd();
+ }
+ if (Variable_names != null && __isset.variable_names) {
+ field.Name = "variable_names";
+ field.Type = TType.List;
+ field.ID = 4;
+ oprot.WriteFieldBegin(field);
+ {
+ oprot.WriteListBegin(new TList(TType.String, Variable_names.Count));
+ foreach (string _iter94 in Variable_names)
{
- oprot.WriteString(_iter90);
+ oprot.WriteString(_iter94);
}
oprot.WriteListEnd();
}
@@ -173,6 +220,8 @@ public void Read (TProtocol iprot)
sb.Append(Count);
sb.Append(",Variable_types: ");
sb.Append(Variable_types);
+ sb.Append(",Variable_names: ");
+ sb.Append(Variable_names);
sb.Append(")");
return sb.ToString();
}
View
2  test/FluentCassandra.Tests/CassandraDatabaseSetup.cs
@@ -44,7 +44,7 @@ public CassandraDatabaseSetup(bool reset = false)
{
ConnectionBuilder = new ConnectionBuilder(keyspace: Keyspace, server: Server);
DB = new CassandraContext(ConnectionBuilder);
-
+
var exists = DB.KeyspaceExists(Keyspace);
Family = DB.GetColumnFamily<AsciiType>("Standard");
Please sign in to comment.
Something went wrong with that request. Please try again.