You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/06/24 12:11:47 UTC
[ignite-3] branch ignite-14743-row-formats created (now 4d31cb3)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-14743-row-formats
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
at 4d31cb3 Minor.
This branch includes the following new commits:
new 28f2f46 Merge branch 'main' into ignite-14743-row-formats
new 4d31cb3 Minor.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite-3] 01/02: Merge branch 'main' into ignite-14743-row-formats
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-14743-row-formats
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 28f2f467f7b9fd6c8d74d10aeda99384f397fad4
Merge: 6284c34 972672f
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Thu Jun 24 01:42:02 2021 +0300
Merge branch 'main' into ignite-14743-row-formats
.../ignite/internal/affinity/AffinityManager.java | 8 +-
.../internal/affinity/AffinityManagerTest.java | 37 +-
.../affinity/TestConfigurationStorage.java | 10 +-
.../network/NetworkConfigurationSchema.java | 2 +-
.../schemas/rest/RestConfigurationSchema.java | 2 +-
.../schemas/runner/ClusterConfigurationSchema.java | 2 +-
.../schemas/runner/NodeConfigurationSchema.java | 2 +-
.../schemas/table/TablesConfigurationSchema.java | 2 +-
.../main/java/org/apache/ignite/table/Table.java | 8 +
.../ignite/internal/baseline/BaselineManager.java | 2 +-
.../internal/processors/query/calcite/Stubs.java | 6 -
.../query/calcite/exec/AbstractIndexScan.java | 107 +
.../query/calcite/exec/ArrayRowHandler.java | 77 +
.../calcite/exec/ExecutionCancelledException.java} | 8 +-
.../query/calcite/exec/ExecutionContext.java | 292 +++
.../query/calcite/exec/PlannerHelper.java | 229 ++
.../query/calcite/exec/QueryTaskExecutor.java} | 35 +-
.../query/calcite/exec/QueryTaskExecutorImpl.java | 95 +
.../processors/query/calcite/exec/RowHandler.java | 73 +
.../query/calcite/exec/RuntimeHashIndex.java | 113 +
.../query/calcite/exec/RuntimeIndex.java} | 12 +-
.../query/calcite/exec/RuntimeTreeIndex.java | 196 ++
.../query/calcite/exec/TableFunctionScan.java | 48 +
.../processors/query/calcite/exec/TreeIndex.java} | 17 +-
.../query/calcite/exec/exp/CallImplementor.java | 42 +
.../query/calcite/exec/exp/ConverterUtils.java | 460 ++++
.../query/calcite/exec/exp/ExpressionFactory.java | 125 +
.../calcite/exec/exp/ExpressionFactoryImpl.java | 509 ++++
.../calcite/exec/exp/IgniteBuiltInMethod.java | 45 +
.../query/calcite/exec/exp/IgniteSqlFunctions.java | 154 ++
.../calcite/exec/exp/ImplementableFunction.java} | 34 +-
.../query/calcite/exec/exp/NotNullImplementor.java | 43 +
.../exec/exp/ReflectiveCallNotNullImplementor.java | 82 +
.../query/calcite/exec/exp/RexImpTable.java | 2574 ++++++++++++++++++++
.../query/calcite/exec/exp/RexToLixTranslator.java | 1312 ++++++++++
.../processors/query/calcite/exec/exp/Scalar.java} | 10 +-
.../query/calcite/exec/exp/agg/Accumulator.java} | 27 +-
.../calcite/exec/exp/agg/AccumulatorWrapper.java} | 19 +-
.../query/calcite/exec/exp/agg/Accumulators.java | 1068 ++++++++
.../calcite/exec/exp/agg/AccumulatorsFactory.java | 330 +++
.../query/calcite/exec/exp/agg/AggregateType.java} | 17 +-
.../query/calcite/exec/exp/agg/GroupKey.java | 101 +
.../query/calcite/exec/rel/AbstractNode.java | 202 ++
.../query/calcite/exec/rel/AbstractSetOpNode.java | 367 +++
.../exec/rel/CorrelatedNestedLoopJoinNode.java | 479 ++++
.../query/calcite/exec/rel/Downstream.java} | 31 +-
.../query/calcite/exec/rel/FilterNode.java | 145 ++
.../query/calcite/exec/rel/HashAggregateNode.java | 372 +++
.../query/calcite/exec/rel/IndexSpoolNode.java | 205 ++
.../query/calcite/exec/rel/IntersectNode.java | 118 +
.../query/calcite/exec/rel/LimitNode.java | 132 +
.../query/calcite/exec/rel/Mailbox.java} | 25 +-
.../query/calcite/exec/rel/MergeJoinNode.java | 1134 +++++++++
.../query/calcite/exec/rel/MinusNode.java | 102 +
.../query/calcite/exec/rel/NestedLoopJoinNode.java | 812 ++++++
.../processors/query/calcite/exec/rel/Node.java | 81 +
.../query/calcite/exec/rel/ProjectNode.java | 84 +
.../query/calcite/exec/rel/RootNode.java | 283 +++
.../query/calcite/exec/rel/ScanNode.java | 130 +
.../query/calcite/exec/rel/SingleNode.java} | 28 +-
.../query/calcite/exec/rel/SortAggregateNode.java | 316 +++
.../query/calcite/exec/rel/SortNode.java | 148 ++
.../query/calcite/exec/rel/TableSpoolNode.java | 160 ++
.../query/calcite/exec/rel/UnionAllNode.java | 97 +
.../calcite/metadata/FragmentDescription.java | 75 +
.../calcite/metadata/cost/IgniteCostFactory.java | 4 +-
.../calcite/prepare/ddl/ColumnDefinition.java | 2 +-
.../processors/query/calcite/util/Commons.java | 27 +-
.../query/calcite/util/FilteringIterator.java | 79 +
.../query/calcite/util/IgniteMethod.java | 25 +
.../processors/query/calcite/util/RexUtils.java | 8 +-
.../calcite/util/StripedThreadPoolExecutor.java | 226 ++
.../query/calcite/util/TransformingIterator.java} | 33 +-
.../processors/query/calcite/util/TypeUtils.java | 111 +
.../query/calcite/exec/RuntimeTreeIndexTest.java | 199 ++
.../calcite/exec/rel/AbstractExecutionTest.java | 226 ++
.../exec/rel/AbstractSetOpExecutionTest.java | 166 ++
.../query/calcite/exec/rel/BaseAggregateTest.java | 552 +++++
.../query/calcite/exec/rel/ExecutionTest.java | 667 +++++
.../exec/rel/HashAggregateExecutionTest.java | 135 +
.../rel/HashAggregateSingleGroupExecutionTest.java | 497 ++++
.../exec/rel/HashIndexSpoolExecutionTest.java | 167 ++
.../calcite/exec/rel/IntersectExecutionTest.java | 83 +
.../calcite/exec/rel/MergeJoinExecutionTest.java | 378 +++
.../query/calcite/exec/rel/MinusExecutionTest.java | 83 +
.../exec/rel/NestedLoopJoinExecutionTest.java | 363 +++
.../exec/rel/SortAggregateExecutionTest.java | 141 ++
.../calcite/exec/rel/TableSpoolExecutionTest.java | 152 ++
.../exec/rel/TreeIndexSpoolExecutionTest.java | 194 ++
.../java/org/apache/ignite/cli/IgnitePaths.java | 26 +-
.../cli/builtins/init/InitIgniteCommand.java | 2 +-
.../org/apache/ignite/cli/ui/TerminalFactory.java | 6 +-
modules/configuration-annotation-processor/pom.xml | 14 +-
.../processor}/AbstractProcessorTest.java | 10 +-
.../configuration/processor}/ConfigSet.java | 2 +-
.../configuration/processor}/HasFieldMatcher.java | 2 +-
.../configuration/processor}/HasMethodMatcher.java | 2 +-
.../configuration/processor}/ITProcessorTest.java | 4 +-
.../configuration/processor}/ParsedClass.java | 4 +-
.../processor}/TestConfigurationSchema.java | 2 +-
.../configuration/processor}/Processor.java | 119 +-
.../processor}/ProcessorException.java | 2 +-
.../configuration/processor}/Utils.java | 2 +-
.../services/javax.annotation.processing.Processor | 2 +-
.../sample/ConfigurationArrayTest.java | 116 -
.../configuration/ConfigurationChangerTest.java | 20 +-
.../configuration/json/JsonConverterTest.java | 540 ++++
.../json/TestConfigurationStorage.java | 13 +-
.../notifications/ConfigurationListenerTest.java | 12 +-
.../sample/AutoAdjustConfigurationSchema.java | 2 +-
.../sample/BaselineConfigurationSchema.java | 2 +-
.../sample/CacheConfigurationSchema.java | 2 +-
.../sample/ClusterWideConfigurationSchema.java | 2 +-
.../sample/ConfigurationArrayTest.java | 225 ++
.../sample/ConstructableTreeNodeTest.java | 10 +-
.../sample/DiscoveryConfigurationSchema.java | 2 +-
.../sample/LocalConfigurationSchema.java | 4 +-
.../sample/NetworkConfigurationSchema.java | 4 +-
.../sample/NodeConfigurationSchema.java | 2 +-
.../sample/TraversableTreeNodeTest.java | 16 +-
.../configuration/sample/UsageTest.java | 6 +-
.../storage/TestConfigurationStorage.java | 3 +-
.../configuration}/util/ConfigurationUtilTest.java | 12 +-
.../validation/ValidationUtilTest.java | 14 +-
.../configuration/NamedConfigurationTree.java | 2 -
.../configuration/{tree => }/NamedListChange.java | 2 +-
.../configuration/{tree => }/NamedListView.java | 2 +-
.../org/apache/ignite/configuration/RootKey.java | 2 +-
.../annotation/ConfigurationRoot.java | 1 -
.../{storage => annotation}/ConfigurationType.java | 2 +-
modules/configuration/README.md | 7 +-
.../configuration/internal/rest/JsonConverter.java | 358 ---
.../configuration/ConfigurationChanger.java | 37 +-
.../configuration}/ConfigurationManager.java | 14 +-
.../configuration}/ConfigurationNode.java | 9 +-
.../configuration/ConfigurationRegistry.java | 34 +-
.../configuration}/DynamicConfiguration.java | 7 +-
.../configuration}/DynamicProperty.java | 7 +-
.../configuration}/NamedListConfiguration.java | 7 +-
.../configuration}/SuperRoot.java | 8 +-
.../ignite/internal/configuration/TypeUtils.java | 83 +
.../asm/ConfigurationAsmGenerator.java | 44 +-
.../configuration}/asm/SchemaClassesInfo.java | 6 +-
.../configuration}/asm/StringSwitchBuilder.java | 14 +-
.../json/JsonConfigurationVisitor.java | 127 +
.../internal/configuration/json/JsonConverter.java | 43 +
.../json/JsonObjectConfigurationSource.java | 105 +
.../json/JsonPrimitiveConfigurationSource.java | 202 ++
.../ConfigurationNotificationEventImpl.java | 2 +-
.../storage/ConfigurationStorage.java | 3 +-
.../storage/ConfigurationStorageListener.java | 2 +-
.../{ => internal}/configuration/storage/Data.java | 2 +-
.../configuration/storage/StorageException.java | 2 +-
.../configuration/tree/ConfigurationSource.java | 2 +-
.../configuration/tree/ConfigurationVisitor.java | 2 +-
.../configuration/tree/ConstructableTreeNode.java | 2 +-
.../configuration/tree/InnerNode.java | 2 +-
.../configuration/tree/NamedListNode.java | 4 +-
.../configuration/tree/TraversableTreeNode.java | 2 +-
.../util/AnyNodeConfigurationVisitor.java | 8 +-
.../util/ConfigurationNotificationsUtil.java | 26 +-
.../configuration}/util/ConfigurationUtil.java | 16 +-
.../configuration}/util/KeyNotFoundException.java | 2 +-
.../util/KeysTrackingConfigurationVisitor.java | 8 +-
.../validation/ImmutableValidator.java | 2 +-
.../configuration}/validation/MaxValidator.java | 2 +-
.../configuration}/validation/MemberKey.java | 2 +-
.../configuration}/validation/MinValidator.java | 2 +-
.../validation/ValidationContextImpl.java | 12 +-
.../configuration}/validation/ValidationUtil.java | 12 +-
.../org/apache/ignite/internal/manager/Event.java | 2 +-
.../ignite/internal/manager/EventListener.java | 47 +
.../{Event.java => ListenerRemovedException.java} | 7 +-
.../apache/ignite/internal/manager/Producer.java | 24 +-
.../apache/ignite/internal/util/ArrayUtils.java | 2 +
.../org/apache/ignite/internal/util/ByteUtils.java | 11 +
.../apache/ignite/internal/util/GridUnsafe.java | 108 +-
.../apache/ignite/internal/util/IgniteUtils.java | 30 +-
.../internal/testframework/IgniteTestUtils.java | 71 +
.../internal/util/IgniteIntListSelfTest.java | 159 ++
.../client/ITMetaStorageServiceTest.java | 45 +-
.../server/raft/MetaStorageListener.java | 13 +-
.../internal/metastorage/MetaStorageManager.java | 146 +-
modules/network-annotation-processor/pom.xml | 2 +-
.../ITTransferableObjectProcessorTest.java | 6 +-
.../network/processor}/AllTypesMessage.java | 2 +-
.../network/processor}/ConflictingTypeMessage.java | 2 +-
.../network/processor}/ITTestMessageGroup.java | 2 +-
.../processor}/InvalidAnnotatedTypeMessage.java | 2 +-
.../processor}/InvalidParameterGetterMessage.java | 2 +-
.../processor}/InvalidReturnTypeGetterMessage.java | 2 +-
.../network/processor}/SecondGroup.java | 2 +-
.../network/processor}/TransitiveMessage.java | 2 +-
.../processor}/UnmarshallableTypeMessage.java | 2 +-
.../UnmarshallableTypeNonSerializableMessage.java | 2 +-
.../network/processor}/MessageClass.java | 2 +-
.../network/processor}/MessageGroupWrapper.java | 2 +-
.../network/processor}/ProcessingException.java | 2 +-
.../processor}/TransferableObjectProcessor.java | 16 +-
.../network/processor}/TypeUtils.java | 2 +-
.../messages/MessageBuilderGenerator.java | 6 +-
.../messages/MessageFactoryGenerator.java | 6 +-
.../processor}/messages/MessageImplGenerator.java | 6 +-
.../serialization/BaseMethodNameResolver.java | 6 +-
.../MessageCollectionItemTypeConverter.java | 6 +-
.../MessageDeserializerGenerator.java | 6 +-
.../serialization/MessageReaderMethodResolver.java | 2 +-
.../serialization/MessageSerializerGenerator.java | 6 +-
.../serialization/MessageWriterMethodResolver.java | 4 +-
.../RegistryInitializerGenerator.java | 6 +-
.../SerializationFactoryGenerator.java | 6 +-
.../services/javax.annotation.processing.Processor | 2 +-
.../processor}/SerializationOrderMessage.java | 2 +-
.../network/processor}/SerializationOrderTest.java | 2 +-
.../network/processor}/TestMessageGroup.java | 2 +-
.../apache/ignite/network/MessagingService.java | 10 +
.../ignite/network/NetworkMessageHandler.java | 5 +-
.../network}/netty/ConnectionManagerTest.java | 79 +-
.../network}/recovery/RecoveryHandshakeTest.java | 30 +-
.../scalecube/ITScaleCubeNetworkMessagingTest.java | 13 +-
.../network/NetworkMessageTypes.java | 8 +-
.../network}/direct/DirectMarshallingUtils.java | 4 +-
.../network}/direct/DirectMessageReader.java | 10 +-
.../network}/direct/DirectMessageWriter.java | 10 +-
.../network}/direct/state/DirectMessageState.java | 2 +-
.../direct/state/DirectMessageStateItem.java | 2 +-
.../direct/stream/DirectByteBufferStream.java | 2 +-
.../stream/DirectByteBufferStreamImplV1.java | 2 +-
.../network}/handshake/HandshakeAction.java | 4 +-
.../network}/handshake/HandshakeException.java | 2 +-
.../network}/handshake/HandshakeManager.java | 6 +-
.../network}/message/ScaleCubeMessage.java | 4 +-
.../network}/netty/ConnectionManager.java | 25 +-
.../network}/netty/HandshakeHandler.java | 33 +-
.../network}/netty/InboundDecoder.java | 37 +-
.../netty/IoExceptionSuppressingHandler.java} | 36 +-
.../network}/netty/MessageHandler.java | 2 +-
.../network}/netty/NettyClient.java | 7 +-
.../network}/netty/NettySender.java | 4 +-
.../network}/netty/NettyServer.java | 16 +-
.../network}/netty/NettyUtils.java | 2 +-
.../network}/netty/OutboundEncoder.java | 4 +-
.../recovery/RecoveryClientHandshakeManager.java | 18 +-
.../recovery/RecoveryServerHandshakeManager.java | 18 +-
.../recovery/message/HandshakeStartMessage.java | 4 +-
.../message/HandshakeStartResponseMessage.java | 4 +-
.../network/MessageSerializationRegistryImpl.java | 12 +-
.../scalecube/ScaleCubeClusterServiceFactory.java | 14 +-
.../ScaleCubeDirectMarshallerTransport.java | 12 +-
.../scalecube/ScaleCubeMessagingService.java | 28 +-
.../network}/AllTypesMessage.java | 2 +-
.../network}/AllTypesMessageGenerator.java | 2 +-
.../network}/NestedMessageMessage.java | 2 +-
.../network}/netty/InboundDecoderTest.java | 10 +-
.../netty/IoExceptionSuppressingHandlerTest.java | 58 +
.../network}/netty/NettyClientTest.java | 6 +-
.../network}/netty/NettyServerTest.java | 6 +-
.../MessageSerializationRegistryImplTest.java | 4 +-
.../client/service/impl/RaftGroupServiceImpl.java | 14 +-
.../raft/client/service/RaftGroupServiceTest.java | 26 +-
.../ignite/raft/jraft/core/ITCliServiceTest.java | 451 ++--
.../apache/ignite/raft/jraft/core/ITNodeTest.java | 1924 +++++++--------
.../raft/server/ITJRaftCounterServerTest.java | 107 +-
.../raft/server/ITSimpleCounterServerTest.java | 38 +-
.../java/org/apache/ignite/internal/raft/Loza.java | 5 +-
.../internal/raft/server/impl/JRaftServerImpl.java | 19 +-
.../internal/raft/server/impl/RaftServerImpl.java | 32 +-
.../apache/ignite/raft/jraft/RaftGroupService.java | 37 +-
.../apache/ignite/raft/jraft/core/NodeImpl.java | 11 +-
.../ignite/raft/jraft/error/RemotingException.java | 1 -
.../apache/ignite/raft/jraft/rpc/RpcClient.java | 60 +-
.../ignite/raft/jraft/rpc/RpcRequestClosure.java | 1 +
.../ignite/raft/jraft/rpc/RpcRequestProcessor.java | 1 +
.../raft/jraft/rpc/RpcResponseClosureAdapter.java | 4 -
.../raft/jraft/rpc/impl/AbstractClientService.java | 47 +-
.../raft/jraft/rpc/impl/IgniteRpcClient.java | 90 +-
.../raft/jraft/rpc/impl/IgniteRpcServer.java | 112 +-
.../impl/core/AppendEntriesRequestProcessor.java | 6 +-
.../ignite/raft/jraft/util/internal/ThrowUtil.java | 60 +-
.../apache/ignite/raft/jraft/core/TestCluster.java | 222 +-
.../raft/jraft/rpc/AbstractClientServiceTest.java | 66 +-
.../ignite/raft/jraft/rpc/AbstractRpcTest.java | 215 +-
.../ignite/raft/jraft/rpc/IgniteRpcTest.java | 47 +-
.../ignite/raft/jraft/rpc/TestIgniteRpcServer.java | 56 +-
.../snapshot/local/LocalSnapshotReaderTest.java | 9 +-
.../apache/ignite/raft/jraft/test/TestUtils.java | 70 +-
.../java/org/apache/ignite/rest/RestModule.java | 8 +-
.../rest/presentation/json/JsonConverter.java | 358 ---
.../rest/presentation/json/JsonPresentation.java | 9 +-
.../rest/presentation/json/JsonConverterTest.java | 401 ---
.../runner/app/DynamicTableCreationTest.java | 28 +-
.../ignite/internal/runner/app/IgnitionTest.java | 2 -
.../apache/ignite/internal/app/IgnitionImpl.java | 14 +-
.../storage/DistributedConfigurationStorage.java | 79 +-
.../storage/LocalConfigurationStorage.java | 10 +-
.../ignite/internal/schema/SchemaManager.java | 42 +-
.../SchemaConfigurationConverter.java | 17 +-
.../configuration/SchemaTableValidatorImpl.java | 7 +-
.../SchemaConfigurationConverterTest.java | 2 +-
.../configuration/TestConfigurationStorage.java | 10 +-
.../ignite/distributed/ITDistributedTableTest.java | 20 +-
.../ignite/internal/table/InternalTable.java | 7 +
.../apache/ignite/internal/table/TableImpl.java | 16 +-
.../internal/table/distributed/TableManager.java | 287 ++-
.../distributed/storage/InternalTableImpl.java | 17 +-
.../internal/table/event/TableEventParameters.java | 57 +-
.../ignite/internal/table/TableManagerTest.java | 231 +-
.../internal/table/TestConfigurationStorage.java | 10 +-
.../table/impl/DummyInternalTableImpl.java | 5 +
.../apache/ignite/internal/vault/VaultManager.java | 74 +-
.../internal/vault/common/VaultListener.java | 43 -
.../ignite/internal/vault/common/VaultWatch.java | 85 -
.../ignite/internal/vault/common/WatcherImpl.java | 151 --
.../internal/vault/impl/VaultServiceImpl.java | 25 -
.../internal/vault/service/VaultService.java | 17 -
.../vault/impl/VaultBaseContractsTest.java | 99 +-
parent/pom.xml | 2 +-
317 files changed, 23208 insertions(+), 4825 deletions(-)
diff --cc modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
index 83884ac,99c8c8d..3141b0e
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java
@@@ -25,10 -26,10 +26,10 @@@ import java.util.UUID
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import org.apache.ignite.internal.schema.BinaryRow;
-import org.apache.ignite.internal.schema.Row;
+import org.apache.ignite.internal.schema.row.Row;
import org.apache.ignite.internal.schema.SchemaDescriptor;
- import org.apache.ignite.internal.schema.marshaller.TupleMarshaller;
import org.apache.ignite.internal.schema.SchemaRegistry;
+ import org.apache.ignite.internal.schema.marshaller.TupleMarshaller;
import org.apache.ignite.table.InvokeProcessor;
import org.apache.ignite.table.KeyValueBinaryView;
import org.apache.ignite.table.KeyValueView;
[ignite-3] 02/02: Minor.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-14743-row-formats
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 4d31cb3dd2d37d6c8be17e6dcd5c59c5a29a8971
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Thu Jun 24 15:11:38 2021 +0300
Minor.
---
.../schema/marshaller/reflection/JavaSerializer.java | 13 ++++++++-----
.../org/apache/ignite/internal/schema/row/ChunkFormat.java | 4 +---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
index 57b5bdd..6b5f252 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
@@ -85,7 +85,7 @@ public class JavaSerializer extends AbstractSerializer {
ObjectStatistic keyStat = collectObjectStats(schema.keyColumns(), keyMarsh, key);
ObjectStatistic valStat = collectObjectStats(schema.valueColumns(), valMarsh, val);
- return new RowAssembler(schema, keyStat.maxChunkDataSize, keyStat.nonNullCols, valStat.maxChunkDataSize, valStat.nonNullCols);
+ return new RowAssembler(schema, keyStat.nonNullColsSize, keyStat.nonNullCols, valStat.nonNullColsSize, valStat.nonNullCols);
}
/**
@@ -98,7 +98,7 @@ public class JavaSerializer extends AbstractSerializer {
*/
private ObjectStatistic collectObjectStats(Columns cols, Marshaller marsh, Object obj) {
if (obj == null || !cols.hasVarlengthColumns())
- return new ObjectStatistic(0, 0);
+ return ObjectStatistic.ZERO_VARLEN_STATISTICS;
int cnt = 0;
int size = cols.fixsizeMaxLen();
@@ -138,16 +138,19 @@ public class JavaSerializer extends AbstractSerializer {
* Object statistic.
*/
private static class ObjectStatistic {
+ /** Cached zero statistics. */
+ static final ObjectStatistic ZERO_VARLEN_STATISTICS = new ObjectStatistic(0,0);
+
/** Non-null columns of varlen type. */
int nonNullCols;
/** Length of all non-null columns of varlen types. */
- int maxChunkDataSize;
+ int nonNullColsSize;
/** Constructor. */
- ObjectStatistic(int nonNullCols, int maxRowSize) {
+ ObjectStatistic(int nonNullCols, int nonNullColsSize) {
this.nonNullCols = nonNullCols;
- this.maxChunkDataSize = maxRowSize;
+ this.nonNullColsSize = nonNullColsSize;
}
}
}
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ChunkFormat.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ChunkFormat.java
index ba2588c..e18156f 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ChunkFormat.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ChunkFormat.java
@@ -149,9 +149,7 @@ abstract class ChunkFormat {
* @return Chunk formatter regarding the provided flags.
*/
private static ChunkFormat fromFlags(byte chunkFlags) {
- final int mode = chunkFlags & FORMAT_CODE_MASK;
-
- switch (mode) {
+ switch (chunkFlags & FORMAT_CODE_MASK) {
case 1:
return TINY;
case 2: