Removing index only from model xmls (#2413)

* Removing index only from model xmls * Updating yaml with indexOnly prunes --------- Co-authored-by: pcagbu <[email protected]> Co-authored-by: palindrome <[email protected]> Co-authored-by: Moriarty <[email protected]>
NationalSecurityAgency · Sep 16, 2024 · 7391b33 · 7391b33
1 parent 2525399
commit 7391b33
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 41 deletions.
diff --git a/docker/config/application-query.yml b/docker/config/application-query.yml
@@ -516,59 +516,45 @@ datawave:
           - fieldName: "SOURCE"
             modelFieldName: "VERTEXA"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "SOURCE"
             modelFieldName: "VERTEXA"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "SINK"
             modelFieldName: "VERTEXB"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "SINK"
             modelFieldName: "VERTEXB"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "RELATION"
             modelFieldName: "RELATION"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "RELATION"
             modelFieldName: "RELATION"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "TYPE"
             modelFieldName: "TYPE"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "TYPE"
             modelFieldName: "TYPE"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "ATTRIBUTE1"
             modelFieldName: "ATTR1"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "ATTRIBUTE1"
             modelFieldName: "ATTR1"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "ATTRIBUTE2"
             modelFieldName: "ATTR2"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "ATTRIBUTE2"
             modelFieldName: "ATTR2"
             direction: "FORWARD"
-            indexOnly: false
           - fieldName: "ATTRIBUTE3"
             modelFieldName: "ATTR3"
             direction: "REVERSE"
-            indexOnly: false
           - fieldName: "ATTRIBUTE3"
             modelFieldName: "ATTR3"
             direction: "FORWARD"
-            indexOnly: false
 
 # Enable additional Hazelcast cluster for use by the query and executor services
 hazelcast:

diff --git a/warehouse/query-core/src/main/resources/DATAWAVE_EDGE.xml b/warehouse/query-core/src/main/resources/DATAWAVE_EDGE.xml
@@ -9,26 +9,26 @@
          name representation as needed for the deployment environment's default query syntax.
     -->
     <Mappings>
-        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="FORWARD" columnVisibility="PUBLIC"/>
 
     </Mappings>
 </Model>

diff --git a/warehouse/query-core/src/test/resources/DATAWAVE_EDGE.xml b/warehouse/query-core/src/test/resources/DATAWAVE_EDGE.xml
@@ -9,26 +9,26 @@
          name representation as needed for the deployment environment's default query syntax.
     -->
     <Mappings>
-        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="REVERSE" columnVisibility="PUBLIC"/>
         <Mapping fieldName="SOURCE" modelFieldName="VERTEXA" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="SINK" modelFieldName="VERTEXB" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="RELATION" modelFieldName="RELATION" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="TYPE" modelFieldName="TYPE" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE1" modelFieldName="ATTR1" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE2" modelFieldName="ATTR2" direction="FORWARD" columnVisibility="PUBLIC"/>
 
-        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="REVERSE" indexOnly="false" columnVisibility="PUBLIC"/>
-        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="FORWARD" indexOnly="false" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="REVERSE" columnVisibility="PUBLIC"/>
+        <Mapping fieldName="ATTRIBUTE3" modelFieldName="ATTR3" direction="FORWARD" columnVisibility="PUBLIC"/>
 
     </Mappings>
 </Model>