This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit bfea25bbfc6884ab10c10c4ca0bc1f8a3d6f8cba Merge: 4715224 f0fe3ea Author: Michael Blow <[email protected]> AuthorDate: Sat Mar 13 14:57:23 2021 -0500 Merge branch 'gerrit/cheshire-cat' Change-Id: I7300c1ad43e258420df059a8934f248e00ed4e86 .../src/main/java/org/apache/asterix/active/Activity.java | 2 +- .../src/main/java/org/apache/asterix/active/ActivityState.java | 2 +- .../java/org/apache/asterix/algebra/extension/ExtensionStatement.java | 2 +- .../asterix/optimizer/rules/AsterixConsolidateWindowOperatorsRule.java | 2 +- .../asterix/optimizer/rules/InjectTypeCastForFunctionArgumentsRule.java | 2 +- .../asterix/optimizer/rules/SetAsterixMemoryRequirementsRule.java | 2 +- .../apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java | 2 +- .../java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java | 2 +- .../src/main/java/org/apache/asterix/app/cc/CCExtensionManager.java | 2 +- .../java/org/apache/asterix/app/message/ClientRequestsResponse.java | 2 +- .../main/java/org/apache/asterix/app/nc/task/MetadataBootstrapTask.java | 2 +- .../org/apache/asterix/app/nc/task/StartReplicationServiceTask.java | 2 +- .../asterix/app/replication/message/MetadataNodeRequestMessage.java | 2 +- .../java/org/apache/asterix/app/resource/OperatorResourcesComputer.java | 2 +- .../org/apache/asterix/messaging/MessagingChannelWriteInterface.java | 2 +- .../org/apache/asterix/api/common/SslAsterixHyracksIntegrationUtil.java | 2 +- .../src/test/java/org/apache/asterix/runtime/ParseDurationTest.java | 2 +- .../src/test/java/org/apache/asterix/test/active/Action.java | 2 +- .../asterix-app/src/test/java/org/apache/asterix/test/active/Actor.java | 2 +- .../test/java/org/apache/asterix/test/common/TestTupleReference.java | 2 +- .../org/apache/asterix/common/annotations/MissingNullInOutFunction.java | 2 +- .../common/annotations/SecondaryIndexSearchPreferenceAnnotation.java | 2 +- .../src/main/java/org/apache/asterix/common/api/Duration.java | 2 +- .../src/main/java/org/apache/asterix/common/api/IConfigValidator.java | 2 +- .../java/org/apache/asterix/common/api/IConfigValidatorFactory.java | 2 +- .../main/java/org/apache/asterix/common/api/IReceptionistFactory.java | 2 +- .../java/org/apache/asterix/common/api/ISchedulableClientRequest.java | 2 +- .../src/main/java/org/apache/asterix/common/config/GlobalConfig.java | 2 +- .../main/java/org/apache/asterix/common/config/MessagingProperties.java | 2 +- .../java/org/apache/asterix/common/exceptions/ReplicationException.java | 2 +- .../org/apache/asterix/common/functions/ExternalFunctionLanguage.java | 2 +- .../src/main/java/org/apache/asterix/common/metadata/DataverseName.java | 2 +- .../asterix/common/replication/AllDatasetsReplicationStrategy.java | 2 +- .../org/apache/asterix/common/replication/INcLifecycleCoordinator.java | 2 +- .../org/apache/asterix/common/replication/NoReplicationStrategy.java | 2 +- .../apache/asterix/common/replication/ReplicationStrategyFactory.java | 2 +- .../java/org/apache/asterix/common/storage/DatasetCopyIdentifier.java | 2 +- .../java/org/apache/asterix/common/transactions/ICheckpointManager.java | 2 +- .../main/java/org/apache/asterix/common/transactions/ILogReader.java | 2 +- .../src/main/java/org/apache/asterix/common/utils/RequestStatus.java | 2 +- .../asterix/external/library/ExternalFunctionDescriptorProvider.java | 2 +- .../asterix/external/library/ExternalScalarFunctionDescriptor.java | 2 +- .../asterix/external/operators/AbstractLibraryOperatorDescriptor.java | 2 +- .../external/operators/LibraryDeployAbortOperatorDescriptor.java | 2 +- .../external/operators/LibraryDeployCommitOperatorDescriptor.java | 2 +- .../geo/aggregates/ScalarSTUnionDistinctAggregateDescriptor.java | 2 +- .../apache/asterix/lang/common/statement/CreateLibraryStatement.java | 2 +- .../apache/asterix/lang/common/statement/CreateSynonymStatement.java | 2 +- .../org/apache/asterix/lang/common/statement/LibraryDropStatement.java | 2 +- .../org/apache/asterix/lang/common/statement/SynonymDropStatement.java | 2 +- .../java/org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java | 2 +- .../lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java | 2 +- .../lexer-generator-maven-plugin/src/main/resources/Lexer.java | 2 +- .../main/java/org/apache/asterix/metadata/api/ICCExtensionManager.java | 2 +- .../src/main/java/org/apache/asterix/metadata/entities/Synonym.java | 2 +- .../asterix/metadata/entitytupletranslators/IndexTupleTranslator.java | 2 +- .../asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java | 2 +- .../main/java/org/apache/asterix/metadata/feeds/LocationConstraint.java | 2 +- .../src/main/java/org/apache/asterix/metadata/lock/MetadataLockKey.java | 2 +- .../java/org/apache/asterix/formats/nontagged/TypeTraitProvider.java | 2 +- .../src/main/java/org/apache/asterix/om/base/AMutableUUID.java | 2 +- .../asterix/om/typecomputer/impl/AggregateResultTypeComputer.java | 2 +- .../org/apache/asterix/om/typecomputer/impl/CastTypeLaxComputer.java | 2 +- .../asterix/om/typecomputer/impl/IfMissingOrNullTypeComputer.java | 2 +- .../asterix/om/typecomputer/impl/Int64ArrayToStringTypeComputer.java | 2 +- .../runtime/aggregates/scalar/ScalarAvgDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarKurtosisDistinctAggregateDescriptor.java | 2 +- .../runtime/aggregates/scalar/ScalarMaxDistinctAggregateDescriptor.java | 2 +- .../runtime/aggregates/scalar/ScalarMinDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSkewnessDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlAvgDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlCountDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlKurtosisDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlMaxDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlMinDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlSkewnessDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlStddevDistinctAggregateDescriptor.java | 2 +- .../scalar/ScalarSqlStddevPopDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlSumDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlVarDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarSqlVarPopDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarStddevDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarStddevPopDistinctAggregateDescriptor.java | 2 +- .../runtime/aggregates/scalar/ScalarSumDistinctAggregateDescriptor.java | 2 +- .../runtime/aggregates/scalar/ScalarVarDistinctAggregateDescriptor.java | 2 +- .../aggregates/scalar/ScalarVarPopDistinctAggregateDescriptor.java | 2 +- .../org/apache/asterix/runtime/aggregates/utils/PointableHashSet.java | 2 +- .../runtime/evaluators/comparisons/AbstractIfEqualsEvaluator.java | 2 +- .../evaluators/functions/DecodeDataverseDisplayNameDescriptor.java | 2 +- .../asterix/runtime/evaluators/functions/StringJoinDescriptor.java | 2 +- .../operators/AbstractLSMSecondaryIndexCreationNodePushable.java | 2 +- .../algebricks/core/algebra/expressions/IExpressionAnnotation.java | 2 +- .../core/algebra/operators/physical/AbstractDistinctByPOperator.java | 2 +- .../core/algebra/operators/physical/AbstractGroupByPOperator.java | 2 +- .../hyracks/algebricks/core/algebra/plan/PlanStabilityVerifier.java | 2 +- .../hyracks/algebricks/core/algebra/plan/PlanStructureVerifier.java | 2 +- .../algebricks/core/algebra/properties/LocalMemoryRequirements.java | 2 +- .../apache/hyracks/algebricks/data/IUnnestingPositionWriterFactory.java | 2 +- .../hyracks/algebricks/rewriter/rules/HybridToInMemoryHashJoinRule.java | 2 +- .../algebricks/rewriter/rules/PushMapOperatorThroughUnionRule.java | 2 +- .../hyracks/algebricks/rewriter/rules/SetMemoryRequirementsRule.java | 2 +- .../algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java | 2 +- .../algebricks/runtime/operators/win/WindowNestedPlansPushRuntime.java | 2 +- .../java/org/apache/hyracks/api/exceptions/IFormattedException.java | 2 +- .../java/org/apache/hyracks/api/network/INetworkSecurityConfig.java | 2 +- .../java/org/apache/hyracks/api/network/INetworkSecurityManager.java | 2 +- .../src/main/java/org/apache/hyracks/api/network/ISocketChannel.java | 2 +- .../src/main/java/org/apache/hyracks/api/result/IJobResultCallback.java | 2 +- .../main/java/org/apache/hyracks/api/util/ExecutionTimeStopWatch.java | 2 +- .../src/main/java/org/apache/hyracks/api/util/StopWatch.java | 2 +- .../src/test/java/org/apache/hyracks/api/test/CountAndThrowError.java | 2 +- .../test/java/org/apache/hyracks/api/test/CountAndThrowException.java | 2 +- .../src/test/java/org/apache/hyracks/api/test/CountAnswer.java | 2 +- .../test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java | 2 +- .../main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java | 2 +- .../java/org/apache/hyracks/control/common/ControllerShutdownHook.java | 2 +- .../org/apache/hyracks/control/common/controllers/ControllerConfig.java | 2 +- .../src/main/java/org/apache/hyracks/control/nc/NodeControllerIPCI.java | 2 +- .../main/java/org/apache/hyracks/control/nc/task/HeartbeatAckTask.java | 2 +- .../src/main/java/org/apache/hyracks/control/nc/task/PingTask.java | 2 +- .../java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java | 2 +- .../hyracks/data/std/util/ByteArrayAccessibleDataInputStream.java | 2 +- .../apache/hyracks/data/std/util/ByteArrayAccessibleInputStream.java | 2 +- .../hyracks/dataflow/common/comm/io/FixedSizeFrameTupleAppender.java | 2 +- .../hyracks/dataflow/common/data/accessors/PointableTupleReference.java | 2 +- .../hyracks/dataflow/std/structures/SerializableHashTableTest.java | 2 +- .../dataflow/std/structures/SimpleSerializableHashTableTest.java | 2 +- .../src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java | 2 +- .../hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java | 2 +- .../storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java | 2 +- .../hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java | 2 +- .../storage/am/lsm/common/impls/LSMIndexDiskComponentBulkLoader.java | 2 +- .../storage/am/lsm/common/impls/MultitenantVirtualBufferCache.java | 2 +- .../hyracks/storage/am/lsm/invertedindex/api/IInvertedListCursor.java | 2 +- .../am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluator.java | 2 +- .../invertedindex/fulltext/AbstractFullTextFilterEvaluatorFactory.java | 2 +- .../ondisk/fixedsize/FixedSizeElementInvertedListScanCursor.java | 2 +- .../org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAccessor.java | 2 +- .../am/lsm/rtree/tuples/LSMRTreeTupleWriterFactoryForPointMBR.java | 2 +- .../range/FieldRangeIntersectPartitionComputerFactoryTest.java | 2 +- .../storage/am/lsm/invertedindex/ondisk/InvertedIndexUtilsTest.java | 2 +- .../src/main/java/org/apache/hyracks/util/annotations/CriticalPath.java | 2 +- .../src/main/java/org/apache/hyracks/util/annotations/Idempotent.java | 2 +- .../src/main/java/org/apache/hyracks/util/annotations/ThreadSafe.java | 2 +- .../src/main/java/org/apache/hyracks/util/cache/ICacheManager.java | 2 +- .../src/main/java/org/apache/hyracks/util/cache/ICachePolicy.java | 2 +- .../hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java | 2 +- 147 files changed, 147 insertions(+), 147 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluator.java index 6225101,6a7da02..50d87b5 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluator.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluator.java @@@ -17,23 -17,22 +17,23 @@@ * under the License. */ -package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers; +package org.apache.hyracks.storage.am.lsm.invertedindex.fulltext; -import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.TokenizerInfo.TokenizerType; +public abstract class AbstractFullTextFilterEvaluator implements IFullTextFilterEvaluator { -public interface IBinaryTokenizer { - public IToken getToken(); + protected final String name; + protected final FullTextFilterType type; - public boolean hasNext(); + public AbstractFullTextFilterEvaluator(String name, FullTextFilterType type) { + this.name = name; + this.type = type; + } - public void next(); + public String getName() { + return name; + } - public void reset(byte[] data, int start, int length); - - // Get the total number of tokens - public short getTokensCount(); - - // Get the tokenizer types - public TokenizerType getTokenizerType(); + public FullTextFilterType getFilterType() { + return type; + } - } + } diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluatorFactory.java index d883829,6a7da02..4fa27ca --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluatorFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/fulltext/AbstractFullTextFilterEvaluatorFactory.java @@@ -17,17 -17,22 +17,17 @@@ * under the License. */ -package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers; +package org.apache.hyracks.storage.am.lsm.invertedindex.fulltext; -import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.TokenizerInfo.TokenizerType; +import com.fasterxml.jackson.databind.ObjectMapper; -public interface IBinaryTokenizer { - public IToken getToken(); +public abstract class AbstractFullTextFilterEvaluatorFactory implements IFullTextFilterEvaluatorFactory { + protected final String name; + protected final FullTextFilterType type; + protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - public boolean hasNext(); - - public void next(); - - public void reset(byte[] data, int start, int length); - - // Get the total number of tokens - public short getTokensCount(); - - // Get the tokenizer types - public TokenizerType getTokenizerType(); + protected AbstractFullTextFilterEvaluatorFactory(String name, FullTextFilterType type) { + this.name = name; + this.type = type; + } - } + }
