>From Murtadha Hubail <[email protected]>:
Murtadha Hubail has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19644 )
Change subject: Merge branch 'ionic' into 'master'
......................................................................
Merge branch 'ionic' into 'master'
Change-Id: Ia2a193ecfeb7df3a8f0da9203b065493cf92c3b0
---
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.121.plan
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinter.java
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.021.plan
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriterFactory.java
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/GCSExternalFileWriterFactory.java
M
asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.04.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.08.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.021.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.031.plan
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AzureExternalFileWriterFactory.java
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.121.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.031.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.03.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.09.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.011.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.011.plan
M
asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.05.plan
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinterFactory.java
21 files changed, 63 insertions(+), 151 deletions(-)
Approvals:
Jenkins: Verified
Murtadha Hubail: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.011.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.011.plan
index 64b6bc9..ac64aa4 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.011.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.011.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
[cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
row-group-filter on: eq($$d.getField("department"), "accounting") [cardinality:
0.0, op-cost: 0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
row-group-filter on: eq($$d.getField("department"), "accounting") [cardinality:
0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.021.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.021.plan
index 0dacbae..bb6e9b3 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.021.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.021.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
[cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
row-group-filter on: and(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") embed-filter-value: true
row-group-filter on: and(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.031.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.031.plan
index 178da5e..5ba75b1 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.031.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.031.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department embed-filter-value:
true [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department embed-filter-value:
true row-group-filter on: or(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department embed-filter-value:
true row-group-filter on: or(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.121.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.121.plan
index c66a957..e4f848b 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.121.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/embed-one-value/one-field.121.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") embed-filter-value: true
[cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") embed-filter-value: true
row-group-filter on: eq($$d.getField("name").getField("last"), "Jones")
[cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") embed-filter-value: true
row-group-filter on: eq($$d.getField("name").getField("last"), "Jones")
[cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.011.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.011.plan
index 504e982..6c49ee6 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.011.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.011.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") row-group-filter on:
eq($$d.getField("department"), "accounting") [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") row-group-filter on:
eq($$d.getField("department"), "accounting") [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.021.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.021.plan
index ececc46..8900a93 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.021.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.021.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") row-group-filter on:
and(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department prefix-filter on:
eq($$d.getField("department"), "accounting") row-group-filter on:
and(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.031.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.031.plan
index 12ec76e..a05ff5f 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.031.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.031.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.Department [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.Department row-group-filter on:
or(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.Department row-group-filter on:
or(eq($$d.getField("department"), "accounting"),
eq($$d.getField("name").getField("last"), "Smith")) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.121.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.121.plan
index 407459d..a8469c7 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.121.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/parquet/one-field/one-field.121.plan
@@ -16,11 +16,7 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") row-group-filter on:
eq($$d.getField("name").getField("last"), "Jones") [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$d] <- test.LastName prefix-filter on:
eq($$d.getField("name").getField("last"), "Jones") row-group-filter on:
eq($$d.getField("name").getField("last"), "Jones") [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.03.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.03.plan
index 3fd461b..000b1f3 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.03.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.03.plan
@@ -14,11 +14,7 @@
-- STREAM_SELECT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$p1] <- test.ParquetDataset1 [cardinality:
0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$p1] <- test.ParquetDataset1 row-group-filter
on: gt($$p1.getField("id"), 10) [cardinality: 0.0, op-cost: 0.0, total-cost:
0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$p1] <- test.ParquetDataset1 row-group-filter
on: gt($$p1.getField("id"), 10) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.04.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.04.plan
index 1f091a1..a17f99b 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.04.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.04.plan
@@ -36,11 +36,7 @@
-- STREAM_SELECT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:any},id:any}) [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:any},id:any}) row-group-filter on:
gt($$p1.getField("id"), 10) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:any},id:any}) row-group-filter on:
gt($$p1.getField("id"), 10) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.05.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.05.plan
index 0ee44cc..52650d7 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.05.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.05.plan
@@ -36,11 +36,7 @@
-- STREAM_SELECT |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:[{indices:any,text:any}]},id:any}) [cardinality:
0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-=======
- data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:[{indices:any,text:any}]},id:any})
row-group-filter on: gt($$p1.getField("id"), 10) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$p1] <- test.ParquetDataset1
project ({entities:{hashtags:[{indices:any,text:any}]},id:any})
row-group-filter on: gt($$p1.getField("id"), 10) [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.08.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.08.plan
index ad05fbe..1645245 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.08.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.08.plan
@@ -48,13 +48,9 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any}]}) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost:
0.0]
-=======
- data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any}]}) row-group-filter on:
or(eq(scan-collection($$p.getField("val1")).getField("x"), 1),
eq(scan-collection($$p.getField("val1")).getField("x"), 2)) [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any}]}) row-group-filter on:
or(eq(scan-collection($$p.getField("val1")).getField("x"), 1),
eq(scan-collection($$p.getField("val1")).getField("x"), 2)) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
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]
- -- EMPTY_TUPLE_SOURCE |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.09.plan
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.09.plan
index 18262ba..82f52b8 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.09.plan
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/parquet/pushdown-plans/pushdown-plans.09.plan
@@ -48,13 +48,9 @@
-- ASSIGN |PARTITIONED|
exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any,y:any}]}) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-=======
- data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any,y:any}]}) row-group-filter on:
or(eq(scan-collection($$p.getField("val1")).getField("x"), 1),
eq(scan-collection($$p.getField("val1")).getField("y"), 2)) [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+ data-scan []<-[$$p] <- test.ParquetDataset1 project
({val1:[{x:any,y:any}]}) row-group-filter on:
or(eq(scan-collection($$p.getField("val1")).getField("x"), 1),
eq(scan-collection($$p.getField("val1")).getField("y"), 2)) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
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]
- -- EMPTY_TUPLE_SOURCE |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index a9c1f06..3082661 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -120,8 +120,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="copy-to">
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
-=======
<compilation-unit name="parquet-file-writers">
<placeholder name="adapter" value="S3" />
<placeholder name="pathprefix" value="" />
@@ -132,7 +130,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="copy-to">
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
<compilation-unit name="parquet-field-names">
<placeholder name="adapter" value="S3" />
<placeholder name="pathprefix" value="" />
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriterFactory.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriterFactory.java
index 5b60090..977f90a 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriterFactory.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriterFactory.java
@@ -63,15 +63,10 @@
abstract ICloudClient createCloudClient(IApplicationContext appCtx) throws
CompilationException;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
abstract String getAdapterName();
abstract int getPathMaxLengthInBytes();
- abstract boolean isNoContainerFoundException(IOException e);
-
- abstract boolean isSdkException(Throwable e);
-=======
/**
* Certain failures are wrapped in our exceptions as IO failures, this
method checks if the original failure
* is reported from the external SDK, and if so, returns it. This is to
ensure that the failure
@@ -81,7 +76,6 @@
* @return the throwable if it is an SDK exception, null otherwise
*/
abstract Optional<T> getSdkException(Throwable ex);
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
final void buildClient(IApplicationContext appCtx) throws
HyracksDataException {
try {
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AzureExternalFileWriterFactory.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AzureExternalFileWriterFactory.java
index 3a2923d..fd71ffc 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AzureExternalFileWriterFactory.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AzureExternalFileWriterFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.asterix.cloud.writer;
-import java.io.IOException;
+import java.util.Optional;
import org.apache.asterix.cloud.clients.ICloudClient;
import org.apache.asterix.cloud.clients.ICloudGuardian;
@@ -40,12 +40,11 @@
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.IWarningCollector;
+import org.apache.hyracks.api.util.ExceptionUtils;
import com.azure.core.exception.AzureException;
-import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
-
-public final class AzureExternalFileWriterFactory extends
AbstractCloudExternalFileWriterFactory {
+public final class AzureExternalFileWriterFactory extends
AbstractCloudExternalFileWriterFactory<AzureException> {
private static final long serialVersionUID = 4551318140901866805L;
static final char SEPARATOR = '/';
public static final IExternalFileWriterFactoryProvider PROVIDER = new
IExternalFileWriterFactoryProvider() {
@@ -83,13 +82,8 @@
}
@Override
- boolean isNoContainerFoundException(IOException e) {
- return e.getCause() instanceof NoSuchBucketException;
- }
-
- @Override
- boolean isSdkException(Throwable e) {
- return e instanceof AzureException;
+ Optional<AzureException> getSdkException(Throwable ex) {
+ return ExceptionUtils.getCauseOfType(ex, AzureException.class);
}
@Override
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/GCSExternalFileWriterFactory.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/GCSExternalFileWriterFactory.java
index 8e63303..dcf9166 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/GCSExternalFileWriterFactory.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/GCSExternalFileWriterFactory.java
@@ -27,12 +27,8 @@
import org.apache.asterix.common.api.IApplicationContext;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.external.util.ExternalDataConstants;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
-import org.apache.asterix.external.util.google.gcs.GCSConstants;
-import org.apache.asterix.external.util.google.gcs.GCSUtils;
-=======
import org.apache.asterix.external.util.google.gcs.GCSAuthUtils;
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
+import org.apache.asterix.external.util.google.gcs.GCSConstants;
import org.apache.asterix.runtime.writer.ExternalFileWriterConfiguration;
import org.apache.asterix.runtime.writer.IExternalFileWriter;
import org.apache.asterix.runtime.writer.IExternalFileWriterFactory;
@@ -76,7 +72,6 @@
}
@Override
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
String getAdapterName() {
return ExternalDataConstants.KEY_ADAPTER_NAME_GCS;
}
@@ -87,17 +82,8 @@
}
@Override
- boolean isNoContainerFoundException(IOException e) {
- return e.getCause() instanceof StorageException;
- }
-
- @Override
- boolean isSdkException(Throwable e) {
- return e instanceof BaseServiceException;
-=======
Optional<BaseServiceException> getSdkException(Throwable ex) {
return ExceptionUtils.getCauseOfType(ex, BaseServiceException.class);
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
}
@Override
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
index cd8f311..b374746 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
@@ -72,7 +72,6 @@
}
@Override
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
String getAdapterName() {
return ExternalDataConstants.KEY_ADAPTER_NAME_AWS_S3;
}
@@ -83,17 +82,8 @@
}
@Override
- boolean isNoContainerFoundException(IOException e) {
- return e.getCause() instanceof NoSuchBucketException;
- }
-
- @Override
- boolean isSdkException(Throwable e) {
- return e instanceof SdkException;
-=======
Optional<SdkException> getSdkException(Throwable ex) {
return ExceptionUtils.getCauseOfType(ex, SdkException.class);
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
}
@Override
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinter.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinter.java
index 0a8824e..046c03f 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinter.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinter.java
@@ -40,28 +40,16 @@
private final CompressionCodecName compressionCodecName;
private final MessageType schema;
private ParquetOutputFile parquetOutputFile;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
-=======
// private String parquetSchemaString;
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
private ParquetWriter<IValueReference> writer;
private final long rowGroupSize;
private final int pageSize;
private final ParquetProperties.WriterVersion writerVersion;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- public ParquetExternalFilePrinter(CompressionCodecName
compressionCodecName, MessageType schema, IAType typeInfo,
- long rowGroupSize, int pageSize, ParquetProperties.WriterVersion
writerVersion) {
-=======
public ParquetExternalFilePrinter(CompressionCodecName
compressionCodecName, MessageType parquetSchemaString,
IAType typeInfo, long rowGroupSize, int pageSize,
ParquetProperties.WriterVersion writerVersion) {
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
this.compressionCodecName = compressionCodecName;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- this.schema = schema;
-=======
this.schema = parquetSchemaString;
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
this.typeInfo = typeInfo;
this.rowGroupSize = rowGroupSize;
this.pageSize = pageSize;
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinterFactory.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinterFactory.java
index 3b32f22..797c1ad 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinterFactory.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/writer/printer/ParquetExternalFilePrinterFactory.java
@@ -31,15 +31,9 @@
public class ParquetExternalFilePrinterFactory implements
IExternalPrinterFactory {
private static final long serialVersionUID = 8971234908711235L;
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- // parquetInferredSchema is for the case when the schema is inferred from
the data, not provided by the user
- // set During the runtime
- private transient MessageType parquetInferredSchema;
-=======
// parquetInferSchema is for the case when the schema is inferred from the
data, not provided by the user
// set During the runtime
private transient MessageType parquetInferSchema;
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
// parquetProvidedSchema is for the case when the schema is provided by
the user
private ARecordType parquetProvidedSchema;
private final IAType typeInfo;
@@ -68,32 +62,12 @@
this.writerVersion = writerVersion;
}
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- public void setParquetSchema(MessageType parquetInferredSchema) {
- this.parquetInferredSchema = parquetInferredSchema;
-=======
public void setParquetSchema(MessageType parquetInferSchema) {
this.parquetInferSchema = parquetInferSchema;
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
}
@Override
public IExternalPrinter createPrinter(IEvaluatorContext context) {
-<<<<<<< HEAD (83a47b [ASTERIXDB-3589][COMP] replace complex join predicate
with e)
- if (parquetInferredSchema != null) {
- return new ParquetExternalFilePrinter(compressionCodecName,
parquetInferredSchema, typeInfo, rowGroupSize,
- pageSize, writerVersion);
- }
-
- MessageType schema;
- try {
- schema =
SchemaConverterVisitor.convertToParquetSchema(parquetProvidedSchema);
- } catch (CompilationException e) {
- // This should not happen, Compilation Exception should be caught
at the query-compile time
- throw new RuntimeException(e);
- }
- //TODO(ian): shouldn't this printer use the context to warn if there's
a schema mismatch?
-=======
if (parquetInferSchema != null) {
return new ParquetExternalFilePrinter(compressionCodecName,
parquetInferSchema, typeInfo, rowGroupSize,
pageSize, writerVersion);
@@ -106,7 +80,6 @@
// This should not happen, Compilation Exception should be caught
at the query-compile time
throw new RuntimeException(e);
}
->>>>>>> BRANCH (ceb62b [NO ISSUE][RT] Do not retry IllegalArgumentException on
Expo)
return new ParquetExternalFilePrinter(compressionCodecName, schema,
typeInfo, rowGroupSize, pageSize,
writerVersion);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19644
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Ia2a193ecfeb7df3a8f0da9203b065493cf92c3b0
Gerrit-Change-Number: 19644
Gerrit-PatchSet: 5
Gerrit-Owner: Murtadha Hubail <[email protected]>
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Hussain Towaileb <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Murtadha Hubail <[email protected]>
Gerrit-MessageType: merged
