[ignite-3] branch main updated (f456cd8314 -> f2ee7dd101)
This is an automated email from the ASF dual-hosted git repository. isapego pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git from f456cd8314 IGNITE-18613 .NET: Balance requests across connections (#1677) add f2ee7dd101 IGNITE-18815 C++ Tx sync rollback on desctruction (#1683) No new revisions were added by this update. Summary of changes: .../cpp/ignite/client/detail/transaction/transaction_impl.h | 8 +++- modules/platforms/cpp/ignite/client/transaction/transaction.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
[ignite-3] branch main updated: IGNITE-18613 .NET: Balance requests across connections (#1677)
This is an automated email from the ASF dual-hosted git repository. ptupitsyn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/main by this push: new f456cd8314 IGNITE-18613 .NET: Balance requests across connections (#1677) f456cd8314 is described below commit f456cd8314ee34fc1b10da17e85fc6df764f2dbf Author: Pavel Tupitsyn AuthorDate: Thu Feb 16 08:50:05 2023 +0200 IGNITE-18613 .NET: Balance requests across connections (#1677) When .NET client is connected to more than one server node, send requests to different connections in a round-robin fashion instead of using the same default connection every time. --- .../Compute/ComputeClusterAwarenessTests.cs| 9 +- .../Apache.Ignite.Tests/PartitionAwarenessTests.cs | 34 +++- .../Apache.Ignite.Tests/RequestBalancingTests.cs | 64 +++ .../Apache.Ignite/Internal/ClientFailoverSocket.cs | 96 +++--- .../Apache.Ignite/Internal/Table/RecordView.cs | 8 +- 5 files changed, 136 insertions(+), 75 deletions(-) diff --git a/modules/platforms/dotnet/Apache.Ignite.Tests/Compute/ComputeClusterAwarenessTests.cs b/modules/platforms/dotnet/Apache.Ignite.Tests/Compute/ComputeClusterAwarenessTests.cs index bb94f710ac..652dc89ae3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Tests/Compute/ComputeClusterAwarenessTests.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Tests/Compute/ComputeClusterAwarenessTests.cs @@ -17,6 +17,7 @@ namespace Apache.Ignite.Tests.Compute { +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Internal.Proto; @@ -95,14 +96,16 @@ namespace Apache.Ignite.Tests.Compute // ReSharper disable once AccessToDisposedClosure TestUtils.WaitForCondition(() => client.GetConnections().Count == 2, 5000); +var nodeNames = new HashSet(); + for (int i = 0; i < 100; i++) { var node = i % 2 == 0 ? server1.Node : server2.Node; - var res = await client.Compute.ExecuteAsync(nodes: new[] { node }, jobClassName: string.Empty); - -Assert.AreEqual(node.Name, res); +nodeNames.Add(res); } + +CollectionAssert.AreEquivalent(new[] { "s1", "s2" }, nodeNames); } } } diff --git a/modules/platforms/dotnet/Apache.Ignite.Tests/PartitionAwarenessTests.cs b/modules/platforms/dotnet/Apache.Ignite.Tests/PartitionAwarenessTests.cs index b5d14cd7d6..0d92d217ac 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Tests/PartitionAwarenessTests.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Tests/PartitionAwarenessTests.cs @@ -68,15 +68,10 @@ public class PartitionAwarenessTests { using var client = await GetClient(); var recordView = (await client.Tables.GetTableAsync(FakeServer.ExistingTableName))!.GetRecordView(); -var (defaultServer, _) = GetServerPair(); // Warm up. await recordView.UpsertAsync(null, 1); -Assert.AreEqual( -new[] { ClientOp.TableGet, ClientOp.SchemasGet, ClientOp.PartitionAssignmentGet }, -defaultServer.ClientOps.Take(3)); - // Check. await AssertOpOnNode(async () => await recordView.UpsertAsync(null, 1), ClientOp.TupleUpsert, _server2, _server1); await AssertOpOnNode(async () => await recordView.UpsertAsync(null, 3), ClientOp.TupleUpsert, _server1, _server2); @@ -85,22 +80,20 @@ public class PartitionAwarenessTests } [Test] -public async Task TestPutWithTxUsesDefaultNode() +public async Task TestPutWithTxUsesTxNode() { using var client = await GetClient(); var recordView = (await client.Tables.GetTableAsync(FakeServer.ExistingTableName))!.GetRecordView(); -var tx = await client.Transactions.BeginAsync(); -var (defaultServer, secondaryServer) = GetServerPair(); -// Second server. -await recordView.UpsertAsync(tx, 1); -await recordView.UpsertAsync(tx, 3); +var tx = await client.Transactions.BeginAsync(); +var txServer = new[] { _server1, _server2 }.Single(x => x.ClientOps.Contains(ClientOp.TxBegin)); -Assert.AreEqual( -new[] { ClientOp.TableGet, ClientOp.TxBegin, ClientOp.SchemasGet, ClientOp.TupleUpsert, ClientOp.TupleUpsert }, -defaultServer.ClientOps); +for (int i = 0; i < 10; i++) +{ +await recordView.UpsertAsync(tx, i); +} -CollectionAssert.IsEmpty(secondaryServer.ClientOps); +Assert.AreEqual(Enumerable.Repeat(ClientOp.TupleUpsert, 10), txServer.ClientOps.TakeLast(10)); } [Test] @@ -108,7 +101,6 @@ public class PartitionAwarenessTests { using var client = await GetClient(); var recordView = (await
[ignite-3] branch main updated: IGNITE-18793 Add public doc for LINQ (#1674)
This is an automated email from the ASF dual-hosted git repository. ptupitsyn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/main by this push: new 9806c3ee00 IGNITE-18793 Add public doc for LINQ (#1674) 9806c3ee00 is described below commit 9806c3ee000d6a97f039297c9b1ac8fbe5943750 Author: IgGusev AuthorDate: Wed Feb 15 18:01:19 2023 +0200 IGNITE-18793 Add public doc for LINQ (#1674) --- docs/_data/toc.yaml | 8 +- docs/_docs/thin-clients/linq.adoc | 562 ++ 2 files changed, 568 insertions(+), 2 deletions(-) diff --git a/docs/_data/toc.yaml b/docs/_data/toc.yaml index 317e31ddff..526946636a 100644 --- a/docs/_data/toc.yaml +++ b/docs/_data/toc.yaml @@ -45,8 +45,12 @@ url: sql-reference/operators-and-functions - title: REST API url: rest/rest-api -- title: Thin Clients - url: thin-clients/index +- title: Clients + items: +- title: Clients Overview + url: thin-clients/index +- title: .NET LINQ Queries + url: thin-clients/linq - title: Distributed Computing url: compute/compute - title: Data Region Configuration diff --git a/docs/_docs/thin-clients/linq.adoc b/docs/_docs/thin-clients/linq.adoc new file mode 100644 index 00..be47332ea0 --- /dev/null +++ b/docs/_docs/thin-clients/linq.adoc @@ -0,0 +1,562 @@ += .NET LINQ Queries + +Apache Ignite .NET client provides LINQ support that is integrated with Ignite SQL APIs. You can avoid working with SQL syntax directly and write queries in C# with LINQ. C# LINQ expressions are then translated into Ignite-specific SQL. For example, the following two snippets achieve the same result: + +[tabs] +-- +tab:LINQ[] +[source, csharp] + +var table = await Client.Tables.GetTableAsync("TBL1"); +IQueryable query = table!.GetRecordView().AsQueryable() +.Where(x => x.Key > 3) +.OrderBy(x => x.Key); +List queryResults = await query.ToListAsync(); + + +tab:SQL[] +[source, csharp] + +var query = "select KEY, VAL from PUBLIC.TBL1 where (KEY > ?) order by KEY asc"; +await using IResultSet resultSet = await Client.Sql. +ExecuteAsync(transaction: null, query, 3); +var queryResults = new List(); +await foreach (IIgniteTuple row in resultSet) +{ +queryResults.Add(new Poco { Key = (long)row[0]!, Val = (string?)row[1] }); +} + +-- + +LINQ has the following advantages over SQL: + +* Queries are strongly typed and checked at compilation; +* It is easier to write and maintain with IDE support (auto-completion, navigation, find usages); +* LINQ is refactoring-friendly: rename a column and all queries are updated at once; +* Ignite-specific SQL knowledge is not required, and most C# developers are already familiar with LINQ; +* LINQ is safe against SQL injections; +* Results are mapped to types naturally. + +In real-world scenarios the performance of Apache Ignite LINQ queries is on par with equivalent SQL queries. +However, a small overhead still exists (due to query translation), and your mileage may vary depending on the query complexity, so it is recommended to measure the performance of your queries. + +== Getting Started With LINQ + +Here is how you can create a simple table in Apache Ignite: + +1. Create a table: ++ +[source, csharp] + +await Client.Sql.ExecuteAsync( +null, @"CREATE TABLE PUBLIC.PERSON (NAME VARCHAR PRIMARY KEY, AGE INT)"); + ++ +2. Define the classes (or records) that represent tables: +* Member names should match column names (case-insensitive). +* If a column name is not a valid C# identifier, use `[Column("name")]` attribute to specify the name. ++ +[source, csharp] + +public record Person(string Name, int Age, string Address, string Status); + ++ +3. Obtain a table reference: ++ +[source, csharp] + +ITable table = await Client.Tables.GetTableAsync("PERSON"); + ++ +4. Use the `GetRecordView()` method to get a typed view of the table: ++ +[source, csharp] + +IRecordView view = table.GetRecordView(); + ++ +5. Use `AsQueryable()` to perform LINQ queries on `IRecordView`. ++ +[source, csharp] + +List names = await view.AsQueryable() +.Where(x => x.Age > 30) +.Select(x => x.Name) +.ToListAsync(); + + +== Using LINQ + +=== Inspecting Generated SQL + +Viewing generated SQL is useful for debugging and performance tuning. There are two ways to do it: + +* `IgniteQueryableExtensions.ToQueryString()` extension method: ++ +[source, csharp] + +IQueryable query = table.GetRecordView() +.AsQueryable() +.Where(x => x.Age > 30); +string sql = query.ToQueryString(); + ++ +* Debug logging: ++ +[source, csharp] + +var cfg = new IgniteClientConfiguration +{ +Logger = new ConsoleLogger { MinLevel = LogLevel.Debug }, +... +}; +using var client = IgniteClient.StartAsync(cfg); +... + + +All generated SQL will be logged with `Debug` level to the specified
[ignite] branch IGNITE-17177_inc_snapshots updated (4e15c1c8674 -> b8b4d802c65)
This is an automated email from the ASF dual-hosted git repository. timoninmaxim pushed a change to branch IGNITE-17177_inc_snapshots in repository https://gitbox.apache.org/repos/asf/ignite.git from 4e15c1c8674 IGNITE-18150 Incremental snapshot restores binary and marshaller meta (#10536) add 7ea953999ae IGNITE-18750 .NET: Fix task options not being reset after task execution (#10523) add 9a8241951cb IGNITE-18719 Deprecate SqlFieldsQuery#lazy and set default to true. (#10518) add f22ceb2d336 IGNITE-17368 Remove obsolete GridClient JDBC driver (#10473) add b8b4d802c65 Merge branch 'master' into IGNITE-17177_inc_snapshots No new revisions were added by this update. Summary of changes: .../common/RunningQueryInfoCheckInitiatorTest.java |4 +- .../internal/jdbc2/JdbcConnectionSelfTest.java | 13 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 63 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java |2 +- .../apache/ignite/jdbc/JdbcConnectionSelfTest.java | 211 --- .../ignite/jdbc/JdbcDefaultNoOpCacheTest.java | 35 - .../apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 125 -- .../apache/ignite/jdbc/JdbcMetadataSelfTest.java | 419 -- .../apache/ignite/jdbc/JdbcNoDefaultCacheTest.java | 154 -- .../ignite/jdbc/JdbcPojoLegacyQuerySelfTest.java | 46 - .../ignite/jdbc/JdbcPreparedStatementSelfTest.java | 779 -- .../apache/ignite/jdbc/JdbcResultSetSelfTest.java | 803 -- .../apache/ignite/jdbc/JdbcStatementSelfTest.java | 277 .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 18 - .../jdbc/thin/JdbcThinConnectionSelfTest.java | 39 +- .../jdbc/thin/JdbcThinDataSourceSelfTest.java | 13 +- .../qa/query/WarningOnBigQueryResultsTest.java |4 +- .../java/org/apache/ignite/IgniteJdbcDriver.java | 277 +--- .../org/apache/ignite/IgniteJdbcThinDriver.java|2 +- .../apache/ignite/cache/query/SqlFieldsQuery.java | 15 +- .../ignite/internal/IgniteComputeHandler.java | 695 + .../apache/ignite/internal/IgniteComputeImpl.java | 668 + .../ignite/internal/jdbc/JdbcConnection.java | 603 .../jdbc/JdbcConnectionValidationTask.java | 54 - .../ignite/internal/jdbc/JdbcDatabaseMetadata.java | 1327 - .../internal/jdbc/JdbcPreparedStatement.java | 426 -- .../apache/ignite/internal/jdbc/JdbcResultSet.java | 1548 .../internal/jdbc/JdbcResultSetMetadata.java | 175 --- .../apache/ignite/internal/jdbc/JdbcStatement.java | 464 -- .../org/apache/ignite/internal/jdbc/JdbcUtils.java | 257 .../jdbc/thin/ConnectionPropertiesImpl.java|3 +- .../ignite/internal/jdbc2/JdbcConnection.java |3 +- .../query/jdbc/GridCacheQueryJdbcMetadataTask.java | 186 --- .../cache/query/jdbc/GridCacheQueryJdbcTask.java | 459 -- .../jdbc/GridCacheQueryJdbcValidationTask.java | 67 - .../processors/closure/GridClosureProcessor.java | 58 + .../platform/compute/PlatformCompute.java | 128 +- .../platform/compute/PlatformFullTask.java | 14 +- .../platform/utils/PlatformFutureUtils.java| 11 + .../main/resources/META-INF/classnames.properties | 23 +- .../IgniteBinaryCacheQueryTestSuite.java |8 + .../IgniteBinaryCacheQueryTestSuite2.java |8 + .../IgniteBinaryCacheQueryTestSuite3.java |8 + .../IgniteBinaryCacheQueryTestSuite4.java |8 + .../Compute/ComputeApiTest.cs | 14 + .../yardstick/config/benchmark-query.properties|1 - 46 files changed, 1078 insertions(+), 9437 deletions(-) delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcDefaultNoOpCacheTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPojoLegacyQuerySelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java delete mode 100644 modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeHandler.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnectionValidationTask.java delete mode 100644
[ignite-3] branch main updated (3a28836f97 -> 82141ed914)
This is an automated email from the ASF dual-hosted git repository. ibessonov pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 3a28836f97 IGNITE-18813 Useless waits commented with TODO in ItTxDistributedTestThreeNodesThreeReplicas. (#1678) add 82141ed914 IGNITE-18795 Reduce the number of Logical Topology updates (#1679) No new revisions were added by this update. Summary of changes: .../cluster/management/ItClusterManagerTest.java | 2 - .../management/ClusterManagementGroupManager.java | 45 ++ .../impl/ItMetaStorageMultipleNodesTest.java | 6 +-- 3 files changed, 32 insertions(+), 21 deletions(-)
[ignite] branch IGNITE-17177_inc_snapshots updated (2ebaedc764e -> 4e15c1c8674)
This is an automated email from the ASF dual-hosted git repository. timoninmaxim pushed a change to branch IGNITE-17177_inc_snapshots in repository https://gitbox.apache.org/repos/asf/ignite.git from 2ebaedc764e Merge remote-tracking branch 'upstream/master' into IGNITE-17177_inc_snapshots add 4e15c1c8674 IGNITE-18150 Incremental snapshot restores binary and marshaller meta (#10536) No new revisions were added by this update. Summary of changes: .../snapshot/IncrementalSnapshotFutureTask.java| 16 ++- .../snapshot/SnapshotRestoreProcess.java | 21 +++- .../IncrementalSnapshotRestoreTest.java| 121 + 3 files changed, 150 insertions(+), 8 deletions(-)
[ignite-3] branch main updated (123960c689 -> 3a28836f97)
This is an automated email from the ASF dual-hosted git repository. ibessonov pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 123960c689 IGNITE-18578 Add SSL for Java client (#1662) add 3a28836f97 IGNITE-18813 Useless waits commented with TODO in ItTxDistributedTestThreeNodesThreeReplicas. (#1678) No new revisions were added by this update. Summary of changes: .../distributed/ItTxDistributedTestThreeNodesThreeReplicas.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[ignite-3] branch ignite-18208 updated: WIP. Rearrange AggregatePlannerTest tests.
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-18208 in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/ignite-18208 by this push: new 1e1cfe5b2d WIP. Rearrange AggregatePlannerTest tests. 1e1cfe5b2d is described below commit 1e1cfe5b2dd3dd99ceafe16eaafb202bc79db4f7 Author: amashenkov AuthorDate: Wed Feb 15 14:48:05 2023 +0300 WIP. Rearrange AggregatePlannerTest tests. --- .../sql/engine/framework/TestBuilders.java | 5 +- .../planner/AbstractAggregatePlannerTest.java | 126 +- .../sql/engine/planner/AggregatePlannerTest.java | 184 + .../planner/ColocatedHashAggregatePlannerTest.java | 113 + .../planner/ColocatedSortAggregatePlannerTest.java | 112 + .../planner/MapReduceHashAggregatePlannerTest.java | 128 ++ .../planner/MapReduceSortAggregatePlannerTest.java | 136 +++ 7 files changed, 621 insertions(+), 183 deletions(-) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java index 02cb0772d1..23a41e83f1 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java @@ -286,7 +286,10 @@ public class TestBuilders { @Override public TestTable build() { return new TestTable( -new TableDescriptorImpl(columns, distribution), name, dataProviders, size +new TableDescriptorImpl(columns, distribution), +Objects.requireNonNull(name), +dataProviders, +size ); } diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java index 53e1bb1574..7337ff615f 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java @@ -17,11 +17,19 @@ package org.apache.ignite.internal.sql.engine.planner; +import static org.apache.ignite.internal.sql.engine.trait.IgniteDistributions.broadcast; +import static org.apache.ignite.internal.sql.engine.trait.IgniteDistributions.single; + import java.util.UUID; +import java.util.function.Consumer; import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.SqlExplainLevel; +import org.apache.ignite.internal.schema.NativeTypes; +import org.apache.ignite.internal.sql.engine.framework.TestBuilders; import org.apache.ignite.internal.sql.engine.rel.IgniteRel; import org.apache.ignite.internal.sql.engine.rel.agg.IgniteColocatedAggregateBase; import org.apache.ignite.internal.sql.engine.rel.agg.IgniteColocatedHashAggregate; @@ -32,21 +40,131 @@ import org.apache.ignite.internal.sql.engine.rel.agg.IgniteMapSortAggregate; import org.apache.ignite.internal.sql.engine.rel.agg.IgniteReduceAggregateBase; import org.apache.ignite.internal.sql.engine.rel.agg.IgniteReduceHashAggregate; import org.apache.ignite.internal.sql.engine.rel.agg.IgniteReduceSortAggregate; +import org.apache.ignite.internal.sql.engine.schema.IgniteIndex; +import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; +import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; +import org.apache.ignite.internal.sql.engine.trait.TraitUtils; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.junit.jupiter.api.Test; /** * Base class for further planner test implementations. */ public abstract class AbstractAggregatePlannerTest extends AbstractPlannerTest { +@Test +public void simpleAggregateWithSingleDistribution() throws Exception { +checkTestCase1("SELECT AVG(val0) FROM test", schema(single())); +} + +@Test +public void simpleAggregateHashDistribution() throws Exception { +checkTestCase2("SELECT AVG(val0) FROM test", schema(hash())); +} + +@Test +public void groupNoIndexSingleDistribution() throws Exception { +checkTestCase3("SELECT AVG(val0) FROM test GROUP BY grp0", schema(single())); +checkTestCase3("SELECT AVG(val0) FROM
[ignite-extensions] branch master updated: IGNITE-18803 Fix compilation error of ignite-hibernate-ext
This is an automated email from the ASF dual-hosted git repository. timoninmaxim pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git The following commit(s) were added to refs/heads/master by this push: new bfe45be5 IGNITE-18803 Fix compilation error of ignite-hibernate-ext new dd5d4d10 Merge pull request #203 from nao-it/IGNITE-18803 bfe45be5 is described below commit bfe45be585efbbd12bb398417298279bdbf971e1 Author: Aleksandr Nikolaev AuthorDate: Tue Feb 14 19:27:02 2023 +0300 IGNITE-18803 Fix compilation error of ignite-hibernate-ext --- .../apache/ignite/cache/hibernate/HibernateCacheProxy.java| 11 --- 1 file changed, 11 deletions(-) diff --git a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java index 15b7fc48..1da411bf 100644 --- a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java +++ b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java @@ -41,7 +41,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal; import org.apache.ignite.lang.IgniteBiPredicate; -import org.apache.ignite.mxbean.CacheMetricsMXBean; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; @@ -545,16 +544,6 @@ public class HibernateCacheProxy implements IgniteInternalCache return delegate.get().localMetrics(); } -/** {@inheritDoc} */ -@Override public CacheMetricsMXBean clusterMxBean() { -return delegate.get().clusterMxBean(); -} - -/** {@inheritDoc} */ -@Override public CacheMetricsMXBean localMxBean() { -return delegate.get().localMxBean(); -} - /** {@inheritDoc} */ @Override public long offHeapEntriesCount() { return delegate.get().offHeapEntriesCount();
[ignite-3] branch main updated: IGNITE-18578 Add SSL for Java client (#1662)
This is an automated email from the ASF dual-hosted git repository. ptupitsyn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/main by this push: new 123960c689 IGNITE-18578 Add SSL for Java client (#1662) 123960c689 is described below commit 123960c689af1a721329a8078d0810926d5a5983 Author: Aleksandr AuthorDate: Wed Feb 15 12:20:08 2023 +0400 IGNITE-18578 Add SSL for Java client (#1662) * Client side: add `IgniteClientConfiguration.ssl` * Server side: add `ClientConnectorConfigurationSchema.ssl` --- modules/client-handler/build.gradle| 2 + .../ignite/client/handler/ItClientHandlerTest.java | 65 + .../client/handler/ItSslClientHandlerTest.java | 146 + .../apache/ignite/client/handler/TestServer.java | 106 +++ .../ignite/client/handler/TestSslConfig.java | 76 +++ .../ignite/client/handler/ClientHandlerModule.java | 8 ++ .../ClientConnectorConfigurationSchema.java| 6 + modules/client/build.gradle| 1 + .../ignite/client/ClientAuthenticationMode.java| 31 + .../org/apache/ignite/client/IgniteClient.java | 18 ++- .../ignite/client/IgniteClientConfiguration.java | 10 ++ .../org/apache/ignite/client/SslConfiguration.java | 53 .../client/IgniteClientConfigurationImpl.java | 13 +- .../internal/client/SslConfigurationBuilder.java | 113 .../internal/client/SslConfigurationImpl.java | 110 .../io/netty/NettyClientConnectionMultiplexer.java | 92 + .../org/apache/ignite/client/RetryPolicyTest.java | 2 +- .../java/org/apache/ignite/lang/ErrorGroups.java | 3 + .../org/apache/ignite/internal/ssl/ItSslTest.java | 116 19 files changed, 908 insertions(+), 63 deletions(-) diff --git a/modules/client-handler/build.gradle b/modules/client-handler/build.gradle index 868c69c50f..4b083fdac5 100644 --- a/modules/client-handler/build.gradle +++ b/modules/client-handler/build.gradle @@ -54,7 +54,9 @@ dependencies { integrationTestImplementation project(':ignite-sql-engine') integrationTestImplementation project(':ignite-table') integrationTestImplementation(testFixtures(project(':ignite-configuration'))) +integrationTestImplementation(testFixtures(project(':ignite-core'))) integrationTestImplementation libs.msgpack.core +integrationTestImplementation libs.netty.handler } description = 'ignite-client-handler' diff --git a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java index 5d2bc0fd63..2daea85c7a 100644 --- a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java +++ b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.client.handler; -import static org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL; import static org.apache.ignite.lang.ErrorGroups.Client.PROTOCOL_COMPATIBILITY_ERR; import static org.apache.ignite.lang.ErrorGroups.Common.UNKNOWN_ERR; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,32 +26,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Mockito.mock; import java.io.IOException; import java.io.OutputStream; import java.net.Socket; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import org.apache.ignite.client.handler.configuration.ClientConnectorConfiguration; -import org.apache.ignite.compute.IgniteCompute; -import org.apache.ignite.internal.configuration.ConfigurationManager; -import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage; -import org.apache.ignite.internal.network.configuration.NetworkConfiguration; -import org.apache.ignite.internal.sql.engine.QueryProcessor; -import org.apache.ignite.internal.table.IgniteTablesInternal; -import org.apache.ignite.network.ClusterService; -import org.apache.ignite.network.NettyBootstrapFactory; -import org.apache.ignite.sql.IgniteSql; -import org.apache.ignite.tx.IgniteTransactions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; -import org.mockito.Mockito; import org.msgpack.core.MessagePack; /** @@ -60,27 +41,25 @@ import
svn commit: r60120 - /dev/ignite/pyignite/0.6.1-rc0/
Author: ivandasch Date: Wed Feb 15 08:08:59 2023 New Revision: 60120 Log: Add pyignite-0.6.1-rc0 signatures and chechsums Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_x86_64.whl.asc