>From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20374?usp=email )
Change subject: Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
* [ASTERIXDB-3641] Sampling query taking long time to run
* [ASTERIXDB-3636][STO] Fix buffer reservations understimation
* [NO ISSUE][*HYR][MISC] += Lazy helper for deferred initialization
* [NO ISSUE][RT] Notify joblet cleanup if joblet creation fails
* [NO ISSUE][*DB][EXT] Avoid serialization of JsonFactory
* [NO ISSUE][*DB][RT] Whisper logging for active partition,txn block msgs
Ext-ref: MB-67819
Change-Id: Id6e9ebbbb1f121d79bf927030dbde126be50a639
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
M
asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
3 files changed, 13 insertions(+), 17 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
index d7289ec..78cf365 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java
@@ -173,7 +173,6 @@
if
(!(joinExpr.getFunctionIdentifier().equals(AlgebricksBuiltinFunctions.EQ))) {
return 0.5; // this may not be accurate obviously!
} // we can do all relops here and other joins such as interval
joins and spatial joins, the compile time might increase a lot
-<<<<<<< HEAD (af89a7 [ASTERIXDB-3641] Sampling query taking long time to run)
boolean unnestOp1 =
joinEnum.findUnnestOp(joinEnum.leafInputs.get(idx1 - 1));
boolean unnestOp2 =
joinEnum.findUnnestOp(joinEnum.leafInputs.get(idx2 - 1));
@@ -189,16 +188,6 @@
joinEnum.leafInputs.get(idx2 - 1), index1, index2,
joinExpr, jOp);
if (sels == 0.0) {
sels = 1.0 / Math.max(card1, card2);
-=======
- ILogicalOperator leafInput1 = joinEnum.leafInputs.get(idx1 - 1);
- ILogicalOperator leafInput2 = joinEnum.leafInputs.get(idx2 - 1);
- LogicalVariable var1 = exprUsedVars.get(0);
- LogicalVariable var2 = exprUsedVars.get(1);
- if (isJoinSelFromSamplesApplicable(leafInput1, leafInput2, index1,
index2, var1, var2)) {
- double sel = findJoinSelFromSamples(leafInput1, leafInput2,
index1, index2, joinExpr, jOp);
- if (sel > 0.0) { // if sel is 0.0 we call naiveJoinSelectivity
- return sel;
->>>>>>> BRANCH (f1da2b [NO ISSUE][*DB][RT] Whisper logging for active
partition,txn)
}
return sels;
}
diff --git
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
index 91c9bc22..d1ca00f 100644
---
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
+++
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
@@ -18,9 +18,4 @@
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
-<<<<<<< HEAD (af89a7 [ASTERIXDB-3641] Sampling query taking long time to run)
- SOFTWARE
-
-=======
- SOFTWARE
->>>>>>> BRANCH (f1da2b [NO ISSUE][*DB][RT] Whisper logging for active
partition,txn)
+ SOFTWARE
\ No newline at end of file
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20374?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: Id6e9ebbbb1f121d79bf927030dbde126be50a639
Gerrit-Change-Number: 20374
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
