You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2019/08/15 13:17:52 UTC
[ignite] branch master updated: IGNITE-11848 Monitoring &
Profiling: remove IMetricExporterSpi from .NET
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 089d3c2 IGNITE-11848 Monitoring & Profiling: remove IMetricExporterSpi from .NET
089d3c2 is described below
commit 089d3c2f96fefb7e65f4e6fba63d8bfd4473cda4
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Thu Aug 15 16:17:33 2019 +0300
IGNITE-11848 Monitoring & Profiling: remove IMetricExporterSpi from .NET
Remove empty interface, fix parity tests instead
---
.../ApiParity/IgniteConfigurationParityTest.cs | 3 ++-
.../ApiParity/ParityTest.cs | 5 +++-
.../Apache.Ignite.Core/Apache.Ignite.Core.csproj | 4 +--
.../Apache.Ignite.Core/IgniteConfiguration.cs | 6 -----
.../IgniteConfigurationSection.xsd | 5 ----
.../Metric/IMetricExporterSpi.cs | 30 ----------------------
.../Apache.Ignite.Core/Metric/Package-Info.cs | 26 -------------------
7 files changed, 7 insertions(+), 72 deletions(-)
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/IgniteConfigurationParityTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/IgniteConfigurationParityTest.cs
index af67ccc..069aa71 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/IgniteConfigurationParityTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/IgniteConfigurationParityTest.cs
@@ -65,7 +65,8 @@ namespace Apache.Ignite.Core.Tests.ApiParity
"PlatformConfiguration",
"ExecutorConfiguration",
"CommunicationFailureResolver",
- "EncryptionSpi"
+ "EncryptionSpi",
+ "MetricExporterSpi"
};
/** Properties that are missing on .NET side. */
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/ParityTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/ParityTest.cs
index c9116af..ee15aa5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/ParityTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/ParityTest.cs
@@ -148,7 +148,10 @@ namespace Apache.Ignite.Core.Tests.ApiParity
{
if (!knownMissing.ContainsKey(javaMissingProp.Key))
{
- sb.AppendFormat("{0}.{1} member is missing in .NET.\n", type.Name, javaMissingProp.Key);
+ sb.AppendFormat("{0}.{1} member is missing in .NET.\n" +
+ "For new functionality please file a .NET ticket and update MissingProperties " +
+ "array accordingly with a link to that ticket.\n", type.Name, javaMissingProp.Key);
+
codeSb.AppendFormat("\"{0}\", ", javaMissingProp.Key);
}
}
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 46c222c..303d6a6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -174,8 +174,6 @@
<Compile Include="Encryption\IEncryptionSpi.cs" />
<Compile Include="Encryption\Keystore\Package-Info.cs" />
<Compile Include="Encryption\Keystore\KeystoreEncryptionSpi.cs" />
- <Compile Include="Metric\Package-Info.cs" />
- <Compile Include="Metric\IMetricExporterSpi.cs" />
<Compile Include="Impl\Binary\BinaryArrayEqualityComparer.cs" />
<Compile Include="Impl\Binary\BinaryProcessor.cs" />
<Compile Include="Impl\Binary\BinaryReflectiveSerializerInternal.cs" />
@@ -615,4 +613,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
index 216f8fe..b5be2be 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
@@ -50,7 +50,6 @@ namespace Apache.Ignite.Core
using Apache.Ignite.Core.Impl.Ssl;
using Apache.Ignite.Core.Lifecycle;
using Apache.Ignite.Core.Log;
- using Apache.Ignite.Core.Metric;
using Apache.Ignite.Core.PersistentStore;
using Apache.Ignite.Core.Plugin;
using Apache.Ignite.Core.Ssl;
@@ -1106,11 +1105,6 @@ namespace Apache.Ignite.Core
public IEncryptionSpi EncryptionSpi { get; set; }
/// <summary>
- /// Gets or sets the MetricExporterSpi.
- /// </summary>
- public IMetricExporterSpi MetricExporterSpi { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether node should start in client mode.
/// Client node cannot hold data in the caches.
/// </summary>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index d593221..60b1276 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -951,11 +951,6 @@
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="metricExporterSpi" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Metrics exporter spi. Null for NoOp implementation.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="discoverySpi" minOccurs="0">
<xs:annotation>
<xs:documentation>Discovery service provider. Null for default discovery.</xs:documentation>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Metric/IMetricExporterSpi.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Metric/IMetricExporterSpi.cs
deleted file mode 100644
index a555e68..0000000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Metric/IMetricExporterSpi.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.Metric
-{
- using System.Diagnostics.CodeAnalysis;
-
- /// <summary>
- /// MetricExporter SPI.
- /// </summary>
- [SuppressMessage("Microsoft.Design", "CA1040:AvoidEmptyInterfaces")]
- public interface IMetricExporterSpi
- {
- // No-op.
- }
-}
\ No newline at end of file
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Metric/Package-Info.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Metric/Package-Info.cs
deleted file mode 100644
index 89d3846..0000000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Metric/Package-Info.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-#pragma warning disable 1587 // invalid XML comment
-
-/// <summary>
-/// Metric exporter API.
-/// </summary>
-namespace Apache.Ignite.Core.Metric
-{
- // No-op.
-}