6816.patch

Radu Apetrii, 12/14/2022 04:20 AM

     **     OM  20210704          Added specialized copy constructor.
     **     AL2 20220706          Added isCompatible to filter out the sort clauses not belonging to the buffer.
     **     OM  20220727          FieldId and PropertyId are different for denormalized extent fields.
     **     RAA 20221213          Added a cache for storing the result of toSortExpression() method.
     */
     /*
-...
        /** Lock for cache */
        private static final Object cacheLock = new Object();
        /** Cache for storing the result of {@code toSortExpression} method. */
        private final Vector<String> toStringCache;
        /** <code>true</code> if sort is ascending, else it is descending */
        private final boolean ascending;
-...
        private final String originalName;
        /** Sort property name, usually qualified */
        private String name;
        private final String name;
        /** Subscript value, if any */
        private int subscript = -1;
        private final int subscript;
        /** SQL dialect which used this sort criterion; used for rtrim calls on character properties */
        private Dialect dialect = null;
        private final Dialect dialect;
        /**
         * Constructor which parses original sort component text, deriving the property name, sort
-...
           // parse the test and extract alias, property and optional extent
           int spacePos = text.indexOf(' ');
           String rawName = ((spacePos != -1) ? text.substring(0, spacePos) : text).trim();
           name = rawName;
           String actualName = rawName;
           originalName = internStrings ? rawName.intern() : rawName;
           int bracketPos = rawName.indexOf("[");
           int endPos = -1;
           int actualSubscript = -1;
           if (bracketPos >= 0)
+          {
              endPos = rawName.indexOf("]");
-...
+             }
              // extract base name
              name = rawName.substring(0, bracketPos);
              actualName = rawName.substring(0, bracketPos);
+          }
           int dotPos = name.lastIndexOf(".");
           int dotPos = actualName.lastIndexOf(".");
           if (dotPos < 0)
+          {
              throw new PersistenceException("Sort property may not be unqualified:  " + rawName);
+          }
           String propName = name.substring(dotPos + 1);
           String alias = name.substring(0, dotPos);
           String propName = actualName.substring(dotPos + 1);
           String alias = actualName.substring(0, dotPos);
           DmoMeta dmoMeta = DmoMetadataManager.getDmoInfo(dmoClass);
           Property propMeta = dmoMeta.getFieldInfo(propName);
           this.propertyName = propMeta.name; // already interned, anyway
-...
                 String sub = rawName.substring(bracketPos + 1, endPos);
                 try
+                {
                    subscript = Integer.parseInt(sub);
                    actualSubscript = Integer.parseInt(sub);
+                }
                 catch (NumberFormatException exc)
+                {
                    throw new PersistenceException("Unsupported subscript:  " + sub);
+                }
                 name = alias + "." + propertyName;
                 actualName = alias + "." + propertyName;
+             }
+          }
           if (internStrings)
+          {
              name = name.intern();
              actualName = actualName.intern();
+          }
           // determine sort direction
-...
              ignoreCase = isCharacter && !caseSens;
              computedColumnPrefix = ccPrefix;
+          }
           name = actualName;
           subscript = actualSubscript;
           toStringCache = new Vector<>(16);
           toStringCache.setSize(16);
+       }
        /**
-...
           this.originalName = other.originalName;
           this.name = alias + "." + propertyName +
                       (subscript < 0 ? "" : "[" + subscript + "]") + (ascending ? " asc" : " desc");
           toStringCache = new Vector<>(16);
           toStringCache.setSize(16);
+       }
        /**
-...
           // ASC:   ASC + NULLS LAST    (CASE WHEN [Order] IS NULL THEN 1 ELSE 0 END), [Order] ASC
           // DESC:  DESC + NULLS FIRST  (CASE WHEN [Order] IS NULL THEN 0 ELSE 1 END), [Order] DESC
           int cacheKey = 0;
           cacheKey += (invert ? 1 << 3 : 0);
           cacheKey += (useTableAlias ? 1 << 2 : 0);
           cacheKey += (uniqueAlias ? 1 << 1 : 0);
           cacheKey += (doSpecificProcessing ? 1 : 0);
           String cacheResult = null;
           cacheResult = toStringCache.get(cacheKey);
           if (cacheResult != null)
+          {
              return cacheResult;
+          }
           boolean mssqlFix = dialect instanceof P2JSQLServer2008Dialect;
           StringBuilder buf = new StringBuilder();
           StringBuilder sortExpr = mssqlFix ? new StringBuilder() : null;
-...
              buf.append(ascending ? "asc" : "desc");
+          }
           return buf.toString();
           String result = buf.toString();
           toStringCache.setElementAt(result, cacheKey);
           return result;
+       }
        /**

Project

General

Profile

FWD » Core Development » Database

6816.patch