Project

General

Profile

1587.patch

Radu Apetrii, 10/09/2024 10:47 AM

Download (2.9 KB)

View differences:

new/rules/annotations/index_selection.rules 2021-02-09 20:22:00 +0000
4 4
** Module   : index_selection.rules
5 5
** Abstract : duplicate the index selection decision of the Progress compiler 
6 6
**
7
** Copyright (c) 2004-2020, Golden Code Development Corporation.
7
** Copyright (c) 2004-2021, Golden Code Development Corporation.
8 8
**
9 9
** _#_ _I_ __Date__ __JPRM__ ____________________________Description_____________________________
10 10
** 001 GES 20051014   @23066 Duplicates the index selection decision of
......
113 113
** 041 OM  20190213          Extracted UDF calls as P2JQuery.Parameters.
114 114
**                           Fixed conversion of sorting by extent fields with non-constant index.
115 115
** 042 ECF 20200906          New ORM implementation.
116
** 043 IAS 20210209          Do not use word index field for sorting
116 117
*/
117 118
-->
118 119

  
......
948 949
                  <action>putNote("matchtype", #(long) prog.range_match)</action>
949 950
               </rule>
950 951
               
952
 <!-- 
951 953
               <rule>matchType == prog.kw_contains
952 954
                  <action>isw.addWordMatch(sname)</action>
953 955
                  <action>putNote("matchtype", #(long) prog.word_match)</action>
954 956
               </rule>
955
            </rule>
957
 -->
958
             </rule>
956 959
         </rule>
957 960
      </rule>
958 961
      
new/src/com/goldencode/p2j/convert/IndexSelectionWorker.java 2021-02-09 20:22:00 +0000
3 3
** Abstract : provides access to schema index data and helpers to calc the 
4 4
**            actual implicit index in use
5 5
**
6
** Copyright (c) 2005-2020, Golden Code Development Corporation.
6
** Copyright (c) 2005-2021, Golden Code Development Corporation.
7 7
**
8 8
** -#- -I- --Date-- --JPRM-- -----------------------------------Description-----------------------------------
9 9
** 001 GES 20051013   @23061 Provides access to schema index data and
......
58 58
**                           current class (thus we need to recursively load .p2o files).
59 59
** 022 CA  20200412          Added incremental conversion support.
60 60
** 023 OM  20200924          P2JIndexComponent carries multiple information to avoid map lookups for them.
61
** 024 IAS 20210209          Do not use word index field for sorting
61 62
*/
62 63

  
63 64
/*
......
908 909
            P2JIndex idx = iter.next();
909 910
            
910 911
            // remember the complete list in case we find no matches
911
            all.add(idx);
912
            // word index is used for ordering only if there is a CONTAINS
913
            // operator for a corresponding field
914
            if (!idx.isWord()) 
915
            {
916
               all.add(idx);
917
            }
912 918
         }
913 919
         
914 920
         return all;