>From Ian Maxon <[email protected]>:
Ian Maxon has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21310?usp=email )
Change subject: Merge branch 'lumina'
......................................................................
Merge branch 'lumina'
d493307ca1 (gerrit/lumina, lumina) [NO ISSUE][MISC] Upgrade Netty to 4.1.135 to
address CVEs
22caa8a193 [NO ISSUE][*DB][EXT] Replace instances of 'sdk_default' with null
001c54fe50 [NO ISSUE][EXT]: set inputStreamType and changeDetectionMode if
missing
059b75158d [NO ISSUE][OTH] Ignore directory objects returned for listing
objects from S3
44e54a6e67 [NO ISSUE][EXT]: map the iceberg MAP type to array of key-value
objects
bafe9ba1b8 [NO ISSUE][CLOUD] S3 Checksum Behavior Updates
fa4f610f6c [NO ISSUE][EXT]: fixes for timezone
a4454e8c50 [NO ISSUE][EXT]: fixes for azure
5d8966768c [ASTERIXDB-3559][COMP] Fix incorrect 0.0 cost annotation for GROUP
BY and ORDER BY operators
c004702697 [ASTERIXDB-3649][HYR] Ensure reportPartitionConsumed for all
partitions
fafbc855c5 [NO ISSUE][LOG] changed logLevel to trace for
AbstractColumnTupleReference
44797dabe2 [NO ISSUE][MISC] Update Dependencies
f0ee6c3d7d [ASTERIXDB-3634][EXT]: default datetime types to return datetime
82e6e10095 [ASTERIXDB-3649][API] Add servlet for open-requests()
ffa9883806 [ASTERIXDB-3768][CLOUD] Set explicit CRC32C checksum on S3
DeleteObjects
6319e9ca68 [ASTERIXDB-3649][API] Remove tracking info when no job created
a1e7fafd00 [NO ISSUE][MISC] Revert nessie depdency update, to keep in sync with
iceberg
a7bed8a1cc [NO ISSUE][*DB][STO] += S3ClientConfig.toString()
d32f6488af [ASTERIXDB-3649][HYR][API] Call job record finish before callback
4a5fa7ca29 [ASTERIXDB-3649][HYR][API] Sweep only completed jobs + RESULT_TTL
change
ac03460277 [NO ISSUE][MISC] Update Azure Dependencies
1d7aa4b17f [NO ISSUE][MISC] Force compatible service version when Azurite
98f9ea6b6e [ASTERIXDB-3649][FUN] Rename 'async-requests()' -> 'open-requests()'
98429e34c2 [ASTERIXDB-3649][HYR] Measure result expiry since job complete
47a543b46d [NO ISSUE][MISC] Update Dependencies
4c6cf2ebe9 [ASTERIXDB-3649][API] Untrack non-ASYNC requests
504967ae9e [NO ISSUE][EXT]: ensure all required params are set before validation
57310b73b7 [ASTERIXDB-3649][FUN] Add data-source function for ASYNC requests
135dca2c7c [ASTERIXDB-3649][API] Set max result reads + untrack request
435c4c9631 [ASTERIXDB-3769][API] Fail ASYNC requests for DMLs
11b0b9bbf9 [NO ISSUE][EXT]: misc iceberg fixes
5860d6b42d [NO ISSUE][EXT]: validate catalog endpoint on catalog creation
1940876940 [NO ISSUE][*DB][TEST] Disable LicensingIT (until release time)
89560d163d [NO ISSUE][MISC] Update dependencies
963229388b [NO ISSUE][MISC] Remove maven-antrun-plugin override
7ce29d2a40 [NO ISSUE][HYR][NET] Update Netty to 4.1.133.Final for CVEs
78be252761 [NO ISSUE][RT] Enable VSizeFrame allocation extension
5b988b2bc0 [ASTERIXDB-3774][CLOUD] Adding HTTP idle/lifetime config in S3 and
GCS cloud clients
ab9079effc [NO ISSUE][MISC] Update build-time dependencies
f33151088a [NO ISSUE][MISC] Fix compiler warnings
35fa8732bd [ASTERIXDB-3634][EXT]: set source type beforehand for snapshot
validation
0a07d16823 [NO ISSUE][*DB][RT] Guard against cancelled request removed from
tracker
7101691544 [ASTERIXDB-3634][EXT]: Allow any order for snapshot ID and pos var
85872601ae [ASTERIXDB-3768][CLOUD] Add S3 checksumBehavior parameter for
external link
89d53cfbf5 [ASTERIXDB-3772][RT] Surface ASX1113 for invalid regex patterns
1355135de1 [ASTERIXDB-3719][COMP] Using index when redundant range predicates
are present
27ade8870b [NO ISSUE][EXT] loosening ser/de visibility
1aef56aea9 [ASTERIXDB-3634][EXT]: Support passing time travel in query
8d097f4788 [ASTERIXDB-3769][API] Fail async requests for unsupported statements
7bb7f1cc2a [NO ISSUE][COMP] Fix testcases for UPDATE statement
e7addff822 [NO ISSUE][OTH] Shutdown s3Mock before start
4f970e317a [ASTERIXDB-3770][COMP] Fix incorrect Result When Updating a Full
Object
497272ed6f [NO ISSUE][COMP] Adding more testcases for UPDATE statement
7fa17e7691 [ASTERIXDB-3634][EXT]: correctly parse iceberg data types
b39d9cffb0 [ASTERIXDB-3768][CLOUD] Add configurable S3 checksum behavior for
S3-compatible storage
a9d93ea4bd [NO ISSUE][MISC] Update GCS, Protobuf Dependencies
e247ae2c64 [NO ISSUE][MISC] Update commons-codec, commons-io, awsjavasdk
94f6aaf3e7 [ASTERIXDB-3759][COMP] Fix inconsistent array index handling in
UPDATE AT clause
bc5e8277ec [NO ISSUE][MISC] Update Maven artifacts
0223dc3649 (gerrit/phoenix) [NO ISSUE][HYR][MISC][BP] Fix Span lifefycle / API
issues
c5c69eafda [NO ISSUE][*DB][STO] Clean up Azure cloud client configuration
Change-Id: Id7d20b9c9106485fe89e9318fe41fd73c9b4239c
---
M
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
M
asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
7 files changed, 79 insertions(+), 76 deletions(-)
Approvals:
Jenkins: Verified; Verified
Michael Blow: Looks good to me, approved
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
index df49d16..d2b4080 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
@@ -72,7 +72,7 @@
<test-case FilePath="async-deferred">
<compilation-unit name="async-not-supported">
<output-dir compare="Clean-JSON">async-not-supported</output-dir>
- <expected-error>ASX1247: Async mode not supported for the
statement CREATE COLLECTION</expected-error>
+ <expected-error>Async mode not supported for the statement CREATE
COLLECTION</expected-error>
<source-location>false</source-location>
</compilation-unit>
</test-case>
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index 448ee0e..02a31df 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -351,18 +351,15 @@
NOT_ICEBERG_CATALOG(1243),
UPDATE_PRIMARY_KEY(1244),
PARQUET_WRITER_ERROR(1245),
-<<<<<<< HEAD (ec1773 [ASTERIXDB-3780][OTH]Set up default protection ruleset
for d)
SRID_MISMATCH(1246),
CRS_NOT_FOUND(1247),
CRS_ALREADY_EXISTS(1248),
CRS_TRANSFORM_FAILED(1249),
INVALID_CRS_WKT(1250),
ST_DISTANCE_SPHEROID_REQUIRES_4326(1251),
-=======
- UPDATE_INSERT_POSITION_OUT_OF_BOUNDS(1246),
- ASYNC_NOT_SUPPORTED_FOR_STATEMENT(1247),
- UNSUPPORTED_FILE_IO_TYPE(1248),
->>>>>>> BRANCH (d49330 [NO ISSUE][MISC] Upgrade Netty to 4.1.135 to address
CVEs)
+ UPDATE_INSERT_POSITION_OUT_OF_BOUNDS(1252),
+ ASYNC_NOT_SUPPORTED_FOR_STATEMENT(1253),
+ UNSUPPORTED_FILE_IO_TYPE(1254),
// Feed errors
DATAFLOW_ILLEGAL_STATE(3001),
diff --git
a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index edca9c9..a4b82d3 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -353,18 +353,15 @@
1243 = Catalog '%1$s' is not an Iceberg catalog
1244 = Cannot update primary key '%1$s'
1245 = Parquet writer error: %1$s
-<<<<<<< HEAD (ec1773 [ASTERIXDB-3780][OTH]Set up default protection ruleset
for d)
1246 = SRID mismatch: %1$s vs %2$s in spatial operation %3$s
1247 = CRS definition not found for SRID %1$s
1248 = CRS definition already exists for SRID %1$s
1249 = Failed to transform geometry from SRID %1$s to %2$s: %3$s
1250 = Invalid CRS WKT for SRID %1$s: %2$s
1251 = ST_DISTANCE_SPHEROID requires SRID 4326 (WGS84). Found SRID %1$s and
%2$s
-=======
-1246 = Insert position %1$s is out of bounds for array of length %2$s
-1247 = Async mode not supported for the statement %1$s
-1248 = Unsupported Iceberg FileIO type. Found: %1$s
->>>>>>> BRANCH (d49330 [NO ISSUE][MISC] Upgrade Netty to 4.1.135 to address
CVEs)
+1252 = Insert position %1$s is out of bounds for array of length %2$s
+1253 = Async mode not supported for the statement %1$s
+1254 = Unsupported Iceberg FileIO type. Found: %1$s
# Feed Errors
3001 = Illegal state.
diff --git
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
index 7c02d70..bdc7a9a 100644
---
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
+++
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
@@ -72,64 +72,6 @@
}
enum Kind {
-<<<<<<< HEAD (ec1773 [ASTERIXDB-3780][OTH]Set up default protection ruleset
for d)
- TRUNCATE,
- DATASET_DECL,
- DATAVERSE_DECL,
- DATABASE_DROP,
- DATAVERSE_DROP,
- DATASET_DROP,
- DELETE,
- INSERT,
- UPSERT,
- UPDATE,
- FUNCTION_DECL,
- VIEW_DECL,
- LOAD,
- NODEGROUP_DECL,
- NODEGROUP_DROP,
- QUERY,
- SET,
- TYPE_DECL,
- TYPE_DROP,
- CREATE_INDEX,
- CREATE_DATABASE,
- CREATE_DATAVERSE,
- CREATE_VIEW,
- CREATE_FULL_TEXT_FILTER,
- CREATE_FULL_TEXT_CONFIG,
- INDEX_DROP,
- FULL_TEXT_FILTER_DROP,
- FULL_TEXT_CONFIG_DROP,
- CREATE_FEED,
- DROP_FEED,
- START_FEED,
- STOP_FEED,
- CONNECT_FEED,
- DISCONNECT_FEED,
- CREATE_FEED_POLICY,
- DROP_FEED_POLICY,
- CREATE_FUNCTION,
- CREATE_ADAPTER,
- CREATE_LIBRARY,
- FUNCTION_DROP,
- ADAPTER_DROP,
- LIBRARY_DROP,
- CREATE_SYNONYM,
- SYNONYM_DROP,
- VIEW_DROP,
- ANALYZE,
- ANALYZE_DROP,
- COMPACT,
- SUBSCRIBE_FEED,
- EXTENSION,
- COPY_FROM,
- COPY_TO,
- CATALOG_CREATE,
- CATALOG_DROP,
- CRS_CREATE,
- CRS_DROP
-=======
SET("SET", true),
FUNCTION_DECL("DECLARE FUNCTION", false),
VIEW_DECL("DECLARE VIEW", false),
@@ -183,7 +125,9 @@
COPY_FROM("COPY FROM", false),
COPY_TO("COPY TO", true),
CATALOG_CREATE("CATALOG CREATE", false),
- CATALOG_DROP("CATALOG DROP", false);
+ CATALOG_DROP("CATALOG DROP", false),
+ CRS_CREATE("CRS_CREATE", false),
+ CRS_DROP("CRS_DROP", false);
private final String displayName;
private final boolean isSupportAsync;
@@ -200,6 +144,5 @@
public boolean isSupportAsync() {
return isSupportAsync;
}
->>>>>>> BRANCH (d49330 [NO ISSUE][MISC] Upgrade Netty to 4.1.135 to address
CVEs)
}
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index 1f6bdd5..968cd0f 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -292,15 +292,12 @@
protected static final String CATALOG = "CATALOG";
private static final String SOURCE = "SOURCE";
private static final String CASCADE = "CASCADE";
-<<<<<<< HEAD (ec1773 [ASTERIXDB-3780][OTH]Set up default protection ruleset
for d)
private static final String COORDINATE = "COORDINATE";
private static final String REFERENCE = "REFERENCE";
private static final String SYSTEM = "SYSTEM";
private static final String NAME = "NAME";
-=======
private static final String SNAPSHOT = "SNAPSHOT";
private static final String TIMESTAMP = "TIMESTAMP";
->>>>>>> BRANCH (d49330 [NO ISSUE][MISC] Upgrade Netty to 4.1.135 to address
CVEs)
private static final String INT_TYPE_NAME = "int";
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
index 1533f65..63d8902 100644
---
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
+++
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
@@ -249,4 +249,5 @@
String bare = host.charAt(0) == '[' ? host.substring(1, host.length()
- 1) : host;
return InetAddresses.isInetAddress(bare);
}
+
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21310?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: master
Gerrit-Change-Id: Id7d20b9c9106485fe89e9318fe41fd73c9b4239c
Gerrit-Change-Number: 21310
Gerrit-PatchSet: 10
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
