CSHARP-1019: Add support for C* 4.1, DSE 6.9.x, and HCD releases to CI

Jenkinsfile

@@ -129,13 +129,26 @@ CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibilit
 CCM_VERSION=${DSE_FIXED_VERSION}
 CCM_SERVER_TYPE=dse
 DSE_VERSION=${DSE_FIXED_VERSION}
-CCM_IS_DSE=true
+CCM_DISTRIBUTION=dse
+CASSANDRA_VERSION=${DSE_FIXED_VERSION}
 CCM_BRANCH=${DSE_FIXED_VERSION}
 DSE_BRANCH=${DSE_FIXED_VERSION}
 JDK=1.8
 ENVIRONMENT_EOF
  '''
  }
+
+ if (env.SERVER_VERSION.split('-')[0] == 'hcd') {
+ env.HCD_FIXED_VERSION = env.SERVER_VERSION.split('-')[1]
+ sh label: 'Update environment for HCD', script: '''#!/bin/bash -le
+ cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF
+CCM_PATH=${HOME}/ccm
+CCM_CASSANDRA_VERSION=${HCD_FIXED_VERSION} # maintain for backwards compatibility
+CASSANDRA_VERSION=${HCD_FIXED_VERSION}
+CCM_DISTRIBUTION=hcd
+ENVIRONMENT_EOF
+ '''
+ }
 
  if (env.SERVER_VERSION == env.SERVER_VERSION_SNI && env.DOTNET_VERSION != 'mono') {
  sh label: 'Update environment for SNI proxy tests', script: '''#!/bin/bash -le
@@ -435,10 +448,13 @@ pipeline {
  values '3.0', // latest 3.0.x Apache Cassandra�
  '3.11', // latest 3.11.x Apache Cassandra�
  '4.0', // latest 4.0.x Apache Cassandra�
- '5.0-beta1', // Development Apache Cassandra�
+ '4.1',
+ '5.0', // Development Apache Cassandra�
  'dse-5.1.35', // latest 5.1.x DataStax Enterprise
  'dse-6.7.17', // latest 6.7.x DataStax Enterprise
- 'dse-6.8.30' // 6.8 current DataStax Enterprise
+ 'dse-6.8.30', // 6.8 current DataStax Enterprise
+ 'dse-6.9.3',
+ 'hcd-1.0.0'
  }
  axis {
  name 'DOTNET_VERSION'

src/Cassandra.IntegrationTests/Core/ParameterizedStatementsTests.cs

@@ -50,7 +50,9 @@ protected override string[] SetupQueries
  }
  };
 
- if (TestClusterManager.CheckCassandraVersion(false, new Version(4, 0), Comparison.LessThan))
+ // COMPACT STORAGE is not supported by DSE 6.0 / C* 4.0.
+ if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.LessThan) || 
+ (TestClusterManager.IsDse && TestClusterManager.CheckDseVersion(new Version(6, 0), Comparison.LessThan)))
  {
  setupQueries.Add($"CREATE TABLE {TableCompactStorage} (key blob PRIMARY KEY, bar int, baz uuid)" +
  $" WITH COMPACT STORAGE");
@@ -547,9 +549,11 @@ public void SimpleStatement_With_Keyspace_Defined_On_Lower_Protocol_Versions()
  [TestCassandraVersion(3, 11)]
  public void SimpleStatement_With_No_Compact_Enabled_Should_Reveal_Non_Schema_Columns()
  {
- if (TestClusterManager.CheckCassandraVersion(false, new Version(4, 0), Comparison.GreaterThanOrEqualsTo))
+ if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.GreaterThanOrEqualsTo) || 
+ (TestClusterManager.IsDse && TestClusterManager.CheckDseVersion(new Version(6, 0), Comparison.GreaterThanOrEqualsTo)) ||
+ TestClusterManager.IsHcd)
  {
- Assert.Ignore("COMPACT STORAGE is only supported by C* versions prior to 4.0");
+ Assert.Ignore("COMPACT STORAGE is not supported by DSE 6.0 / C* 4.0");
  return;
  }
 
