usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [08/36] usergrid git commit: Ignored test that isn't currently supported due to needing a new endpoint. Added logic that will index entire arrays by only specifying the top level identifier.
Date Fri, 08 Apr 2016 20:20:55 GMT
Ignored test that isn't currently supported due to needing a new endpoint.
Added logic that will index entire arrays by only specifying the top level identifier.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c0b96a56
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c0b96a56
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c0b96a56

Branch: refs/heads/release-2.1.1
Commit: c0b96a56729e8f1bf10a6c883756dbedb08a4baa
Parents: f0480b4
Author: George Reyes <grey@apache.org>
Authored: Wed Mar 16 15:21:04 2016 -0700
Committer: George Reyes <grey@apache.org>
Committed: Thu Mar 24 09:14:25 2016 -0700

----------------------------------------------------------------------
 .../corepersistence/index/IndexServiceImpl.java | 78 +++++++++++++++++++-
 .../collection/CollectionsResourceIT.java       |  2 +-
 2 files changed, 77 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/c0b96a56/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
index 9e0e799..8d7a541 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
@@ -199,6 +199,7 @@ public class IndexServiceImpl implements IndexService {
         String jsonMap = mm.getString( indexEdge.getEdgeName().split( "\\|" )[1] );
 
         Set<String> defaultProperties = null;
+        ArrayList fieldsToKeep = null;
 
         if(jsonMap != null) {
 
@@ -206,7 +207,7 @@ public class IndexServiceImpl implements IndexService {
             Schema schema = Schema.getDefaultSchema();
             defaultProperties = schema.getRequiredProperties( indexEdge.getEdgeName().split(
"\\|" )[1]);
             //TODO: additional logic to
-            ArrayList fieldsToKeep = ( ArrayList ) jsonMapData.get( "fields" );
+            fieldsToKeep = ( ArrayList ) jsonMapData.get( "fields" );
             defaultProperties.addAll( fieldsToKeep );
         }
         else
@@ -221,6 +222,7 @@ public class IndexServiceImpl implements IndexService {
             while ( collectionIterator.hasNext() ) {
                 EntityField testedField = ( EntityField ) collectionIterator.next();
                 String fieldName = ( String ) (testedField).get( "name" );
+
                 //TODO: need to change the logic here such that default properties does a
check against each every field.
                 //it is very likely that the below does O(n) comparisons anyways so doing
it for each value in a loop
                 //would be the right equivalent here. Even if it isn't very efficient.
@@ -232,9 +234,81 @@ public class IndexServiceImpl implements IndexService {
                 //then if it doesn't do a split of the properties and see if any of them
match for the split
                 //if they do match then allow in, otherwise don't allow.
 
+                //will only enter the loop for properties that aren't default properties
so we only need to check
+                //the properties that the user imposed.
                 if ( !finalDefaultProperties.contains( fieldName ) ) {
-                    mapFields.remove( testedField );
+
+                    //loop through and string split it all and if they still dont' match
after that loop then remove them.
+                    boolean toRemoveFlag = true;
+                    String[] flattedStringArray = fieldName.split( "\\." );
+                    Iterator fieldIterator = fieldsToKeep.iterator();
+                    while(fieldIterator.hasNext()) {
+                        String requiredInclusionString = ( String ) fieldIterator.next();
+                        String[] flattedRequirementString = new String[0];
+
+                        if(!requiredInclusionString.contains( "." )){
+                            flattedRequirementString = new String[]{requiredInclusionString};
+                        }
+                        else {
+                             flattedRequirementString= requiredInclusionString.split( "\\."
);
+                        }
+
+                        //what we're aiming to do here is check the entire length of the
string against
+                        //
+                        for ( int index = 0; index < flattedRequirementString.length;index++){
+                            //if the array contains a string that it is equals to then set
the remove flag to true
+                            //otherwise remain false.
+
+                            //TODO: document that whatever comes first in the index will
be filtered out in the way specified
+                            //so if the filtering spec had to filter one and one.two.three.
and there is a value of
+                            // one.three. Then it will be filtered out because the rule one.two.three
is applied
+                            //without a reference or care that one exists.
+                            if(flattedStringArray.length <= index){
+                                toRemoveFlag = true;
+                                break;
+                            }
+                            //this has a condition issue where if we evaluate that it passes
on the first pass, we dont' want to continue the while lo
+                            if(flattedRequirementString[index].equals( flattedStringArray[index]
)){
+                                toRemoveFlag=false;
+                            }
+                            else{
+                                toRemoveFlag=true;
+                            }
+                        }
+                        if(toRemoveFlag==false){
+                            break;
+                        }
+                    }
+
+                    if(toRemoveFlag){
+                        mapFields.remove( testedField );
+                    }
+
                 }
+
+
+//                Iterator iterator = finalDefaultProperties.iterator();
+//                while(iterator.hasNext()){
+//                    String includedFieldName = ( String ) iterator.next();
+//                    //if the field name
+//                    if(!includedFieldName.equals( fieldName )){
+//
+//                    }
+//
+//                }
+
+//                for(int index = 0; index < finalDefaultProperties.size();index++){
+//                    finalDefaultProperties.
+//
+//                }
+
+//
+//                if ( !finalDefaultProperties.contains( fieldName ) ) {
+//                    mapFields.remove( testedField );
+//                }
+//                else{
+//
+//                }
             }
         }
         return map;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/c0b96a56/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index ab46681..7e29016 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -123,7 +123,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
      *
      * @throws Exception
      */
-    @Test
+    @Ignore("The reindexing isn't currently supported yet.")
     public void postToCollectionSchemaUpdateExistingCollection() throws Exception {
 
         //Create test collection with test entity that is full text indexed.


Mime
View raw message