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 a7ea529288 IGNITE-22271 Rename copying overload of Tuple.create to copy (#3873) a7ea529288 is described below commit a7ea529288e2d81b165d2bd5548aba1f67e5c832 Author: Pavel Tupitsyn <ptupit...@apache.org> AuthorDate: Wed Jun 5 08:09:47 2024 +0300 IGNITE-22271 Rename copying overload of Tuple.create to copy (#3873) --- modules/api/src/main/java/org/apache/ignite/table/Tuple.java | 2 +- .../ignite/internal/client/table/MutableTupleBinaryTupleAdapter.java | 2 +- .../apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java | 2 +- .../apache/ignite/internal/sql/api/ItRecordViewKeyPositionsTest.java | 2 +- .../apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java | 4 ++-- .../java/org/apache/ignite/internal/table/MutableRowTupleAdapter.java | 2 +- .../org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java | 2 +- .../table/src/test/java/org/apache/ignite/table/TupleImplTest.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/api/src/main/java/org/apache/ignite/table/Tuple.java b/modules/api/src/main/java/org/apache/ignite/table/Tuple.java index 4526f9335b..56f95c9b02 100644 --- a/modules/api/src/main/java/org/apache/ignite/table/Tuple.java +++ b/modules/api/src/main/java/org/apache/ignite/table/Tuple.java @@ -79,7 +79,7 @@ public interface Tuple extends Iterable<Object> { * @param tuple Tuple to copy. * @return A new tuple. */ - static Tuple create(Tuple tuple) { + static Tuple copy(Tuple tuple) { return new TupleImpl(tuple); } diff --git a/modules/client-common/src/main/java/org/apache/ignite/internal/client/table/MutableTupleBinaryTupleAdapter.java b/modules/client-common/src/main/java/org/apache/ignite/internal/client/table/MutableTupleBinaryTupleAdapter.java index dd38ff2de9..cc719694e9 100644 --- a/modules/client-common/src/main/java/org/apache/ignite/internal/client/table/MutableTupleBinaryTupleAdapter.java +++ b/modules/client-common/src/main/java/org/apache/ignite/internal/client/table/MutableTupleBinaryTupleAdapter.java @@ -372,7 +372,7 @@ public abstract class MutableTupleBinaryTupleAdapter implements Tuple, BinaryTup @Override public Tuple set(String columnName, @Nullable Object value) { if (tuple == null) { - tuple = Tuple.create(this); + tuple = Tuple.copy(this); //noinspection DataFlowIssue binaryTuple = null; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java index 74add250f1..a543ba5f49 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java @@ -151,7 +151,7 @@ public class AbstractMultiNodeBenchmark { batchSize = Math.min(size, batchSize); List<Tuple> batch = new ArrayList<>(batchSize); for (int i = 0; i < size; i++) { - batch.add(Tuple.create(payload).set("ycsb_key", i)); + batch.add(Tuple.copy(payload).set("ycsb_key", i)); if (batch.size() == batchSize) { view.insertAll(null, batch); diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItRecordViewKeyPositionsTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItRecordViewKeyPositionsTest.java index abc14087a4..45040c718f 100644 --- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItRecordViewKeyPositionsTest.java +++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItRecordViewKeyPositionsTest.java @@ -226,7 +226,7 @@ public class ItRecordViewKeyPositionsTest extends BaseSqlIntegrationTest { @Override Tuple toValue(Tuple record) { - return Tuple.create(record); + return Tuple.copy(record); } } diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java index 452c7b6394..3560cce7a4 100644 --- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java +++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java @@ -105,7 +105,7 @@ public class ItPkOnlyTableCrossApiTest extends BaseSqlIntegrationTest { env.runInTransaction( rwTx -> { - assertThrows(IgniteException.class, () -> view.upsert(rwTx, Tuple.create(key).set("val", 1))); + assertThrows(IgniteException.class, () -> view.upsert(rwTx, Tuple.copy(key).set("val", 1))); view.upsert(rwTx, key); @@ -216,7 +216,7 @@ public class ItPkOnlyTableCrossApiTest extends BaseSqlIntegrationTest { binView.put(rwTx, key, emptyVal); }, tx -> { - assertNull(binView.get(tx, Tuple.create(key).set("name", "Mary"))); + assertNull(binView.get(tx, Tuple.copy(key).set("name", "Mary"))); assertEquals(emptyVal, binView.get(tx, key)); assertTrue(binView.contains(tx, key)); assertEquals(1, binView.getAll(tx, Collections.singleton(key)).size()); diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/MutableRowTupleAdapter.java b/modules/table/src/main/java/org/apache/ignite/internal/table/MutableRowTupleAdapter.java index 26a75378b8..697daa4abb 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/MutableRowTupleAdapter.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/MutableRowTupleAdapter.java @@ -308,7 +308,7 @@ public class MutableRowTupleAdapter extends AbstractRowTupleAdapter implements S */ private void unmarshalRow() { if (tuple == null) { - tuple = Tuple.create(this); + tuple = Tuple.copy(this); row = null; } diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java index e62dca893b..a2ffd9bf2a 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java @@ -456,7 +456,7 @@ public class MutableRowTupleAdapterTest { .set("valNumberCol", BigInteger.valueOf(rnd.nextLong())) .set("valDecimalCol", BigDecimal.valueOf(rnd.nextLong(), 5)); - Tuple tuple = Tuple.create(valTuple).set(keyTuple.columnName(0), keyTuple.value(0)); + Tuple tuple = Tuple.copy(valTuple).set(keyTuple.columnName(0), keyTuple.value(0)); // Check tuples backed with Row. TupleMarshaller marshaller = new TupleMarshallerImpl(fullSchema); diff --git a/modules/table/src/test/java/org/apache/ignite/table/TupleImplTest.java b/modules/table/src/test/java/org/apache/ignite/table/TupleImplTest.java index 910fa27c45..950389d098 100644 --- a/modules/table/src/test/java/org/apache/ignite/table/TupleImplTest.java +++ b/modules/table/src/test/java/org/apache/ignite/table/TupleImplTest.java @@ -299,7 +299,7 @@ public class TupleImplTest { Tuple.create(Map.of("id", 42L, "name", "universe"))); assertEquals(Tuple.create().set("id", 42L).set("name", "universe"), - Tuple.create(Tuple.create().set("id", 42L).set("name", "universe"))); + Tuple.copy(Tuple.create().set("id", 42L).set("name", "universe"))); } private static TupleImpl createTuple() {