@@ -568,9 +572,11 @@ public void SimpleStatement_With_No_Compact_Enabled_Should_Reveal_Non_Schema_Col
  [TestCassandraVersion(3, 11)]
  public void SimpleStatement_With_No_Compact_Disabled_Should_Not_Reveal_Non_Schema_Columns()
  {
- if (TestClusterManager.CheckCassandraVersion(false, new Version(4, 0), Comparison.GreaterThanOrEqualsTo))
+ if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.GreaterThanOrEqualsTo) || 
+ (TestClusterManager.IsDse && TestClusterManager.CheckDseVersion(new Version(6, 0), Comparison.GreaterThanOrEqualsTo)) ||
+ TestClusterManager.IsHcd)
  {
- Assert.Ignore("COMPACT STORAGE is only supported by C* versions prior to 4.0");
+ Assert.Ignore("COMPACT STORAGE is not supported by DSE 6.0 / C* 4.0");
  return;
  }
 

src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs

@@ -34,11 +34,8 @@ public SchemaMetadataTests() :
  base(() =>
  {
  string[] cassandraYaml = null;
- if (TestClusterManager.CheckCassandraVersion(true, new Version(5, 0), Comparison.GreaterThanOrEqualsTo))
- {
- cassandraYaml = new[] { "materialized_views_enabled: true" };
- }
- else if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.GreaterThanOrEqualsTo))
+ if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.GreaterThanOrEqualsTo) ||
+ TestClusterManager.IsHcd)
  {
  cassandraYaml = new[] { "enable_materialized_views: true" };
  }
@@ -664,11 +661,13 @@ public void RaiseErrorOnInvalidMultipleSecondaryIndexTest(bool metadataSync)
  [Test, TestCase(true), TestCase(false), TestCassandraVersion(3, 0)]
  public void ColumnClusteringOrderReversedTest(bool metadataSync)
  {
- if (TestClusterManager.CheckCassandraVersion(false, new Version(4, 0), Comparison.GreaterThanOrEqualsTo))
+ if (TestClusterManager.CheckCassandraVersion(true, new Version(4, 0), Comparison.GreaterThanOrEqualsTo) || 
+ (TestClusterManager.IsDse && TestClusterManager.CheckDseVersion(new Version(6, 0), Comparison.GreaterThanOrEqualsTo)))
  {
- Assert.Ignore("Compact table test designed for C* 3.0");
+ Assert.Ignore("COMPACT STORAGE is not supported by DSE 6.0 / C* 4.0");
  return;
  }
+
  var keyspaceName = TestUtils.GetUniqueKeyspaceName();
  var tableName = TestUtils.GetUniqueTableName().ToLower();
  var cluster = GetNewTemporaryCluster(builder => builder.WithMetadataSyncOptions(new MetadataSyncOptions().SetMetadataSyncEnabled(metadataSync)));

src/Cassandra.IntegrationTests/Core/UdfTests.cs

@@ -51,12 +51,7 @@ public void TestFixtureSetup()
  return;
  }
  _testCluster = TestClusterManager.GetTestCluster(1, 0, false, DefaultMaxClusterCreateRetries, false, false);
- var cassandraYaml = "enable_user_defined_functions: true";
- if (TestClusterManager.CheckCassandraVersion(true, Version.Parse("5.0"), Comparison.GreaterThanOrEqualsTo))
- {
- cassandraYaml = "user_defined_functions_enabled: true";
- }
- _testCluster.UpdateConfig(cassandraYaml);
+ _testCluster.UpdateConfig("enable_user_defined_functions:true");
  _testCluster.Start(1);
  using (var cluster = ClusterBuilder().AddContactPoint(_testCluster.InitialContactPoint).Build())
  {
@@ -159,7 +154,7 @@ public void GetFunction_Should_Retrieve_Metadata_Of_Cql_Function_Without_Paramet
  Assert.AreEqual(false, func.CalledOnNullInput);
  Assert.False(func.Monotonic);
  Assert.False(func.Deterministic);
- Assert.AreEqual(func.MonotonicOn, new string[0]);
+ Assert.AreEqual(new string[0], func.MonotonicOn);
  }
 
  [Test, TestCase(true), TestCase(false), TestCassandraVersion(2, 2)]

src/Cassandra.IntegrationTests/TestClusterManagement/CcmBridge.cs

@@ -17,7 +17,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Sockets;
+using System.Text.RegularExpressions;
 using System.Threading;
 using Cassandra.IntegrationTests.TestBase;
 using Cassandra.Tests;
@@ -71,6 +73,11 @@ public void Create(bool useSsl)
  ExecuteCcm(string.Format(
  "create {0} --dse -v {1} {2}", Name, Version, sslParams));
  }
