Merge branch 'master' into DS-1801.a

# Conflicts:
#	xyz-util/src/main/java/com/here/xyz/util/db/pg/Script.java
#	xyz-util/src/main/resources/sql/common.sql
#	xyz-util/src/main/resources/sql/feature_writer.sql

Author: roegi

xyz-connectors/src/main/java/com/here/xyz/connectors/EntryConnectorHandler.java

@@ -189,7 +189,7 @@ private void getFeatures(final RoutingContext context, List<String> ids, ApiResp
    * Creates or replaces a feature.
    */
   private void putFeature(final RoutingContext context) throws HttpException {
-    if (Config.instance.USE_WRITE_FEATURES_EVENT)
+    if (useWFE(context))
       executeWriteFeatures(context, FEATURE,
           toFeatureModificationList(readFeature(context).withId(getFeatureId(context)), IfNotExists.CREATE, IfExists.REPLACE,
               ConflictResolution.ERROR), getSpaceContext(context));
@@ -198,6 +198,10 @@ private void putFeature(final RoutingContext context) throws HttpException {
           ConflictResolution.ERROR);
   }
 
+  private boolean useWFE(RoutingContext context) {
+    return Config.instance.USE_WRITE_FEATURES_EVENT && getSpaceId(context).contains("drgnstn");
+  }
+
   private FeatureModificationList toFeatureModificationList(Feature feature, IfNotExists ifNotExists, IfExists ifExists,
       ConflictResolution conflictResolution) {
     return toFeatureModificationList(new FeatureCollection().withFeatures(List.of(feature)), ifNotExists, ifExists, conflictResolution);
@@ -230,7 +234,7 @@ private FeatureModificationList toFeatureModificationList(List<String> featureId
    */
   private void putFeatures(final RoutingContext context) throws HttpException {
     ApiResponseType responseType = getEmptyResponseTypeOr(context, FEATURE_COLLECTION);
-    if (Config.instance.USE_WRITE_FEATURES_EVENT)
+    if (useWFE(context))
       executeWriteFeatures(context, responseType,
           toFeatureModificationList(readFeatureOrFeatureCollection(context), IfNotExists.CREATE, IfExists.REPLACE, ConflictResolution.ERROR),
           getSpaceContext(context));
@@ -366,7 +370,7 @@ private Future<Void> updateContentUpdatedAt(Marker marker, Space space) {
    * Patches a feature
    */
   private void patchFeature(final RoutingContext context) throws HttpException {
-    if (Config.instance.USE_WRITE_FEATURES_EVENT)
+    if (useWFE(context))
       executeWriteFeatures(context, FEATURE,
           toFeatureModificationList(readFeature(context).withId(getFeatureId(context)), IfNotExists.RETAIN, PATCH, ConflictResolution.ERROR),
           getSpaceContext(context));
@@ -385,7 +389,7 @@ private void postFeatures(final RoutingContext context) throws HttpException {
     ApiResponseType responseType = getEmptyResponseTypeOr(context, FEATURE_COLLECTION);
     String contentType = context.parsedHeaders().contentType().value();
 
-    if (Config.instance.USE_WRITE_FEATURES_EVENT) {
+    if (useWFE(context)) {
       FeatureModificationList featureModificationList = APPLICATION_VND_HERE_FEATURE_MODIFICATION_LIST.equals(contentType)
           ? readFeatureModificationList(context, ifExists, ifNotExists, conflictResolution)
           : toFeatureModificationList(readFeatureOrFeatureCollection(context), ifNotExists, ifExists, conflictResolution);
@@ -404,7 +408,7 @@ private void deleteFeature(final RoutingContext context) throws HttpException {
     String featureId = context.pathParam(Path.FEATURE_ID);
     final SpaceContext spaceContext = getSpaceContext(context);
 
-    if (Config.instance.USE_WRITE_FEATURES_EVENT)
+    if (useWFE(context))
       executeDeleteFeatures(context, EMPTY, List.of(featureId), spaceContext, true);
     else
       executeConditionalOperationChain(true, context, ApiResponseType.EMPTY, IfExists.DELETE, IfNotExists.RETAIN,
@@ -426,7 +430,7 @@ private void deleteFeatures(final RoutingContext context) throws HttpException {
       sendErrorResponse(context, new DetailedHttpException("E318406"));
     else {
       //Delete features by IDs
-      if (Config.instance.USE_WRITE_FEATURES_EVENT && !eraseContent)
+      if (useWFE(context) && !eraseContent)
         executeDeleteFeatures(context, responseType, featureIds, spaceContext, false);
       else
         executeConditionalOperationChain(false, context, responseType, IfExists.DELETE, IfNotExists.RETAIN, true,

xyz-hub-service/src/main/java/com/here/xyz/hub/rest/FeatureApi.java

@@ -145,7 +145,13 @@ public static Typed readFeaturesByRefQuadAndGlobalVersions(StorageConnector conn
   }
 
   public static Typed readFeaturesByRefQuadAndGlobalVersions(StorageConnector connector, List<String> spaceNames, String refQuad,
-                                                             List<Integer> globalVersions, int limit, boolean isCount)
+                                                             List<Integer> globalVersions, int limit, boolean isCount) throws Exception {
+    return readFeaturesByRefQuadAndGlobalVersions(connector, spaceNames, refQuad, globalVersions, limit, isCount, null);
+  }
+
+  public static Typed readFeaturesByRefQuadAndGlobalVersions(StorageConnector connector, List<String> spaceNames, String refQuad,
+                                                             List<Integer> globalVersions, int limit, boolean isCount, Integer
+                                                                     refQuadLevel)
           throws Exception {
     Event searchForFeaturesEvent;
 
@@ -169,8 +175,32 @@ public static Typed readFeaturesByRefQuadAndGlobalVersions(StorageConnector conn
             .withLimit(limit)
             .withPropertiesQuery(propertiesQuery);
 
-    if (isCount)
-      ((SearchForFeaturesEvent) searchForFeaturesEvent).setSelection(List.of("f.refQuadCount"));
+    if (isCount) {
+      String selectionParam = "f.refQuadCount";
+      if(refQuadLevel != null)
+        selectionParam += "@"+refQuadLevel;
+
+      ((SearchForFeaturesEvent) searchForFeaturesEvent).setSelection(List.of(selectionParam));
+    }
+
+    return handleRequest(connector, (ContextAwareEvent<?>) searchForFeaturesEvent, spaceNames);
+  }
+
+  public static Typed readStatus(StorageConnector connector, List<String> spaceNames, String operations)
+          throws Exception {
+    Event searchForFeaturesEvent;
+
+    PropertiesQuery propertiesQuery = new PropertiesQuery();
+    PropertyQueryList queries = new PropertyQueryList();
+
+    queries.add(new PropertyQuery()
+            .withKey("properties.status")
+            .withOperation(EQUALS)
+            .withValues(List.of(operations)));
+
+    propertiesQuery.add(queries);
+    searchForFeaturesEvent = new SearchForFeaturesEvent()
+            .withPropertiesQuery(propertiesQuery);
 
     return handleRequest(connector, (ContextAwareEvent<?>) searchForFeaturesEvent, spaceNames);
   }

xyz-hub-test/src/main/java/com/here/xyz/benchmarks/tools/PerformanceTestHelper.java

@@ -15,7 +15,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
-rootLogger.level = WARN
+rootLogger.level = OFF
 
 #packages = com.amazonaws.services.lambda.runtime.log4j2
 #appender.LAMBDA.type = Lambda

xyz-hub-test/src/test/resources/log4j2.properties renamed to xyz-hub-test/src/main/resources/log4j2.properties

@@ -55,6 +55,7 @@
 import com.here.xyz.util.db.datasource.DatabaseSettings;
 import com.here.xyz.util.db.datasource.DatabaseSettings.ScriptResourcePath;
 import com.here.xyz.util.runtime.FunctionRuntime;
+import com.here.xyz.util.runtime.LambdaFunctionRuntime;
 import java.sql.BatchUpdateException;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -68,8 +69,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import com.here.xyz.util.runtime.LambdaFunctionRuntime;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -165,7 +164,7 @@ private boolean retryCausedOnServerlessDB(Exception e) {
                 return false;
             }
             if (!retryAttempted) {
-                logger.warn("{} Retry based on serverless scaling detected! RemainingTime: {} ", traceItem, remainingSeconds, e);
+                logger.warn("{} Retryable error detected! RemainingTime: {} ", traceItem, remainingSeconds, e);
                 return true;
             }
         }