>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20245 )
Change subject: Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
......................................................................
Merge branch 'gerrit/ionic' into 'gerrit/phoenix'
* [ASTERIXDB-3617][STO] Supporting sparse page zero writer
* [ASTERIXDB-3601][STO] Supporting multi-page zeroes
* [ASTERIXDB-3601][STO][CONF] Passing storage config to Btrees
* [ASTERIXDB-3601][STO][CONF] adding cofig for selecting pagezero writer
* [ASTERIXDB-3601][STO] Properly unpinning segment files
* [ASTERIXDB-3624][FUN] Fix record_remove_fields() type computer
* [NO ISSUE][EXT] Query fails on GCS external delta table
* [ASTERIXDB-3601][STO] Removing warn log
* [ASTERIXDB-3611][RT] Add more stats to query profile
* [ASTERIXDB-3601][STO] Fixed calculation issues
* [ASTERIXDB-3601][STO] Unpinning the not required segmentPages
* [NO ISSUE][*DB][EXT] Exclude hadoop-client-runtime transitive dependency
* [ASTERIXDB-3626][COMP] Restrict filter pushdown for array functions
* [ASTERIXDB-3603][FUN] Added extra validation for transform functions
* [NO ISSUE][OTH] Keep elapsedTime as float
* [ASTERIXDB-3627][OTH] Primary key missing from result
* [NO ISSUE][OTH] Adding getters to evaluator factories
* [ASTERIXDB-3601][STO] Fixing Merge failure
* [NO ISSUE][COMP] Remove check-unknown for Insert/Upsert on datasets with
meta part
* [ASTERIXDB-3601][STO] Remove unnecessary present column calculation for flush
* [NO ISSUE][COMP] Change plan to show RETAIN-UNTRUE for null placeholders
* [ASTERIXDB-3628][RT] Correct subplan profiles
* [ASTERIXDB-3601][STO] Fix calculation of presentColumns
* [ASTERIXDB-3601][FUNC] Added column-count function
* [ASTERIXDB-3392] Handle NULL/Empty types in Copy to parquet
* [ASTERIXDB-3392] Fix Hdfs tests
* [NO ISSUE][STO] Fixed multiple issue
* [NO ISSUE][HTTP][MISC] += ClusterStateManager.isPendingRemoval, HTTP stop
bind at shutdown
* [NO ISSUE][COMP] Add None as quote option for CSV in external collections
* [NO ISSUE]: Update dependency to address CVE
Change-Id: I2a0dba5a1ee4ec89dad16624572a3036efd54878
---
M
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
M
asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.008.adm
M
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
M
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
M
asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.007.adm
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
M
asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.009.adm
8 files changed, 86 insertions(+), 130 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/45/20245/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
index d269c3c..bb24b8a 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$18] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
- -- ASSIGN |PARTITIONED|
- select (eq(numeric-add($$c.getField("n").getField("x"), 1), 13))
[cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset filter on:
eq(numeric-add($$c.getField("n").getField("x"), 1), 13) [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
index 12cba3d..1935885 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$18] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
- -- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("array_field"),
ordered-list-constructor(1, "a", true))) [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
index ba59df2..9b20402 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$17] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$17] <- [{"c": $$c}] project: [$$17] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
- -- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("a"), 1)) [cardinality:
0.0, op-cost: 0.0, total-cost: 0.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$18, $$c] <- test.ColumnDataset filter on:
eq($$c.getField("nested_field").getField("a"), 1) range-filter on:
eq($$c.getField("nested_field").getField("a"), 1) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.007.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.007.adm
index 3f695b6..f4ab3a5 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.007.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.007.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$18] [cardinality: 0.0, doc-size: 271.0, op-cost: 0.0,
total-cost: 1.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 271.0, op-cost: 0.0, total-cost: 1.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 0.0, op-cost: 0.0, total-cost: 1.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, op-cost:
0.0, total-cost: 1.0]
- -- ASSIGN |PARTITIONED|
- select (eq(numeric-add($$c.getField("n").getField("x"), 1), 13))
[cardinality: 0.0, op-cost: 0.0, total-cost: 1.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset filter on:
eq(numeric-add($$c.getField("n").getField("x"), 1), 13) [cardinality: 1.0,
op-cost: 1.0, total-cost: 1.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.008.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.008.adm
index 10ad178..2364182 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.008.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.008.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$18] [cardinality: 1.0, doc-size: 271.0, op-cost: 0.0,
total-cost: 1.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 1.0, doc-size: 271.0, op-cost: 0.0, total-cost: 1.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 1.0, op-cost:
0.0, total-cost: 1.0]
- -- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("array_field"),
ordered-list-constructor(1, "a", true))) [cardinality: 1.0, op-cost: 0.0,
total-cost: 1.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset [cardinality: 1.0,
op-cost: 1.0, total-cost: 1.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.009.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.009.adm
index 082fb52..3b959fe 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.009.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/column/filter/return-array/return-array.009.adm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
distribute result [$$17] [cardinality: 1.0, doc-size: 271.0, op-cost: 0.0,
total-cost: 1.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
exchange [cardinality: 1.0, doc-size: 271.0, op-cost: 0.0, total-cost: 1.0]
@@ -16,23 +15,4 @@
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$17] [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
--- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$17] <- [{"c": $$c}] project: [$$17] [cardinality: 1.0, op-cost:
0.0, total-cost: 1.0]
- -- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("a"), 1)) [cardinality:
1.0, op-cost: 0.0, total-cost: 1.0]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 1.0, op-cost: 0.0, total-cost: 1.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$18, $$c] <- test.ColumnDataset filter on:
eq($$c.getField("nested_field").getField("a"), 1) range-filter on:
eq($$c.getField("nested_field").getField("a"), 1) [cardinality: 1.0, op-cost:
1.0, total-cost: 1.0]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
index 6c7c1bb..e06d400 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
@@ -653,7 +653,14 @@
return appConfig.getInt(Option.ABORT_TASKS_TIMEOUT);
}
-<<<<<<< HEAD (01d1ce [NO ISSUE][COMP] Add None as quote option for CSV in
externa)
+ public int getStorageMaxColumnsInZerothSegment() {
+ return appConfig.getInt(Option.STORAGE_MAX_COLUMNS_IN_ZEROTH_SEGMENT);
+ }
+
+ public String getStoragePageZeroWriter() {
+ return appConfig.getString(Option.STORAGE_PAGE_ZERO_WRITER);
+ }
+
public long getLibraryMaxFileSize() {
return appConfig.getLong(Option.LIBRARY_MAX_FILE_SIZE);
}
@@ -666,13 +673,4 @@
return appConfig.getInt(Option.LIBRARY_MAX_ARCHIVE_ENTRIES);
}
-=======
- public int getStorageMaxColumnsInZerothSegment() {
- return appConfig.getInt(Option.STORAGE_MAX_COLUMNS_IN_ZEROTH_SEGMENT);
- }
-
- public String getStoragePageZeroWriter() {
- return appConfig.getString(Option.STORAGE_PAGE_ZERO_WRITER);
- }
->>>>>>> BRANCH (fcc0af [NO ISSUE]: Update dependency to address CVE)
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20245
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: I2a0dba5a1ee4ec89dad16624572a3036efd54878
Gerrit-Change-Number: 20245
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