+ else if(TestClusterManager.CurrentBackendType == TestClusterManager.BackendType.Hcd)
+ {
+ ExecuteCcm(string.Format(
+ "create {0} --hcd -v {1} {2}", Name, Version, sslParams));
+ }
  else
  {
  ExecuteCcm(string.Format(
@@ -266,6 +273,9 @@ public ProcessOutput BootstrapNode(int n, string dc, bool start = true)
  if (TestClusterManager.IsDse)
  {
  cmd += " --dse";
+ }else if (TestClusterManager.CurrentBackendType == TestClusterManager.BackendType.Hcd)
+ {
+ cmd += " --hcd";
  }
 
  var output = ExecuteCcm(string.Format(cmd, n, IpPrefix, n, 7000 + 100 * n, dc != null ? "-d " + dc : null));
@@ -294,6 +304,7 @@ public void UpdateConfig(params string[] configs)
  {
  return;
  }
+ FixYaml(configs);
  foreach (var c in configs)
  {
  ExecuteCcm(string.Format("updateconf \"{0}\"", c));
@@ -311,12 +322,57 @@ public void UpdateDseConfig(params string[] configs)
  {
  return;
  }
+ FixYaml(configs);
  foreach (var c in configs)
  {
  ExecuteCcm(string.Format("updatedseconf \"{0}\"", c));
  }
  }
 
+ public void UpdateConfig(int nodeId, params string[] yamlChanges)
+ {
+ if (yamlChanges == null) return;
+ FixYaml(yamlChanges);
+ var joinedChanges = string.Join(" ", yamlChanges.Select(s => $"\"{s}\""));
+ ExecuteCcm($"node{nodeId} updateconf {joinedChanges}");
+ }
+
+ private static void FixYaml(string[] yamlToFix)
+ {
+ // in-place fix
+ if (TestClusterManager.CheckCassandraVersion(false, System.Version.Parse("4.1"), Comparison.GreaterThanOrEqualsTo))
+ {
+ // Fix the yaml options that turned obsolete since 4.1.0
+ for (int i = 0; i < yamlToFix.Length; i++)
+ {
+ string line = yamlToFix[i];
+ var keyValueParts = line.Split(':');
+
+ var key = keyValueParts[0];
+ var value = keyValueParts[1];
+
+ var matchMs = Regex.Match(key, @"^(\w+)_in_ms$");
+ if (matchMs.Success)
+ {
+ yamlToFix[i] = $"{matchMs.Groups[1].Value}:{value}ms";
+ }
+
+ var matchKb = Regex.Match(key, @"^(\w+)_in_kb$");
+ if (matchKb.Success)
+ {
+ yamlToFix[i] = $"{matchKb.Groups[1].Value}:{value}KiB";
+ }
+
+ var matchEnable = Regex.Match(key, @"enable_(\w+)$");
+ if (matchEnable.Success)
+ {
+ yamlToFix[i] = $"{matchEnable.Groups[1].Value}_enabled:{value}";
+ }
+ }
+ }
+ }
+
+
  public void SetNodeWorkloads(int nodeId, string[] workloads)
  {
  if (!TestClusterManager.IsDse)

src/Cassandra.IntegrationTests/TestClusterManagement/CcmCluster.cs

@@ -214,23 +214,17 @@ public void BootstrapNode(int nodeIdToStart, string dataCenterName, bool start =
 
  public void UpdateDseConfig(params string[] yamlChanges)
  {
- if (yamlChanges == null) return;
- var joinedChanges = string.Join(" ", yamlChanges.Select(s => $"\"{s}\""));
- _ccm.ExecuteCcm($"updatedseconf {joinedChanges}");
+ _ccm.UpdateDseConfig(yamlChanges);
  }
 
  public void UpdateConfig(params string[] yamlChanges)
  {
- if (yamlChanges == null) return;
- var joinedChanges = string.Join(" ", yamlChanges.Select(s => $"\"{s}\""));
- _ccm.ExecuteCcm($"updateconf {joinedChanges}");
+ _ccm.UpdateConfig(yamlChanges);
  }
 
  public void UpdateConfig(int nodeId, params string[] yamlChanges)
  {
- if (yamlChanges == null) return;
- var joinedChanges = string.Join(" ", yamlChanges.Select(s => $"\"{s}\""));
- _ccm.ExecuteCcm($"node{nodeId} updateconf {joinedChanges}");
+ _ccm.UpdateConfig(nodeId, yamlChanges);
  }
  }
 }

src/Cassandra.IntegrationTests/TestClusterManagement/TestClusterManager.cs

@@ -29,6 +29,7 @@ public static class TestClusterManager
  public const string DefaultKeyspaceName = "test_cluster_keyspace";
  private static ICcmProcessExecuter _executor;
 
+ private static readonly Version Version1Dot0 = new Version(1, 0);
  private static readonly Version Version2Dot0 = new Version(2, 0);
  private static readonly Version Version2Dot1 = new Version(2, 1);
  private static readonly Version Version2Dot2 = new Version(2, 2);
@@ -44,6 +45,8 @@ public static class TestClusterManager
  private static readonly Version Version5Dot1 = new Version(5, 1);
  private static readonly Version Version6Dot0 = new Version(6, 0);
  private static readonly Version Version6Dot7 = new Version(6, 7);
+ private static readonly Version Version6Dot8 = new Version(6, 8);
+ private static readonly Version Version6Dot9 = new Version(6, 9);
 
  /// <summary>
  /// Gets the Cassandra version used for this test run
@@ -70,15 +73,18 @@ public static Version CassandraVersion
  // C* 3.0
  return Version3Dot0;
  }
- if (dseVersion < Version6Dot0)
+ if (dseVersion <= Version6Dot9)
  {
  // C* 3.11
  return Version3Dot11;
  }
  // C* 4.0
  return Version4Dot0;
  }
-
+ if (IsHcd)
+ {
+ return Version4Dot0;
+ }
  return new Version(TestClusterManager.CassandraVersionString.Split('-')[0]);
  }
  }
