DS-1723,DS-1841:

* Temp. fix PSQLIndexIT test
* OnDemandIndex.transformIntoNewDefinition() remove "f." from Expression

Signed-off-by: mchrza <[email protected]>

Author: mchrza

xyz-models/src/main/java/com/here/xyz/models/hub/Space.java

@@ -725,7 +725,7 @@ private NormalizedProperty tryParseNewStyleKey(String key) {
    *  - "foo::array"
    */
   private NormalizedProperty parseLegacyKey(String key) {
-    String base = key.startsWith("f.") ? key : "properties." + key;
+    String base = key.startsWith("f.") ? key.substring("f.".length()) : "properties." + key;
     String resultType = "scalar"; //default
 
     int sepIdx = key.lastIndexOf("::");
@@ -753,6 +753,8 @@ private NormalizedProperty parseLegacyKey(String key) {
     String alias;
     if (expression.startsWith("$.") && expression.length() > 2) {
       alias = expression.substring(2);
+      if(!alias.startsWith("properties."))
+        alias = "f." + alias;
     }
     else if (expression.startsWith("$") && expression.length() > 1) {
       alias = expression.substring(1);

xyz-psql-connector/src/test/java/com/here/xyz/psql/PSQLIndexIT.java

@@ -195,7 +195,7 @@ public void testOnDemandIdxCreation() throws Exception {
                     assertEquals("s",resultSet.getString("src"));
                 }
                 else {
-                    searchableProperties.remove(idxProperty);
+                    searchableProperties.remove(idxProperty.substring("properties.".length()));
                     assertEquals("m",resultSet.getString("src"));
                 }
 
@@ -215,9 +215,8 @@ public void testOnDemandIdxCreation() throws Exception {
 
         List<StatisticsResponse.PropertyStatistics> propStatistics = resp.getProperties().getValue();
         for (StatisticsResponse.PropertyStatistics propStat: propStatistics ) {
-           assertEquals("foo",propStat.getKey().substring(0,3));
-           // TODO: Clarify Behavior (StatisticsResponse)
-           //assertNull(propStat.isSearchable());
+          //TODO: Discuss BWC !
+           assertEquals("foo",propStat.getKey().replace("properties.","").substring(0,3));
         }
     }
 

xyz-util/src/main/java/com/here/xyz/util/db/pg/IndexHelper.java

@@ -215,34 +215,18 @@ public void transformIntoNewDefinition() {
         }
       }
 
+      String alias = path;
       if(!path.startsWith("f."))
-        path = "properties."+path;
+        alias = path = "properties."+path;
+      else
+        path = path.substring("f.".length());
 
-      propertyPath = "$" + path + ":[$." + path + "]::" + datatype;
+      propertyPath = "$" + alias + ":[$." + path + "]::" + datatype;
     }
 
     public boolean definitionGotTransformed() {
       String alias = extractAlias();
-      if(alias.equals(extractLogicalPropertyPath())){
-        if(alias.startsWith("properties.") || alias.startsWith("f."))
-          return true;
-        return true;
-      }
-      return false;
-//      propertyPath = propertyPath.trim();
-//      int colonIndex = propertyPath.indexOf(':');
-//
-//      String leftPath = propertyPath.substring(1, colonIndex);
-//
-//      int openBracket = propertyPath.indexOf("[$.");
-//      int closeBracket = propertyPath.indexOf("]", openBracket);
-//
-//      String inner = propertyPath.substring(openBracket + 3, closeBracket);
-//
-//
-//
-//      // Compare paths
-//      return leftPath.equals(inner);
+      return alias.startsWith("f.") || alias.startsWith("properties.");
     }
 
     @Override
@@ -294,7 +278,6 @@ public static List<OnDemandIndex> getActivatedSearchableProperties(Map<String, B
   public static SQLQuery buildOnDemandIndexCreationQuery(String schema, String table, OnDemandIndex index, TableLayout layout, boolean async){
     if(layout.hasSearchableColumn())
       return buildOnDemandIndexCreationQuery(schema, table, index.extractAlias(), NEW_LAYOUT_INDEX_COULMN, async);
-  index.definitionGotTransformed();
     return buildOnDemandIndexCreationQuery(schema, table, index.extractLogicalPropertyPath(), OLD_LAYOUT_INDEX_COULMN, async);
   }