This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a change to branch auto-pick-57823-branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git


 discard 720a0024d83 [chore](type) remove useless code in type (#57823)
     add 0024b079b53 branch-4.0: [feature] (nereids) generate sql digest for 
nereids prased stmt #56256 (#57818)
     add 0cf712e3109 branch-4.0: [chore](sensitive) Hide accessor and secret 
key for create/alter storage vault #57528 (#57881)
     add af2354dd38a branch-4.0: [chore](thirdparty) Update unstable gnu mirror 
#56075 (#57904)
     add 59661fcb7d1 branch-4.0: [chore](log) return error to caller when 
get_tablet in cloud mode #57520 (#57901)
     add e818321d9bd branch-4.0: [feature](inverted index) add multi position 
PhraseQuery support to search function #57588 (#57897)
     add 841aa792d53 branch-4.0: [fix](compile) compiled failed due to parallel 
merge (#57936)
     add 68a2a6ca7a3 [chore](type) remove useless code in type (#57823)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (720a0024d83)
            \
             N -- N -- N   refs/heads/auto-pick-57823-branch-4.0 (68a2a6ca7a3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 be/src/cloud/cloud_tablet_mgr.cpp                  |  17 +-
 .../inverted_index/query/query_helper.cpp          |   5 +
 .../segment_v2/inverted_index/query/query_helper.h |   2 +
 .../segment_v2/inverted_index/query_v2/doc_set.h   | 106 ++-
 .../inverted_index/query_v2/intersection.cpp       |  36 +-
 .../inverted_index/query_v2/nullable_scorer.h      |  77 +++
 .../query_v2/phrase_query/multi_phrase_query.h     |  71 +++
 .../query_v2/phrase_query/multi_phrase_weight.h    | 113 ++++
 .../query_v2/phrase_query/phrase_query.h           |  30 +-
 .../query_v2/phrase_query/phrase_scorer.cpp        |   3 +-
 .../query_v2/phrase_query/phrase_weight.h          |  67 +-
 .../query_v2/phrase_query/postings_with_offset.h   |   4 -
 .../query_v2/postings/loaded_postings.cpp          | 136 ++++
 .../{intersection.h => postings/loaded_postings.h} |  36 +-
 .../query_v2/regexp_query/regexp_query.h           |   3 +-
 .../query_v2/regexp_query/regexp_weight.cpp        |  29 +-
 .../query_v2/regexp_query/regexp_weight.h          |   5 +-
 .../segment_v2/inverted_index/query_v2/scorer.h    |  11 +-
 .../inverted_index/query_v2/segment_postings.h     |  71 ++-
 .../inverted_index/query_v2/union/simple_union.cpp | 143 +++++
 .../{intersection.h => union/simple_union.h}       |  37 +-
 .../segment_v2/inverted_index/query_v2/weight.h    |  31 +
 .../query_v2/wildcard_query/wildcard_query.h       |   3 +-
 .../query_v2/wildcard_query/wildcard_weight.h      |   8 +-
 be/src/vec/functions/function_search.cpp           |  39 +-
 .../inverted_index/query_v2/doc_set_test.cpp       | 709 +++++++++++++++------
 .../query_v2/loaded_postings_test.cpp              | 296 +++++++++
 ..._query_test.cpp => multi_phrase_query_test.cpp} | 466 ++++++++++----
 .../inverted_index/query_v2/phrase_query_test.cpp  | 128 +++-
 .../query_v2/segment_postings_test.cpp             | 361 ++++++++---
 .../inverted_index/query_v2/simple_union_test.cpp  | 568 +++++++++++++++++
 cloud/src/meta-service/meta_service_helper.h       |   3 +-
 cloud/src/meta-service/meta_service_resource.cpp   |   3 +-
 .../org/apache/doris/analysis/TableSnapshot.java   |   8 +
 .../property/storage/AzureProperties.java          |   1 +
 .../datasource/property/storage/COSProperties.java |   1 +
 .../datasource/property/storage/GCSProperties.java |   1 +
 .../property/storage/MinioProperties.java          |   1 +
 .../datasource/property/storage/OBSProperties.java |   1 +
 .../property/storage/OSSHdfsProperties.java        |   1 +
 .../datasource/property/storage/OSSProperties.java |   2 +
 .../datasource/property/storage/S3Properties.java  |   1 +
 .../doris/nereids/analyzer/UnboundAlias.java       |  10 +
 .../doris/nereids/analyzer/UnboundFunction.java    |  14 +
 .../doris/nereids/analyzer/UnboundInlineTable.java |   6 +
 .../nereids/analyzer/UnboundOneRowRelation.java    |  12 +
 .../doris/nereids/analyzer/UnboundRelation.java    |  23 +
 .../doris/nereids/analyzer/UnboundResultSink.java  |   5 +
 .../apache/doris/nereids/analyzer/UnboundSlot.java |   5 +
 .../apache/doris/nereids/analyzer/UnboundStar.java |  15 +
 .../doris/nereids/analyzer/UnboundTVFRelation.java |   7 +
 .../doris/nereids/analyzer/UnboundTableSink.java   |  11 +
 .../doris/nereids/analyzer/UnboundVariable.java    |   5 +
 .../doris/nereids/parser/LogicalPlanBuilder.java   |   7 +
 .../parser/LogicalPlanBuilderForEncryption.java    |  24 +
 .../apache/doris/nereids/properties/OrderKey.java  |  18 +
 .../org/apache/doris/nereids/trees/TreeNode.java   |   4 +
 .../doris/nereids/trees/expressions/Alias.java     |  12 +
 .../nereids/trees/expressions/BinaryOperator.java  |   9 +
 .../doris/nereids/trees/expressions/CaseWhen.java  |  14 +
 .../doris/nereids/trees/expressions/Cast.java      |  11 +
 .../trees/expressions/CompoundPredicate.java       |  10 +
 .../trees/expressions/DefaultValueSlot.java        |   5 +
 .../doris/nereids/trees/expressions/Exists.java    |  10 +
 .../nereids/trees/expressions/InPredicate.java     |  25 +
 .../nereids/trees/expressions/InSubquery.java      |  10 +
 .../doris/nereids/trees/expressions/IsNull.java    |   8 +
 .../doris/nereids/trees/expressions/Not.java       |   7 +
 .../nereids/trees/expressions/OrderExpression.java |   5 +
 .../nereids/trees/expressions/Placeholder.java     |   4 +
 .../nereids/trees/expressions/Properties.java      |   5 +
 .../nereids/trees/expressions/ScalarSubquery.java  |   9 +
 .../trees/expressions/StringRegexPredicate.java    |  11 +
 .../doris/nereids/trees/expressions/Subtract.java  |  13 +
 .../trees/expressions/TimestampArithmetic.java     |  15 +
 .../nereids/trees/expressions/UnaryOperator.java   |   8 +
 .../nereids/trees/expressions/WhenClause.java      |   7 +
 .../trees/expressions/WindowExpression.java        |  18 +
 .../nereids/trees/expressions/WindowFrame.java     |  38 ++
 .../trees/expressions/functions/BoundFunction.java |  11 +
 .../functions/agg/AggregateFunction.java           |  14 +
 .../trees/expressions/functions/agg/Count.java     |   8 +
 .../trees/expressions/functions/scalar/Lambda.java |  12 +
 .../trees/expressions/literal/ArrayLiteral.java    |   7 +
 .../trees/expressions/literal/Interval.java        |   9 +
 .../nereids/trees/expressions/literal/Literal.java |   5 +
 .../plans/commands/AlterStorageVaultCommand.java   |   7 +-
 .../trees/plans/commands/ExplainCommand.java       |   8 +
 .../trees/plans/commands/ExportCommand.java        |  13 +
 .../insert/BatchInsertIntoTableCommand.java        |   7 +
 .../commands/insert/InsertIntoTableCommand.java    |  11 +
 .../insert/InsertOverwriteTableCommand.java        |  12 +
 .../trees/plans/logical/LogicalAggregate.java      |  70 +-
 .../nereids/trees/plans/logical/LogicalCTE.java    |  14 +
 .../trees/plans/logical/LogicalCheckPolicy.java    |   5 +
 .../nereids/trees/plans/logical/LogicalExcept.java |   9 +
 .../trees/plans/logical/LogicalFileSink.java       |  10 +
 .../nereids/trees/plans/logical/LogicalFilter.java |  12 +
 .../trees/plans/logical/LogicalGenerate.java       |  22 +
 .../nereids/trees/plans/logical/LogicalHaving.java |  13 +
 .../trees/plans/logical/LogicalIntersect.java      |   9 +
 .../nereids/trees/plans/logical/LogicalJoin.java   |  18 +
 .../nereids/trees/plans/logical/LogicalLimit.java  |  11 +
 .../trees/plans/logical/LogicalProject.java        |  19 +
 .../trees/plans/logical/LogicalQualify.java        |  10 +
 .../nereids/trees/plans/logical/LogicalRepeat.java |  45 +-
 .../trees/plans/logical/LogicalSelectHint.java     |   5 +
 .../nereids/trees/plans/logical/LogicalSort.java   |  12 +
 .../trees/plans/logical/LogicalSubQueryAlias.java  |  13 +
 .../nereids/trees/plans/logical/LogicalUnion.java  |   9 +
 .../trees/plans/logical/LogicalUsingJoin.java      |  16 +
 .../glue/translator/CountStarSmallestSlotTest.java |   6 +-
 .../doris/nereids/parser/EncryptSQLTest.java       |  15 +-
 .../nereids/parser/NereidsParserDigestTest.java    | 300 +++++++++
 .../external_table_p0/tvf/test_catalogs_tvf.out    |   4 +-
 .../streaming_job/test_streaming_insert_job.groovy |   2 +-
 thirdparty/vars.sh                                 |   8 +-
 117 files changed, 4152 insertions(+), 683 deletions(-)
 create mode 100644 
be/src/olap/rowset/segment_v2/inverted_index/query_v2/nullable_scorer.h
 create mode 100644 
be/src/olap/rowset/segment_v2/inverted_index/query_v2/phrase_query/multi_phrase_query.h
 create mode 100644 
be/src/olap/rowset/segment_v2/inverted_index/query_v2/phrase_query/multi_phrase_weight.h
 create mode 100644 
be/src/olap/rowset/segment_v2/inverted_index/query_v2/postings/loaded_postings.cpp
 copy be/src/olap/rowset/segment_v2/inverted_index/query_v2/{intersection.h => 
postings/loaded_postings.h} (51%)
 create mode 100644 
be/src/olap/rowset/segment_v2/inverted_index/query_v2/union/simple_union.cpp
 copy be/src/olap/rowset/segment_v2/inverted_index/query_v2/{intersection.h => 
union/simple_union.h} (52%)
 create mode 100644 
be/test/olap/rowset/segment_v2/inverted_index/query_v2/loaded_postings_test.cpp
 copy 
be/test/olap/rowset/segment_v2/inverted_index/query_v2/{phrase_query_test.cpp 
=> multi_phrase_query_test.cpp} (56%)
 create mode 100644 
be/test/olap/rowset/segment_v2/inverted_index/query_v2/simple_union_test.cpp
 create mode 100644 
fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserDigestTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to