This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit e7974ce1adf788c93868736704ce3d755d51de22 Merge: e75c8ef 3435172 Author: Ian Maxon <[email protected]> AuthorDate: Fri May 21 12:41:46 2021 -0700 Merge branch 'cheshire-cat' Change-Id: I72241c264b37ead5ae1fc40ed1f2b50f20c8689c .../active/message/ActiveManagerMessage.java | 2 +- .../ExtractBatchableExternalFunctionCallsRule.java | 12 +- ...duceDynamicTypeCastForExternalFunctionRule.java | 13 +- .../asterix/translator/IRequestParameters.java | 2 + .../asterix/translator/IStatementExecutor.java | 6 +- .../apache/asterix/api/common/APIFramework.java | 24 +- .../api/http/server/AbstractNCUdfServlet.java | 2 +- .../app/active/ActiveEntityEventsListener.java | 7 +- .../asterix/app/function/DumpIndexDatasource.java | 14 +- .../asterix/app/function/DumpIndexRewriter.java | 6 +- .../message/ExecuteStatementRequestMessage.java | 20 +- .../org/apache/asterix/app/nc/RecoveryManager.java | 20 +- .../asterix/app/nc/task/RetrieveLibrariesTask.java | 7 +- .../asterix/app/translator/QueryTranslator.java | 16 +- .../asterix/app/translator/RequestParameters.java | 17 + .../org/apache/asterix/utils/FeedOperations.java | 2 +- .../asterix/app/external/ExternalUDFLibrarian.java | 3 +- .../apache/asterix/test/common/TestExecutor.java | 9 +- .../test/dataflow/LSMFlushRecoveryTest.java | 12 +- .../s3/anonymous_no_auth/test.000.ddl.sqlpp} | 18 +- .../s3/anonymous_no_auth/test.001.ddl.sqlpp} | 18 +- .../s3/anonymous_no_auth/test.002.ddl.sqlpp} | 17 +- .../s3/anonymous_no_auth/test.099.ddl.sqlpp} | 4 +- ....query.sqlpp => type_validation.10.query.sqlpp} | 7 +- ...on.4.ddl.sqlpp => type_validation.11.ddl.sqlpp} | 0 .../type_validation.2.ddl.sqlpp | 4 +- .../type_validation.3.query.sqlpp | 3 +- ...3.query.sqlpp => type_validation.4.query.sqlpp} | 5 +- ...3.query.sqlpp => type_validation.5.query.sqlpp} | 5 +- ...3.query.sqlpp => type_validation.6.query.sqlpp} | 7 +- ...3.query.sqlpp => type_validation.7.query.sqlpp} | 3 +- ...3.query.sqlpp => type_validation.8.query.sqlpp} | 5 +- ...3.query.sqlpp => type_validation.9.query.sqlpp} | 5 +- ...ntiment.0.ddl.sqlpp => toplevel_fn.0.ddl.sqlpp} | 0 ...ntiment.1.lib.sqlpp => toplevel_fn.1.lib.sqlpp} | 0 ...ntiment.2.ddl.sqlpp => toplevel_fn.2.ddl.sqlpp} | 0 ...ent.3.query.sqlpp => toplevel_fn.3.query.sqlpp} | 0 ...ent.3.query.sqlpp => toplevel_fn.4.query.sqlpp} | 7 +- ...ntiment.4.ddl.sqlpp => toplevel_fn.5.ddl.sqlpp} | 0 .../type_name.0.ddl.sqlpp} | 0 .../type_name.1.lib.sqlpp} | 4 +- .../type_name.2.ddl.sqlpp} | 6 +- .../type_name.3.query.sqlpp} | 11 +- .../type_name.4.ddl.sqlpp} | 0 .../query-ASTERIXDB-2886.1.ddl.sqlpp} | 25 +- .../query-ASTERIXDB-2886.2.ddl.sqlpp} | 25 +- .../query-ASTERIXDB-2886.3.query.sqlpp} | 14 +- .../special_chars_2/special_chars_2.2.query.sqlpp | 1 - .../type_validation.1.adm | 2 +- .../type_validation.2.adm | 1 + .../type_validation.3.adm | 1 + .../type_validation.4.adm | 1 + .../type_validation.5.adm | 1 + .../type_validation.6.adm | 1 + .../type_validation.7.adm | 1 + .../type_validation.8.adm | 1 + .../{toplevel_fn.1.adm => toplevel_fn.3.adm} | 0 .../external-library/toplevel_fn/toplevel_fn.4.adm | 1 + .../external-library/type_name/type_name.3.adm | 1 + .../push-limit-to-primary-scan-select.11.adm | 4 +- .../push-limit-to-primary-scan.7.adm | 4 +- .../query-ASTERIXDB-2886.3.adm | 4 + .../special_chars_2/special_chars_2.2.adm | 12 +- .../results/union/union_opt_1/union_opt_1.11.adm | 8 +- ...stsuite_external_dataset_azure_blob_storage.xml | 10 +- .../runtimets/testsuite_external_dataset_s3.xml | 17 +- ...testsuite_external_dataset_s3_one_partition.xml | 20 +- .../resources/runtimets/testsuite_it_sqlpp.xml | 5 + .../test/resources/runtimets/testsuite_sqlpp.xml | 5 + .../common/api/IDatasetLifecycleManager.java | 9 + .../common/context/DatasetLifecycleManager.java | 11 + .../asterix/common/exceptions/ErrorCode.java | 4 +- .../common/transactions/IRecoveryManager.java | 11 - .../src/main/resources/asx_errormsg/en.properties | 2 + .../src/main/user-defined_function/udf.md | 63 ++- .../dataflow/AbstractFeedDataFlowController.java | 5 + .../dataflow/FeedRecordDataFlowController.java | 5 +- .../dataflow/FeedStreamDataFlowController.java | 1 - .../reader/stream/QuotedLineRecordReader.java | 2 +- .../reader/stream/SemiStructuredRecordReader.java | 2 +- .../ExternalScalarJavaFunctionEvaluator.java | 45 ++- .../ExternalScalarPythonFunctionEvaluator.java | 30 +- .../ExternalAssignBatchRuntimeFactory.java | 19 +- ...DataParser.java => AbstractJsonDataParser.java} | 105 ++--- .../external/parser/AbstractNestedDataParser.java | 2 +- .../external/parser/DelimitedDataParser.java | 2 +- .../asterix/external/parser/JSONDataParser.java | 437 ++------------------- .../asterix/external/parser/ParseException.java | 4 + .../asterix/external/parser/TweetParser.java | 2 +- .../{ObjectPool.java => AbstractObjectPool.java} | 28 +- .../external/parser/jackson/IObjectPool.java | 13 +- .../external/parser/jackson/ObjectPool.java | 34 +- .../external/parser/jackson/ParserContext.java | 8 +- .../{ObjectPool.java => SoftObjectPool.java} | 38 +- .../asterix/external/util/ExternalDataUtils.java | 64 ++- .../asterix/external/library/TypeNameFactory.java | 14 +- .../asterix/external/library/TypeNameFunction.java | 30 +- .../asterix/metadata/entities/NodeGroup.java | 18 +- .../functions/ExternalFunctionCompilerUtil.java | 2 +- .../metadata/functions/ExternalTypeComputer.java | 13 +- .../apache/asterix/metadata/utils/DatasetUtil.java | 2 +- .../utils/SecondaryIndexOperationsHelper.java | 4 + .../asterix/om/functions/BuiltinFunctions.java | 3 - .../org/apache/asterix/om/types/BuiltinType.java | 60 +-- .../replication/management/NetworkingUtil.java | 34 +- .../DecodeDataverseDisplayNameDescriptor.java | 88 ----- .../runtime/functions/FunctionCollection.java | 2 - .../asterix/runtime/utils/ClusterStateManager.java | 2 - asterixdb/asterix-server/pom.xml | 4 +- .../service/locking/ResourceGroupTable.java | 2 +- asterixdb/pom.xml | 4 +- .../appended-resources/supplemental-models.xml | 8 +- ....com_netty_netty_netty-4.1.63.Final_NOTICE.txt} | 0 .../LogicalOperatorPrettyPrintVisitorJson.java | 9 +- .../rules/RemoveRedundantVariablesRule.java | 94 +++-- .../api/rewriter/runtime/SuperActivity.java | 5 + .../runtime/SuperActivityOperatorNodePushable.java | 7 +- .../apache/hyracks/api/util/ErrorMessageUtil.java | 11 +- .../hyracks/api/util/HyracksThrowingSupplier.java} | 8 +- .../org/apache/hyracks/api/util/InvokeUtil.java | 3 + .../java/org/apache/hyracks}/util/ParseUtil.java | 25 +- .../src/main/resources/errormsg/en.properties | 2 +- .../apache/hyracks/control/cc/job/JobManager.java | 4 +- .../file/FieldCursorForDelimitedDataParser.java | 5 +- .../hyracks/http/server/AbstractServlet.java | 23 +- .../hyracks/http/server/HttpServerHandler.java | 8 +- .../apache/hyracks/http/server/utils/HttpUtil.java | 31 +- .../java/org/apache/hyracks/util/ExitUtil.java | 6 +- .../util/MaintainedThreadNameExecutorService.java | 12 +- .../java/org/apache/hyracks/util/NetworkUtil.java | 22 ++ .../java/org/apache/hyracks/util/StorageUtil.java | 53 +-- .../org/apache/hyracks/util/ThrowingFunction.java | 19 + .../apache/hyracks/util/string/UTF8StringUtil.java | 11 +- .../hyracks/util/string/UTF8StringWriter.java | 3 +- .../org/apache/hyracks/util/NetworkUtilTest.java | 11 + .../org/apache/hyracks/util/StorageUnitTest.java | 79 ++++ hyracks-fullstack/pom.xml | 18 +- 137 files changed, 1095 insertions(+), 1098 deletions(-) diff --cc asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java index 17159d3,e1c9164..18d55aa --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java @@@ -331,11 -331,10 +331,10 @@@ import org.apache.asterix.runtime.evalu import org.apache.asterix.runtime.evaluators.functions.CreateQueryUIDDescriptor; import org.apache.asterix.runtime.evaluators.functions.CreateRectangleDescriptor; import org.apache.asterix.runtime.evaluators.functions.CreateUUIDDescriptor; - import org.apache.asterix.runtime.evaluators.functions.DecodeDataverseDisplayNameDescriptor; import org.apache.asterix.runtime.evaluators.functions.DecodeDataverseNameDescriptor; import org.apache.asterix.runtime.evaluators.functions.DeepEqualityDescriptor; -import org.apache.asterix.runtime.evaluators.functions.FullTextContainsDescriptor; -import org.apache.asterix.runtime.evaluators.functions.FullTextContainsWithoutOptionDescriptor; +import org.apache.asterix.runtime.evaluators.functions.FullTextContainsFunctionDescriptor; +import org.apache.asterix.runtime.evaluators.functions.FullTextContainsWithoutOptionFunctionDescriptor; import org.apache.asterix.runtime.evaluators.functions.GetItemDescriptor; import org.apache.asterix.runtime.evaluators.functions.GetJobParameterByNameDescriptor; import org.apache.asterix.runtime.evaluators.functions.GetTypeDescriptor;
