This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 888fb45707861ad69cbfc3bfcd0a4703403e1742 Merge: b63ead9 4d23f02 Author: Dmitry Lychagin <[email protected]> AuthorDate: Fri Dec 4 12:00:51 2020 -0800 Merge commit '70a7d58','6903fa3','4d23f02' Change-Id: Ib4bb9009617c4b99827ba7073a74aebe0fe0c725 .../asterix/app/active/ActiveEntityEventsListener.java | 1 + .../apache/asterix/app/translator/QueryTranslator.java | 15 ++++++++++++--- .../org/apache/asterix/metadata/entities/Dataset.java | 12 +++++++----- .../entitytupletranslators/FunctionTupleTranslator.java | 2 +- .../org/apache/asterix/metadata/utils/DatasetUtil.java | 9 ++++++++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 9137f5e,45f0a82..e446ab8 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@@ -239,8 -227,8 +239,9 @@@ import org.apache.hyracks.api.result.IR import org.apache.hyracks.api.result.ResultSetId; import org.apache.hyracks.control.cc.ClusterControllerService; import org.apache.hyracks.control.common.controllers.CCConfig; + import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption; import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory; +import org.apache.hyracks.storage.am.lsm.invertedindex.fulltext.TokenizerCategory; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;