@@ -99,14 +105,50 @@ public static string DsePath
  get { return Environment.GetEnvironmentVariable("DSE_PATH"); }
  }
 
+ public enum BackendType
+ {
+ Hcd,
+ Dse,
+ Cassandra
+ }
+
+ /// <summary>
+ /// "hcd", "dse", or "cassandra" (default)
+ /// </summary>
+ public static BackendType CurrentBackendType
+ {
+ get
+ {
+ string distribution = Environment.GetEnvironmentVariable("CCM_DISTRIBUTION") ?? "cassandra";
+ switch (distribution)
+ {
+ case "hcd":
+ return BackendType.Hcd;
+ case "dse":
+ return BackendType.Dse;
+ case "cassandra":
+ return BackendType.Cassandra;
+ default:
+ throw new TestInfrastructureException("Unknown CCM_DISTRIBUTION value: " + distribution);
+ }
+ }
+ }
+
  public static string InitialContactPoint
  {
  get { return IpPrefix + "1"; }
  }
 
  public static string DseVersionString
  {
- get { return Environment.GetEnvironmentVariable("DSE_VERSION") ?? "6.7.7"; }
+ get
+ {
+ if (!IsDse)
+ {
+ throw new TestInfrastructureException("DSE_VERSION is only available when using DSE backend");
+ }
+ return Environment.GetEnvironmentVariable("CASSANDRA_VERSION") ?? "6.7.7";
+ }
  }
 
  public static string CassandraVersionString
@@ -116,7 +158,12 @@ public static string CassandraVersionString
 
  public static bool IsDse
  {
- get { return Environment.GetEnvironmentVariable("DSE_VERSION") != null; }
+ get { return CurrentBackendType == BackendType.Dse; }
+ }
+
+ public static bool IsHcd
+ {
+ get { return CurrentBackendType == BackendType.Hcd; }
  }
 
  public static Version DseVersion
@@ -161,15 +208,14 @@ public static bool CheckDseVersion(Version version, Comparison comparison)
 
  public static bool CheckCassandraVersion(bool requiresOss, Version version, Comparison comparison)
  {
- if (requiresOss && TestClusterManager.IsDse)
+ if (requiresOss && TestClusterManager.CurrentBackendType != BackendType.Cassandra)
  {
  return false;
  }
 
- var runningVersion = TestClusterManager.IsDse ? TestClusterManager.DseVersion : TestClusterManager.CassandraVersion;
- var expectedVersion = TestClusterManager.IsDse ? TestClusterManager.GetDseVersionFromCassandraVersion(version) : version;
-
- return TestDseVersion.VersionMatch(expectedVersion, runningVersion, comparison);
+ var runningVersion = TestClusterManager.CassandraVersion;
+ var expectedVersion = version;
+ return TestCassandraVersion.VersionMatch(expectedVersion, runningVersion, comparison);
  }
 
  /// <summary>